From 6f64ebfba3d937bbaed78b7831e92fa486971428 Mon Sep 17 00:00:00 2001
From: dubai <weichen0716@163.com>
Date: Sun, 11 Jan 2026 14:23:26 +0800
Subject: [PATCH] =?UTF-8?q?fix(profile):=20=E4=BF=AE=E5=A4=8D=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E4=B8=AD=E5=BF=83=E6=8E=A5=E5=8F=A3=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apps/web-antd/src/api/system/profile/index.ts  | 14 ++++++++++----
 .../_core/profile/components/base-setting.vue      |  6 ++----
 .../web-antd/src/views/_core/profile/index.vue     | 14 +++++++++-----
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/api/system/profile/index.ts b/Yi.Vben5.Vue3/apps/web-antd/src/api/system/profile/index.ts
index 6e68ef98..82bcd37a 100644
--- a/Yi.Vben5.Vue3/apps/web-antd/src/api/system/profile/index.ts
+++ b/Yi.Vben5.Vue3/apps/web-antd/src/api/system/profile/index.ts
@@ -1,21 +1,27 @@
-import type { FileCallBack, UpdatePasswordParam, UserProfile } from './model';
+import type { FileCallBack, UpdatePasswordParam } from './model';
+import type { UserInfoResp } from '#/api/core/user';
 
 import { buildUUID } from '@vben/utils';
 
 import { requestClient } from '#/api/request';
+import { getUserInfoApi } from '#/api/core/user';
 
 enum Api {
   root = '/user/profile',
   updateAvatar = '/user/profile/avatar',
-  updatePassword = '/user/profile/updatePwd',
+  updatePassword = '/account/password',
 }
 
 /**
  * 用户个人主页信息
  * @returns userInformation
  */
-export function userProfile() {
-  return requestClient.get<UserProfile>(Api.root);
+export async function userProfile() {
+  const resp = await getUserInfoApi() as UserInfoResp;
+  if (!resp) {
+    throw new Error('获取用户信息失败');
+  }
+  return resp;
 }
 
 /**
diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/views/_core/profile/components/base-setting.vue b/Yi.Vben5.Vue3/apps/web-antd/src/views/_core/profile/components/base-setting.vue
index fc16b4ed..58e623e0 100644
--- a/Yi.Vben5.Vue3/apps/web-antd/src/views/_core/profile/components/base-setting.vue
+++ b/Yi.Vben5.Vue3/apps/web-antd/src/views/_core/profile/components/base-setting.vue
@@ -1,8 +1,6 @@
 <script setup lang="ts">
 import type { Recordable } from '@vben/types';
-
-import type { UserProfile } from '#/api/system/profile/model';
-
+import type { UserInfoResp } from '#/api/core/user';
 import { onMounted } from 'vue';
 
 import { DictEnum } from '@vben/constants';
@@ -17,7 +15,7 @@ import { getDictOptions } from '#/utils/dict';
 
 import { emitter } from '../mitt';
 
-const props = defineProps<{ profile: UserProfile }>();
+const props = defineProps<{ profile: UserInfoResp }>();
 
 const userStore = useUserStore();
 const authStore = useAuthStore();
diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/views/_core/profile/index.vue b/Yi.Vben5.Vue3/apps/web-antd/src/views/_core/profile/index.vue
index a3af56cb..4c34ddfb 100644
--- a/Yi.Vben5.Vue3/apps/web-antd/src/views/_core/profile/index.vue
+++ b/Yi.Vben5.Vue3/apps/web-antd/src/views/_core/profile/index.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { UserProfile } from '#/api/system/profile/model';
+import type { UserInfoResp } from '#/api/core/user';
 
 import { onMounted, onUnmounted, ref } from 'vue';
 
@@ -13,10 +13,14 @@ import { emitter } from './mitt';
 import ProfilePanel from './profile-panel.vue';
 import SettingPanel from './setting-panel.vue';
 
-const profile = ref<UserProfile>();
-async function loadProfile() {
-  const resp = await userProfile();
-  profile.value = resp;
+const profile = ref<UserInfoResp>();
+  async function loadProfile() {
+  try {
+    const resp = await userProfile();
+    profile.value = resp;
+  } catch (error) {
+    console.error('加载用户信息失败:', error);
+  }
 }
 
 onMounted(loadProfile);