Commit 0be8c132 by 蒋勇

d

parent 40e27198
......@@ -10,12 +10,12 @@ class AccessAuthAPI extends APIBase {
this.userSve = system.getObject("service.auth.userSve");
this.vCodeExTime = 120;//验证码缓存秒数
}
async deleteUserForBoss(pobj, query, req){
async deleteUserForBoss (pobj, query, req) {
await this.userSve.deleteUserForTest(pobj);
return system.getResult({});
}
/*查询注册用户的信息sys*/
async queryRegUser(pobj, query, req) {
async queryRegUser (pobj, query, req) {
var appid = req.app.id;
var userList = await this.userSve.queryUsersByAppId(appid);
return system.getResult(userList);
......@@ -26,7 +26,7 @@ class AccessAuthAPI extends APIBase {
* @param {*} query
* @param {*} req
*/
async fetchOtherVCode(pobj, query, req) {
async fetchOtherVCode (pobj, query, req) {
var appkey = req.app.appkey;
if (!pobj.mobile) {
return system.getResult(null, "电话号码不能为空.");
......@@ -61,7 +61,7 @@ class AccessAuthAPI extends APIBase {
* @param {*} query
* @param {*} req
*/
async fetchVCode(pobj, query, req) {
async fetchVCode (pobj, query, req) {
var appkey = req.app.appkey;
var mobile = pobj.mobile;
var tmplCode = pobj.tmplCode;
......@@ -98,7 +98,7 @@ class AccessAuthAPI extends APIBase {
* @param {*} query
* @param {*} req
*/
async fetchDefaultVCode(pobj, query, req) {
async fetchDefaultVCode (pobj, query, req) {
var appkey = req.app.appkey;
var mobile = pobj.mobile;
if (!mobile) {
......@@ -113,14 +113,14 @@ class AccessAuthAPI extends APIBase {
var vcodeResult = this.cacheManager["VCodeCache"].cache(cacheKeyStr, pobj, this.vCodeExTime, null);
return system.getResult(vcodeResult);
}
async authAccessKey(pobj, query, req) {
async authAccessKey (pobj, query, req) {
var acckapp = await this.cacheManager["ApiAccessKeyCache"].cache(pobj.checkAccessKey);
if (!acckapp) {
return system.getResultFail(system.tokenFail, "访问token失效,请重新获取!!");
}
return system.getResultSuccess({ isaccess: true, app: acckapp });
}
async getAccessKey(pobj, query, req) {
async getAccessKey (pobj, query, req) {
var appkey = query.appkey;
var secret = query.secret;
if (!appkey) {
......@@ -143,7 +143,7 @@ class AccessAuthAPI extends APIBase {
rtnData.app = appData.data;
return system.getResultSuccess(rtnData);
}
async apiAccessCount(p, q, r) {
async apiAccessCount (p, q, r) {
var tradeObj = {
srcappkey: p.srcappkey,
tradeType: "consume",
......@@ -156,7 +156,7 @@ class AccessAuthAPI extends APIBase {
var t = await this.apitradeSvr.create(tradeObj);
return system.getResultSuccess(t);
}
async register(pobj, qobj, req) {
async register (pobj, qobj, req) {
if (!pobj.userName) {
return system.getResult(null, "用户名不能为空");
}
......@@ -182,7 +182,7 @@ class AccessAuthAPI extends APIBase {
return system.getResultSuccess({ auth_url: authUrl, opencode: opencode, open_user_id: ruser.id, account_id: ruser.account_id });
}
async modifyPassword(pobj, qobj, req) {
async modifyPassword (pobj, qobj, req) {
if (!pobj.account_id) {
return system.getResult(null, "用户名不能为空");
}
......@@ -199,7 +199,7 @@ class AccessAuthAPI extends APIBase {
return system.getResultSuccess();
}
async login(pobj, qobj, req) {
async login (pobj, qobj, req) {
if (!pobj.userName) {
return system.getResult(null, "用户名不能为空");
}
......@@ -220,7 +220,7 @@ class AccessAuthAPI extends APIBase {
await this.cacheManager["OpenCodeCache"].cache(opencode, ruser, 120);
return system.getResultSuccess({ auth_url: authUrl, opencode: opencode });
}
async loginByMobileWithoutReg(pobj, qobj, req) {
async loginByMobileWithoutReg (pobj, qobj, req) {
if (!pobj.mobile) {
return system.getResult(null, "电话不能为空");
}
......@@ -229,9 +229,14 @@ class AccessAuthAPI extends APIBase {
mobile: pobj.mobile,
}
var ruser = await this.userSve.getUserByUserMobile(param);
if (!ruser) {
return system.getResult(null, "查无此用户");
}
//需要设置这个用户的默认密码为gsb123456789
ruser.password = await this.userSve.getEncryptStr("gsb123456789");
await ruser.save()
var opencode = super.getUUID();
var authUrl = req.app.authUrl + "?opencode=" + opencode;
await this.cacheManager["OpenCodeCache"].cache(opencode, ruser, 120);
......@@ -239,7 +244,7 @@ class AccessAuthAPI extends APIBase {
}
//根据openid查询是否与用户绑定
async checkWxBind(p, q, req) {
async checkWxBind (p, q, req) {
var openid = p.openid;
if (!openid) {
return system.getResult(null, "openid不能为空");
......@@ -255,7 +260,7 @@ class AccessAuthAPI extends APIBase {
return system.getResult(ruser);
}
//根据openid登录
async loginByOpenId(p, q, req) {
async loginByOpenId (p, q, req) {
var openid = p.openid;
if (!openid) {
return system.getResult(null, "openid不能为空");
......@@ -274,7 +279,7 @@ class AccessAuthAPI extends APIBase {
return system.getResultSuccess({ auth_url: authUrl, opencode: opencode });
}
//unWxBind
async unWxBind(pobj, qobj, req) {
async unWxBind (pobj, qobj, req) {
var appkey = req.app.appkey;
if (!pobj.mobile) {
return system.getResult(null, "电话号码不能为空.");
......@@ -284,13 +289,13 @@ class AccessAuthAPI extends APIBase {
mobile: pobj.mobile,
}
var ruser = await this.userSve.unWxBind(param);
if(!ruser){
return system.getResultFail(-1,"查无此账户",-129);
if (!ruser) {
return system.getResultFail(-1, "查无此账户", -129);
}
return system.getResult(ruser);
}
//wxbind
async wxBind(pobj, qobj, req) {
async wxBind (pobj, qobj, req) {
var appkey = req.app.appkey;
if (!pobj.mobile) {
return system.getResult(null, "电话号码不能未空.");
......@@ -331,7 +336,7 @@ class AccessAuthAPI extends APIBase {
//wxbind
async wxBindWithoutVCode(pobj, qobj, req) {
async wxBindWithoutVCode (pobj, qobj, req) {
var appkey = req.app.appkey;
if (!pobj.mobile) {
return system.getResult(null, "电话号码不能未空.");
......@@ -362,8 +367,8 @@ class AccessAuthAPI extends APIBase {
await this.cacheManager["OpenCodeCache"].cache(opencode, ruser, 120);
return system.getResultSuccess({ auth_url: authUrl, opencode: opencode });
}
async loginByMobileWithReg(pobj, qobj, req) {
//修改默认密码
async loginByMobileWithReg (pobj, qobj, req) {
if (!pobj.mobile) {
return system.getResult(null, "电话不能为空");
}
......@@ -378,7 +383,7 @@ class AccessAuthAPI extends APIBase {
userName: pobj.mobile,
nickName: pobj.mobile,
mobile: pobj.mobile,
password: pobj.mobile
password: "gsb123456789"
}
ruser = await this.userSve.register(param);
}
......@@ -387,7 +392,7 @@ class AccessAuthAPI extends APIBase {
await this.cacheManager["OpenCodeCache"].cache(opencode, ruser, 120);
return system.getResultSuccess({ auth_url: authUrl, opencode: opencode });
}
async loginByMd5Password(pobj, qobj, req) {
async loginByMd5Password (pobj, qobj, req) {
if (!pobj.userName) {
return system.getResult(null, "用户名不能为空");
}
......@@ -420,9 +425,9 @@ class AccessAuthAPI extends APIBase {
* data:-130--已经存在账户
* }
*/
async modifyLoginNameByOldMobile(pobj, qobj, req){
var appid=req.app.id;
var appkey=req.app.appkey;
async modifyLoginNameByOldMobile (pobj, qobj, req) {
var appid = req.app.id;
var appkey = req.app.appkey;
if (!pobj.oldmobile) {
return system.getResult(null, "原电话号码不能为空.");
}
......@@ -430,9 +435,9 @@ class AccessAuthAPI extends APIBase {
return system.getResult(null, "密码不能为空.");
}
//检查原账户是否存在
var u=await this.userSve.findUserByMobilePwd(appid,pobj.oldmobile,pobj.pwd);
if(!u){
return system.getResultFail(-1, "要修改的账户不存在.",-129);
var u = await this.userSve.findUserByMobilePwd(appid, pobj.oldmobile, pobj.pwd);
if (!u) {
return system.getResultFail(-1, "要修改的账户不存在.", -129);
}
if (!pobj.newmobile) {
return system.getResult(null, "新电话号码不能未空.");
......@@ -442,19 +447,19 @@ class AccessAuthAPI extends APIBase {
}
var cacheCode = await this.cacheManager["VCodeCache"].cache(appkey + "_" + pobj.newmobile, null);
if (pobj.vcode != cacheCode.vcode) {
return system.getResultFail(-1, "验证码校验不成功,请重新获取验证码验证.",system.verifyVCodeFail);
return system.getResultFail(-1, "验证码校验不成功,请重新获取验证码验证.", system.verifyVCodeFail);
}
//修改为新的账号
var ruser = await this.userSve.updateUserMobile(u,pobj.newmobile);
if(!ruser){
return system.getResultFail(-1,"账号已经存在",-130);
var ruser = await this.userSve.updateUserMobile(u, pobj.newmobile);
if (!ruser) {
return system.getResultFail(-1, "账号已经存在", -130);
}
return system.getResult(ruser);
}
/**
* 按照手机号和验证码修改密码
*/
async modiPasswordByMobile(pobj, qobj, req) {
async modiPasswordByMobile (pobj, qobj, req) {
var appid = req.app.id;
var appkey = req.app.appkey;
if (!pobj.mobile) {
......@@ -479,7 +484,7 @@ class AccessAuthAPI extends APIBase {
/**
* 按照账号和appid修改密码
*/
async modiPasswordByUserName(pobj, qobj, req) {
async modiPasswordByUserName (pobj, qobj, req) {
var appid = req.app.id;
if (!pobj.userName) {
return system.getResult(null, "账号不能未空.");
......@@ -499,7 +504,7 @@ class AccessAuthAPI extends APIBase {
* @param {*} qobj
* @param {*} req
*/
async loginByVCode(pobj, qobj, req) {
async loginByVCode (pobj, qobj, req) {
var appkey = req.app.appkey;
if (!pobj.mobile) {
return system.getResult(null, "电话号码不能未空.");
......@@ -542,7 +547,7 @@ class AccessAuthAPI extends APIBase {
* @param {*} query
* @param {*} req
*/
async authByCode(pobj, query, req) {
async authByCode (pobj, query, req) {
if (!pobj.opencode) {
return system.getResult(null, "opencode参数不能为空");
}
......@@ -553,7 +558,7 @@ class AccessAuthAPI extends APIBase {
return system.getResultSuccess(cacheuser);
}
classDesc() {
classDesc () {
return {
groupName: "auth",
groupDesc: "认证相关的包",
......@@ -568,7 +573,7 @@ class AccessAuthAPI extends APIBase {
`,
};
}
methodDescs() {
methodDescs () {
return [
{
......@@ -890,7 +895,7 @@ class AccessAuthAPI extends APIBase {
},
];
}
exam() {
exam () {
return `
<pre>
......
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