Merge branch 'main' into perf/tailwindcss-class

locales/en.yaml

@@ -239,3 +239,18 @@ login:
   purePassWordSureReg: Please enter confirm password
   purePassWordDifferentReg: The two passwords do not match!
   purePassWordUpdateReg: Password has been updated
+  pureLoginExpired: Login expired, please login again
+tableBar:
+  pureList: List
+  pureLarge: Large
+  pureDefault: Default
+  pureSmall: Small
+  pureColumnSettings: ColumnSettings
+  pureCollapse: Collapse
+  pureExpand: Expand
+  pureRefresh: Refresh
+  pureDensity: Density
+  pureColumnDisplay: ColumnDisplay
+  pureReset: Reset
+  pureExitFullScreen: ExitFullScreen
+  pureFullScreen: FullScreen

locales/zh-CN.yaml

@@ -239,3 +239,18 @@ login:
   purePassWordSureReg: 请输入确认密码
   purePassWordDifferentReg: 两次密码不一致!
   purePassWordUpdateReg: 修改密码成功
+  pureLoginExpired: 登录已过期，请重新登录
+tableBar:
+  pureList: 列表
+  pureLarge: 宽松
+  pureDefault: 默认
+  pureSmall: 紧凑
+  pureColumnSettings: 列设置
+  pureCollapse: 折叠
+  pureExpand: 展开
+  pureRefresh: 刷新
+  pureDensity: 密度
+  pureColumnDisplay: 列展示
+  pureReset: 重置
+  pureExitFullScreen: 退出全屏
+  pureFullScreen: 全屏

mock/asyncRoutes.ts

