Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
511cd64a
M
metersphere
项目概览
MeterSphere
/
metersphere
上一次同步 大约 3 年
通知
25
Star
1
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
metersphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
511cd64a
编写于
6月 05, 2020
作者:
C
chenjianxing
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' of
https://github.com/metersphere/server
into dev
上级
d74f2e5b
5291f607
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
32 addition
and
27 deletion
+32
-27
backend/src/main/java/io/metersphere/controller/UserController.java
...c/main/java/io/metersphere/controller/UserController.java
+3
-2
backend/src/main/resources/i18n/messages_en_US.properties
backend/src/main/resources/i18n/messages_en_US.properties
+9
-8
backend/src/main/resources/i18n/messages_zh_CN.properties
backend/src/main/resources/i18n/messages_zh_CN.properties
+10
-9
backend/src/main/resources/i18n/messages_zh_TW.properties
backend/src/main/resources/i18n/messages_zh_TW.properties
+10
-8
未找到文件。
backend/src/main/java/io/metersphere/controller/UserController.java
浏览文件 @
511cd64a
...
...
@@ -17,6 +17,7 @@ import io.metersphere.controller.request.organization.AddOrgMemberRequest;
import
io.metersphere.controller.request.organization.QueryOrgMemberRequest
;
import
io.metersphere.dto.UserDTO
;
import
io.metersphere.dto.UserRoleDTO
;
import
io.metersphere.i18n.Translator
;
import
io.metersphere.service.OrganizationService
;
import
io.metersphere.service.UserService
;
import
io.metersphere.service.WorkspaceService
;
...
...
@@ -206,7 +207,7 @@ public class UserController {
workspaceService
.
checkWorkspaceOwner
(
workspaceId
);
String
currentUserId
=
SessionUtils
.
getUser
().
getId
();
if
(
StringUtils
.
equals
(
userId
,
currentUserId
))
{
MSException
.
throwException
(
"Insufficient permissions!"
);
MSException
.
throwException
(
Translator
.
get
(
"cannot_remove_current"
)
);
}
userService
.
deleteMember
(
workspaceId
,
userId
);
}
...
...
@@ -230,7 +231,7 @@ public class UserController {
organizationService
.
checkOrgOwner
(
organizationId
);
String
currentUserId
=
SessionUtils
.
getUser
().
getId
();
if
(
StringUtils
.
equals
(
userId
,
currentUserId
))
{
MSException
.
throwException
(
"Insufficient permissions!"
);
MSException
.
throwException
(
Translator
.
get
(
"cannot_remove_current"
)
);
}
userService
.
delOrganizationMember
(
organizationId
,
userId
);
}
...
...
backend/src/main/resources/i18n/messages_en_US.properties
浏览文件 @
511cd64a
...
...
@@ -15,6 +15,15 @@ user_id_already_exists=User ID already exists
password_modification_failed
=
The old password is wrong. Please re-enter it
cannot_delete_current_user
=
Cannot delete the user currently logged in
user_already_exists
=
The user already exists in the current member list
cannot_remove_current
=
Unable to remove the currently logged in user
password_is_incorrect
=
Incorrect password
user_not_exist
=
user does not exist:
user_has_been_disabled
=
the user has been disabled.
excessive_attempts
=
Excessive attempts
user_locked
=
the user has been locked.
user_expires
=
user expires.
not_authorized
=
not authorized.
login_fail
=
Login fail
#load test
edit_load_test_not_found
=
Cannot edit test, test not found=
run_load_test_not_found
=
Cannot run test, test not found=
...
...
@@ -97,11 +106,3 @@ test_case_report_template_repeat=The workspace has the same name template
plan_name_already_exists
=
Test plan name already exists
test_case_already_exists_excel
=
There are duplicate test cases in the import file
api_test_name_already_exists
=
Test name already exists
password_is_incorrect
=
Incorrect password
user_not_exist
=
user does not exist:
user_has_been_disabled
=
the user has been disabled.
excessive_attempts
=
Excessive attempts
user_locked
=
the user has been locked.
user_expires
=
user expires.
not_authorized
=
not authorized.
login_fail
=
Login fail
\ No newline at end of file
backend/src/main/resources/i18n/messages_zh_CN.properties
浏览文件 @
511cd64a
...
...
@@ -15,7 +15,15 @@ password_modification_failed=旧密码输入错误,请重新输入
cannot_delete_current_user
=
无法删除当前登录用户
connection_failed
=
连接失败
user_already_exists
=
该用户已存在于当前成员列表中
cannot_remove_current
=
无法移除当前登录用户
login_fail
=
登陆失败
password_is_incorrect
=
密码不正确
user_not_exist
=
用户不存在:
user_has_been_disabled
=
用户已被禁用
excessive_attempts
=
操作频繁
user_locked
=
用户被锁定
user_expires
=
用户过期
not_authorized
=
未经授权
#load test
edit_load_test_not_found
=
无法编辑测试,未找到测试:
run_load_test_not_found
=
无法运行测试,未找到测试:
...
...
@@ -98,14 +106,7 @@ test_case_report_template_repeat=同一工作空间下不能存在同名模版
plan_name_already_exists
=
测试计划名称已存在
test_case_already_exists_excel
=
导入文件中存在重复用例
api_test_name_already_exists
=
测试名称已经存在
login_fail
=
登陆失败
password_is_incorrect
=
密码不正确
user_not_exist
=
用户不存在:
user_has_been_disabled
=
用户已被禁用
excessive_attempts
=
操作频繁
user_locked
=
用户被锁定
user_expires
=
用户过期
not_authorized
=
未经授权
backend/src/main/resources/i18n/messages_zh_TW.properties
浏览文件 @
511cd64a
...
...
@@ -15,6 +15,15 @@ user_id_already_exists=用戶id已存在
password_modification_failed
=
舊密碼輸入錯誤,請重新輸入
cannot_delete_current_user
=
無法刪除當前登錄用戶
user_already_exists
=
該用戶已存在於當前成員列表中
cannot_remove_current
=
無法移除當前登錄用戶
password_is_incorrect
=
密碼不正確
user_not_exist
=
用戶不存在:
user_has_been_disabled
=
用戶已被禁用
excessive_attempts
=
操作頻繁
user_locked
=
用戶被鎖定
user_expires
=
用戶過期
not_authorized
=
未經授權。
login_fail
=
登入失敗
#load test
edit_load_test_not_found
=
無法編輯測試,未找到測試:
run_load_test_not_found
=
無法運行測試,未找到測試:
...
...
@@ -97,11 +106,4 @@ test_case_report_template_repeat=同壹工作空間下不能存在同名模版
plan_name_already_exists
=
測試計劃名稱已存在
test_case_already_exists_excel
=
導入文件中存在重復用例
api_test_name_already_exists
=
測試名稱已經存在
password_is_incorrect
=
密碼不正確
user_not_exist
=
用戶不存在:
user_has_been_disabled.
=
用戶已被禁用
excessive_attempts
=
操作頻繁
user_locked
=
用戶被鎖定
user_expires
=
用戶過期
not_authorized
=
未經授權。
login_fail
=
登入失敗
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录