Skip to content

Z
zhichan
Commit 01fe32f6 by 王昆
Options

gsb

parent cdcc6ff1
Showing with 19 additions and 36 deletions
xgg-admin/app/base/controller/impl/uc/authCtl.js
...@@ -11,7 +11,6 @@ class AuthCtl extends CtlBase { ...@@ -11,7 +11,6 @@ class AuthCtl extends CtlBase {
* @param {*} params * @param {*} params
*/ */
async addAuth(params, pobj2, req) { async addAuth(params, pobj2, req) {
params.saas_id = req.loginUser.saas_id;
try { try {
var auth = { var auth = {
pid: Number(params.pid || 0), pid: Number(params.pid || 0),
...@@ -33,7 +32,6 @@ class AuthCtl extends CtlBase { ...@@ -33,7 +32,6 @@ class AuthCtl extends CtlBase {
* @param {*} params * @param {*} params
*/ */
async updAuth(params, pobj2, req) { async updAuth(params, pobj2, req) {
params.saas_id = req.loginUser.saas_id;
var auth = { var auth = {
id: Number(params.id), id: Number(params.id),
pid: Number(params.pid || 0), pid: Number(params.pid || 0),
...@@ -56,8 +54,6 @@ class AuthCtl extends CtlBase { ...@@ -56,8 +54,6 @@ class AuthCtl extends CtlBase {
* @param {*} params * @param {*} params
*/ */
async delAuth(params, pobj2, req) { async delAuth(params, pobj2, req) {
params.saas_id = req.loginUser.saas_id;
try { try {
return await this.authSve.delAuth(params); return await this.authSve.delAuth(params);
} catch (error) { } catch (error) {
...@@ -70,8 +66,6 @@ class AuthCtl extends CtlBase { ...@@ -70,8 +66,6 @@ class AuthCtl extends CtlBase {
* @param {*} params * @param {*} params
*/ */
async queryById(params, pobj2, req) { async queryById(params, pobj2, req) {
params.saas_id = req.loginUser.saas_id;
try { try {
return await this.authSve.queryById(params); return await this.authSve.queryById(params);
} catch (error) { } catch (error) {
...@@ -84,8 +78,6 @@ class AuthCtl extends CtlBase { ...@@ -84,8 +78,6 @@ class AuthCtl extends CtlBase {
* @param {*} params * @param {*} params
*/ */
async byPid(params, pobj2, req) { async byPid(params, pobj2, req) {
params.saas_id = req.loginUser.saas_id;
try { try {
return await this.authSve.byPid(params); return await this.authSve.byPid(params);
} catch (error) { } catch (error) {
...@@ -98,8 +90,6 @@ class AuthCtl extends CtlBase { ...@@ -98,8 +90,6 @@ class AuthCtl extends CtlBase {
* @param {*} params * @param {*} params
*/ */
async tree(params, pobj2, req) { async tree(params, pobj2, req) {
params.saas_id = req.loginUser.saas_id;
try { try {
return await this.authSve.tree(params); return await this.authSve.tree(params);
} catch (error) { } catch (error) {
......
xgg-admin/app/base/controller/impl/uc/orgCtl.js
...@@ -12,7 +12,6 @@ class OrgCtl extends CtlBase { ...@@ -12,7 +12,6 @@ class OrgCtl extends CtlBase {
*/ */
async addOrg(params, pobj2, req) { async addOrg(params, pobj2, req) {
try { try {
params.saas_id = req.loginUser.saas_id;
return await this.orgSve.addOrg(params); return await this.orgSve.addOrg(params);
} catch (error) { } catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`); return system.getResult(null, `系统错误 错误信息 ${error}`);
...@@ -24,7 +23,6 @@ class OrgCtl extends CtlBase { ...@@ -24,7 +23,6 @@ class OrgCtl extends CtlBase {
* @param {*} params * @param {*} params
*/ */
async updOrg(params, pobj2, req) { async updOrg(params, pobj2, req) {
params.saas_id = req.loginUser.saas_id;
try { try {
return await this.orgSve.updOrg(params); return await this.orgSve.updOrg(params);
} catch (error) { } catch (error) {
...@@ -37,7 +35,6 @@ class OrgCtl extends CtlBase { ...@@ -37,7 +35,6 @@ class OrgCtl extends CtlBase {
* @param {*} params * @param {*} params
*/ */
async delOrg(params, pobj2, req) { async delOrg(params, pobj2, req) {
params.saas_id = req.loginUser.saas_id;
try { try {
return await this.orgSve.delOrg(params); return await this.orgSve.delOrg(params);
} catch (error) { } catch (error) {
...@@ -50,7 +47,6 @@ class OrgCtl extends CtlBase { ...@@ -50,7 +47,6 @@ class OrgCtl extends CtlBase {
*/ */
async listOrg(params, pobj2, req) { async listOrg(params, pobj2, req) {
try { try {
params.saas_id = req.loginUser.saas_id;
return await this.orgSve.listOrg(params); return await this.orgSve.listOrg(params);
} catch (error) { } catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`); return system.getResult(null, `系统错误 错误信息 ${error}`);
...@@ -74,8 +70,6 @@ class OrgCtl extends CtlBase { ...@@ -74,8 +70,6 @@ class OrgCtl extends CtlBase {
* @param {*} params * @param {*} params
*/ */
async byPid(params, pobj2, req) { async byPid(params, pobj2, req) {
params.saas_id = req.loginUser.saas_id;
try { try {
return await this.orgSve.byPid(params); return await this.orgSve.byPid(params);
} catch (error) { } catch (error) {
...@@ -88,8 +82,6 @@ class OrgCtl extends CtlBase { ...@@ -88,8 +82,6 @@ class OrgCtl extends CtlBase {
* @param {*} params * @param {*} params
*/ */
async tree(params, pobj2, req) { async tree(params, pobj2, req) {
params.saas_id = req.loginUser.saas_id;
try { try {
return await this.orgSve.tree(params); return await this.orgSve.tree(params);
} catch (error) { } catch (error) {
......
xgg-admin/app/base/controller/impl/uc/roleCtl.js
...@@ -12,7 +12,6 @@ class RoleCtl extends CtlBase { ...@@ -12,7 +12,6 @@ class RoleCtl extends CtlBase {
*/ */
async addRole(params, pobj2, req) { async addRole(params, pobj2, req) {
try { try {
params.saas_id = req.loginUser.saas_id;
return await this.roleSve.addRole(params); return await this.roleSve.addRole(params);
} catch (error) { } catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`); return system.getResult(null, `系统错误 错误信息 ${error}`);
...@@ -66,7 +65,6 @@ class RoleCtl extends CtlBase { ...@@ -66,7 +65,6 @@ class RoleCtl extends CtlBase {
} }
} }
async setAuth(params, pobj2, req) { async setAuth(params, pobj2, req) {
params.saas_id = req.loginUser.saas_id;
try { try {
return await this.roleSve.setAuth(params); return await this.roleSve.setAuth(params);
} catch (error) { } catch (error) {
......
xgg-admin/app/base/controller/impl/uc/userCtl.js
...@@ -62,8 +62,6 @@ class UserCtl extends CtlBase { ...@@ -62,8 +62,6 @@ class UserCtl extends CtlBase {
* @param {*} params * @param {*} params
*/ */
async addUser(params, pobj2, req) { async addUser(params, pobj2, req) {
params.saas_id = req.loginUser.saas_id;
try { try {
var user = { var user = {
saas_id: params.saas_id, saas_id: params.saas_id,
...@@ -106,8 +104,6 @@ class UserCtl extends CtlBase { ...@@ -106,8 +104,6 @@ class UserCtl extends CtlBase {
* @param {*} params * @param {*} params
*/ */
async updUser(params, pobj2, req) { async updUser(params, pobj2, req) {
params.saas_id = req.loginUser.saas_id;
var user = { var user = {
id: Number(params.id || 0), id: Number(params.id || 0),
saas_id: params.saas_id, saas_id: params.saas_id,
...@@ -153,7 +149,6 @@ class UserCtl extends CtlBase { ...@@ -153,7 +149,6 @@ class UserCtl extends CtlBase {
* @param {*} req * @param {*} req
*/ */
async enabled(params, pobj2, req) { async enabled(params, pobj2, req) {
params.saas_id = req.loginUser.saas_id;
try { try {
params.id = Number(params.id || 0); params.id = Number(params.id || 0);
params.enabled = Number(params.enabled || 0); params.enabled = Number(params.enabled || 0);
...@@ -164,8 +159,6 @@ class UserCtl extends CtlBase { ...@@ -164,8 +159,6 @@ class UserCtl extends CtlBase {
} }
async delUser(params, pobj2, req) { async delUser(params, pobj2, req) {
params.saas_id = req.loginUser.saas_id;
try { try {
return await this.userSve.delUser(params); return await this.userSve.delUser(params);
} catch (error) { } catch (error) {
...@@ -178,8 +171,6 @@ class UserCtl extends CtlBase { ...@@ -178,8 +171,6 @@ class UserCtl extends CtlBase {
* @param {*} params * @param {*} params
*/ */
async queryById(params, pobj2, req) { async queryById(params, pobj2, req) {
params.saas_id = req.loginUser.saas_id;
try { try {
return await this.userSve.queryById(params); return await this.userSve.queryById(params);
} catch (error) { } catch (error) {
...@@ -187,7 +178,6 @@ class UserCtl extends CtlBase { ...@@ -187,7 +178,6 @@ class UserCtl extends CtlBase {
} }
} }
async updPassword(params, pobj2, req) { async updPassword(params, pobj2, req) {
params.saas_id = req.loginUser.saas_id;
params.password = this.trim(params.password); params.password = this.trim(params.password);
if(!params.password) { if(!params.password) {
return system.getResult(null, `请填写密码`); return system.getResult(null, `请填写密码`);
...@@ -205,7 +195,6 @@ class UserCtl extends CtlBase { ...@@ -205,7 +195,6 @@ class UserCtl extends CtlBase {
* @param {*} params * @param {*} params
*/ */
async page(params, pobj2, req) { async page(params, pobj2, req) {
params.saas_id = req.loginUser.saas_id;
try { try {
return await this.userSve.page(params); return await this.userSve.page(params);
} catch (error) { } catch (error) {
......
xgg-admin/app/base/service/impl/uc/userSve.js
...@@ -21,24 +21,23 @@ class UserService extends ServiceBase { ...@@ -21,24 +21,23 @@ class UserService extends ServiceBase {
*/ */
async addUser(params) { async addUser(params) {
try { try {
var relation = await this.opuserrelationDao.findOne({ var relation = await this.opuserrelationDao.findOne({
ucname: params.ucname ucname: params.ucname
}); });
if (!relation) { if (!relation) {
var rs = await this.platformUtils.createUserInfo(params.ucname, params.ucname, params.password); var rs = await this.platformUtils.createUserInfo(params.ucname, params.ucname, params.password);
if (!rs.data || !rs.data.account_id) { if (!rs.data || !rs.data.account_id) {
return rs; return rs;
} }
params.ucid = rs.data.account_id; params.ucid = rs.data.account_id;
this.opuserrelationDao.model.create({ await this.opuserrelationDao.model.create({
ucname: params.ucname, ucname: params.ucname,
ucid: rs.data.account_id, ucid: rs.data.account_id,
}); });
} else { } else {
params.ucid = relation.ucid; params.ucid = relation.ucid;
} }
system.getResultSuccess();
return await this.callms("uc", "addUser", params); return await this.callms("uc", "addUser", params);
} catch (error) { } catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`); return system.getResult(null, `系统错误 错误信息 ${error}`);
......
xgg-admin/app/config/routes/web.js
...@@ -8,8 +8,8 @@ module.exports = function (app) { ...@@ -8,8 +8,8 @@ module.exports = function (app) {
app.all("/web/*", async function (req, res, next) { app.all("/web/*", async function (req, res, next) {
var xggadminsid; var xggadminsid;
// var jsonUser = req.session.user; var jsonUser = req.session.user;
var jsonUser = null; // var jsonUser = null;
if(!jsonUser) { if(!jsonUser) {
xggadminsid = req.headers["xggadminsid"] || ""; xggadminsid = req.headers["xggadminsid"] || "";
jsonUser = await redisClient.get(xggadminsid); jsonUser = await redisClient.get(xggadminsid);
...@@ -19,6 +19,7 @@ module.exports = function (app) { ...@@ -19,6 +19,7 @@ module.exports = function (app) {
} }
if (req.url.indexOf("auth/userCtl/login") > 0 || if (req.url.indexOf("auth/userCtl/login") > 0 ||
req.url.indexOf("uc/userCtl/login") > 0 ||
req.url.indexOf("auth/userCtl/smsCode") > 0 || req.url.indexOf("auth/userCtl/smsCode") > 0 ||
req.url.indexOf("common/metaCtl/getApiDoc") > 0 || req.url.indexOf("common/metaCtl/getApiDoc") > 0 ||
req.url.indexOf("common/captchaCtl/captcha") > 0 || req.url.indexOf("common/captchaCtl/captcha") > 0 ||
...@@ -41,6 +42,10 @@ module.exports = function (app) { ...@@ -41,6 +42,10 @@ module.exports = function (app) {
redisClient.setWithEx(xggadminsid, JSON.stringify(jsonUser), 60 * 60 * 60); redisClient.setWithEx(xggadminsid, JSON.stringify(jsonUser), 60 * 60 * 60);
} }
req.loginUser = jsonUser; req.loginUser = jsonUser;
if(req.loginUser.uctype != 1) {
res.end(JSON.stringify({ status: -99, msg: "no platform user, kick off" }));
return;
}
next(); next();
}); });
...@@ -61,6 +66,11 @@ module.exports = function (app) { ...@@ -61,6 +66,11 @@ module.exports = function (app) {
var gname = req.params["gname"]; var gname = req.params["gname"];
classPath = gname + "." + classPath; classPath = gname + "." + classPath;
var params = []; var params = [];
// 处理用户参数
if(req.loginUser) {
req.query = req.query || {};
req.query.saas_id = req.loginUser.saas_id;
}
params.push(methodName); params.push(methodName);
params.push(req.body); params.push(req.body);
params.push(req.query); params.push(req.query);
...@@ -88,6 +98,11 @@ module.exports = function (app) { ...@@ -88,6 +98,11 @@ module.exports = function (app) {
req.body.clientIp = tClientIp; req.body.clientIp = tClientIp;
req.body.agent = req.headers["user-agent"]; req.body.agent = req.headers["user-agent"];
req.body.classname = classPath; req.body.classname = classPath;
// 处理用户参数
if(req.loginUser) {
req.body.saas_id = req.loginUser.saas_id;
}
params.push(methodName); params.push(methodName);
params.push(req.body); params.push(req.body);
params.push(req.query); params.push(req.query);
......
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