From ede3bab23fd6253363c7fc6e9a48b19c7158cd07 Mon Sep 17 00:00:00 2001
From: shaoying <shylinux@icloud.com>
Date: Sat, 25 Jul 2020 16:21:32 +0800
Subject: [PATCH] opt some

---
 client/mp/.app.js.swo                           | Bin 0 -> 16384 bytes
 {trash/client => client}/mp/app.js              |  13 +++++++++----
 {trash/client => client}/mp/app.json            |   0
 {trash/client => client}/mp/app.wxml            |   0
 {trash/client => client}/mp/app.wxss            |   0
 .../client => client}/mp/pages/action/action.js |   0
 .../mp/pages/action/action.json                 |   0
 .../mp/pages/action/action.wxml                 |   0
 .../mp/pages/action/action.wxss                 |   0
 .../client => client}/mp/pages/active/active.js |   0
 .../mp/pages/active/active.json                 |   0
 .../mp/pages/active/active.wxml                 |   0
 .../mp/pages/active/active.wxss                 |   0
 .../client => client}/mp/pages/favor/favor.js   |   0
 .../client => client}/mp/pages/favor/favor.json |   0
 .../client => client}/mp/pages/favor/favor.wxml |   0
 .../client => client}/mp/pages/favor/favor.wxss |   0
 .../client => client}/mp/pages/river/river.js   |   7 ++++++-
 .../client => client}/mp/pages/river/river.json |   0
 .../client => client}/mp/pages/river/river.wxml |   0
 .../client => client}/mp/pages/river/river.wxss |   0
 .../client => client}/mp/pages/scans/scans.js   |   0
 .../client => client}/mp/pages/scans/scans.json |   0
 .../client => client}/mp/pages/scans/scans.wxml |   0
 .../client => client}/mp/pages/scans/scans.wxss |   0
 .../client => client}/mp/pages/storm/storm.js   |   0
 .../client => client}/mp/pages/storm/storm.json |   0
 .../client => client}/mp/pages/storm/storm.wxml |   0
 .../client => client}/mp/pages/storm/storm.wxss |   0
 {trash/client => client}/mp/project.config.json |   0
 {trash/client => client}/mp/sitemap.json        |   0
 {trash/client => client}/mp/utils/kit.js        |   0
 {trash/client => client}/mp/utils/util.js       |   0
 pane/River.js                                   |   2 +-
 34 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 client/mp/.app.js.swo
 rename {trash/client => client}/mp/app.js (92%)
 rename {trash/client => client}/mp/app.json (100%)
 rename {trash/client => client}/mp/app.wxml (100%)
 rename {trash/client => client}/mp/app.wxss (100%)
 rename {trash/client => client}/mp/pages/action/action.js (100%)
 rename {trash/client => client}/mp/pages/action/action.json (100%)
 rename {trash/client => client}/mp/pages/action/action.wxml (100%)
 rename {trash/client => client}/mp/pages/action/action.wxss (100%)
 rename {trash/client => client}/mp/pages/active/active.js (100%)
 rename {trash/client => client}/mp/pages/active/active.json (100%)
 rename {trash/client => client}/mp/pages/active/active.wxml (100%)
 rename {trash/client => client}/mp/pages/active/active.wxss (100%)
 rename {trash/client => client}/mp/pages/favor/favor.js (100%)
 rename {trash/client => client}/mp/pages/favor/favor.json (100%)
 rename {trash/client => client}/mp/pages/favor/favor.wxml (100%)
 rename {trash/client => client}/mp/pages/favor/favor.wxss (100%)
 rename {trash/client => client}/mp/pages/river/river.js (87%)
 rename {trash/client => client}/mp/pages/river/river.json (100%)
 rename {trash/client => client}/mp/pages/river/river.wxml (100%)
 rename {trash/client => client}/mp/pages/river/river.wxss (100%)
 rename {trash/client => client}/mp/pages/scans/scans.js (100%)
 rename {trash/client => client}/mp/pages/scans/scans.json (100%)
 rename {trash/client => client}/mp/pages/scans/scans.wxml (100%)
 rename {trash/client => client}/mp/pages/scans/scans.wxss (100%)
 rename {trash/client => client}/mp/pages/storm/storm.js (100%)
 rename {trash/client => client}/mp/pages/storm/storm.json (100%)
 rename {trash/client => client}/mp/pages/storm/storm.wxml (100%)
 rename {trash/client => client}/mp/pages/storm/storm.wxss (100%)
 rename {trash/client => client}/mp/project.config.json (100%)
 rename {trash/client => client}/mp/sitemap.json (100%)
 rename {trash/client => client}/mp/utils/kit.js (100%)
 rename {trash/client => client}/mp/utils/util.js (100%)

