Commit e8a50954 by Sxy

fix: log

parent 118daa14
......@@ -9,11 +9,11 @@ class UserService extends ServiceBase {
this.roleDao = system.getObject("db.auth.roleDao");
this.authS = system.getObject("service.auth.authSve");
}
async pmgetUserByCode (code) {
async pmgetUserByCode(code) {
let ux = await this.cacheManager["CodeCache"].getCache(code);
return ux;
}
async loginApp (appkey, uname) {
async loginApp(appkey, uname) {
let rtn = {}
let app = await this.cacheManager["AppCache"].cache(appkey);
let userLogined = await this.cacheManager["UserCache"].cache(uname);
......@@ -38,7 +38,7 @@ class UserService extends ServiceBase {
//和租户绑定同一家公司
//按照用户名和密码进行注册
//控制器端检查用户名和密码非空
async registerByTantent (p, q) {
async registerByTantent(p, q) {
// 需要默认添加访客角色,为了控制单点从平台登录时看到的菜单和功能
if (p.roles && p.roles.length > 0) {
if (p.roles.indexOf(settings.pmroleid["pr"]) < 0) {
......@@ -51,7 +51,7 @@ class UserService extends ServiceBase {
}
//应用的自由用户注册,无需验证,需要前端头设置公司KEY
async pmregisterByFreeUser (p, q) {
async pmregisterByFreeUser(p, q) {
p.rolecodes = [settings.pmroleid["pr"]];
let rtn = await this.pmregister(p, q)
return rtn;
......@@ -60,7 +60,7 @@ class UserService extends ServiceBase {
//平台租户注册接口方法
//控制器端检查用户名和密码非空
async pmregister (p, q) {
async pmregister(p, q) {
var self = this;
let tmppwd = p.password;
if (!tmppwd) {
......@@ -134,12 +134,12 @@ class UserService extends ServiceBase {
}
});
}
async unlockUser (username) {
async unlockUser(username) {
await this.resetPassword(username, settings.defaultpwd);
return this.dao.updateByWhere({ isEnabled: true }, { userName: username })
}
async logout (pobj) {
async logout(pobj) {
await this.cacheManager["UserCache"].invalidate(pobj.username);
return {}
}
......@@ -147,7 +147,7 @@ class UserService extends ServiceBase {
//登录接口封装kong-url
//登录路由放行
//p里面含有appkey,company_id,userName,password
async pmlogin (p, q, req) {
async pmlogin(p, q, req) {
var self = this;
//先要按照用户名,在统一账户中查找存在性
//如果不存在
......@@ -191,7 +191,7 @@ class UserService extends ServiceBase {
}
})
}
async getUserInfo (uname) {
async getUserInfo(uname) {
// let userfind = await this.dao.model.findOne({
// where: { userName: uname, app_id: settings.pmappid },
// attributes: ['userName', 'nickName',"headUrl",'isSuper','isAdmin'],
......@@ -212,7 +212,7 @@ class UserService extends ServiceBase {
//自由用户的电话登录和注册
//需要存在公司KEY
async pmloginByVCodeForFreeUser (p, q) {
async pmloginByVCodeForFreeUser(p, q) {
p.rolecodes = [settings.pmroleid["pr"]];
let rtn = await this.pmloginByVCode(p, q, req)
return system.getResult(rtn);
......@@ -221,7 +221,7 @@ class UserService extends ServiceBase {
//平台租户注册与登录
//用户验证码登录
//
async pmloginByVCode (p, q, req) {
async pmloginByVCode(p, q, req) {
var rtn = {}
//检查传递过来的手机验证码是否与缓存的一致
let mobile = p.mobile;
......@@ -266,19 +266,19 @@ class UserService extends ServiceBase {
//不一致那么就
}
//发送手机验证码并缓存
async sendVCode (p, q, req) {
async sendVCode(p, q, req) {
let mobile = p.mobile;
let vcodeobj = await this.cacheManager["VCodeCache"].cache(mobile, null, 60);
return vcodeobj.vcode;
}
async reSendVCode (p, q, req) {
async reSendVCode(p, q, req) {
let mobile = p.mobile;
await this.cacheManager["VCodeCache"].invalidate(mobile);
let vcodeobj = await this.cacheManager["VCodeCache"].cache(mobile, null, 60);
return vcodeobj.vcode;
}
//修改中心密码
async cmodifypwd (uname, newpwd, cmpid) {
async cmodifypwd(uname, newpwd, cmpid) {
try {
let rtn = await system.postJsonTypeReq(UserService.consumerUrl(uname), { tags: ["cmp_" + cmpid, "pass_" + newpwd] }, "PATCH")
console.log(rtn)
......@@ -292,7 +292,7 @@ class UserService extends ServiceBase {
}
}
//创建统一账号及jwt身份
async cregister (uname, cmpid, pass, uid) {
async cregister(uname, cmpid, pass, uid) {
try {
var rtn2 = null;
let rtn = await system.postJsonTypeReq(UserService.newConsumerUrl(), { username: uname, custom_id: uid, tags: ["cmp_" + cmpid, "pass_" + pass] })
......@@ -314,7 +314,7 @@ class UserService extends ServiceBase {
}
//plkey--对应消费者jwt身份的key,插件解码token后,获取iss-key,查询出身份,利用
//身份中的secret验证签名
async jwtsign (plkey, secretstr, opts) {
async jwtsign(plkey, secretstr, opts) {
let promise = new Promise(function (resv, rej) {
jwt.sign({ exp: Math.floor(Date.now() / 1000) + (60 * 60), iss: plkey }, secretstr, opts, function (err, rtn) {
if (err) {
......@@ -327,13 +327,13 @@ class UserService extends ServiceBase {
return promise;
}
//只要登录 生成新的访问jwttoken
async cmakejwt (key, secret, opts) {
async cmakejwt(key, secret, opts) {
var token = await this.jwtsign(key, secret, opts);
return token;
}
//删除统一账号
async cunregister (uname) {
async cunregister(uname) {
try {
let rtn = await system.delReq(UserService.consumerUrl(uname))
if (rtn.statusCode == 204) {
......@@ -347,15 +347,15 @@ class UserService extends ServiceBase {
//登录统一账号
async clogin (uname) {
async clogin(uname) {
//检查是否存在重名
}
//按用户名查询统一用户
async findCUser (uname) {
async findCUser(uname) {
}
async resetPassword (uname, pwd) {
async resetPassword(uname, pwd) {
let inpassword = this.getEncryptStr(pwd, true);
var self = this;
return this.db.transaction(async function (t) {
......@@ -373,7 +373,7 @@ class UserService extends ServiceBase {
});
}
//修改
async update (qobj, tm = null) {
async update(qobj, tm = null) {
var self = this;
return this.db.transaction(async function (t) {
delete qobj['company_id']
......@@ -395,7 +395,7 @@ class UserService extends ServiceBase {
* @param {*} productCatName 产品类型名称
* @param {*} regionName 区域
*/
async getBizUserForBizChance (clientMobile, spName, productCatName, regionName) {
async getBizUserForBizChance(clientMobile, spName, productCatName, regionName) {
var self = this
clientMobile = clientMobile + "_" + spName + "_" + regionName + "_" + productCatName
//按照服务商名字查询到公司,按照公司查询出users,条件是可以接受派单任务,并且技能标签含有,产品类别名称
......@@ -420,8 +420,8 @@ class UserService extends ServiceBase {
}
], excludes: ['orgJson'], transaction: t
});
console.log("getBizUserForBizChance获取服务商信息:" + companyFind);
if (companyFind) {
console.log("getBizUserForBizChance获取服务商信息:" + JSON.stringify(companyFind));
if (isGoExec) {
let users = companyFind.us
let cansels = users.filter(u => {
......@@ -475,7 +475,7 @@ class UserService extends ServiceBase {
}
})
}
async findCostBySkuCode (skucode) {
async findCostBySkuCode(skucode) {
let productpricetmp = await this.db.models.productprice.findOne({
where: { skucode: skucode, isEnabled: true },
include: [
......@@ -501,7 +501,7 @@ class UserService extends ServiceBase {
* @param {*} skucode 最小销售货品编码,来自渠道上架的码
* @param {*} regionName 区域
*/
async getBizUserForDelivery (xclientMobile, spName, productCatName, skucode, regionName) {
async getBizUserForDelivery(xclientMobile, spName, productCatName, skucode, regionName) {
let clientMobile = 'fordeliver' + xclientMobile + "_" + spName + "_" + regionName + "_" + productCatName
var self = this
//按照服务商名字查询到公司,按照公司查询出users,条件是可以接受派单任务,并且技能标签含有,产品类别名称
......@@ -527,8 +527,8 @@ class UserService extends ServiceBase {
}
], excludes: ['orgJson'], transaction: t
});
console.log("getBizUserForDelivery获取服务商信息:" + companyFind);
if (companyFind) {
console.log("getBizUserForDelivery获取服务商信息:" + JSON.stringify(companyFind));
if (isGoExec) {
let users = companyFind.us
let cansels = users.filter(u => {
......
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