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