x/icebergs
1
0
Fork 1
mirror of https://shylinux.com/x/icebergs synced 2025-04-29 02:29:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

opt some

Browse Source
This commit is contained in:
IT 老营长 @云轩领航-创始人 2022-03-15 14:17:39 +08:00
parent b2232d458c
commit 37b16d89d1
4 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
base/web/serve.go
View File

@ -275,7 +275,15 @@ func init() {
cli.NodeInfo(m, WORKER, ice.Info.PathName) cli.NodeInfo(m, WORKER, ice.Info.PathName)
AddRewrite(func(w http.ResponseWriter, r *http.Request) bool { AddRewrite(func(w http.ResponseWriter, r *http.Request) bool {
if r.Method == SPIDE_GET && r.URL.Path == ice.PS { if r.Method == SPIDE_GET && r.URL.Path == ice.PS {
msg := m.Spawn(SERVE, w, r) msg := m.Spawn(SERVE, w, r)
if share := r.URL.Query().Get("share"); share != "" {
switch msg := msg.Cmd(SHARE, share); msg.Append(mdb.TYPE) {
case "login":
RenderCookie(msg, aaa.SessCreate(msg, msg.Append(aaa.USERNAME)))
}
}
repos := kit.Select(ice.INTSHELL, ice.VOLCANOS, strings.Contains(r.Header.Get("User-Agent"), "Mozilla/5.0")) repos := kit.Select(ice.INTSHELL, ice.VOLCANOS, strings.Contains(r.Header.Get("User-Agent"), "Mozilla/5.0"))
Render(msg, ice.RENDER_DOWNLOAD, path.Join(msg.Config(kit.Keys(repos, nfs.PATH)), msg.Config(kit.Keys(repos, INDEX)))) Render(msg, ice.RENDER_DOWNLOAD, path.Join(msg.Config(kit.Keys(repos, nfs.PATH)), msg.Config(kit.Keys(repos, INDEX))))
return true // 网站主页 return true // 网站主页

6
core/chat/header.go
View File

@ -20,10 +20,12 @@ func _header_agent(m *ice.Message, arg ...string) {
} }
} }
func _header_check(m *ice.Message, arg ...string) { func _header_check(m *ice.Message, arg ...string) {
if m.Option(ice.MSG_USERNAME) == "" { if m.Option(ice.MSG_USERNAME) != "" {
return
}
m.Option(web.LOGIN, m.Config(web.LOGIN)) m.Option(web.LOGIN, m.Config(web.LOGIN))
m.Option(web.SSO, m.Conf(web.SERVE, kit.Keym(web.SSO))) m.Option(web.SSO, m.Conf(web.SERVE, kit.Keym(web.SSO)))
}
if m.Option("login.dev", m.Cmd(web.SPACE, ice.DEV).Append(mdb.TEXT)) == "" { if m.Option("login.dev", m.Cmd(web.SPACE, ice.DEV).Append(mdb.TEXT)) == "" {
m.Option("login.dev", m.Cmd(web.SPACE, ice.SHY).Append(mdb.TEXT)) m.Option("login.dev", m.Cmd(web.SPACE, ice.SHY).Append(mdb.TEXT))
} }

4
core/chat/website.go
View File

@ -36,9 +36,7 @@ func _website_parse(m *ice.Message, text string, args ...string) (map[string]int
), kit.Dict(), kit.Dict() ), kit.Dict(), kit.Dict()
prefix := "" prefix := ""
m.Debug("what %v", prefix)
m.Cmd(lex.SPLIT, "", mdb.KEY, mdb.NAME, func(deep int, ls []string, meta map[string]interface{}) []string { m.Cmd(lex.SPLIT, "", mdb.KEY, mdb.NAME, func(deep int, ls []string, meta map[string]interface{}) []string {
m.Debug("what %v", ls)
data := kit.Dict() data := kit.Dict()
switch display := ice.DisplayRequire(1, ls[0])[ctx.DISPLAY]; kit.Ext(ls[0]) { switch display := ice.DisplayRequire(1, ls[0])[ctx.DISPLAY]; kit.Ext(ls[0]) {
case nfs.JS: case nfs.JS:
@ -259,6 +257,7 @@ func init() {
var _website_template = `<!DOCTYPE html> var _website_template = `<!DOCTYPE html>
<head> <head>
<meta name="viewport" content="width=device-width,initial-scale=0.8,maximum-scale=0.8,user-scalable=0">
<meta charset="utf-8"> <meta charset="utf-8">
<title>volcanos</title> <title>volcanos</title>
<link rel="shortcut icon" type="image/ico" href="/favicon.ico"> <link rel="shortcut icon" type="image/ico" href="/favicon.ico">
@ -274,6 +273,7 @@ var _website_template = `<!DOCTYPE html>
var _website_template2 = `<!DOCTYPE html> var _website_template2 = `<!DOCTYPE html>
<head> <head>
<meta name="viewport" content="width=device-width,initial-scale=0.8,maximum-scale=0.8,user-scalable=0">
<meta charset="utf-8"> <meta charset="utf-8">
<title>volcanos</title> <title>volcanos</title>
<link rel="shortcut icon" type="image/ico" href="/favicon.ico"> <link rel="shortcut icon" type="image/ico" href="/favicon.ico">

23
misc/lark/sso.go
View File

@ -21,7 +21,15 @@ func init() {
appid := m.Cmd(APP).Append(APPID) appid := m.Cmd(APP).Append(APPID)
home := m.MergeURL2("/chat/lark/sso") home := m.MergeURL2("/chat/lark/sso")
if m.Option(cli.CODE) != "" { // 登录成功 if m.Option(cli.CODE) == "" { // 登录页面
if back := m.R.Header.Get("Referer"); back != "" {
home = kit.MergeURL(home, cli.BACK, back)
}
m.RenderRedirect(kit.MergeURL2(m.Cmd(web.SPIDE, LARK).Append("client.url"), "/open-apis/authen/v1/index"),
"redirect_uri", home, APP_ID, m.Cmd(APP).Append(APPID))
return
}
msg := m.Cmd(web.SPIDE, LARK, "/open-apis/authen/v1/access_token", "grant_type", "authorization_code", msg := m.Cmd(web.SPIDE, LARK, "/open-apis/authen/v1/access_token", "grant_type", "authorization_code",
cli.CODE, m.Option(cli.CODE), "app_access_token", m.Cmdx(APP, TOKEN, appid)) cli.CODE, m.Option(cli.CODE), "app_access_token", m.Cmdx(APP, TOKEN, appid))
@ -37,17 +45,8 @@ func init() {
) )
// 创建会话 // 创建会话
web.RenderCookie(m, aaa.SessCreate(m, m.Option(aaa.USERNAME)), web.CookieName(m.Option(cli.BACK))) // web.RenderCookie(m, aaa.SessCreate(m, m.Option(aaa.USERNAME)), web.CookieName(m.Option(cli.BACK)))
m.RenderRedirect(kit.Select(home, m.Option(cli.BACK))) m.RenderRedirect(kit.MergeURL(kit.Select(home, m.Option(cli.BACK)), "sessid", aaa.SessCreate(m, m.Option(aaa.USERNAME))))
return
}
if back := m.R.Header.Get("Referer"); back != "" {
home = kit.MergeURL(home, cli.BACK, back)
}
// 登录页面
m.RenderRedirect(kit.MergeURL2(m.Cmd(web.SPIDE, LARK).Append("client.url"), "/open-apis/authen/v1/index"),
"redirect_uri", home, APP_ID, m.Cmd(APP).Append(APPID))
}}, }},
}}) }})
} }