feat:重构请求模块-大更新

Yi.BBS.Vue3/src/stores/user.js

@@ -1,98 +1,109 @@
-import { login, logout, getInfo,register } from '@/apis/accountApi'
-import { getToken, setToken, removeToken } from '@/utils/auth'
-import { defineStore } from 'pinia'
-const useUserStore = defineStore('user', 
-{
-    state: () => ({
-      id:'',
-      token: getToken(),
-      name: '游客',
-      userName:'',
-      icon: null,
-      roles: [],
-      permissions: []
-      }),
-      getters: {
-      },
-      actions: {
-      // 登录
-      login(userInfo) {
-        const userName = userInfo.userName.trim()
-        const password = userInfo.password
-        const code = userInfo.code
-        const uuid = userInfo.uuid
-        return new Promise((resolve, reject) => {
-          login(userName, password, code, uuid).then(response => {
-            const res=response.data;
+import { login, logout, getInfo, register } from "@/apis/accountApi";
+import { getUserDetailInfo } from "@/apis/auth";
+import useAuths from "@/hooks/useAuths";
+import { defineStore } from "pinia";
+
+const { getToken, setToken, removeToken } = useAuths();
+
+const useUserStore = defineStore("user", {
+  state: () => ({
+    id: "",
+    token: getToken(),
+    name: "游客",
+    userName: "",
+    icon: null,
+    roles: [],
+    permissions: [],
+  }),
+  getters: {},
+  actions: {
+    // 登录
+    login(userInfo) {
+      const userName = userInfo.userName.trim();
+      const password = userInfo.password;
+      const code = userInfo.code;
+      const uuid = userInfo.uuid;
+      return new Promise((resolve, reject) => {
+        login(userName, password, code, uuid)
+          .then((response) => {
+            const res = response.data;
             setToken(res.token);
             this.token = res.token;
             resolve(response);
-          }).catch(error => {
-            reject(error)
           })
-        })
-      },
-      // 获取用户信息
-      getInfo() {
-        return new Promise((resolve, reject) => {
-          getInfo().then(response => {
-            const res=response.data;
-            const user = res.user
-            const avatar = (user.icon == "" || user.icon == null) ? "/src/assets/logo.ico" : import.meta.env.VITE_APP_BASEAPI + "/file/"+user.icon;
-            
-            if (res.roleCodes && res.roleCodes.length > 0) { // 验证返回的roles是否是一个非空数组
-              this.roles = res.roleCodes
-              this.permissions = res.permissionCodes
+          .catch((error) => {
+            reject(error);
+          });
+      });
+    },
+    // 获取用户信息
+    getInfo() {
+      return new Promise((resolve, reject) => {
+        getUserDetailInfo()
+          .then((response) => {
+            const res = response.data;
+            const user = res.user;
+            const avatar =
+              user.icon == "" || user.icon == null
+                ? "/src/assets/logo.ico"
+                : import.meta.env.VITE_APP_BASEAPI + "/file/" + user.icon;
+
+            if (res.roleCodes && res.roleCodes.length > 0) {
+              // 验证返回的roles是否是一个非空数组
+              this.roles = res.roleCodes;
+              this.permissions = res.permissionCodes;
               // this.roles = ["admin"];
               // this.permissions=["*:*:*"]
-
             } else {
-              this.roles = ['ROLE_DEFAULT']
+              this.roles = ["ROLE_DEFAULT"];
             }
             // this.roles = ["admin"];
             // this.permissions=["*:*:*"]
-            this.name = user.nick
+            this.name = user.nick;
             this.icon = avatar;
 
-            this.userName=user.userName;
-            this.id=user.id;
-            resolve(res)
-          }).catch(error => {
-            reject(error)
+            this.userName = user.userName;
+            this.id = user.id;
+            resolve(res);
           })
-        })
-      },
-      // 退出系统
-      logOut() {
-        return new Promise((resolve, reject) => {
-          logout().then(() => {
-            this.token = ''
-            this.roles = []
-            this.permissions = []
-            removeToken()
-            resolve()
-          }).catch(error => {
-            reject(error)
+          .catch((error) => {
+            reject(error);
+          });
+      });
+    },
+    // 退出系统
+    logOut() {
+      return new Promise((resolve, reject) => {
+        logout()
+          .then(() => {
+            this.token = "";
+            this.roles = [];
+            this.permissions = [];
+            removeToken();
+            resolve();
           })
-        })
-      },
-            // 注册
-            register(userInfo) {
-              const userName = userInfo.userName.trim()
-              const password = userInfo.password.trim()
-              const phone = userInfo.phone;
-              const uuid = userInfo.uuid;
-              const code=userInfo.code;
-              return new Promise((resolve, reject) => {
-                register(userName,password,phone,code,uuid).then(response => {
-                  resolve(response);
-                }).catch(error => {
-                  reject(error)
-                })
-              })
-            },
-
-      },
-})
+          .catch((error) => {
+            reject(error);
+          });
+      });
+    },
+    // 注册
+    register(userInfo) {
+      const userName = userInfo.userName.trim();
+      const password = userInfo.password.trim();
+      const phone = userInfo.phone;
+      const uuid = userInfo.uuid;
+      const code = userInfo.code;
+      return new Promise((resolve, reject) => {
+        register(userName, password, phone, code, uuid)
+          .then((response) => {
+            resolve(response);
+          })
+          .catch((error) => {
+            reject(error);
+          });
+      });
+    },
+  },
+});
 export default useUserStore;
-