Merge branch 'master' of http://123.207.147.179:8888/node_server/tikeyi

# Conflicts:
#	src/biz/permission.ts

src/biz/permission.ts

@@ -21,7 +21,7 @@ export async function checkToken(req, res) {
 //权限列表
 export async function getList(req, res) {
     let access_token = req.body;
-    let userInfo = await get(getUrl(urlEnum.权限列表), {}, {});
+    let userInfo = await get(getUrl(urlEnum.权限列表), {access_token}, {});
     return userInfo;
 }
 
@@ -29,4 +29,5 @@ export async function getList(req, res) {
 export async function searchByName(req, res) {
     let {name, tel} = req.body;
     // let userInfo = await get(getUrl())
+    let userInfo = await get(getUrl(urlEnum.权限列表), {}, {})
 }
\ No newline at end of file

src/data/interface/data.ts

@@ -16,11 +16,10 @@ async function get获取token() {
         let url = getUrl(urlEnum.获取token);
         let head = {};
         let body = {client_id:requestConfig.client_id, client_secret:requestConfig.client_secret};
-        let result:any = await postForm(url, body, head );
+        let result:any = await postForm(url, body, head);
         if (!result || !result.access_token || !result.expires_in) {
             throw new BizError(`获取token 失败： ${JSON.stringify(result)}`, );
         }
-    
         
         token = result.access_token;
         tokenTime = result.expires_in;

src/data/interface/permissionData.ts

+import { requestConfig } from "../../serverConfig";
+import { BizError } from "../../util/bizError";
+import { postForm } from "../../util/request";
+import { getUrl, urlEnum } from "./url";
+
+let token = "";
+let tokenTime = 0;//有效时间
+let lastTime = 0;//上一次时间
+const timeOutTime = 50;//超时时间s
+
+async function gettoken() {
+    let time = new Date().valueOf();
+
+    if ( (Math.ceil((time - lastTime)/1000 ) + timeOutTime )> tokenTime ) {
+        let url = getUrl(urlEnum.获取token);
+        let head = {};
+        let body = {client_id:requestConfig.client_id, client_secret:requestConfig.client_secret};
+        let result:any = await postForm(url, body, head);
+        if (!result || !result.access_token || !result.expires_in) {
+            throw new BizError(`获取token 失败： ${JSON.stringify(result)}`, );
+        }
+
+        token = result.access_token;
+        tokenTime = result.expires_in;
+        lastTime = time;
+        console.log("获取一次token",`token${token}, lastTime ${lastTime}, time ${time}, tokenTime ${tokenTime}, `);
+    }
+    
+}
\ No newline at end of file