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

Merge branch 'master' of https://github.com/metersphere/metersphere

This commit is contained in:
fit2-zhao 2021-01-11 13:47:29 +08:00
parent 489b2b8f10 a00334acf3
commit b542049389
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/io/metersphere/controller/UserController.java
View File

@ -168,6 +168,9 @@ public class UserController {
@GetMapping("/info/{userId}")
public UserDTO getUserInfo(@PathVariable(value = "userId") String userId) {
if (!StringUtils.equals(userId, SessionUtils.getUserId())) {
MSException.throwException(Translator.get("not_authorized"));
}
return userService.getUserInfo(userId);
}

2
backend/src/main/java/io/metersphere/xpack

@ -1 +1 @@
Subproject commit 9f4a9bbf46fc1333dbcccea21f83e27e3ec10b1f
Subproject commit 068127ce59ea8b016434ed52a9de4a7a4b13bdb4

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit 010ad7a5f072a5e9d368c756a2473bbd20781433
Subproject commit 7d43154a7c19732407a8e9ace8a7d1ea13c91f36