@@ -326,7 +326,8 @@ export default defineFakeRoute([
     method: "get",
     response: () => {
       return {
-        success: true,
+        code: 0,
+        message: "操作成功",
         data: [
           systemManagementRouter,
           systemMonitorRouter,

mock/list.ts

@@ -6,7 +6,8 @@ export default defineFakeRoute([
     method: "post",
     response: () => {
       return {
-        success: true,
+        code: 0,
+        message: "操作成功",
         data: {
           list: [
             {

mock/login.ts

@@ -8,7 +8,8 @@ export default defineFakeRoute([
     response: ({ body }) => {
       if (body.username === "admin") {
         return {
-          success: true,
+          code: 0,
+          message: "操作成功",
           data: {
             avatar: "https://avatars.githubusercontent.com/u/44761321",
             username: "admin",
@@ -24,7 +25,8 @@ export default defineFakeRoute([
         };
       } else {
         return {
-          success: true,
+          code: 0,
+          message: "操作成功",
           data: {
             avatar: "https://avatars.githubusercontent.com/u/52823142",
             username: "common",

mock/map.ts

@@ -33,7 +33,8 @@ export default defineFakeRoute([
     method: "get",
     response: () => {
       return {
-        success: true,
+        code: 0,
+        message: "操作成功",
         data: mapList()
       };
     }

mock/mine.ts

@@ -8,7 +8,8 @@ export default defineFakeRoute([
     method: "get",
     response: () => {
       return {
-        success: true,
+        code: 0,
+        message: "操作成功",
         data: {
           avatar: "https://avatars.githubusercontent.com/u/44761321",
           username: "admin",
@@ -46,7 +47,8 @@ export default defineFakeRoute([
         }
       ];
       return {
-        success: true,
+        code: 0,
+        message: "操作成功",
         data: {
           list,
           total: list.length, // 总条目数

mock/refreshToken.ts

@@ -8,7 +8,8 @@ export default defineFakeRoute([
     response: ({ body }) => {
       if (body.refreshToken) {
         return {
-          success: true,
+          code: 0,
+          message: "操作成功",
           data: {
             accessToken: "eyJhbGciOiJIUzUxMiJ9.newAdmin",
             refreshToken: "eyJhbGciOiJIUzUxMiJ9.newAdminRefresh",
@@ -18,7 +19,8 @@ export default defineFakeRoute([
         };
       } else {
         return {
-          success: false,
+          code: 10001,
+          message: "请求参数缺失或格式不正确",
           data: {}
         };
       }

mock/system.ts

@@ -50,7 +50,8 @@ export default defineFakeRoute([
       if (body.phone) list = list.filter(item => item.phone === body.phone);
       if (body.deptId) list = list.filter(item => item.dept.id === body.deptId);
       return {
-        success: true,
+        code: 0,
+        message: "操作成功",
         data: {
           list,
           total: list.length, // 总条目数
@@ -66,7 +67,8 @@ export default defineFakeRoute([
     method: "get",
     response: () => {
       return {
-        success: true,
+        code: 0,
+        message: "操作成功",
         data: [
           { id: 1, name: "超级管理员" },
           { id: 2, name: "普通角色" }
@@ -82,18 +84,21 @@ export default defineFakeRoute([
       if (body.userId) {
         if (body.userId == 1) {
           return {
-            success: true,
+            code: 0,
+            message: "操作成功",
             data: [1]
           };
         } else if (body.userId == 2) {
           return {
-            success: true,
+            code: 0,
+            message: "操作成功",
             data: [2]
           };
         }
       } else {
         return {
-          success: false,
+          code: 10001,
+          message: "请求参数缺失或格式不正确",
           data: []
         };
       }
@@ -130,7 +135,8 @@ export default defineFakeRoute([
       );
       if (body.code) list = list.filter(item => item.code === body.code);
       return {
-        success: true,
+        code: 0,
+        message: "操作成功",
         data: {
           list,
           total: list.length, // 总条目数
@@ -146,7 +152,8 @@ export default defineFakeRoute([
     method: "post",
     response: () => {
       return {
-        success: true,
+        code: 0,
+        message: "操作成功",
         data: [
           // 外部页面
           {
@@ -350,7 +357,8 @@ export default defineFakeRoute([
     response: ({ body }) => {
       if (body.id == 1) {
         return {
-          success: true,
+          code: 0,
+          message: "操作成功",
           data: [
             100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 200, 201,
             202, 203, 204, 205, 300, 301, 302, 303, 304, 400, 401, 402, 403,
@@ -359,7 +367,8 @@ export default defineFakeRoute([
         };
       } else if (body.id == 2) {
         return {
-          success: true,
+          code: 0,
+          message: "操作成功",
           data: [
             100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 404, 500,
             501, 502, 503
@@ -374,7 +383,8 @@ export default defineFakeRoute([
     method: "post",
     response: () => {
       return {
-        success: true,
+        code: 0,
+        message: "操作成功",
         data: [
           // 外部页面
           {
@@ -1255,7 +1265,8 @@ export default defineFakeRoute([
     method: "post",
     response: () => {
       return {
-        success: true,
+        code: 0,
+        message: "操作成功",
         data: [
           {
             name: "杭州总公司",
@@ -1418,7 +1429,8 @@ export default defineFakeRoute([
       ];
       list = list.filter(item => item.username.includes(body?.username));
       return {
-        success: true,
+        code: 0,
+        message: "操作成功",
         data: {
           list,
           total: list.length, // 总条目数
@@ -1462,7 +1474,8 @@ export default defineFakeRoute([
         String(item.status).includes(String(body?.status))
       );
       return {
-        success: true,
+        code: 0,
+        message: "操作成功",
         data: {
           list,
           total: list.length, // 总条目数
@@ -1508,7 +1521,8 @@ export default defineFakeRoute([
         String(item.status).includes(String(body?.status))
       );
       return {
-        success: true,
+        code: 0,
+        message: "操作成功",
         data: {
           list,
           total: list.length, // 总条目数
@@ -1566,7 +1580,8 @@ export default defineFakeRoute([
       ];
       list = list.filter(item => item.module.includes(body?.module));
       return {
-        success: true,
+        code: 0,
+        message: "操作成功",
         data: {
           list,
           total: list.length, // 总条目数
@@ -1601,7 +1616,8 @@ export default defineFakeRoute([
             "Content-Length": 17019
           },
           responseBody: {
-            success: true,
+            code: 0,
+            message: "操作成功",
             data: [
               {
                 parentId: 0,

src/api/list.ts

@@ -1,7 +1,8 @@
 import { http } from "@/utils/http";
 
 type Result = {
-  success: boolean;
+  code: number;
+  message: string;
   data?: {
     /** 列表数据 */
     list: Array<any>;

src/api/mock.ts

@@ -1,7 +1,8 @@
 import { http } from "@/utils/http";
 
 type Result = {
-  success: boolean;
+  code: number;
+  message: string;
   data: Array<any>;
 };
 
@@ -14,7 +15,7 @@ export const mapJson = (params?: object) => {
 export const formUpload = data => {
   return http.request<Result>(
     "post",
-    "https://run.mocky.io/v3/3aa761d7-b0b3-4a03-96b3-6168d4f7467b",
+    "https://pureadmin.free.beeceptor.com/images",
     { data },
     {
       headers: {

src/api/routes.ts

@@ -1,7 +1,8 @@
 import { http } from "@/utils/http";
 
 type Result = {
-  success: boolean;
+  code: number;
+  message: string;
   data: Array<any>;
 };
 

src/api/system.ts

@@ -1,12 +1,14 @@
 import { http } from "@/utils/http";
 
 type Result = {
-  success: boolean;
+  code: number;
+  message: string;
   data?: Array<any>;
 };
 
 type ResultTable = {
-  success: boolean;
+  code: number;
+  message: string;
   data?: {
     /** 列表数据 */
     list: Array<any>;

src/api/user.ts

@@ -1,7 +1,8 @@
 import { http } from "@/utils/http";
 
 export type UserResult = {
-  success: boolean;
+  code: number;
+  message: string;
   data: {
     /** 头像 */
     avatar: string;
@@ -23,7 +24,8 @@ export type UserResult = {
 };
 
 export type RefreshTokenResult = {
-  success: boolean;
+  code: number;
+  message: string;
   data: {
     /** `token` */
     accessToken: string;
@@ -50,12 +52,14 @@ export type UserInfo = {
 };
 
 export type UserInfoResult = {
-  success: boolean;
+  code: number;
+  message: string;
   data: UserInfo;
 };
 
 type ResultTable = {
-  success: boolean;
+  code: number;
+  message: string;
   data?: {
     /** 列表数据 */
     list: Array<any>;

src/components/ReMap/src/Amap.vue

@@ -92,7 +92,8 @@ onBeforeMount(() => {
 
       // 获取模拟车辆信息
       mapJson()
-        .then(({ data }) => {
+        .then(({ code, data }) => {
+          if (code === 0) {
             const points: object = data.map(v => {
               return {
                 lnglat: [v.lng, v.lat],
@@ -100,6 +101,7 @@ onBeforeMount(() => {
               };
             });
             if (MarkerCluster) MarkerCluster.setData(points);
+          }
         })
         .catch(err => {
           console.log("err:", err);

src/components/RePureTableBar/src/bar.tsx

@@ -1,5 +1,5 @@
 import Sortable from "sortablejs";
-import { transformI18n } from "@/plugins/i18n";
+import { $t, transformI18n } from "@/plugins/i18n";
 import { useEpThemeStoreHook } from "@/store/modules/epTheme";
 import {
   type PropType,
@@ -30,7 +30,7 @@ const props = {
   /** 头部最左边的标题 */
   title: {
     type: String,
-    default: "列表"
+    default: $t("tableBar.pureList")
   },
   /** 对于树形表格，如果想启用展开和折叠功能，传入当前表格的ref即可 */
   tableRef: {
@@ -169,19 +169,19 @@ export default defineComponent({
             style={getDropdownItemStyle.value("large")}
             onClick={() => (size.value = "large")}
           >
-            宽松
+            {transformI18n($t("tableBar.pureLarge"))}
           </el-dropdown-item>
           <el-dropdown-item
             style={getDropdownItemStyle.value("default")}
             onClick={() => (size.value = "default")}
           >
-            默认
+            {transformI18n($t("tableBar.pureDefault"))}
           </el-dropdown-item>
           <el-dropdown-item
             style={getDropdownItemStyle.value("small")}
             onClick={() => (size.value = "small")}
           >
-            紧凑
+            {transformI18n($t("tableBar.pureSmall"))}
           </el-dropdown-item>
         </el-dropdown-menu>
       )
@@ -245,7 +245,9 @@ export default defineComponent({
       reference: () => (
         <SettingIcon
           class={["w-4", iconClass.value]}
-          v-tippy={rendTippyProps("列设置")}
+          v-tippy={rendTippyProps(
+            transformI18n($t("tableBar.pureColumnSettings"))
+          )}
         />
       )
     };
@@ -264,11 +266,11 @@ export default defineComponent({
               : "mt-2"
           ]}
         >
-          <div class="flex justify-between w-full mt-4 h-15 p-4">
+          <div class="flex justify-between w-full h-15 p-4">
             {slots?.title ? (
               slots.title()
             ) : (
-              <p class="font-bold truncate">{props.title}</p>
+              <p class="font-bold truncate">{transformI18n(props.title)}</p>
             )}
             <div class="flex-ac  ">
               {slots?.buttons ? (
@@ -282,7 +284,9 @@ export default defineComponent({
                       transform: isExpandAll.value ? "none" : "rotate(-90deg)"
                     }}
                     v-tippy={rendTippyProps(
-                      isExpandAll.value ? "折叠" : "展开"
+                      isExpandAll.value
+                        ? transformI18n($t("tableBar.pureCollapse"))
+                        : transformI18n($t("tableBar.pureExpand"))
                     )}
                     onClick={() => onExpand()}
                   />
@@ -295,14 +299,18 @@ export default defineComponent({
                   iconClass.value,
                   loading.value ? "animate-spin" : ""
                 ]}
-                v-tippy={rendTippyProps("刷新")}
+                v-tippy={rendTippyProps(
+                  transformI18n($t("tableBar.pureRefresh"))
+                )}
                 onClick={() => onReFresh()}
               />
               <el-divider direction="vertical" />
               <el-dropdown
                 v-slots={dropdown}
                 trigger="click"
-                v-tippy={rendTippyProps("密度")}
+                v-tippy={rendTippyProps(
+                  transformI18n($t("tableBar.pureDensity"))
+                )}
               >
                 <CollapseIcon class={["w-4", iconClass.value]} />
               </el-dropdown>
@@ -318,13 +326,13 @@ export default defineComponent({
                 <div class={[topClass.value]}>
                   <el-checkbox
                     class="-mr-1!"
-                    label="列展示"
+                    label={transformI18n($t("tableBar.pureColumnDisplay"))}
                     v-model={checkAll.value}
                     indeterminate={isIndeterminate.value}
                     onChange={value => handleCheckAllChange(value)}
                   />
                   <el-button type="primary" link onClick={() => onReset()}>
-                    重置
+                    {transformI18n($t("tableBar.pureReset"))}
                   </el-button>
                 </div>
 
@@ -382,7 +390,11 @@ export default defineComponent({
               <iconifyIconOffline
                 class={["w-4", iconClass.value]}
                 icon={isFullscreen.value ? ExitFullscreen : Fullscreen}
-                v-tippy={isFullscreen.value ? "退出全屏" : "全屏"}
+                v-tippy={
+                  isFullscreen.value
+                    ? transformI18n($t("tableBar.pureExitFullScreen"))
+                    : transformI18n($t("tableBar.pureFullScreen"))
+                }
                 onClick={() => onFullscreen()}
               />
             </div>

src/components/ReVxeTableBar/src/bar.tsx

@@ -1,5 +1,5 @@
 import Sortable from "sortablejs";
-import { transformI18n } from "@/plugins/i18n";
+import { $t, transformI18n } from "@/plugins/i18n";
 import { useEpThemeStoreHook } from "@/store/modules/epTheme";
 import { delay, cloneDeep, getKeyList } from "@pureadmin/utils";
 import {
@@ -24,7 +24,7 @@ const props = {
   /** 头部最左边的标题 */
   title: {
     type: String,
-    default: "列表"
+    default: $t("tableBar.pureList")
   },
   vxeTableRef: {
     type: Object as PropType<any>
@@ -161,19 +161,19 @@ export default defineComponent({
             style={getDropdownItemStyle.value("medium")}
             onClick={() => changeSize("medium")}
           >
-            宽松
+            {transformI18n($t("tableBar.pureLarge"))}
           </el-dropdown-item>
           <el-dropdown-item
             style={getDropdownItemStyle.value("small")}
             onClick={() => changeSize("small")}
           >
-            默认
+            {transformI18n($t("tableBar.pureDefault"))}
           </el-dropdown-item>
           <el-dropdown-item
             style={getDropdownItemStyle.value("mini")}
             onClick={() => changeSize("mini")}
           >
-            紧凑
+            {transformI18n($t("tableBar.pureSmall"))}
           </el-dropdown-item>
         </el-dropdown-menu>
       )
@@ -238,7 +238,9 @@ export default defineComponent({
       reference: () => (
         <SettingIcon
           class={["w-4", iconClass.value]}
-          v-tippy={rendTippyProps("列设置")}
+          v-tippy={rendTippyProps(
+            transformI18n($t("tableBar.pureColumnSettings"))
+          )}
         />
       )
     };
@@ -261,7 +263,7 @@ export default defineComponent({
             {slots?.title ? (
               slots.title()
             ) : (
-              <p class="font-bold truncate">{props.title}</p>
+              <p class="font-bold truncate">{transformI18n(props.title)}</p>
             )}
             <div class="flex-ac  ">
               {slots?.buttons ? (
@@ -275,7 +277,9 @@ export default defineComponent({
                       transform: isExpandAll.value ? "none" : "rotate(-90deg)"
                     }}
                     v-tippy={rendTippyProps(
-                      isExpandAll.value ? "折叠" : "展开"
+                      isExpandAll.value
+                        ? transformI18n($t("tableBar.pureCollapse"))
+                        : transformI18n($t("tableBar.pureExpand"))
                     )}
                     onClick={() => onExpand()}
                   />
@@ -288,14 +292,18 @@ export default defineComponent({
                   iconClass.value,
                   loading.value ? "animate-spin" : ""
                 ]}
-                v-tippy={rendTippyProps("刷新")}
+                v-tippy={rendTippyProps(
+                  transformI18n($t("tableBar.pureRefresh"))
+                )}
                 onClick={() => onReFresh()}
               />
               <el-divider direction="vertical" />
               <el-dropdown
                 v-slots={dropdown}
                 trigger="click"
-                v-tippy={rendTippyProps("密度")}
+                v-tippy={rendTippyProps(
+                  transformI18n($t("tableBar.pureDensity"))
+                )}
               >
                 <CollapseIcon class={["w-4", iconClass.value]} />
               </el-dropdown>
@@ -311,13 +319,13 @@ export default defineComponent({
                 <div class={[topClass.value]}>
                   <el-checkbox
                     class="-mr-1!"
-                    label="列展示"
+                    label={transformI18n($t("tableBar.pureColumnDisplay"))}
                     v-model={checkAll.value}
                     indeterminate={isIndeterminate.value}
                     onChange={value => handleCheckAllChange(value)}
                   />
                   <el-button type="primary" link onClick={() => onReset()}>
-                    重置
+                    {transformI18n($t("tableBar.pureReset"))}
                   </el-button>
                 </div>
 
@@ -373,7 +381,11 @@ export default defineComponent({
               <iconifyIconOffline
                 class={["w-4", iconClass.value]}
                 icon={isFullscreen.value ? ExitFullscreen : Fullscreen}
-                v-tippy={isFullscreen.value ? "退出全屏" : "全屏"}
+                v-tippy={
+                  isFullscreen.value
+                    ? transformI18n($t("tableBar.pureExitFullScreen"))
+                    : transformI18n($t("tableBar.pureFullScreen"))
+                }
                 onClick={() => onFullscreen()}
               />
             </div>

src/router/utils.ts

@@ -209,18 +209,26 @@ function initRouter() {
       });
     } else {
       return new Promise(resolve => {
-        getAsyncRoutes().then(({ data }) => {
+        getAsyncRoutes().then(({ code, data }) => {
+          if (code === 0) {
             handleAsyncRoutes(cloneDeep(data));
             storageLocal().setItem(key, data);
             resolve(router);
+          } else {
+            resolve(router);
+          }
         });
       });
     }
   } else {
     return new Promise(resolve => {
-      getAsyncRoutes().then(({ data }) => {
+      getAsyncRoutes().then(({ code, data }) => {
+        if (code === 0) {
           handleAsyncRoutes(cloneDeep(data));
           resolve(router);
+        } else {
+          resolve(router);
+        }
       });
     });
   }

src/store/modules/user.ts

@@ -80,8 +80,12 @@ export const useUserStore = defineStore("pure-user", {
       return new Promise<UserResult>((resolve, reject) => {
         getLogin(data)
           .then(data => {
-            if (data?.success) setToken(data.data);
+            if (data.code === 0) {
+              setToken(data.data);
               resolve(data);
+            } else {
+              reject(data.message);
+            }
           })
           .catch(error => {
             reject(error);
@@ -103,9 +107,11 @@ export const useUserStore = defineStore("pure-user", {
       return new Promise<RefreshTokenResult>((resolve, reject) => {
         refreshTokenApi(data)
           .then(data => {
-            if (data) {
+            if (data.code === 0) {
               setToken(data.data);
               resolve(data);
+            } else {
+              reject(data.message);
             }
           })
           .catch(error => {

src/utils/http/index.ts

@@ -10,6 +10,8 @@ import type {
   PureHttpRequestConfig
 } from "./types.d";
 import { stringify } from "qs";
+import { message } from "@/utils/message";
+import { $t, transformI18n } from "@/plugins/i18n";
 import { getToken, formatToken } from "@/utils/auth";
 import { useUserStoreHook } from "@/store/modules/user";
 
@@ -90,6 +92,13 @@ class PureHttp {
                         PureHttp.requests.forEach(cb => cb(token));
                         PureHttp.requests = [];
                       })
+                      .catch(_err => {
+                        PureHttp.requests = [];
+                        useUserStoreHook().logOut();
+                        message(transformI18n($t("login.pureLoginExpired")), {
+                          type: "warning"
+                        });
+                      })
                       .finally(() => {
                         PureHttp.isRefreshing = false;
                       });

src/views/account-settings/components/Profile.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import { reactive, ref } from "vue";
 import { formUpload } from "@/api/mock";
 import { message } from "@/utils/message";
+import { onMounted, reactive, ref } from "vue";
 import { type UserInfo, getMine } from "@/api/user";
 import type { FormInstance, FormRules } from "element-plus";
 import ReCropperPreview from "@/components/ReCropperPreview";
@@ -73,8 +73,8 @@ const handleSubmitImage = () => {
     files: new File([cropperBlob.value], "avatar")
   });
   formUpload(formData)
-    .then(({ success, data }) => {
+    .then(({ code }) => {
-      if (success) {
+      if (code === 0) {
         message("更新头像成功", { type: "success" });
         handleClose();
       } else {
@@ -98,8 +98,11 @@ const onSubmit = async (formEl: FormInstance) => {
   });
 };
 
-getMine().then(res => {
+onMounted(async () => {
-  Object.assign(userInfos, res.data);
+  const { code, data } = await getMine();
+  if (code === 0) {
+    Object.assign(userInfos, data);
+  }
 });
 </script>
 

src/views/account-settings/components/SecurityLog.vue

@@ -55,11 +55,13 @@ const columns: TableColumnList = [
 
 async function onSearch() {
   loading.value = true;
-  const { data } = await getMineLogs();
+  const { code, data } = await getMineLogs();
+  if (code === 0) {
     dataList.value = data.list;
     pagination.total = data.total;
     pagination.pageSize = data.pageSize;
     pagination.currentPage = data.currentPage;
+  }
 
   setTimeout(() => {
     loading.value = false;

src/views/account-settings/index.vue

@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import { getMine } from "@/api/user";
 import { useRouter } from "vue-router";
-import { ref, onBeforeMount } from "vue";
 import { ReText } from "@/components/ReText";
 import Profile from "./components/Profile.vue";
+import { ref, onMounted, onBeforeMount } from "vue";
 import Preferences from "./components/Preferences.vue";
 import SecurityLog from "./components/SecurityLog.vue";
 import { useGlobal, deviceDetection } from "@pureadmin/utils";
@@ -61,8 +61,11 @@ const panes = [
 ];
 const witchPane = ref("profile");
 
-getMine().then(res => {
+onMounted(async () => {
-  userInfo.value = res.data;
+  const { code, data } = await getMine();
+  if (code === 0) {
+    userInfo.value = data;
+  }
 });
 </script>
 

src/views/components/upload/form.vue

@@ -23,8 +23,8 @@ const submitForm = formEl => {
         date: validateForm.date // 别的字段
       });
       formUpload(formData)
-        .then(({ success }) => {
+        .then(({ code }) => {
-          if (success) {
+          if (code === 0) {
             message("提交成功", { type: "success" });
           } else {
             message("提交失败");

src/views/components/upload/index.vue

@@ -143,7 +143,7 @@ const onDownload = () => {
       class="pure-upload"
       list-type="picture-card"
       accept="image/jpeg,image/png,image/gif"
-      action="https://run.mocky.io/v3/3aa761d7-b0b3-4a03-96b3-6168d4f7467b"
+      action="https://pureadmin.free.beeceptor.com/images"
       :limit="3"
       :headers="{ Authorization: 'eyJhbGciOiJIUzUxMiJ9.admin' }"
       :on-exceed="onExceed"
@@ -264,13 +264,13 @@ const onDownload = () => {
         表格操作栏中的上传头像功能
       </p>
       <p class="text-[red] text-[12px] flex flex-auto items-center justify-end">
-        免责声明：上传接口使用免费开源的
+        免责声明：上传接口使用
         <el-link
-          href="https://designer.mocky.io/"
+          href="https://beeceptor.com/"
           target="_blank"
           style="font-size: 16px; font-weight: 800"
         >
-          &nbsp;Mocky&nbsp;
+          &nbsp;Beeceptor&nbsp;
         </el-link>
         <span class="font-bold text-[18x]"> 请不要上传重要信息 </span
         >，如果造成任何损失，我们概不负责

src/views/list/card/index.vue

@@ -38,12 +38,14 @@ const dataLoading = ref(true);
 
 const getCardListData = async () => {
   try {
-    const { data } = await getCardList();
+    const { code, data } = await getCardList();
+    if (code === 0) {
       productList.value = data.list;
       pagination.value = {
         ...pagination.value,
         total: data.list.length
       };
+    }
   } catch (e) {
     console.log(e);
   } finally {

src/views/login/index.vue

@@ -73,23 +73,21 @@ const onLogin = async (formEl: FormInstance | undefined) => {
           username: ruleForm.username,
           password: ruleForm.password
         })
-        .then(res => {
+        .then(async () => {
-          if (res.success) {
           // 获取后端路由
-            return initRouter().then(() => {
+          await initRouter();
           disabled.value = true;
-              router
+          router.push(getTopMenu(true).path).then(() => {
-                .push(getTopMenu(true).path)
-                .then(() => {
             message(t("login.pureLoginSuccess"), { type: "success" });
-                })
-                .finally(() => (disabled.value = false));
           });
-          } else {
-            message(t("login.pureLoginFail"), { type: "error" });
-          }
         })
-        .finally(() => (loading.value = false));
+        .catch(_err => {
+          message(t("login.pureLoginFail"), { type: "error" });
+        })
+        .finally(() => {
+          disabled.value = false;
+          loading.value = false;
+        });
     }
   });
 };

src/views/monitor/logs/login/hook.tsx

@@ -129,11 +129,13 @@ export function useRole(tableRef: Ref) {
 
   async function onSearch() {
     loading.value = true;
-    const { data } = await getLoginLogsList(toRaw(form));
+    const { code, data } = await getLoginLogsList(toRaw(form));
+    if (code === 0) {
       dataList.value = data.list;
       pagination.total = data.total;
       pagination.pageSize = data.pageSize;
       pagination.currentPage = data.currentPage;
+    }
 
     setTimeout(() => {
       loading.value = false;

src/views/monitor/logs/operation/hook.tsx

@@ -134,11 +134,13 @@ export function useRole(tableRef: Ref) {
 
   async function onSearch() {
     loading.value = true;
-    const { data } = await getOperationLogsList(toRaw(form));
+    const { code, data } = await getOperationLogsList(toRaw(form));
+    if (code === 0) {
       dataList.value = data.list;
       pagination.total = data.total;
       pagination.pageSize = data.pageSize;
       pagination.currentPage = data.currentPage;
+    }
 
     setTimeout(() => {
       loading.value = false;

src/views/monitor/logs/system/hook.tsx

@@ -204,11 +204,13 @@ export function useRole(tableRef: Ref) {
 
   async function onSearch() {
     loading.value = true;
-    const { data } = await getSystemLogsList(toRaw(form));
+    const { code, data } = await getSystemLogsList(toRaw(form));
+    if (code === 0) {
       dataList.value = data.list;
       pagination.total = data.total;
       pagination.pageSize = data.pageSize;
       pagination.currentPage = data.currentPage;
+    }
 
     setTimeout(() => {
       loading.value = false;

src/views/monitor/online/hook.tsx

@@ -80,11 +80,13 @@ export function useRole() {
 
   async function onSearch() {
     loading.value = true;
-    const { data } = await getOnlineLogsList(toRaw(form));
+    const { code, data } = await getOnlineLogsList(toRaw(form));
+    if (code === 0) {
       dataList.value = data.list;
       pagination.total = data.total;
       pagination.pageSize = data.pageSize;
       pagination.currentPage = data.currentPage;
+    }
 
     setTimeout(() => {
       loading.value = false;

src/views/permission/page/index.vue

@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { message } from "@/utils/message";
 import { initRouter } from "@/router/utils";
 import { storageLocal } from "@pureadmin/utils";
 import { type CSSProperties, ref, computed } from "vue";
@@ -32,12 +33,13 @@ const options = [
 function onChange() {
   useUserStoreHook()
     .loginByUsername({ username: username.value, password: "admin123" })
-    .then(res => {
+    .then(() => {
-      if (res.success) {
       storageLocal().removeItem("async-routes");
       usePermissionStoreHook().clearAllCachePage();
       initRouter();
-      }
+    })
+    .catch(err => {
+      message(err, { type: "error" });
     });
 }
 </script>

src/views/system/dept/utils/hook.tsx

@@ -74,7 +74,8 @@ export function useDept() {
 
   async function onSearch() {
     loading.value = true;
-    const { data } = await getDeptList(); // 这里是返回一维数组结构，前端自行处理成树结构，返回格式要求：唯一id加父节点parentId，parentId取父节点id
+    const { code, data } = await getDeptList(); // 这里是返回一维数组结构，前端自行处理成树结构，返回格式要求：唯一id加父节点parentId，parentId取父节点id
+    if (code === 0) {
       let newData = data;
       if (!isAllEmpty(form.name)) {
         // 前端搜索部门名称
@@ -85,6 +86,8 @@ export function useDept() {
         newData = newData.filter(item => item.status === form.status);
       }
       dataList.value = handleTree(newData); // 处理成树结构
+    }
+
     setTimeout(() => {
       loading.value = false;
     }, 500);

src/views/system/menu/utils/hook.tsx

@@ -106,7 +106,8 @@ export function useMenu() {
 
   async function onSearch() {
     loading.value = true;
-    const { data } = await getMenuList(); // 这里是返回一维数组结构，前端自行处理成树结构，返回格式要求：唯一id加父节点parentId，parentId取父节点id
+    const { code, data } = await getMenuList(); // 这里是返回一维数组结构，前端自行处理成树结构，返回格式要求：唯一id加父节点parentId，parentId取父节点id
+    if (code === 0) {
       let newData = data;
       if (!isAllEmpty(form.title)) {
         // 前端搜索菜单名称
@@ -115,6 +116,8 @@ export function useMenu() {
         );
       }
       dataList.value = handleTree(newData); // 处理成树结构
+    }
+
     setTimeout(() => {
       loading.value = false;
     }, 500);

src/views/system/role/utils/hook.tsx

@@ -163,11 +163,13 @@ export function useRole(treeRef: Ref) {
 
   async function onSearch() {
     loading.value = true;
-    const { data } = await getRoleList(toRaw(form));
+    const { code, data } = await getRoleList(toRaw(form));
+    if (code === 0) {
       dataList.value = data.list;
       pagination.total = data.total;
       pagination.pageSize = data.pageSize;
       pagination.currentPage = data.currentPage;
+    }
 
     setTimeout(() => {
       loading.value = false;
@@ -229,8 +231,10 @@ export function useRole(treeRef: Ref) {
     if (id) {
       curRow.value = row;
       isShow.value = true;
-      const { data } = await getRoleMenuIds({ id });
+      const { code, data } = await getRoleMenuIds({ id });
+      if (code === 0) {
         treeRef.value.setCheckedKeys(data);
+      }
     } else {
       curRow.value = null;
       isShow.value = false;
@@ -268,9 +272,11 @@ export function useRole(treeRef: Ref) {
 
   onMounted(async () => {
     onSearch();
-    const { data } = await getRoleMenu();
+    const { code, data } = await getRoleMenu();
+    if (code === 0) {
       treeIds.value = getKeyList(data, "id");
       treeData.value = handleTree(data);
+    }
   });
 
   watch(isExpandAll, val => {

src/views/system/user/utils/hook.tsx

@@ -272,11 +272,13 @@ export function useUser(tableRef: Ref, treeRef: Ref) {
 
   async function onSearch() {
     loading.value = true;
-    const { data } = await getUserList(toRaw(form));
+    const { code, data } = await getUserList(toRaw(form));
+    if (code === 0) {
       dataList.value = data.list;
       pagination.total = data.total;
       pagination.pageSize = data.pageSize;
       pagination.currentPage = data.currentPage;
+    }
 
     setTimeout(() => {
       loading.value = false;
@@ -497,13 +499,16 @@ export function useUser(tableRef: Ref, treeRef: Ref) {
     onSearch();
 
     // 归属部门
-    const { data } = await getDeptList();
+    const { code, data } = await getDeptList();
+    if (code === 0) {
       higherDeptOptions.value = handleTree(data);
       treeData.value = handleTree(data);
+    }
+
     treeLoading.value = false;
 
     // 角色列表
-    roleOptions.value = (await getAllRoleList()).data;
+    roleOptions.value = (await getAllRoleList()).data ?? [];
   });
 
   return {