...
|
...
|
@@ -129,12 +129,20 @@ module.exports = { |
|
|
console.log("enter common Ilogin, code: " + IloginRes.code + ", pwdComplexRate: " + IloginRes.data.pwdComplexRate);
|
|
|
|
|
|
result.code = IloginRes.code;
|
|
|
|
|
|
if (result.code != 200) {
|
|
|
return callback(null, {
|
|
|
message: '密码错误',
|
|
|
code: 500
|
|
|
});
|
|
|
}
|
|
|
|
|
|
result.pwdComplexRate = IloginRes.data.pwdComplexRate;
|
|
|
result.passwd_time = IloginRes.data.pwdExpirationDays;
|
|
|
|
|
|
userInfo = { auth: userData, uid: userData.pid, name: userData.truename, role: userData.roleName, right: {},shopList:[],brands:[]};
|
|
|
common.queryAllAuth(userData.pid).getResourceByPid(userData.pid, userData.role_id).done(function (allAuthResp, getRRes) {
|
|
|
console.log("enter common queryAllAuth, allAuthResp: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^1^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" + allAuthResp.data.brand.list);
|
|
|
console.log("enter common queryAllAuth, allAuthResp: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^1^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^", allAuthResp.data.brand.list);
|
|
|
|
|
|
if(true){
|
|
|
var arrList = [];
|
...
|
...
|
@@ -177,9 +185,9 @@ module.exports = { |
|
|
}
|
|
|
return callback(null, result);
|
|
|
});
|
|
|
}, errcallback);
|
|
|
}, errcallback); // common.Ilogin(user, password).allRight().sessionAsync(user, password).done(
|
|
|
|
|
|
}
|
|
|
} // else 结束
|
|
|
});
|
|
|
},
|
|
|
geeCaptcha: function(req, callback, common) {
|
...
|
...
|
|