From 26f93d5aca8eac3f35e78080fe35243aefabc9a6 Mon Sep 17 00:00:00 2001
From: shylinux <shylinux@icloud.com>
Date: Thu, 27 May 2021 17:01:47 +0800
Subject: [PATCH] opt some

---
 core/code/webpack.go |  5 ++---
 misc/wx/wx.go        | 30 ++++++++++++++++++++++++++++++
 misc/wx/wx.shy       |  2 ++
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/core/code/webpack.go b/core/code/webpack.go
index 9dace8be..e7e438fc 100644
--- a/core/code/webpack.go
+++ b/core/code/webpack.go
@@ -49,7 +49,7 @@ func init() {
 					})
 				}
 
-				for _, k := range []string{"publish/order.js"} {
+				for _, k := range []string{"publish/order.js", "frame.js"} {
 					js.WriteString(`_can_name = "` + path.Join("/", k) + "\"\n")
 					js.WriteString(m.Cmdx(nfs.CAT, k))
 				}
@@ -70,9 +70,8 @@ func init() {
 						m.Cmdx(nfs.CAT, path.Join(ice.USR_VOLCANOS, "page/index.css")),
 
 						m.Cmdx(nfs.CAT, path.Join(ice.USR_VOLCANOS, ice.PROTO_JS)),
-						m.Cmdx(nfs.CAT, path.Join(ice.USR_VOLCANOS, ice.FRAME_JS)),
-
 						m.Cmdx(nfs.CAT, path.Join(ice.USR_PUBLISH, "webpack/"+m.Option(kit.MDB_NAME)+".js")),
+
 						m.Cmdx(nfs.CAT, path.Join(ice.USR_VOLCANOS, "page/cache.js")),
 						m.Cmdx(nfs.CAT, path.Join(ice.USR_VOLCANOS, "page/index.js")),
 					))
diff --git a/misc/wx/wx.go b/misc/wx/wx.go
index 9b1114a5..f088ef6f 100644
--- a/misc/wx/wx.go
+++ b/misc/wx/wx.go
@@ -134,6 +134,8 @@ var Index = &ice.Context{Name: WX, Help: "公众号",
 				),
 			},
 		)},
+		"favor":  {Name: "favor", Help: "收藏", Value: kit.Data(kit.MDB_SHORT, kit.MDB_TEXT)},
+		"favor2": {Name: "favor2", Help: "收藏", Value: kit.Data(kit.MDB_SHORT, kit.MDB_LINK)},
 	},
 	Commands: map[string]*ice.Command{
 		ice.CTX_INIT: {Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
@@ -205,6 +207,34 @@ var Index = &ice.Context{Name: WX, Help: "公众号",
 			})
 		}},
 
+		"favor": {Name: "favor name auto create", Help: "收藏", Action: map[string]*ice.Action{
+			mdb.CREATE: {Name: "create name text", Help: "添加", Hand: func(m *ice.Message, arg ...string) {
+				m.Cmdy(mdb.INSERT, m.Prefix("favor"), "", mdb.HASH, arg)
+			}},
+			mdb.REMOVE: {Name: "remove", Help: "删除", Hand: func(m *ice.Message, arg ...string) {
+				m.Cmdy(mdb.DELETE, m.Prefix("favor"), "", mdb.HASH, kit.MDB_NAME, m.Option(kit.MDB_NAME))
+			}},
+		}, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
+			m.Fields(len(arg) == 0, "time,name,text")
+			m.Cmdy(mdb.SELECT, m.Prefix("favor"), "", mdb.HASH, kit.MDB_HASH, arg)
+			m.Table(func(index int, value map[string]string, head []string) {
+				m.PushImages("qrcode", kit.MergeURL("https://open.weixin.qq.com/qr/code", aaa.USERNAME, value[kit.MDB_TEXT]))
+			})
+			m.PushAction(mdb.REMOVE)
+		}},
+		"favor2": {Name: "favor name auto create", Help: "收藏", Action: map[string]*ice.Action{
+			mdb.CREATE: {Name: "create name link", Help: "添加", Hand: func(m *ice.Message, arg ...string) {
+				m.Cmdy(mdb.INSERT, m.Prefix("favor2"), "", mdb.HASH, arg)
+			}},
+			mdb.REMOVE: {Name: "remove", Help: "删除", Hand: func(m *ice.Message, arg ...string) {
+				m.Cmdy(mdb.DELETE, m.Prefix("favor2"), "", mdb.HASH, kit.MDB_NAME, m.Option(kit.MDB_NAME))
+			}},
+		}, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
+			m.Fields(len(arg) == 0, "time,name,link")
+			m.Cmdy(mdb.SELECT, m.Prefix("favor2"), "", mdb.HASH, kit.MDB_HASH, arg)
+			m.PushAction(mdb.REMOVE)
+		}},
+
 		"/login/": {Name: "/login/", Help: "认证", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
 			check := kit.Sort([]string{m.Conf(LOGIN, kit.Keym(TOKEN)), m.Option("timestamp"), m.Option("nonce")})
 			if b := sha1.Sum([]byte(strings.Join(check, ""))); m.Warn(m.Option("signature") != hex.EncodeToString(b[:]), ice.ErrNotRight) {
diff --git a/misc/wx/wx.shy b/misc/wx/wx.shy
index 5a1bc462..dedf2ce4 100644
--- a/misc/wx/wx.shy
+++ b/misc/wx/wx.shy
@@ -9,6 +9,8 @@ refer `
 qrcode `http://weixin.qq.com/r/_B1-Z7TEXOkjrfAE90jq`
 
 chapter "应用"
+field favor web.chat.wx.favor
+field favor web.chat.wx.favor2
 field scan web.chat.scan
 field files web.chat.files
 field paste web.chat.paste