From 9bc3ddd6a8932d0cd55ed06f0a4d1ecf53c00e81 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Tue, 18 Apr 2023 17:16:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7=E4=BC=A0=E5=85=A5userid?=
 =?UTF-8?q?=E7=9A=84=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 framework/sdk-parent/frontend/src/api/user.js               | 4 ++--
 .../frontend/src/components/personal/PersonRouter.vue       | 2 +-
 .../frontend/src/components/personal/UiSetting.vue          | 4 +---
 .../java/io/metersphere/controller/BaseUserController.java  | 6 +++---
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/framework/sdk-parent/frontend/src/api/user.js b/framework/sdk-parent/frontend/src/api/user.js
index 627cc269ef..80b05b70c6 100644
--- a/framework/sdk-parent/frontend/src/api/user.js
+++ b/framework/sdk-parent/frontend/src/api/user.js
@@ -73,8 +73,8 @@ export function checkLdapOpen() {
   return get('/ldap/open')
 }
 
-export function getUserInfo(userId) {
-  return get(`/user/info/${userId}`);
+export function getUserInfo() {
+  return get(`/user/info`);
 }
 
 export function getWsAndPj(userId) {
diff --git a/framework/sdk-parent/frontend/src/components/personal/PersonRouter.vue b/framework/sdk-parent/frontend/src/components/personal/PersonRouter.vue
index 2ea5245f9b..0eacf972a7 100644
--- a/framework/sdk-parent/frontend/src/components/personal/PersonRouter.vue
+++ b/framework/sdk-parent/frontend/src/components/personal/PersonRouter.vue
@@ -184,7 +184,7 @@ export default {
         .then((r) => {
           this.platformAccountConfigs = r.data;
         });
-      this.result = getUserInfo(encodeURIComponent(this.currentUser().id))
+      this.result = getUserInfo()
         .then(response => {
           let data = response.data;
           this.isLocalUser = response.data.source === 'LOCAL';
diff --git a/framework/sdk-parent/frontend/src/components/personal/UiSetting.vue b/framework/sdk-parent/frontend/src/components/personal/UiSetting.vue
index dbdfab91b8..a59b861ea4 100644
--- a/framework/sdk-parent/frontend/src/components/personal/UiSetting.vue
+++ b/framework/sdk-parent/frontend/src/components/personal/UiSetting.vue
@@ -30,7 +30,6 @@
 </template>
 
 <script>
-import {getCurrentUserId} from "../../utils/token";
 import {getUserInfo, updateSeleniumServer} from "../../api/user";
 
 export default {
@@ -57,8 +56,7 @@ export default {
       this.$emit("confirm");
     },
     async getUserSeleniumServer() {
-      let userId = getCurrentUserId();
-      let res = await getUserInfo(userId);
+      let res = await getUserInfo();
       if (res.data) {
         this.seleniumServer = res.data.seleniumServer || "";
       }
diff --git a/framework/sdk-parent/sdk/src/main/java/io/metersphere/controller/BaseUserController.java b/framework/sdk-parent/sdk/src/main/java/io/metersphere/controller/BaseUserController.java
index 7c0d2fa369..0bcbbf3fc3 100644
--- a/framework/sdk-parent/sdk/src/main/java/io/metersphere/controller/BaseUserController.java
+++ b/framework/sdk-parent/sdk/src/main/java/io/metersphere/controller/BaseUserController.java
@@ -73,9 +73,9 @@ public class BaseUserController {
         return baseUserService.getProjectMemberList(request);
     }
 
-    @GetMapping("/info/{userId}")
-    public UserDTO getUserInfo(@PathVariable(value = "userId") String userId) {
-        return baseUserService.getUserDTO(userId);
+    @GetMapping("/info")
+    public UserDTO getUserInfo() {
+        return baseUserService.getUserDTO(SessionUtils.getUserId());
     }
 
     /**