feat: 修改登录表单字段为账户，添加获取当前用户信息的API，重构字典和用户相关接口

Author: AlphaYu

src/api/auth/index.ts

@@ -6,7 +6,7 @@ const AuthAPI = {
   /** 登录接口*/
   login(data: LoginFormData) {
     const formData = new FormData();
-    formData.append("account", data.username);
+    formData.append("account", data.account);
     formData.append("password", data.password);
     formData.append("captchaKey", data.captchaKey);
     formData.append("captchaCode", data.captchaCode);
@@ -48,6 +48,18 @@ const AuthAPI = {
     });
   },
 
+  /**
+   * 获取当前登录用户信息
+   *
+   * @returns 登录用户昵称、头像信息，包括角色和权限
+   */
+  getInfo() {
+    return request<any, UserInfo>({
+      url: `${AUTH_BASE_URL}/userinfo`,
+      method: "get",
+    });
+  },
+
   /** 获取个人中心用户信息 */
   getProfile() {
     return request<any, UserProfileVO>({
@@ -116,7 +128,7 @@ export default AuthAPI;
 /** 登录表单数据 */
 export interface LoginFormData {
   /** 用户名 */
-  username: string;
+  account: string;
   /** 密码 */
   password: string;
   /** 验证码缓存key */
@@ -145,6 +157,27 @@ export interface CaptchaInfo {
   captchaBase64: string;
 }
 
+/** 登录用户信息 */
+export interface UserInfo {
+  /** 用户ID */
+  id?: number;
+
+  /** 用户名 */
+  account?: string;
+
+  /** 昵称 */
+  name?: string;
+
+  /** 头像URL */
+  avatar?: string;
+
+  /** 角色 */
+  roles: string[];
+
+  /** 权限 */
+  perms: string[];
+}
+
 /** 个人中心用户信息 */
 export interface UserProfileVO {
   /** 用户ID */

src/api/system/config.ts

@@ -80,11 +80,11 @@ export interface ConfigForm {
   /** 主键 */
   id?: number;
   /** 配置名称 */
-  Name?: string;
+  name?: string;
   /** 配置键 */
-  Key?: string;
+  key?: string;
   /** 配置值 */
-  Value?: string;
+  value?: string;
   /** 描述、备注 */
   remark?: string;
 }
@@ -94,11 +94,11 @@ export interface ConfigPageVO {
   /** 主键 */
   id?: number;
   /** 配置名称 */
-  Name?: string;
+  name?: string;
   /** 配置键 */
-  Key?: string;
+  key?: string;
   /** 配置值 */
-  Value?: string;
+  value?: string;
   /** 描述、备注 */
   remark?: string;
 }

src/api/system/dict.ts

@@ -70,13 +70,14 @@ const DictAPI = {
   },
 
   /**
-   * 获取字典列表
+   * 获取字典的数据项
    *
-   * @returns 字典列表
+   * @param dictCode 字典编码
+   * @returns 字典数据项
    */
-  getList() {
+  getOptions() {
     return request<any, DictVO[]>({
-      url: `${DICT_BASE_URL}/page`,
+      url: `${DICT_BASE_URL}/options`,
       method: "get",
     });
   },

src/api/system/notice.ts

@@ -113,7 +113,7 @@ const NoticeAPI = {
   /** 获取我的通知分页列表 */
   getMyNoticePage(queryParams?: NoticePageQuery) {
     return request<any, PageResult<NoticePageVO[]>>({
-      url: `${NOTICE_BASE_URL}/my-page`,
+      url: `${NOTICE_BASE_URL}/mine`,
       method: "get",
       params: queryParams,
     });

src/api/system/user.ts

@@ -3,18 +3,6 @@ import request from "@/utils/request";
 const USER_BASE_URL = "/admin/users";
 
 const UserAPI = {
-  /**
-   * 获取当前登录用户信息
-   *
-   * @returns 登录用户昵称、头像信息，包括角色和权限
-   */
-  getInfo() {
-    return request<any, UserInfo>({
-      url: `${USER_BASE_URL}/userinfo`,
-      method: "get",
-    });
-  },
-
   /**
    * 重置密码
    *
@@ -150,27 +138,6 @@ const UserAPI = {
 
 export default UserAPI;
 
-/** 登录用户信息 */
-export interface UserInfo {
-  /** 用户ID */
-  id?: number;
-
-  /** 用户名 */
-  account?: string;
-
-  /** 昵称 */
-  name?: string;
-
-  /** 头像URL */
-  avatar?: string;
-
-  /** 角色 */
-  roles: string[];
-
-  /** 权限 */
-  perms: string[];
-}
-
 /**
  * 用户分页查询对象
  */

src/lang/package/en.ts

@@ -6,16 +6,16 @@ export default {
   },
   // 登录页面国际化
   login: {
-    username: "Username",
+    account: "Username",
     password: "Password",
     login: "Login",
     captchaCode: "Verify Code",
     capsLock: "Caps Lock is On",
     rememberMe: "Remember Me",
     forgetPassword: "Forget Password",
     message: {
-      username: {
-        required: "Please enter Username",
+      account: {
+        required: "Please enter account",
       },
       password: {
         required: "Please enter Password",

src/lang/package/zh-cn.ts

@@ -6,15 +6,15 @@ export default {
   },
   // 登录页面国际化
   login: {
-    username: "用户名",
+    account: "用户名",
     password: "密码",
     login: "登 录",
     captchaCode: "验证码",
     capsLock: "大写锁定已打开",
     rememberMe: "记住我",
     forgetPassword: "忘记密码",
     message: {
-      username: {
+      account: {
         required: "请输入用户名",
       },
       password: {

src/store/modules/dict.ts

@@ -5,11 +5,11 @@ export const useDictStore = defineStore("dict", () => {
   const dictionary = useStorage<Record<string, DictData[]>>("dictionary", {});
 
   const setDictionary = (dict: DictVO) => {
-    dictionary.value[dict.dictCode] = dict.dictDataList;
+    dictionary.value[dict.code] = dict.dictDataList;
   };
 
   const loadDictionaries = async () => {
-    const dictList = await DictionaryAPI.getList();
+    const dictList = await DictionaryAPI.getOptions();
     dictList.forEach(setDictionary);
   };
 

src/store/modules/user.ts

@@ -38,7 +38,7 @@ export const useUserStore = defineStore("user", () => {
    */
   function getUserInfo() {
     return new Promise<UserInfo>((resolve, reject) => {
-      UserAPI.getInfo()
+      AuthAPI.getInfo()
         .then((data) => {
           if (!data) {
             reject("Verification failed, please Login again.");

src/views/login/index.vue

@@ -46,16 +46,16 @@
         --></div>
 
         <!-- 用户名 -->
-        <el-form-item prop="username">
+        <el-form-item prop="account">
           <div class="input-wrapper">
             <el-icon class="mx-2">
               <User />
             </el-icon>
             <el-input
-              ref="username"
-              v-model="loginFormData.username"
-              :placeholder="$t('login.username')"
-              name="username"
+              ref="account"
+              v-model="loginFormData.account"
+              :placeholder="$t('login.account')"
+              name="account"
               size="large"
               class="h-[48px]"
             />
@@ -171,19 +171,19 @@ const isCapslock = ref(false); // 是否大写锁定
 const captchaBase64 = ref(); // 验证码图片Base64字符串
 
 const loginFormData = ref<LoginFormData>({
-  username: "alpha2008",
+  account: "alpha2008",
   password: "alpha2008",
   captchaKey: "",
   captchaCode: "",
 });
 
 const loginRules = computed(() => {
   return {
-    username: [
+    account: [
       {
         required: true,
         trigger: "blur",
-        message: t("login.message.username.required"),
+        message: t("login.message.account.required"),
       },
     ],
     password: [
@@ -226,7 +226,7 @@ async function handleLoginSubmit() {
         .then(async () => {
           await userStore.getUserInfo();
           // 需要在路由跳转前加载字典数据，否则会出现字典数据未加载完成导致页面渲染异常
-          // await dictStore.loadDictionaries();
+          await dictStore.loadDictionaries();
           // 跳转到登录前的页面
           const { path, queryParams } = parseRedirect();
           router.push({ path: path, query: queryParams });
@@ -279,8 +279,8 @@ function checkCapslock(event: KeyboardEvent) {
 }
 
 // 设置登录凭证
-const setLoginCredentials = (username: string, password: string) => {
-  loginFormData.value.username = username;
+const setLoginCredentials = (account: string, password: string) => {
+  loginFormData.value.account = account;
   loginFormData.value.password = password;
 };
 

src/views/system/menu/index.vue

@@ -331,7 +331,7 @@
 
 <script setup lang="ts">
 defineOptions({
-  name: "SysMenu",
+  name: "Menu",
   inheritAttrs: false,
 });