test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(系统设置): 个人信息权限公开 

--user=郭雨琦 个人信息权限公开
This commit is contained in:
guoyuqi 2022-02-21 14:33:46 +08:00 committed by shiziyuan9527
parent 3bcd136470
commit 3904b634a9
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/src/main/java/io/metersphere/api/service/ShareInfoService.java
View File

@ -16,6 +16,7 @@ import io.metersphere.commons.utils.BeanUtils;
import io.metersphere.commons.utils.CommonBeanFactory; import io.metersphere.commons.utils.CommonBeanFactory;
import io.metersphere.commons.utils.LogUtil; import io.metersphere.commons.utils.LogUtil;
import io.metersphere.commons.utils.SessionUtils; import io.metersphere.commons.utils.SessionUtils;
import io.metersphere.i18n.Translator;
import io.metersphere.service.ProjectApplicationService; import io.metersphere.service.ProjectApplicationService;
import io.metersphere.track.service.TestPlanApiCaseService; import io.metersphere.track.service.TestPlanApiCaseService;
import io.metersphere.track.service.TestPlanScenarioCaseService; import io.metersphere.track.service.TestPlanScenarioCaseService;
@ -518,7 +519,7 @@ public class ShareInfoService {
public void validateExpired(ShareInfo shareInfo) { public void validateExpired(ShareInfo shareInfo) {
// 有效期根据类型从ProjectApplication中获取 // 有效期根据类型从ProjectApplication中获取
if(shareInfo == null ){ if(shareInfo == null ){
MSException.throwException("连接已失效，请重新获取!"); MSException.throwException(Translator.get("connection_expired"));
} }
String type = ""; String type = "";
if(shareInfo.getShareType().equals("PERFORMANCE_REPORT")){ if(shareInfo.getShareType().equals("PERFORMANCE_REPORT")){
@ -544,7 +545,7 @@ public class ShareInfoService {
private void millisCheck(long compareMillis, long millis,String shareInfoId) { private void millisCheck(long compareMillis, long millis,String shareInfoId) {
if (compareMillis>millis) { if (compareMillis>millis) {
shareInfoMapper.deleteByPrimaryKey(shareInfoId); shareInfoMapper.deleteByPrimaryKey(shareInfoId);
MSException.throwException("连接已失效，请重新获取!"); MSException.throwException(Translator.get("connection_expired"));
} }
} }

1
backend/src/main/resources/i18n/messages_en_US.properties
View File

@ -279,6 +279,7 @@ test_case_status_error=Error
test_case_status_success=Success test_case_status_success=Success
test_case_status_trash=Trash test_case_status_trash=Trash
test_case_status_saved=Saved test_case_status_saved=Saved
connection_expired=The connection has expired, please get it again
# track home # track home
api_case=Api api_case=Api
performance_case=Performance performance_case=Performance

1
backend/src/main/resources/i18n/messages_zh_CN.properties
View File

@ -274,6 +274,7 @@ group_permission=用户组与权限
test_case_status_prepare=未开始 test_case_status_prepare=未开始
test_case_status_running=进行中 test_case_status_running=进行中
test_case_status_finished=已完成 test_case_status_finished=已完成
connection_expired=连接已失效，请重新获取
# track home # track home
api_case=接口用例 api_case=接口用例
performance_case=性能用例 performance_case=性能用例

1
backend/src/main/resources/i18n/messages_zh_TW.properties
View File

@ -274,6 +274,7 @@ group_permission=用戶組與權限
test_case_status_prepare=未開始 test_case_status_prepare=未開始
test_case_status_running=進行中 test_case_status_running=進行中
test_case_status_finished=已完成 test_case_status_finished=已完成
connection_expired=連接已失效，請重新獲取
# track home # track home
api_case=接口用例 api_case=接口用例
performance_case=性能用例 performance_case=性能用例

15
backend/src/main/resources/permission.json
View File

@ -947,26 +947,22 @@
{ {
"id": "PERSONAL_INFORMATION:READ+EDIT", "id": "PERSONAL_INFORMATION:READ+EDIT",
"name": "permission.personal_information.personal_setting", "name": "permission.personal_information.personal_setting",
"resourceId": "PERSONAL_INFORMATION", "resourceId": "PERSONAL_INFORMATION"
"license": true
}, },
{ {
"id": "PERSONAL_INFORMATION:READ+API_KEYS", "id": "PERSONAL_INFORMATION:READ+API_KEYS",
"name": "permission.personal_information.api_keys", "name": "permission.personal_information.api_keys",
"resourceId": "PERSONAL_INFORMATION", "resourceId": "PERSONAL_INFORMATION"
"license": true
}, },
{ {
"id": "PERSONAL_INFORMATION:READ+EDIT_PASSWORD", "id": "PERSONAL_INFORMATION:READ+EDIT_PASSWORD",
"name": "permission.personal_information.edit_password", "name": "permission.personal_information.edit_password",
"resourceId": "PERSONAL_INFORMATION", "resourceId": "PERSONAL_INFORMATION"
"license": true
}, },
{ {
"id": "PERSONAL_INFORMATION:READ+THIRD_ACCOUNT", "id": "PERSONAL_INFORMATION:READ+THIRD_ACCOUNT",
"name": "permission.personal_information.third_account", "name": "permission.personal_information.third_account",
"resourceId": "PERSONAL_INFORMATION", "resourceId": "PERSONAL_INFORMATION"
"license": true
} }
], ],
"resource": [ "resource": [
@ -1127,8 +1123,7 @@
}, },
{ {
"id": "PERSONAL_INFORMATION", "id": "PERSONAL_INFORMATION",
"name": "permission.personal_information.name", "name": "permission.personal_information.name"
"license": true
} }
] ]
} }