Skip to content

S
schedule
Commit be022047 by xiexiaoqin
Options

login加锁

parent 164c7af5
Showing with 66 additions and 38 deletions
api/binding.js
...@@ -11,7 +11,7 @@ export default function http(data) { ...@@ -11,7 +11,7 @@ export default function http(data) {
method: data.method, method: data.method,
dataType: "json", dataType: "json",
data: data.data, data: data.data,
success: function(res) { success: function (res) {
if (res.data.code == 0) { if (res.data.code == 0) {
resolve(res); resolve(res);
} else { } else {
...@@ -21,7 +21,7 @@ export default function http(data) { ...@@ -21,7 +21,7 @@ export default function http(data) {
}); });
} }
}, },
fail: function(res) { fail: function (res) {
dd.alert({ dd.alert({
content: "网络异常", content: "网络异常",
buttonText: "确定" buttonText: "确定"
...@@ -33,17 +33,17 @@ export default function http(data) { ...@@ -33,17 +33,17 @@ export default function http(data) {
} else { } else {
return new Promise((resolve, rejects) => { return new Promise((resolve, rejects) => {
login().then(res => { login().then(res => {
const { oapiUser } = res.data.data; // const { oapiUser } = res.data.data;
getApp().globalData.token = res.data.data.accessToken.access_token; // getApp().globalData.token = res.data.data.accessToken.access_token;
getApp().globalData.name = res.data.data.oapiUser.name; // getApp().globalData.name = res.data.data.oapiUser.name;
getApp().globalData.userid = res.data.data.oapiUser.userid; // getApp().globalData.userid = res.data.data.oapiUser.userid;
getApp().globalData.avatar = res.data.data.oapiUser.avatar; // getApp().globalData.avatar = res.data.data.oapiUser.avatar;
getApp().globalData.userInfo = JSON.stringify({ // getApp().globalData.userInfo = JSON.stringify({
username: oapiUser.name, // username: oapiUser.name,
userId: oapiUser.userid, // userId: oapiUser.userid,
headUrl: oapiUser.avatar, // headUrl: oapiUser.avatar,
platform: "dingtalk" // platform: "dingtalk"
}); // });
dd.httpRequest({ dd.httpRequest({
headers: { headers: {
"Content-Type": "application/json", "Content-Type": "application/json",
...@@ -53,10 +53,10 @@ export default function http(data) { ...@@ -53,10 +53,10 @@ export default function http(data) {
method: data.method, method: data.method,
data: data.data, data: data.data,
dataType: "json", dataType: "json",
success: function(res) { success: function (res) {
resolve(res); resolve(res);
}, },
fail: function(res) { fail: function (res) {
rejects(res); rejects(res);
} }
}); });
......
api/http.js
...@@ -11,7 +11,7 @@ export default function http(data) { ...@@ -11,7 +11,7 @@ export default function http(data) {
method: data.method, method: data.method,
dataType: "json", dataType: "json",
data: data.data, data: data.data,
success: function(res) { success: function (res) {
if (res.data.code == 0) { if (res.data.code == 0) {
resolve(res); resolve(res);
} else { } else {
...@@ -21,7 +21,7 @@ export default function http(data) { ...@@ -21,7 +21,7 @@ export default function http(data) {
}); });
} }
}, },
fail: function(res) { fail: function (res) {
dd.alert({ dd.alert({
content: "网络异常", content: "网络异常",
buttonText: "确定" buttonText: "确定"
...@@ -33,18 +33,18 @@ export default function http(data) { ...@@ -33,18 +33,18 @@ export default function http(data) {
} else { } else {
return new Promise((resolve, rejects) => { return new Promise((resolve, rejects) => {
login().then(res => { login().then(res => {
const { oapiUser } = res.data.data; // const { oapiUser } = res.data.data;
getApp().globalData.token = res.data.data.accessToken.access_token; // getApp().globalData.token = res.data.data.accessToken.access_token;
// getApp().globalData.token = 'd2563d3a-7723-4f76-ad04-005815893328'; // // getApp().globalData.token = 'd2563d3a-7723-4f76-ad04-005815893328';
getApp().globalData.name = res.data.data.oapiUser.name; // getApp().globalData.name = res.data.data.oapiUser.name;
getApp().globalData.userid = res.data.data.oapiUser.userid; // getApp().globalData.userid = res.data.data.oapiUser.userid;
getApp().globalData.avatar = res.data.data.oapiUser.avatar; // getApp().globalData.avatar = res.data.data.oapiUser.avatar;
getApp().globalData.userInfo = JSON.stringify({ // getApp().globalData.userInfo = JSON.stringify({
username: oapiUser.name, // username: oapiUser.name,
userId: oapiUser.userid, // userId: oapiUser.userid,
headUrl: oapiUser.avatar, // headUrl: oapiUser.avatar,
platform: "dingtalk" // platform: "dingtalk"
}); // });
dd.httpRequest({ dd.httpRequest({
headers: { headers: {
"Content-Type": "application/json", "Content-Type": "application/json",
...@@ -54,10 +54,10 @@ export default function http(data) { ...@@ -54,10 +54,10 @@ export default function http(data) {
method: data.method, method: data.method,
data: data.data, data: data.data,
dataType: "json", dataType: "json",
success: function(res) { success: function (res) {
resolve(res); resolve(res);
}, },
fail: function(res) { fail: function (res) {
rejects(res); rejects(res);
} }
}); });
......
api/login.js
export function login (data) { let lock = false;
export async function login(data) {
if (lock == true) {
await sleep(1000);
return Promise.resolve();
}
lock = true;
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
dd.getAuthCode({ dd.getAuthCode({
success:function(res){ success: function (res) {
// 获取用户信息 // 获取用户信息
dd.httpRequest({ dd.httpRequest({
headers: { headers: {
...@@ -11,12 +17,29 @@ export function login (data) { ...@@ -11,12 +17,29 @@ export function login (data) {
url: `${getApp().globalData.globalUrl}/admin/skipAuth/getUserInfoByDingtalkCode?orgId=${dd.corpId}&projectName=MING_MEETING&code=${res.authCode}`, url: `${getApp().globalData.globalUrl}/admin/skipAuth/getUserInfoByDingtalkCode?orgId=${dd.corpId}&projectName=MING_MEETING&code=${res.authCode}`,
method: 'POST', method: 'POST',
dataType: 'json', 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) resolve(res)
}, },
fail: function(res) { fail: function (res) {
lock = false;
resolve(res) resolve(res)
console.log('err',res) console.log('err', res)
} }
}) })
}, },
...@@ -25,4 +48,10 @@ export function login (data) { ...@@ -25,4 +48,10 @@ export function login (data) {
} }
}) })
}) })
} }
\ No newline at end of file
function sleep(time) {
return new Promise(resolve => {
setTimeout(resolve, time);
});
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment