d

center-manage/app/base/service/impl/auth/userSve.js

@@ -115,7 +115,6 @@ class UserService extends ServiceBase {
       //创建统一账号 to add extra fields
       //创建统一账号 to add extra fields
       let cred = await self.cregister(u.userName, p.company_id, p.password, u.id + "")
       let cred = await self.cregister(u.userName, p.company_id, p.password, u.id + "")
       console.log("......................................");
       console.log("......................................");
-      console.log(cred.consumer.id);
       if (cred) {
       if (cred) {
         u.center_id = cred.consumer.id;
         u.center_id = cred.consumer.id;
         u.jwtkey = cred.key;
         u.jwtkey = cred.key;

center-manage/app/base/system.js

@@ -108,12 +108,14 @@ class System {
 				url: url,
 				url: url,
 				form: data
 				form: data
 			}, function (error, response, body) {
 			}, function (error, response, body) {
-				rtn.statusCode = response.statusCode
+
 				if (!error) {
 				if (!error) {
+					rtn.statusCode = response.statusCode
 					let data = JSON.parse(body)
 					let data = JSON.parse(body)
 					rtn.data = data
 					rtn.data = data
 					resv(rtn);
 					resv(rtn);
 				} else {
 				} else {
+					console.log(error)
 					rej(error)
 					rej(error)
 				}
 				}
 			});
 			});

center-manage/app/config/routes/api.js

@@ -8,42 +8,65 @@ const settings = require("../settings.js")
 let channelCache = {};
 let channelCache = {};
 module.exports = function (app) {
 module.exports = function (app) {
 	app.get("/autologin", async function (req, res, next) {
 	app.get("/autologin", async function (req, res, next) {
-		console.log("/dddddddddddddddddddddddddddddddddddddddddd")
 		let appkey = req.query.appkey.trim()
 		let appkey = req.query.appkey.trim()
+		if (!appkey) {
+			res.end("没有资质宝appkey,请联系资质宝服务提供方")
+			return
+		}
 		let companykey = req.query.companykey.trim()
 		let companykey = req.query.companykey.trim()
+		if (!companykey) {
+			res.end("没有公司宝的租户companykey,请联系资质宝服务提供方")
+			return
+		}
 		let cooktoken = req.cookies["token"]
 		let cooktoken = req.cookies["token"]
 		let tv = cooktoken.split(' ')[1]
 		let tv = cooktoken.split(' ')[1]
 		let sourceUser = System.verify(tv, settings.publickey())
 		let sourceUser = System.verify(tv, settings.publickey())
 		let openid = sourceUser.employee
 		let openid = sourceUser.employee
-		let userName = sourceUser.name + "~" + openid
-		let nickName = userName
+		let userName = openid
+		let nickName = sourceUser.name
 		let unid = sourceUser.unionid
 		let unid = sourceUser.unionid
-		let rolecode = "资质交付员"
-
+		sourceUser.roles = ["ddddd", "资质宝交付员", '资质宝业务员']
+		let fixedcodes = ["资质宝交付员", '资质宝业务员']
+		let rolecodes = sourceUser.roles ? sourceUser.roles : []
+		let rcs = rolecodes.filter(rc => {
+			if (fixedcodes.indexOf(rc) >= 0) {
+				return true
+			} else {
+				return false
+			}
+		})
+		if (rcs.length == 0) {
+			res.end("当前登录人没有资质宝访问权限")
+			return
+		}
 		//先按照openid去查看是否已经存在
 		//先按照openid去查看是否已经存在
 		let uf = await userS.dao.model.findOne({ where: { openid: openid } })
 		let uf = await userS.dao.model.findOne({ where: { openid: openid } })
 		if (!uf) {
 		if (!uf) {
-			//就去注册一个用户
-
 			//按照公司companykey查询出要注册公司的所在公司，取公司id
 			//按照公司companykey查询出要注册公司的所在公司，取公司id
 			let company = await companyS.dao.model.findOne({ where: { companykey: companykey } })
 			let company = await companyS.dao.model.findOne({ where: { companykey: companykey } })
 			//构造注册用户对象,需要设置默认角色，默认角色需要按照rolecode查询出角色
 			//构造注册用户对象,需要设置默认角色，默认角色需要按照rolecode查询出角色
-			let role = await roleS.dao.model.findOne({ where: { code: rolecode, company_id: company.id } })
-			console.log(role)
+			let rolesfind = await roleS.dao.model.findAll({ where: { code: { [self.db.Op.in]: rcs }, company_id: company.id } })
 			//根据rolecode--,设置组织路径
 			//根据rolecode--,设置组织路径
 			let opath = ''
 			let opath = ''
-			if (rolecode == "资质业务员") {
+			let isSalesman = false
+			let isDelivery = false
+			if (rcs[0] == "资质宝业务员") {
 				opath = "root10/bizgroup01/g1members/" + userName
 				opath = "root10/bizgroup01/g1members/" + userName
+				isSalesman = true
 			} else {
 			} else {
 				opath = "root10/dlivergroup/dgroupmembers/" + userName
 				opath = "root10/dlivergroup/dgroupmembers/" + userName
+				isDelivery = true
 			}
 			}
 			//调用pmregister
 			//调用pmregister
 			let reguser = {
 			let reguser = {
 				company_id: company.id,
 				company_id: company.id,
 				userName: userName,
 				userName: userName,
 				nickName: nickName,
 				nickName: nickName,
-				roles: [role.id],
-				opath: opath
+				roles: rolesfind.map(r => r.id),
+				opath: opath,
+				openid: openid,
+				isSalesman: isSalesman,
+				isDelivery: isDelivery
 			}
 			}
 			uf = await userS.registerByTantent(reguser)
 			uf = await userS.registerByTantent(reguser)
 		}
 		}