|
|
@@ -63,17 +63,17 @@ class LoginController {
|
|
|
}
|
|
|
|
|
|
//还要判断account是否是专业版用户
|
|
|
- let isPro = false;
|
|
|
- const userInfo = await userModel.findDataByAccount(account);
|
|
|
-
|
|
|
- if (userInfo && userInfo.upgrade_list !== undefined) {
|
|
|
- for (const ul of userInfo.upgrade_list) {
|
|
|
- if (ul.isUpgrade === true) {
|
|
|
- isPro = true;
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+ let isPro = true;
|
|
|
+ // const userInfo = await userModel.findDataByAccount(account);
|
|
|
+ //
|
|
|
+ // if (userInfo && userInfo.upgrade_list !== undefined) {
|
|
|
+ // for (const ul of userInfo.upgrade_list) {
|
|
|
+ // if (ul.isUpgrade === true) {
|
|
|
+ // isPro = true;
|
|
|
+ // break;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // }
|
|
|
// 专业版短信验证码验证
|
|
|
if (isPro) {
|
|
|
const codeMsg = request.session.code;
|
|
|
@@ -96,7 +96,7 @@ class LoginController {
|
|
|
const captcha = new Captcha();
|
|
|
const captchResult = await captcha.validate(request);
|
|
|
if (!captchResult) {
|
|
|
- throw '验证码错误';
|
|
|
+ throw '极验验证码错误';
|
|
|
}
|
|
|
|
|
|
let sessionUser = {
|
|
|
@@ -199,14 +199,20 @@ class LoginController {
|
|
|
}
|
|
|
|
|
|
const userInfo = await userModel.findDataByAccount(account);
|
|
|
- if (userInfo && userInfo.upgrade_list !== undefined) {
|
|
|
- for (const ul of userInfo.upgrade_list) {
|
|
|
- if (ul.isUpgrade === true) {
|
|
|
- res.result = true;
|
|
|
- res.data = userInfo.mobile;
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
+ // if (userInfo && userInfo.upgrade_list !== undefined) {
|
|
|
+ // for (const ul of userInfo.upgrade_list) {
|
|
|
+ // if (ul.isUpgrade === true) {
|
|
|
+ // res.result = true;
|
|
|
+ // res.data = userInfo.mobile;
|
|
|
+ // break;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // } else {
|
|
|
+ // res.msg = '当前未存在此用户';
|
|
|
+ // }
|
|
|
+ if (userInfo) {
|
|
|
+ res.result = true;
|
|
|
+ res.data = userInfo.mobile;
|
|
|
} else {
|
|
|
res.msg = '当前未存在此用户';
|
|
|
}
|