From 1890d785603c3553e783184c549659cba2c568aa Mon Sep 17 00:00:00 2001 From: sx1989827 <395414574@qq.com> Date: Thu, 28 Oct 2021 22:57:12 +0800 Subject: [PATCH] add --- code/common/model/team_role.ts | 2 +- code/common/model/team_user.ts | 2 +- code/common/permission/permission.ts | 12 ++++----- code/common/routes/team.ts | 2 +- code/common/status/error.ts | 4 +-- code/server/common/event/types.ts | 2 +- code/server/gateway/util/obtp.ts | 8 +++--- code/server/gateway/util/util.ts | 4 +-- code/server/user/http/team.ts | 38 ++++++++++++++-------------- code/server/user/mapper/team.ts | 18 ++++++------- code/server/user/service/team.ts | 18 ++++++------- 11 files changed, 55 insertions(+), 55 deletions(-) diff --git a/code/common/model/team_role.ts b/code/common/model/team_role.ts index bb126bc..3f575f5 100644 --- a/code/common/model/team_role.ts +++ b/code/common/model/team_role.ts @@ -4,7 +4,7 @@ export interface ICommon_Model_Team_Role { id :string, name :string, description:string, - group_id:string + team_id:string } export const Table_Team_Role="team_role" diff --git a/code/common/model/team_user.ts b/code/common/model/team_user.ts index 16058a4..b217794 100644 --- a/code/common/model/team_user.ts +++ b/code/common/model/team_user.ts @@ -2,7 +2,7 @@ import { BaseModel } from "./base" export interface ICommon_Model_Team_User { user_id :string, - group_id :string, + team_id :string, role:string, id :string , } diff --git a/code/common/permission/permission.ts b/code/common/permission/permission.ts index 59070c7..d3e5835 100644 --- a/code/common/permission/permission.ts +++ b/code/common/permission/permission.ts @@ -12,11 +12,11 @@ export namespace Permission_Types { static readonly DELETE =new Project("DELETE","delete project") static readonly CREATE =new Project("CREATE","create project") } - export class Group extends Permission_Base { - static readonly READ =new Group("READ","read group") - static readonly EDIT =new Group("EDIT","edit group") - static readonly DELETE =new Group("DELETE","delete group") - static readonly CREATE =new Group("CREATE","create group") - static readonly MEMBER =new Group("MEMBER","modify group member") + export class Team extends Permission_Base { + static readonly READ =new Team("READ","read team") + static readonly EDIT =new Team("EDIT","edit team") + static readonly DELETE =new Team("DELETE","delete team") + static readonly CREATE =new Team("CREATE","create team") + static readonly MEMBER =new Team("MEMBER","modify team member") } } \ No newline at end of file diff --git a/code/common/routes/team.ts b/code/common/routes/team.ts index 72683a9..55163b8 100644 --- a/code/common/routes/team.ts +++ b/code/common/routes/team.ts @@ -49,7 +49,7 @@ const api={ id:string, name:string, photo:string, - role:Omit + role:Omit }[]>{} }, addMember:{ diff --git a/code/common/status/error.ts b/code/common/status/error.ts index 0de07bc..1f72ee1 100644 --- a/code/common/status/error.ts +++ b/code/common/status/error.ts @@ -66,11 +66,11 @@ export namespace Err { export let Team = { teamNotFound:{ code:4000, - msg:"group not found" + msg:"team not found" }, teamExists:{ code:4001, - msg:"group exists" + msg:"team exists" }, } } diff --git a/code/server/common/event/types.ts b/code/server/common/event/types.ts index f180055..dbd5be5 100644 --- a/code/server/common/event/types.ts +++ b/code/server/common/event/types.ts @@ -7,6 +7,6 @@ export namespace EServer_Common_Event_Types { DELETE="delete project" //projectId:string } export enum Team { - DELETE="delete group" //teamId:string + DELETE="delete team" //teamId:string } } \ No newline at end of file diff --git a/code/server/gateway/util/obtp.ts b/code/server/gateway/util/obtp.ts index 5c2d3b1..683956e 100644 --- a/code/server/gateway/util/obtp.ts +++ b/code/server/gateway/util/obtp.ts @@ -30,22 +30,22 @@ export namespace OBTPConfig { permission:[Permission_Types.Project.READ] } } - export const Group_Role=<{ + export const Team_Role=<{ [param:string]:{ name:string, description:"", - permission:Permission_Types.Group[] + permission:Permission_Types.Team[] } }>{ admin:{ name:"admin", description:"", - permission:getAllPermissions(Permission_Types.Group) + permission:getAllPermissions(Permission_Types.Team) }, user:{ name:"user", description:"", - permission:[Permission_Types.Group.READ] + permission:[Permission_Types.Team.READ] } } } diff --git a/code/server/gateway/util/util.ts b/code/server/gateway/util/util.ts index 2a93867..6fd812b 100644 --- a/code/server/gateway/util/util.ts +++ b/code/server/gateway/util/util.ts @@ -115,7 +115,7 @@ export async function initSystem() { } await mysql.execute(`insert into ${Table_Project_User} (id,role,project_id,user_id) values ('${await generateSnowId()}','${projectRoleUserId}','${projectId}','${userId}')`) await mysql.execute(`insert into ${Table_Version} (version) values ('${getNacosInstance().version}')`) - let objGroupRole=OBTPConfig.Role.Group_Role,groupRoleUserId; + let objGroupRole=OBTPConfig.Role.Team_Role,groupRoleUserId; for(let key in objGroupRole) { let obj=objGroupRole[key] let groupRoleId=await generateSnowId() @@ -130,7 +130,7 @@ export async function initSystem() { await mysql.execute(`insert into ${Table_Role_Permission} (id,role_id,permission_id) values ('${id}','${groupRoleId}','${objPermission[o.value]}')`) } } - await mysql.execute(`insert into ${Table_Team_User} (id,role,group_id,user_id) values ('${await generateSnowId()}','${groupRoleUserId}','${groupId}','${userId}')`) + await mysql.execute(`insert into ${Table_Team_User} (id,role,team_id,user_id) values ('${await generateSnowId()}','${groupRoleUserId}','${groupId}','${userId}')`) } console.log("init finish") } \ No newline at end of file diff --git a/code/server/user/http/team.ts b/code/server/user/http/team.ts index bde3b69..a5561a0 100644 --- a/code/server/user/http/team.ts +++ b/code/server/user/http/team.ts @@ -9,63 +9,63 @@ import TeamService from "../service/team"; class TeamController { @DHttpApi(teamApi.routes.create) async create(@DHttpReqParamRequired("name") name:string,@DHttpUser user:IUserSession):Promise{ - let group=new TeamService - group.assignItem({ + let team=new TeamService + team.assignItem({ name, created_by:user.type==EServer_Common_User_Type.USER?user.userId:null }); - let obj=await group.create() + let obj=await team.create() return obj } @DHttpApi(teamApi.routes.info) async info(@DHttpReqParamRequired("teamId") teamId:string):Promise { - let group = await TeamService.getItemById(teamId) - if(!group) { + let team = await TeamService.getItemById(teamId) + if(!team) { throw Err.Team.teamNotFound } - return group.getItem() + return team.getItem() } @DHttpApi(teamApi.routes.update) async update(@DHttpReqParamRequired("teamId") teamId:string,@DHttpReqParamRequired("name") name:string):Promise { - let group = await TeamService.getItemById(teamId) - if(!group) { + let team = await TeamService.getItemById(teamId) + if(!team) { throw Err.Team.teamNotFound } - group.assignItem({ + team.assignItem({ name }) - let ret=await group.update() + let ret=await team.update() return ret } @DHttpApi(teamApi.routes.remove) async remove(@DHttpReqParamRequired("teamId") teamId:string) { - let group=await TeamService.getItemById(teamId) - if(!group) { + let team=await TeamService.getItemById(teamId) + if(!team) { throw Err.Team.teamNotFound } - await group.delete() + await team.delete() } @DHttpApi(teamApi.routes.roles) async roles(@DHttpReqParamRequired("teamId") teamId:string) :Promise { - let group=await TeamService.getItemById(teamId) - if(!group) { + let team=await TeamService.getItemById(teamId) + if(!team) { throw Err.Team.teamNotFound } - let ret=await group.getRoles() + let ret=await team.getRoles() return ret; } @DHttpApi(teamApi.routes.members) async members(@DHttpReqParamRequired("teamId") teamId:string) :Promise { - let group=await TeamService.getItemById(teamId) - if(!group) { + let team=await TeamService.getItemById(teamId) + if(!team) { throw Err.Team.teamNotFound } - let ret=await group.members() + let ret=await team.members() return ret; } diff --git a/code/server/user/mapper/team.ts b/code/server/user/mapper/team.ts index 3526080..8074541 100644 --- a/code/server/user/mapper/team.ts +++ b/code/server/user/mapper/team.ts @@ -6,7 +6,7 @@ import { Err } from "../../../common/status/error"; import { getMysqlInstance } from "../../common/db/mysql"; import { generateCreateSql, generateDeleteSql, generateLeftJoin2Sql, generateQuerySql, generateSnowId, generateUpdateSql } from "../../common/util/sql"; export namespace teamMapper { - export async function checkGroup(name:string):Promise { + export async function checkTeam(name:string):Promise { if(!name) { throw Err.Common.paramError } @@ -16,11 +16,11 @@ export namespace teamMapper { } - export async function createGroup(info:ICommon_Model_Team):Promise { + export async function createTeam(info:ICommon_Model_Team):Promise { if(!info || !info.name ||info.id){ throw Err.Common.paramError } - let isExists=await checkGroup(info.name); + let isExists=await checkTeam(info.name); if(isExists) { throw Err.Team.teamExists } @@ -29,7 +29,7 @@ export namespace teamMapper { await mysql.execute(generateCreateSql(teamModel,info)) } - export async function getGroupById(id:string):Promise { + export async function getTeamById(id:string):Promise { if(!id) { throw Err.Team.teamNotFound } @@ -38,7 +38,7 @@ export namespace teamMapper { return ret } - export async function updateGroup(info:ICommon_Model_Team):Promise { + export async function updateTeam(info:ICommon_Model_Team):Promise { if(!info.id) { throw Err.Team.teamNotFound } @@ -48,7 +48,7 @@ export namespace teamMapper { await mysql.execute(generateUpdateSql(teamModel,info,{id})) } - export async function deleteGroup(id:string):Promise { + export async function deleteTeam(id:string):Promise { if(!id) { throw Err.Team.teamNotFound } @@ -62,7 +62,7 @@ export namespace teamMapper { } var mysql=getMysqlInstance(); let ret=await mysql.execute(generateQuerySql(teamRoleModel,null,{ - group_id:{ + team_id:{ value:[teamId,null], exp:"in" } @@ -74,7 +74,7 @@ export namespace teamMapper { id:string, name:string, photo:string, - role:Omit + role:Omit }[]> { if(!teamId) { throw Err.Team.teamNotFound @@ -106,7 +106,7 @@ export namespace teamMapper { } } },{ - group_id:{ + team_id:{ value:teamId, model:teamUserModel } diff --git a/code/server/user/service/team.ts b/code/server/user/service/team.ts index 0d8c395..f7009fb 100644 --- a/code/server/user/service/team.ts +++ b/code/server/user/service/team.ts @@ -13,7 +13,7 @@ export default class Team extends Entity { } else if(this.item.id) { throw Err.Team.teamExists; } - await teamMapper.createGroup(this.item) + await teamMapper.createTeam(this.item) await this.loadItem(); return this.item; } @@ -21,29 +21,29 @@ export default class Team extends Entity { if(!this.item || !this.item.id) { throw Err.Team.teamNotFound; } - await teamMapper.updateGroup(this.item) + await teamMapper.updateTeam(this.item) return this.item; } async delete(){ - await teamMapper.deleteGroup(this.item.id); + await teamMapper.deleteTeam(this.item.id); emitServiceEvent(EServer_Common_Event_Types.Team.DELETE,this.item.id); } async loadItem():Promise { if(!this.item || !this.item.id) { throw Err.Team.teamNotFound; } - let obj = await teamMapper.getGroupById(this.item.id); + let obj = await teamMapper.getTeamById(this.item.id); this.item=obj; return this.item; } static async getItemById(id:string,reload:boolean=false):Promise>{ - let obj = await teamMapper.getGroupById(id); + let obj = await teamMapper.getTeamById(id); if (!obj) { return null } - let group = new Team; - group.setItem(obj); - return group; + let team = new Team; + team.setItem(obj); + return team; } async getRoles():Promise{ @@ -58,7 +58,7 @@ export default class Team extends Entity { id:string, name:string, photo:string, - role:Omit + role:Omit }[]>{ if(!this.item || !this.item.id) { throw Err.Team.teamNotFound;