diff --git a/client/mp/.app.js.swo b/client/mp/.app.js.swo
new file mode 100644
index 00000000..d51d9d2c
Binary files /dev/null and b/client/mp/.app.js.swo differ
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")})