gfwleak/appsketch-works-asw-controller
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 调整同 workspace 下 user 不能重复

Browse Source
This commit is contained in:
zhangshuai
2024-09-05 14:34:54 +08:00
parent 77c62ca317
commit 6bed4ad795
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/net/geedge/asw/common/util/RCode.java
View File

@@ -75,6 +75,7 @@ public enum RCode {
WORKSPACE_VISIBILITY_ERROR(401008, "workspace visibility error"),
WORKSPACE_BUILT_IN(401009, "Built-in workspace cannot be update"),
WORKSPACE_NOT_EXIST(401010, "Workspace does not exist"),
WORKSPACE_MEMBER_USER_ID_REPEAT(401011, "Workspace member user repeat"),
//PCAP
PCAP_UPLOAD_WEB_SHARK_ERROR(501001, "web shark upload pcap error"),

4
src/main/java/net/geedge/asw/module/workspace/service/impl/WorkspaceMemberServiceImpl.java
View File

@@ -59,6 +59,10 @@ public class WorkspaceMemberServiceImpl extends ServiceImpl<WorkspaceMemberDao,
if (T.StrUtil.equalsIgnoreCase(workspaceId, "1")) {
throw new ASWException(RCode.WORKSPACE_BUILT_IN);
}
long count = memberList.stream().map(x -> x.getUserId()).distinct().count();
if (count != memberList.size()) {
throw new ASWException(RCode.WORKSPACE_MEMBER_USER_ID_REPEAT);
}
List<String> userIds = userService.list().stream().map(x -> x.getId()).toList();
List<String> roleIds = roleService.list().stream().map(x -> x.getId()).toList();
for (WorkspaceMemberEntity workspace : memberList) {

2
src/main/resources/db/migration/R__AZ_sys_i18n.sql
View File

@@ -127,5 +127,7 @@ INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_
INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (211, '601002', 'ENVIRONMENT_NOT_EXIST', '环境不存在', 'zh', '', 'admin', 1724030366000);
INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (213, '201017', 'APP_IMPORT_FILE_FORMAT_ERROR', 'application import file format error', 'en', '', 'admin', 1724030366000);
INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (215, '201017', 'APP_IMPORT_FILE_FORMAT_ERROR', '导入文件格式错误', 'zh', '', 'admin', 1724030366000);
INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (217, '401011', 'WORKSPACE_MEMBER_USER_ID_REPEAT', 'Workspace member user repeat', 'en', '', 'admin', 1724030366000);
INSERT INTO `sys_i18n`(`id`, `name`, `code`, `value`, `lang`, `remark`, `update_user_id`, `update_timestamp`) VALUES (219, '401011', 'WORKSPACE_MEMBER_USER_ID_REPEAT', '工作空间用户重复', 'zh', '', 'admin', 1724030366000);
SET FOREIGN_KEY_CHECKS = 1;