xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

后台：修改权限用表

Browse Source
This commit is contained in:
luying
2022-01-04 11:19:08 +08:00
parent 70068402a1
commit c32744f276
13 changed files with 67 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gm-server/app/controller/activity.ts
View File

@@ -16,7 +16,8 @@ export default class ActivityController extends Controller {
public async getActivityGroupList() {
const { ctx } = this;
const { page, pageSize, form: { serverId, current, groupId} } = ctx.request.body;
console.log('******', ctx.request.body);
const { page, pageSize, form: { serverId, current, groupId} = { serverId: 0, current: false, groupId: 0 } } = ctx.request.body;
ctx.body = await ctx.service.activity.getActivityGroupList(page, pageSize, serverId, current, groupId);
return
}

10
gm-server/app/middleware/tokenParser.ts
View File

@@ -1,5 +1,4 @@
import { GMUserModel } from '@db/GMUser';
import { GMUserGroupModel } from '@db/GMUserGroup'
import { GMGroupModel } from '@db/GMGroup'
import { GMRecordModel } from '@db/GMRecord'
import { GM_API_TYPE, STATUS } from '@consts';
@@ -25,14 +24,9 @@ module.exports = () => {
ctx.body = ctx.service.utils.resResult(STATUS.GM_MISS_API);
return;
}
let userGroup = await GMUserGroupModel.getUserGroupByUid(user.uid);
if(!userGroup) {
ctx.body = ctx.service.utils.resResult(STATUS.GM_NO_AUTHORITY_GET);
return
}
let group = await GMGroupModel.getGroupById(userGroup.groupId);
let group = await GMGroupModel.getGroupById(user.groupId);
if(!group) {
if(!group || !user.isEnable) {
ctx.body = ctx.service.utils.resResult(STATUS.GM_NO_AUTHORITY_GET);
return
}

9
gm-server/app/service/Game.ts
View File

@@ -26,8 +26,13 @@ export default class Game extends Service {
public async getRegions() {
const { ctx } = this;
const list = await RegionModel.getAllRegion();
let user = ctx.user;
let list = [];
if(user.envs.indexOf('all') != -1) {
list = await RegionModel.getAllRegion();
} else {
list = await RegionModel.findRegionByEnvs(user.envs||[]);
}
return ctx.service.utils.resResult(STATUS.SUCCESS, {
list
});

44
gm-server/app/service/GmUser.ts
View File

@@ -1,6 +1,5 @@
import { GMUserModel } from '@db/GMUser';
import { GMGroupModel } from '@db/GMGroup';
import { GMUserGroupModel } from '@db/GMUserGroup';
import { Service } from 'egg';
import { STATUS } from '@consts';
import { gameData } from '@pubUtils/data';
@@ -24,17 +23,19 @@ export default class GMUsers extends Service {
if(!user) {
return ctx.service.utils.resResult(STATUS.GM_ERR_PASSWORD);
}
let userGroup = await GMUserGroupModel.getUserGroupByUid(user.uid);
let group = new Array();
if(userGroup) {
let g = await GMGroupModel.getGroupById(userGroup.groupId);
if(g) group.push(g.group);
}
console.log('******', group, token)
return ctx.service.utils.resResult(STATUS.SUCCESS, {
...user, group, token
});
if(!user.isEnable) {
return ctx.service.utils.resResult(STATUS.GM_NO_AUTHORITY_GET);
}
let group = new Array();
if(user.groupId != undefined) {
let g = await GMGroupModel.getGroupById(user.groupId);
if(g) group.push(g.group);
}
console.log('******', group, token)
return ctx.service.utils.resResult(STATUS.SUCCESS, {
...user, group, token
});
}catch(e) {
console.log(e)
}
@@ -43,10 +44,9 @@ export default class GMUsers extends Service {
public async currentUser() {
const {ctx} = this;
let user = ctx.user;
let userGroup = await GMUserGroupModel.getUserGroupByUid(user.uid);
let group = new Array();
if(userGroup) {
let g = await GMGroupModel.getGroupById(userGroup.groupId);
if(user.groupId != undefined) {
let g = await GMGroupModel.getGroupById(user.groupId);
if(g) group.push(g.group);
}
@@ -77,15 +77,12 @@ export default class GMUsers extends Service {
if(list) {
let result = new Array();
for(let user of list) {
let uid = user.uid;
let userGroup = await GMUserGroupModel.getUserGroupByUid(uid);
let groupId = 0, groupStr = '暂无', envs = [];
if(userGroup) {
let group = await GMGroupModel.getGroupById(userGroup.groupId);
console.log(userGroup.groupId, group);
if(user.groupId != undefined) {
let group = await GMGroupModel.getGroupById(user.groupId);
if(group) {
groupId = userGroup.groupId;
envs = userGroup.envs
groupId = user.groupId;
envs = user.envs
groupStr = group.name;
}
}
@@ -200,8 +197,7 @@ export default class GMUsers extends Service {
* 用户组添加接口
*/
public async saveGmGroupToUser(uid: number, groupId: number, envs: string[]) {
await GMUserGroupModel.addUserGroup(uid, groupId, envs);
await GMUserModel.updateInfo(uid, { groupId, envs });
return this.ctx.service.utils.resResult(STATUS.SUCCESS);
}