liubin/icebergs
1
0
Fork 0
forked from x/icebergs
Code Pull Requests Activity

opt portal

Browse Source
This commit is contained in:
IT 老营长 @云轩领航-创始人 2024-07-28 23:21:54 +08:00
parent a5cd77e87d
commit af1a9be68e
7 changed files with 56 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
base/web/serve.go
View File

@ -95,9 +95,9 @@ func _serve_main(m *ice.Message, w http.ResponseWriter, r *http.Request) bool {
return true
}
func _serve_static(msg *ice.Message, w http.ResponseWriter, r *http.Request) bool {
_serve_params(msg, r.Header.Get(html.Referer))
// _serve_params(msg, r.Header.Get(html.Referer))
_serve_params(msg, r.URL.String())
ispod := msg.Option(ice.MSG_USERPOD) != ""
ispod := msg.Option(ice.POD) != ""
if strings.HasPrefix(r.URL.Path, nfs.V) {
return Render(msg, ice.RENDER_DOWNLOAD, path.Join(ice.USR_VOLCANOS, strings.TrimPrefix(r.URL.Path, nfs.V)))
} else if kit.HasPrefix(r.URL.Path, nfs.P) {
@ -105,7 +105,7 @@ func _serve_static(msg *ice.Message, w http.ResponseWriter, r *http.Request) boo
return false
}
p := strings.TrimPrefix(r.URL.Path, nfs.P)
if pp := path.Join(nfs.USR_LOCAL_WORK, msg.Option(ice.MSG_USERPOD)); ispod && nfs.Exists(msg, pp) {
if pp := path.Join(nfs.USR_LOCAL_WORK, msg.Option(ice.POD)); ispod && nfs.Exists(msg, pp) {
if pp = path.Join(pp, p); nfs.Exists(msg, pp) {
return Render(msg, ice.RENDER_DOWNLOAD, pp)
} else {

6
base/web/space.go
View File

@ -430,7 +430,11 @@ func init() {
if !kit.HasPrefix(value, nfs.PS) {
value = kit.MergeURL(nfs.P + value)
}
value = kit.MergeURL2(m.Appendv(mdb.TEXT)[index], value)
if m.Appendv(mdb.NAME)[index] == ice.OPS {
value = kit.MergeURL2(m.Option(ice.MSG_USERWEB), value)
} else {
value = kit.MergeURL2(m.Appendv(mdb.TEXT)[index], value)
}
} else {
if !kit.HasPrefix(value, nfs.PS) {
value = kit.MergeURL(nfs.P+value, ice.POD, kit.Keys(m.Option(ice.MSG_USERPOD), m.Appendv(mdb.NAME)[index]))

59
core/chat/oauth/client.go
View File

@ -2,12 +2,12 @@ package oauth
import (
"path"
"strings"
"shylinux.com/x/ice"
"shylinux.com/x/icebergs/base/aaa"
"shylinux.com/x/icebergs/base/ctx"
"shylinux.com/x/icebergs/base/lex"
"shylinux.com/x/icebergs/base/log"
"shylinux.com/x/icebergs/base/mdb"
"shylinux.com/x/icebergs/base/web"
"shylinux.com/x/icebergs/base/web/html"
@ -15,6 +15,7 @@ import (
)
const (
OAUTH = "oauth"
DOMAIN = "domain"
CLIENT_ID = "client_id"
CLIENT_SECRET = "client_secret"
@ -26,6 +27,8 @@ const (
USER_KEY = "user_key"
NICK_KEY = "nick_key"
ICON_KEY = "icon_key"
SESS_CMD = "sess_cmd"
USER_CMD = "user_cmd"
REDIRECT_URI = "redirect_uri"
RESPONSE_TYPE = "response_type"
@ -89,8 +92,11 @@ func (s Client) Inputs(m *ice.Message, arg ...string) {
}
}
}
func (s Client) List(m *ice.Message, arg ...string) {
s.Hash.List(m, arg...).PushAction(s.User, s.Auth, s.Sso, s.Remove).EchoScript(s.RedirectURI(m))
}
func (s Client) Sso(m *ice.Message, arg ...string) {
m.Cmd(web.CHAT_HEADER, mdb.CREATE, "oauth", m.Option(mdb.NAME), m.Option(mdb.HELP), m.Option(mdb.ICONS), s.OAuthURL(m))
m.Cmd(web.CHAT_HEADER, mdb.CREATE, OAUTH, m.Option(mdb.NAME), m.Option(mdb.HELP), m.Option(mdb.ICONS), s.OAuthURL(m))
}
func (s Client) Auth(m *ice.Message, arg ...string) {
m.ProcessOpen(s.OAuthURL(m))
@ -101,10 +107,12 @@ func (s Client) Link(m *ice.Message, arg ...string) {
}
func (s Client) User(m *ice.Message, arg ...string) {
if res := s.Get(m, m.Option(mdb.HASH), m.Option(USERS_URL), arg...); res != nil {
m.Info("what %v", kit.Format(res))
m.Options(res)
if m.Option("user_cmd") != "" {
m.Cmdy(kit.Split(m.Option("user_cmd")), kit.Simple(res))
if m.Options(res); m.Warn(!kit.IsIn(m.Option("errcode"), "", "0"), m.Option("errmsg")) {
return
}
m.Info("user info %v", kit.Format(res))
if m.Option(USER_CMD) != "" {
m.Cmdy(kit.Split(m.Option(USER_CMD)), m.OptionSimple("openid"), kit.Simple(res))
return
}
username := m.Option(aaa.USERNAME, m.Option(kit.Select(aaa.USERNAME, m.Option(USER_KEY))))
@ -126,9 +134,6 @@ func (s Client) User(m *ice.Message, arg ...string) {
}
func (s Client) Orgs(m *ice.Message, arg ...string) {}
func (s Client) Repo(m *ice.Message, arg ...string) {}
func (s Client) List(m *ice.Message, arg ...string) {
s.Hash.List(m, arg...).PushAction(s.User, s.Auth, s.Sso, s.Remove).EchoScript(s.RedirectURI(m))
}
func init() { ice.ChatCtxCmd(Client{}) }
@ -151,27 +156,21 @@ func (s Client) Login(m *ice.Message, arg ...string) {
}
func (s Client) Login2(m *ice.Message, arg ...string) {
if state, code := m.Option(STATE), m.Option(CODE); !m.WarnNotValid(state == "" || code == "") {
s.Hash.List(m.Spawn(), m.Option(mdb.HASH, state)).Table(func(value ice.Maps) { m.Options(value) })
m.Options(GRANT_TYPE, AUTHORIZATION_CODE, REDIRECT_URI, s.RedirectURI(m))
m.Option(ACCESS_TOKEN, "")
if res := s.Get(m, m.Option(mdb.HASH), m.Option(GRANT_URL), kit.Simple(m.OptionSimple(GRANT_TYPE, CODE), "appid", m.Option(CLIENT_ID), "secret", m.Option(CLIENT_SECRET))...); !m.WarnNotValid(res == nil) {
kit.Value(res, EXPIRES_IN, m.Time(kit.Format("%vs", kit.Int(kit.Value(res, EXPIRES_IN)))))
m.Info("what %v", kit.Format(res))
m.Options(res)
if s.User(m, m.OptionSimple("openid")...); m.Option(aaa.USERNAME) != "" && m.R != nil {
if m.Option("sess_cmd") != "" {
m.Cmdy(kit.Split(m.Option("sess_cmd")), kit.Simple(res))
return
msg := m.Spawn()
s.Hash.List(msg, m.Option(mdb.HASH, state)).Table(func(value ice.Maps) { msg.Options(value) })
msg.Options(GRANT_TYPE, AUTHORIZATION_CODE, REDIRECT_URI, s.RedirectURI(msg)).Option(ACCESS_TOKEN, "")
if res := s.Get(msg, msg.Option(mdb.HASH), msg.Option(GRANT_URL), kit.Simple(msg.OptionSimple(GRANT_TYPE, CODE), "appid", msg.Option(CLIENT_ID), "secret", msg.Option(CLIENT_SECRET))...); !m.WarnNotValid(res == nil) {
if msg.Options(res); m.Warn(!kit.IsIn(msg.Option("errcode"), "", "0"), msg.Option("errmsg")) {
return
}
m.Info("token info %v", kit.Format(res))
msg.Option(EXPIRES_IN, m.Time(kit.Format("%vs", kit.Int(msg.Option(EXPIRES_IN)))))
if s.User(msg, msg.OptionSimple("openid")...); !m.Warn(msg.Option(aaa.USERNAME) == "" && msg.Option("user_uid") == "") {
if msg.Option(SESS_CMD) != "" {
m.Cmdy(kit.Split(msg.Option(SESS_CMD)), msg.OptionSimple("user_uid"))
} else {
m.ProcessCookie(ice.MSG_SESSID, aaa.SessCreate(m.Message, msg.Option(aaa.USERNAME)), "-2")
}
m.Cmd(aaa.USER, mdb.MODIFY, m.OptionSimple(aaa.USERNAME), kit.Simple(res))
web.RenderCookie(m.Message, aaa.SessCreate(m.Message, m.Option(aaa.USERNAME)))
m.ProcessBack("-2")
} else {
if m.Option("sess_cmd") != "" {
m.Cmdy(kit.Split(m.Option("sess_cmd")), kit.Simple(res))
return
}
m.ProcessClose()
}
}
}
@ -180,7 +179,7 @@ func (s Client) OAuthURL(m *ice.Message) string {
return kit.MergeURL2(m.Option(web.DOMAIN), m.Option(OAUTH_URL), RESPONSE_TYPE, CODE, m.OptionSimple(CLIENT_ID), REDIRECT_URI, s.RedirectURI(m), m.OptionSimple(SCOPE), STATE, m.Option(mdb.HASH))
}
func (s Client) RedirectURI(m *ice.Message) string {
return strings.Split(m.MergeLink(web.ChatCmdPath(m.Message, m.ShortKey(), ctx.ACTION, kit.Select(aaa.LOGIN, m.Option("login")))), web.QS)[0]
return m.MergeLink(web.ChatCmdPath(m.Message, m.ShortKey(), ctx.ACTION, kit.Select(aaa.LOGIN, m.Option(aaa.LOGIN))), log.DEBUG, m.Option(log.DEBUG))
}
func (s Client) Get(m *ice.Message, hash, api string, arg ...string) ice.Any {

6
info.go
View File

@ -169,6 +169,12 @@ func MergeActions(arg ...Any) Actions {
if !ok || h.Icon == "" {
kit.Value(_cmd.Meta, kit.Keys(CTX_ICONS, k), v.Icon)
}
if !ok || h.Style == "" {
kit.Value(_cmd.Meta, kit.Keys("_style", k), v.Style)
}
if v.Style != "" {
kit.Value(_cmd.Meta, kit.Keys("_style", k), v.Style)
}
if !ok || h.Help == "" {
if help := kit.Split(v.Help, " :："); len(help) > 0 {
if kit.Value(_cmd.Meta, kit.Keys(CTX_TRANS, strings.TrimPrefix(k, "_")), help[0]); len(help) > 1 {

7
misc/wx/agent.go
View File

@ -11,6 +11,7 @@ import (
"shylinux.com/x/icebergs/base/gdb"
"shylinux.com/x/icebergs/base/mdb"
"shylinux.com/x/icebergs/base/nfs"
"shylinux.com/x/icebergs/base/web"
// "shylinux.com/x/icebergs/base/web/html"
"shylinux.com/x/icebergs/core/chat"
"shylinux.com/x/icebergs/core/chat/location"
@ -39,13 +40,15 @@ func init() {
Index.MergeCommands(ice.Commands{
AGENT: {Name: "agent auto", Help: "代理", Role: aaa.VOID, Actions: ice.MergeActions(ice.Actions{
chat.HEADER_AGENT: {Hand: func(m *ice.Message, arg ...string) {
kit.If(strings.Index(m.Option(ice.MSG_USERUA), "MicroMessenger") > -1, func() { m.Option(mdb.PLUGIN, m.PrefixKey()) })
kit.If(strings.Index(m.Option(ice.MSG_USERUA), "MicroMessenger") > -1, func() {
m.Optionv(mdb.PLUGIN, m.PrefixKey(), mdb.Config(m, web.SPACE))
})
}},
"getLocation": {Hand: func(m *ice.Message, arg ...string) { m.Cmdy(location.LOCATION, mdb.CREATE, arg) }},
"scanQRCode1": {Hand: func(m *ice.Message, arg ...string) { m.Cmdy(chat.FAVOR, mdb.CREATE, arg) }},
"oauth": {Hand: func(m *ice.Message, arg ...string) { mdb.Config(m, "oauth", arg[0]) }},
}, gdb.EventsAction(chat.HEADER_AGENT), ctx.ConfAction(
"oauth", "", nfs.SCRIPT, "https://res.wx.qq.com/open/js/jweixin-1.6.0.js",
"space", "", "oauth", "", nfs.SCRIPT, "https://res.wx.qq.com/open/js/jweixin-1.6.0.js",
)), Hand: func(m *ice.Message, arg ...string) {
m.Cmdy(ACCESS, AGENT).Options(SIGNATURE, _wx_sign(m, m.Option(NONCESTR, ice.Info.Pathname), m.Option(TIMESTAMP, kit.Format(time.Now().Unix())))).Display("")
ctx.OptionFromConfig(m, nfs.SCRIPT, "oauth")

2
option.go
View File

@ -72,7 +72,7 @@ func (m *Message) MergePodCmd(pod, cmd string, arg ...Any) string {
}
func (m *Message) MergeLink(url string, arg ...Any) string {
kit.If(m.Option(DEBUG) == TRUE, func() { arg = append([]Any{DEBUG, TRUE}, arg...) })
return kit.MergeURL2(strings.Split(kit.Select(Info.Domain, m.Option(MSG_USERWEB)), QS)[0], url, arg...)
return kit.MergeURL2(strings.Split(kit.Select(Info.Domain, m.Option(MSG_USERHOST), m.Option(MSG_USERWEB)), QS)[0], url, arg...)
}
func (m *Message) FieldsSetDetail() {
m.OptionFields(FIELDS_DETAIL)

13
type.go
View File

@ -36,12 +36,13 @@ type Config struct {
Value Any
}
type Action struct {
Name string
Help string
Icon string
Role string
Hand Handler
List List
Name string
Help string
Icon string
Role string
Style string
Hand Handler
List List
}
type Command struct {
Name string