diff --git a/client/mp/.app.js.swo b/client/mp/.app.js.swo
new file mode 100644
index 0000000000000000000000000000000000000000..d51d9d2cb7680a503a660e33fd1081cdc07a2aef
GIT binary patch
literal 16384
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
T@1ZB2{qg?$e%SZ^GPA(noX|5Y

literal 0
HcmV?d00001

diff --git a/trash/client/mp/app.js b/client/mp/app.js
similarity index 92%
rename from trash/client/mp/app.js
rename to client/mp/app.js
index c8fb8652..553669b9 100644
--- a/trash/client/mp/app.js
+++ b/client/mp/app.js
@@ -1,9 +1,9 @@
 const kit = require("utils/kit.js")
 
 App({
-    data: {}, conf: {serve: "https://shylinux.com/chat"},
-    request: function(cmd, data, cb) {var app = this; data.sessid = app.conf.sessid
-        wx.request({method: "POST", url: app.conf.serve+"/"+cmd, data: data, success(res) {var msg = res.data
+    data: {}, conf: {serve: "https://shylinux.com/chat", space: "mac"},
+    request: function(cmd, data, cb) {var app = this; data.sessid = app.conf.sessid, data.pod = app.conf.space
+        wx.request({method: "POST", url: app.conf.serve+"/"+cmd, data: data, success: function(res) {var msg = res.data
             console.log("POST", cmd, msg)
             if (res.statusCode == 401) {
                 app.usercode(function() {app.request(cmd, data, cb)})
@@ -51,7 +51,12 @@ App({
         })}})
     },
     userinfo: function(cb) {var app = this
-        if (app.conf.userInfo) {return typeof cb == "function" && cb(app.conf.userInfo)}
+        if (app.conf.userInfo) {
+            app.request("mp/login/info", app.conf.userInfo, function(msg) {
+                typeof cb == "function" && cb(app.conf.userInfo)
+            })
+            return
+        }
         app.usercode(function() {
             wx.getSetting({success: function(res) {res.authSetting['scope.userInfo'] && wx.getUserInfo({success: function(res) {
                 app.request("mp/login/info", res.userInfo, function(msg) {app.conf.userInfo = res.userInfo
diff --git a/trash/client/mp/app.json b/client/mp/app.json
similarity index 100%
rename from trash/client/mp/app.json
rename to client/mp/app.json
diff --git a/trash/client/mp/app.wxml b/client/mp/app.wxml
similarity index 100%
rename from trash/client/mp/app.wxml
rename to client/mp/app.wxml
diff --git a/trash/client/mp/app.wxss b/client/mp/app.wxss
similarity index 100%
rename from trash/client/mp/app.wxss
rename to client/mp/app.wxss
diff --git a/trash/client/mp/pages/action/action.js b/client/mp/pages/action/action.js
similarity index 100%
rename from trash/client/mp/pages/action/action.js
rename to client/mp/pages/action/action.js
diff --git a/trash/client/mp/pages/action/action.json b/client/mp/pages/action/action.json
similarity index 100%
rename from trash/client/mp/pages/action/action.json
rename to client/mp/pages/action/action.json
diff --git a/trash/client/mp/pages/action/action.wxml b/client/mp/pages/action/action.wxml
similarity index 100%
rename from trash/client/mp/pages/action/action.wxml
rename to client/mp/pages/action/action.wxml
diff --git a/trash/client/mp/pages/action/action.wxss b/client/mp/pages/action/action.wxss
similarity index 100%
rename from trash/client/mp/pages/action/action.wxss
rename to client/mp/pages/action/action.wxss
diff --git a/trash/client/mp/pages/active/active.js b/client/mp/pages/active/active.js
similarity index 100%
rename from trash/client/mp/pages/active/active.js
rename to client/mp/pages/active/active.js
diff --git a/trash/client/mp/pages/active/active.json b/client/mp/pages/active/active.json
similarity index 100%
rename from trash/client/mp/pages/active/active.json
rename to client/mp/pages/active/active.json
diff --git a/trash/client/mp/pages/active/active.wxml b/client/mp/pages/active/active.wxml
similarity index 100%
rename from trash/client/mp/pages/active/active.wxml
rename to client/mp/pages/active/active.wxml
diff --git a/trash/client/mp/pages/active/active.wxss b/client/mp/pages/active/active.wxss
similarity index 100%
rename from trash/client/mp/pages/active/active.wxss
rename to client/mp/pages/active/active.wxss
diff --git a/trash/client/mp/pages/favor/favor.js b/client/mp/pages/favor/favor.js
similarity index 100%
rename from trash/client/mp/pages/favor/favor.js
rename to client/mp/pages/favor/favor.js
diff --git a/trash/client/mp/pages/favor/favor.json b/client/mp/pages/favor/favor.json
similarity index 100%
rename from trash/client/mp/pages/favor/favor.json
rename to client/mp/pages/favor/favor.json
diff --git a/trash/client/mp/pages/favor/favor.wxml b/client/mp/pages/favor/favor.wxml
similarity index 100%
rename from trash/client/mp/pages/favor/favor.wxml
rename to client/mp/pages/favor/favor.wxml
diff --git a/trash/client/mp/pages/favor/favor.wxss b/client/mp/pages/favor/favor.wxss
similarity index 100%
rename from trash/client/mp/pages/favor/favor.wxss
rename to client/mp/pages/favor/favor.wxss
diff --git a/trash/client/mp/pages/river/river.js b/client/mp/pages/river/river.js
similarity index 87%
rename from trash/client/mp/pages/river/river.js
rename to client/mp/pages/river/river.js
index 91eaa20b..d256bd96 100644
--- a/trash/client/mp/pages/river/river.js
+++ b/client/mp/pages/river/river.js
@@ -3,7 +3,7 @@ const app = getApp()
 
 Page({
     data: {
-        action: ["扫码", "刷新", "登录"],
+        action: ["扫码", "刷新", "登录", "授权"],
         msg: {append: ["key", "name"]},
     },
     action: {
@@ -22,6 +22,11 @@ Page({
                 page.onaction(event, data, "刷新")
             })
         },
+        "授权": function(event, page, data, name) {
+            app.userinfo(function(res) {
+                page.onaction(event, res, res.name)
+            })
+        },
     },
     onaction: function(event, data, name) {
         data = data || event.target.dataset, name = name || data.name
diff --git a/trash/client/mp/pages/river/river.json b/client/mp/pages/river/river.json
similarity index 100%
rename from trash/client/mp/pages/river/river.json
rename to client/mp/pages/river/river.json
diff --git a/trash/client/mp/pages/river/river.wxml b/client/mp/pages/river/river.wxml
similarity index 100%
rename from trash/client/mp/pages/river/river.wxml
rename to client/mp/pages/river/river.wxml
diff --git a/trash/client/mp/pages/river/river.wxss b/client/mp/pages/river/river.wxss
similarity index 100%
rename from trash/client/mp/pages/river/river.wxss
rename to client/mp/pages/river/river.wxss
diff --git a/trash/client/mp/pages/scans/scans.js b/client/mp/pages/scans/scans.js
similarity index 100%
rename from trash/client/mp/pages/scans/scans.js
rename to client/mp/pages/scans/scans.js
diff --git a/trash/client/mp/pages/scans/scans.json b/client/mp/pages/scans/scans.json
similarity index 100%
rename from trash/client/mp/pages/scans/scans.json
rename to client/mp/pages/scans/scans.json
diff --git a/trash/client/mp/pages/scans/scans.wxml b/client/mp/pages/scans/scans.wxml
similarity index 100%
rename from trash/client/mp/pages/scans/scans.wxml
rename to client/mp/pages/scans/scans.wxml
diff --git a/trash/client/mp/pages/scans/scans.wxss b/client/mp/pages/scans/scans.wxss
similarity index 100%
rename from trash/client/mp/pages/scans/scans.wxss
rename to client/mp/pages/scans/scans.wxss
diff --git a/trash/client/mp/pages/storm/storm.js b/client/mp/pages/storm/storm.js
similarity index 100%
rename from trash/client/mp/pages/storm/storm.js
rename to client/mp/pages/storm/storm.js
diff --git a/trash/client/mp/pages/storm/storm.json b/client/mp/pages/storm/storm.json
similarity index 100%
rename from trash/client/mp/pages/storm/storm.json
rename to client/mp/pages/storm/storm.json
diff --git a/trash/client/mp/pages/storm/storm.wxml b/client/mp/pages/storm/storm.wxml
similarity index 100%
rename from trash/client/mp/pages/storm/storm.wxml
rename to client/mp/pages/storm/storm.wxml
diff --git a/trash/client/mp/pages/storm/storm.wxss b/client/mp/pages/storm/storm.wxss
similarity index 100%
rename from trash/client/mp/pages/storm/storm.wxss
rename to client/mp/pages/storm/storm.wxss
diff --git a/trash/client/mp/project.config.json b/client/mp/project.config.json
similarity index 100%
rename from trash/client/mp/project.config.json
rename to client/mp/project.config.json
diff --git a/trash/client/mp/sitemap.json b/client/mp/sitemap.json
similarity index 100%
rename from trash/client/mp/sitemap.json
rename to client/mp/sitemap.json
diff --git a/trash/client/mp/utils/kit.js b/client/mp/utils/kit.js
similarity index 100%
rename from trash/client/mp/utils/kit.js
rename to client/mp/utils/kit.js
diff --git a/trash/client/mp/utils/util.js b/client/mp/utils/util.js
similarity index 100%
rename from trash/client/mp/utils/util.js
rename to client/mp/utils/util.js
diff --git a/pane/River.js b/pane/River.js
index 379d8d7b..3311a0e9 100644
--- a/pane/River.js
+++ b/pane/River.js
@@ -83,7 +83,7 @@ Volcanos("ondetail", {help: "菜单交互", list: ["添加应用", "添加用户
     "添加用户": function(event, can, river, button) {
         can.run(event, ["search", "Search.onimport.select", "user", "", ""], function(list) {
             var args = []; can.core.List(list, function(item) {
-                args = args.concat([item[4]])
+                args = args.concat([item[5]])
             })
             can.run(event, [can.Conf("river"), "action", "user"].concat(args), function(msg) {
                 can.user.Search(can, {"river": can.Conf("river")})