diff --git a/api/binding.js b/api/binding.js index 65d727f..2fff774 100644 --- a/api/binding.js +++ b/api/binding.js @@ -11,7 +11,7 @@ export default function http(data) { method: data.method, dataType: "json", data: data.data, - success: function(res) { + success: function (res) { if (res.data.code == 0) { resolve(res); } else { @@ -21,7 +21,7 @@ export default function http(data) { }); } }, - fail: function(res) { + fail: function (res) { dd.alert({ content: "网络异常", buttonText: "确定" @@ -33,17 +33,17 @@ export default function http(data) { } else { return new Promise((resolve, rejects) => { login().then(res => { - const { oapiUser } = res.data.data; - getApp().globalData.token = res.data.data.accessToken.access_token; - getApp().globalData.name = res.data.data.oapiUser.name; - getApp().globalData.userid = res.data.data.oapiUser.userid; - getApp().globalData.avatar = res.data.data.oapiUser.avatar; - getApp().globalData.userInfo = JSON.stringify({ - username: oapiUser.name, - userId: oapiUser.userid, - headUrl: oapiUser.avatar, - platform: "dingtalk" - }); + // const { oapiUser } = res.data.data; + // getApp().globalData.token = res.data.data.accessToken.access_token; + // getApp().globalData.name = res.data.data.oapiUser.name; + // getApp().globalData.userid = res.data.data.oapiUser.userid; + // getApp().globalData.avatar = res.data.data.oapiUser.avatar; + // getApp().globalData.userInfo = JSON.stringify({ + // username: oapiUser.name, + // userId: oapiUser.userid, + // headUrl: oapiUser.avatar, + // platform: "dingtalk" + // }); dd.httpRequest({ headers: { "Content-Type": "application/json", @@ -53,10 +53,10 @@ export default function http(data) { method: data.method, data: data.data, dataType: "json", - success: function(res) { + success: function (res) { resolve(res); }, - fail: function(res) { + fail: function (res) { rejects(res); } }); diff --git a/api/http.js b/api/http.js index 47d35d4..51d1e55 100644 --- a/api/http.js +++ b/api/http.js @@ -33,18 +33,18 @@ export default function http(data) { } else { return new Promise((resolve, rejects) => { login().then(res => { - const { oapiUser } = res.data.data; - getApp().globalData.token = res.data.data.accessToken.access_token; - // getApp().globalData.token = 'd2563d3a-7723-4f76-ad04-005815893328'; - getApp().globalData.name = res.data.data.oapiUser.name; - getApp().globalData.userid = res.data.data.oapiUser.userid; - getApp().globalData.avatar = res.data.data.oapiUser.avatar; - getApp().globalData.userInfo = JSON.stringify({ - username: oapiUser.name, - userId: oapiUser.userid, - headUrl: oapiUser.avatar, - platform: "dingtalk" - }); + // const { oapiUser } = res.data.data; + // getApp().globalData.token = res.data.data.accessToken.access_token; + // // getApp().globalData.token = 'd2563d3a-7723-4f76-ad04-005815893328'; + // getApp().globalData.name = res.data.data.oapiUser.name; + // getApp().globalData.userid = res.data.data.oapiUser.userid; + // getApp().globalData.avatar = res.data.data.oapiUser.avatar; + // getApp().globalData.userInfo = JSON.stringify({ + // username: oapiUser.name, + // userId: oapiUser.userid, + // headUrl: oapiUser.avatar, + // platform: "dingtalk" + // }); dd.httpRequest({ headers: { "Content-Type": "application/json", diff --git a/api/login.js b/api/login.js index 259a056..11742b9 100644 --- a/api/login.js +++ b/api/login.js @@ -1,7 +1,13 @@ -export function login (data) { +let lock = false; +export async function login(data) { + if (lock == true) { + await waitLockRelease(20); + return Promise.resolve(); + } + lock = true; return new Promise((resolve, reject) => { dd.getAuthCode({ - success:function(res){ + success: function (res) { // 获取用户信息 dd.httpRequest({ headers: { @@ -11,12 +17,29 @@ export function login (data) { url: `${getApp().globalData.globalUrl}/admin/skipAuth/getUserInfoByDingtalkCode?orgId=${dd.corpId}&projectName=MING_MEETING&code=${res.authCode}`, method: 'POST', dataType: 'json', - success: function(res) { + success: function (res) { + + + const { oapiUser } = res.data.data; + getApp().globalData.token = res.data.data.accessToken.access_token; + // getApp().globalData.token = 'd2563d3a-7723-4f76-ad04-005815893328'; + getApp().globalData.name = res.data.data.oapiUser.name; + getApp().globalData.userid = res.data.data.oapiUser.userid; + getApp().globalData.avatar = res.data.data.oapiUser.avatar; + getApp().globalData.userInfo = JSON.stringify({ + username: oapiUser.name, + userId: oapiUser.userid, + headUrl: oapiUser.avatar, + platform: "dingtalk" + }); + lock = false; resolve(res) }, - fail: function(res) { + fail: function (res) { + lock = false; resolve(res) - console.log('err',res) + console.log('err', res) + } }) }, @@ -25,4 +48,20 @@ export function login (data) { } }) }) -} \ No newline at end of file +} + +async function waitLockRelease(retry) { + for (let i = 0; i < retry; i++) { + if (lock == false) { + console.log(i); + return; + } + await sleep(100); + } +} + +function sleep(time) { + return new Promise(resolve => { + setTimeout(resolve, time); + }); +} diff --git a/pages/index/index.js b/pages/index/index.js index 18f03ac..c107628 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -740,7 +740,7 @@ create.Page({ maxClickCount--; if (maxClickCount == 0) { dd.alert({ - content: "版本号207" + content: "版本号210" }) maxClickCount = 5; }