From acafdd1f87f4df0a006fe5684ed09ada91d77acf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BB=A4?= <2603820757@qq.com>
Date: Wed, 31 Aug 2022 21:53:26 +0800
Subject: [PATCH 01/11] :bug:
 https://gitee.com/example-cloud/example-ui/issues/I5OOJT

---
 src/views/system/authority/index.vue            |  1 +
 src/views/system/role/index.vue                 |  8 +++++++-
 src/views/system/user/components/info-modal.vue | 15 ++++++++++++++-
 src/views/system/user/index.vue                 |  6 +++++-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/views/system/authority/index.vue b/src/views/system/authority/index.vue
index b7ffea8..090ed23 100644
--- a/src/views/system/authority/index.vue
+++ b/src/views/system/authority/index.vue
@@ -37,6 +37,7 @@
         :data="tableData"
         :loading="loading"
         style="margin-top: 20px"
+        row-key="id"
       >
         <template #icon="{ record }">
           <component :is="record.icon" style="font-size: 1.4em" />
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index e048a84..5f4c63e 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -33,7 +33,13 @@
         </a-col>
       </a-row>
 
-      <a-table :columns="tableColumns" :data="tableData" style="margin-top: 20px" :loading="loading">
+      <a-table
+        :columns="tableColumns"
+        :data="tableData"
+        :loading="loading"
+        style="margin-top: 20px"
+        row-key="id"
+      >
         <template #operations="{ record }">
           <a-button type="text" size="small" @click="openModalHandle(0, '角色信息预览', record.id)">预览</a-button>
           <a-button type="text" size="small" @click="openModalHandle(2, '角色信息编辑', record.id)">编辑</a-button>
diff --git a/src/views/system/user/components/info-modal.vue b/src/views/system/user/components/info-modal.vue
index c3f8c0d..b45d728 100644
--- a/src/views/system/user/components/info-modal.vue
+++ b/src/views/system/user/components/info-modal.vue
@@ -55,7 +55,20 @@
         </a-col>
         <a-col :md="12">
           <a-form-item field="enabled" label="状态">
-            <a-switch v-model:model-value="userForm.enabled" type="round" />
+            <a-switch
+              v-model:model-value="userForm.enabled"
+              type="round"
+              :checked-value="false"
+              :unchecked-value="true"
+              checked-color="#F53F3F"
+            >
+              <template #checked>
+                异常
+              </template>
+              <template #unchecked>
+                正常
+              </template>
+            </a-switch>
           </a-form-item>
         </a-col>
       </a-row>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 96c405d..d5f31dd 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -178,7 +178,11 @@
             :width="100"
           >
             <template #cell="{ record }">
-              <a-switch :default-checked="!record.nonLocked" type="round" disabled />
+              <a-switch :default-checked="!record.nonLocked" type="round" disabled>
+                <template #checked>
+                  锁定
+                </template>
+              </a-switch>
             </template>
           </a-table-column>
           <a-table-column
-- 
Gitee


From 3de1ec0f1ff85a5d0d811a70112155148d50234e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BB=A4?= <2603820757@qq.com>
Date: Wed, 31 Aug 2022 22:59:34 +0800
Subject: [PATCH 02/11] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/icon-picker/index.vue          |  9 +++--
 src/types/modules/system.ts                   | 18 +++++-----
 .../authority/components/info-modal.vue       |  2 --
 src/views/system/authority/index.vue          | 36 +++++++++----------
 .../role/components/authority-modal.vue       |  4 +--
 src/views/system/role/index.vue               |  2 +-
 .../system/user/components/info-modal.vue     |  2 +-
 src/views/system/user/index.vue               |  7 ++--
 8 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/src/components/icon-picker/index.vue b/src/components/icon-picker/index.vue
index 889a7e9..3acfa13 100644
--- a/src/components/icon-picker/index.vue
+++ b/src/components/icon-picker/index.vue
@@ -2,10 +2,10 @@
   图标选择器
 -->
 <template>
-  <a-trigger trigger="click">
+  <a-trigger trigger="click" :mouse-enter-delay="0">
     <a-input
       :model-value="pickerIcon" allow-clear readonly class="icon-picker" placeholder="请选择图标..."
-      @clear="onPicker('')"
+      @clear="onPicker(undefined)"
     >
       <template v-if="pickerIcon" #prefix>
         <component :is="pickerIcon" />
@@ -20,7 +20,7 @@
             :xs="8" :sm="8" :md="8" :lg="6" :xl="4" :xxl="4"
           >
             <a-button @click="onPicker(ico)">
-              <component :is="ico"/>
+              <component :is="ico" />
             </a-button>
           </a-col>
         </a-row>
@@ -37,8 +37,7 @@ const toggle = ref<boolean>(false)
 const pickerIcon = computed(() => props.value)
 const emits = defineEmits(['picker'])
 
-const onPicker = (icon: string) => {
-  console.log(icon)
+const onPicker = (icon?: string) => {
   toggle.value = false
   emits('picker', icon)
 }
diff --git a/src/types/modules/system.ts b/src/types/modules/system.ts
index 2db19c1..043153f 100644
--- a/src/types/modules/system.ts
+++ b/src/types/modules/system.ts
@@ -1,14 +1,5 @@
 import { TreeNode } from '@/types/global'
 
-export interface AuthorityVo extends TreeNode {
-  name?: string
-  code?: string
-  icon?: string
-  type?: number
-  path?: string
-  meta?: string
-}
-
 export interface Meta {
   locale?: string
   icon?: string
@@ -17,6 +8,15 @@ export interface Meta {
   order?: number
 }
 
+export interface AuthorityVo extends TreeNode {
+  name?: string
+  code?: string
+  icon?: string
+  type?: number
+  path?: string
+  meta?: Meta
+}
+
 export interface AuthorityDto extends TreeNode{
   id?: number
   name?: string
diff --git a/src/views/system/authority/components/info-modal.vue b/src/views/system/authority/components/info-modal.vue
index 6a15993..7de3fe3 100644
--- a/src/views/system/authority/components/info-modal.vue
+++ b/src/views/system/authority/components/info-modal.vue
@@ -58,7 +58,6 @@
 </template>
 
 <script lang="ts" setup>
-
 import { reactive, ref } from 'vue'
 import {
   AModalConfig,
@@ -95,7 +94,6 @@ const topNode = reactive<AuthorityVo>({
 const emits = defineEmits(['load-data'])
 
 const onBeforeOkHandle = async (done: (closed: boolean) => void) => {
-  console.log(modalForm)
   if (modalConfig.type === 1) {
     await create(modalForm)
   } else if (modalConfig.type === 2) {
diff --git a/src/views/system/authority/index.vue b/src/views/system/authority/index.vue
index 090ed23..7619b2f 100644
--- a/src/views/system/authority/index.vue
+++ b/src/views/system/authority/index.vue
@@ -33,9 +33,9 @@
       </a-row>
 
       <a-table
+        :loading="loading"
         :columns="tableColumns"
         :data="tableData"
-        :loading="loading"
         style="margin-top: 20px"
         row-key="id"
       >
@@ -60,15 +60,15 @@
 </template>
 
 <script lang="ts" setup>
-
-import { onMounted, reactive, ref } from 'vue'
-import type { TableColumnData } from '@arco-design/web-vue'
-import type { TableData } from '@arco-design/web-vue/es/table/interface'
+import { onBeforeMount, ref } from 'vue'
 import { deleteById, getTreeData } from '@/api/system/authority'
 import useLoading from '@/hooks/loading'
 import InfoModal from '@/views/system/authority/components/info-modal.vue'
+import type { AuthorityVo } from '@/types/modules/system'
 
-const tableColumns = reactive<TableColumnData[]>([
+const tableData = ref<AuthorityVo[]>([])
+const { setLoading, loading } = useLoading()
+const tableColumns = [
   {
     title: '权限名',
     dataIndex: 'name',
@@ -102,22 +102,15 @@ const tableColumns = reactive<TableColumnData[]>([
     width: 220,
     slotName: 'operations',
   },
-])
-const tableData = ref<TableData[]>([])
-const { setLoading, loading } = useLoading()
+]
+
 const infoModel = ref<any>(null)
+
 const fetchData = async () => {
   tableData.value = (await getTreeData()).data
 }
 
-const removeHandle = async (id: number) => {
-  setLoading(true)
-  await deleteById(id)
-  await fetchData()
-  setLoading(false)
-}
-
-const openModalHandle = (type: 0 | 1 | 2, title: string, id?: number) => {
+const openModalHandle = (type: 0 | 1 | 2, title: string, id = 0) => {
   infoModel.value.open(type, title, id)
 }
 
@@ -127,7 +120,14 @@ const onSearch = () => {
   setLoading(false)
 }
 
-onMounted(() => {
+const removeHandle = async (id: number) => {
+  setLoading(true)
+  await deleteById(id)
+  await fetchData()
+  setLoading(false)
+}
+
+onBeforeMount(() => {
   setLoading(true)
   fetchData()
   setLoading(false)
diff --git a/src/views/system/role/components/authority-modal.vue b/src/views/system/role/components/authority-modal.vue
index 7586ae3..d3a0af5 100644
--- a/src/views/system/role/components/authority-modal.vue
+++ b/src/views/system/role/components/authority-modal.vue
@@ -21,10 +21,10 @@
 </template>
 
 <script lang="ts" setup>
-import { reactive, ref, h } from 'vue'
+import { reactive, ref } from 'vue'
 import { AModalConfig, initAModalConfig } from '@/types/global'
+import type { AuthorityVo } from '@/types/modules/system'
 import { getTreeData } from '@/api/system/authority'
-import { AuthorityVo } from '@/types/modules/system'
 import { getAuthoritiesIdByRoleId, grantAuthorities } from '@/api/system/role-authority'
 
 const modalConfig = reactive<AModalConfig>(initAModalConfig)
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 5f4c63e..249cf6f 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -62,7 +62,7 @@
 import { onBeforeMount, ref } from 'vue'
 import useLoading from '@/hooks/loading'
 import { deleteById, getRolesTree } from '@/api/system/role'
-import { RoleVo } from '@/api/system/types'
+import type { RoleVo } from '@/api/system/types'
 import InfoModal from '@/views/system/role/components/info-modal.vue'
 import AuthorityModal from '@/views/system/role/components/authority-modal.vue'
 
diff --git a/src/views/system/user/components/info-modal.vue b/src/views/system/user/components/info-modal.vue
index b45d728..3440181 100644
--- a/src/views/system/user/components/info-modal.vue
+++ b/src/views/system/user/components/info-modal.vue
@@ -78,7 +78,7 @@
 
 <script lang="ts" setup>
 import { defineEmits, reactive, ref } from 'vue'
-import { RoleVo, UserDto } from '@/api/system/types'
+import type { RoleVo, UserDto } from '@/api/system/types'
 import { create, getById, updateById } from '@/api/system/user'
 import { getRolesTree } from '@/api/system/role'
 
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index d5f31dd..32927f3 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -106,11 +106,10 @@
       </a-row>
 
       <a-table
-        row-key="id"
-        :loading="loading"
-        :pagination="pagination"
         :data="renderData"
-        :bordered="false"
+        :pagination="pagination"
+        :loading="loading"
+        row-key="id"
         @page-change="pageChangeHandle"
       >
         <template #columns>
-- 
Gitee


From 6cf9e04e4d0c7c1a9aada0cb7fdb934d1c86f343 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BB=A4?= <2603820757@qq.com>
Date: Thu, 1 Sep 2022 21:02:43 +0800
Subject: [PATCH 03/11] =?UTF-8?q?:recycle:=20=E8=B0=83=E6=95=B4=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  2 +-
 src/api/interceptor.ts                        |  2 +-
 src/api/system/role/index.ts                  |  2 +-
 src/api/system/types.ts                       | 74 -------------------
 src/api/system/user/index.ts                  |  6 +-
 src/api/types.ts                              | 20 -----
 src/components/icon-picker/index.vue          |  2 +-
 src/hooks/request.ts                          |  2 +-
 src/store/modules/user/index.ts               |  2 +-
 src/types/global.ts                           | 27 +++++--
 src/types/modules/system.ts                   | 67 +++++++++++++++++
 src/utils/auth.ts                             |  2 +-
 src/views/login/components/login-form.vue     |  2 +-
 .../authority/components/info-modal.vue       |  2 +-
 .../role/components/authority-modal.vue       | 15 ----
 .../system/role/components/info-modal.vue     |  2 +-
 src/views/system/role/index.vue               |  2 +-
 .../system/user/components/info-modal.vue     |  2 +-
 src/views/system/user/index.vue               |  2 +-
 19 files changed, 104 insertions(+), 131 deletions(-)
 delete mode 100644 src/api/system/types.ts
 delete mode 100644 src/api/types.ts

diff --git a/package.json b/package.json
index e4c0fb0..662cd08 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "lint": "eslint src --fix --ext .js,.ts,.jsx,.tsx,.vue"
   },
   "dependencies": {
-    "@arco-design/web-vue": "^2.30.2",
+    "@arco-design/web-vue": "^2.35.3",
     "@types/mockjs": "^1.0.4",
     "@vueuse/core": "^7.3.0",
     "arco-design-pro-vue": "^2.5.7",
diff --git a/src/api/interceptor.ts b/src/api/interceptor.ts
index 590b968..9e7fddb 100644
--- a/src/api/interceptor.ts
+++ b/src/api/interceptor.ts
@@ -3,7 +3,7 @@ import type { AxiosRequestConfig, AxiosResponse } from 'axios'
 import { Message, Modal } from '@arco-design/web-vue'
 import { useUserStore } from '@/store'
 import { getToken } from '@/utils/auth'
-import { Response } from '@/api/types'
+import { Response } from '@/types/global'
 
 if (import.meta.env.VITE_API_BASE_URL) {
   axios.defaults.baseURL = import.meta.env.VITE_API_BASE_URL
diff --git a/src/api/system/role/index.ts b/src/api/system/role/index.ts
index 34155df..4f3156d 100644
--- a/src/api/system/role/index.ts
+++ b/src/api/system/role/index.ts
@@ -1,5 +1,5 @@
 import axios from 'axios'
-import { RoleDto, RoleVo } from '@/api/system/types'
+import { RoleDto, RoleVo } from '@/types/modules/system'
 
 export function getRolesTree(deep = 3) {
   return axios.get<RoleVo[]>(`/system/role/tree/${deep}`)
diff --git a/src/api/system/types.ts b/src/api/system/types.ts
deleted file mode 100644
index 131f47c..0000000
--- a/src/api/system/types.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import { TreeNode } from '@/types/global'
-
-export interface LoginData {
-  username: string
-  password: string
-}
-
-export interface ResToken {
-  access_token: string,
-  token_type: string,
-  refresh_token: string,
-  scope: string
-}
-
-export interface UserInfo {
-  id?: number
-  username?: string
-  nickname?: string
-  avatar?: string
-  phone?: string
-  email?: string
-  gender?: number
-  createTime?: string
-  updateTime?: string
-  roles: string[]
-  authorities: string[]
-}
-
-/**
- * VO
- */
-export interface RoleVo extends TreeNode{
-  name?: string
-  code?: string
-  createTime?: string
-  updateTime?: string
-}
-
-export interface UserVO {
-  id?: number
-  username?: string
-  nickname?: string
-  gender?: number
-  phone?: string
-  email?: string
-  avatar?: string
-  roles: RoleVo[]
-  nonLocked?: boolean
-  enabled?: boolean
-  createTime?: string
-  updateTime?: string
-}
-
-/**
- * DTO
- */
-export interface UserDto {
-  id?: number
-  username?: string
-  nickname?: string
-  password?: string
-  gender?: number
-  phone?: string
-  email?: string
-  avatar?: string
-  rolesId: number[]
-  nonLocked?: boolean
-  enabled?: boolean
-}
-
-export interface RoleDto extends TreeNode{
-  name?: string
-  code?: string
-}
diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts
index 38a3a9f..2c54dad 100644
--- a/src/api/system/user/index.ts
+++ b/src/api/system/user/index.ts
@@ -2,13 +2,13 @@ import axios from 'axios'
 import type { RouteRecordNormalized } from 'vue-router'
 import qs from 'query-string'
 import website from '@/config/website'
+import { Pagination } from '@/types/global'
 import {
   LoginData,
   ResToken, UserDto,
   UserInfo,
   UserVO,
-} from '@/api/system/types'
-import { ResPage } from '@/api/types'
+} from '@/types/modules/system'
 
 export function login(data: LoginData) {
   const grantType = website?.grantTypes?.password || 'password'
@@ -50,7 +50,7 @@ export function getMenuList() {
 }
 
 export function listWithPagination(page: number, size: number, params: object) {
-  return axios.get<ResPage>('/system/user/pagination', {
+  return axios.get<Pagination>('/system/user/pagination', {
     params: {
       page,
       size,
diff --git a/src/api/types.ts b/src/api/types.ts
deleted file mode 100644
index 4483781..0000000
--- a/src/api/types.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-export interface Response<T = any> {
-  code: number
-  message: string
-  data: T
-  timestamp: number | null
-}
-
-export interface ResPage<T = any> {
-  content: []
-  pageable: object
-  totalElements: number
-  totalPages: number
-  last: number
-  number: number
-  size: number
-  sort: object
-  numberOfElements: number
-  first: boolean
-  empty: boolean
-}
diff --git a/src/components/icon-picker/index.vue b/src/components/icon-picker/index.vue
index 3acfa13..53b1e40 100644
--- a/src/components/icon-picker/index.vue
+++ b/src/components/icon-picker/index.vue
@@ -2,7 +2,7 @@
   图标选择器
 -->
 <template>
-  <a-trigger trigger="click" :mouse-enter-delay="0">
+  <a-trigger trigger="click">
     <a-input
       :model-value="pickerIcon" allow-clear readonly class="icon-picker" placeholder="请选择图标..."
       @clear="onPicker(undefined)"
diff --git a/src/hooks/request.ts b/src/hooks/request.ts
index f54500d..4aef45a 100644
--- a/src/hooks/request.ts
+++ b/src/hooks/request.ts
@@ -1,6 +1,6 @@
 import { ref, UnwrapRef } from 'vue'
 import { AxiosResponse } from 'axios'
-import { Response } from '@/api/types'
+import { Response } from '@/types/global'
 import useLoading from './loading'
 
 // use to fetch list
diff --git a/src/store/modules/user/index.ts b/src/store/modules/user/index.ts
index 6e0aedd..904ad11 100644
--- a/src/store/modules/user/index.ts
+++ b/src/store/modules/user/index.ts
@@ -1,7 +1,7 @@
 import { defineStore } from 'pinia'
 import { setToken, clearToken } from '@/utils/auth'
 import { removeRouteListener } from '@/utils/route-listener'
-import { LoginData, UserInfo } from '@/api/system/types'
+import { LoginData, UserInfo } from '@/types/modules/system'
 import {
   login as userLogin,
   logout as userLogout,
diff --git a/src/types/global.ts b/src/types/global.ts
index bb0f144..9c8b265 100644
--- a/src/types/global.ts
+++ b/src/types/global.ts
@@ -25,12 +25,6 @@ export interface PostData {
   url: string;
 }
 
-export interface Pagination {
-  current: number;
-  pageSize: number;
-  total?: number;
-}
-
 export type TimeRanger = [string, string];
 
 export interface GeneralChart {
@@ -38,6 +32,27 @@ export interface GeneralChart {
   data: Array<{ name: string; value: number[] }>;
 }
 
+export interface Response<T = any> {
+  code: number
+  message: string
+  data: T
+  timestamp?: number
+}
+
+export interface Pagination<T = any> {
+  content: []
+  pageable: object
+  totalElements: number
+  totalPages: number
+  last: number
+  number: number
+  size: number
+  sort: object
+  numberOfElements: number
+  first: boolean
+  empty: boolean
+}
+
 /**
  * 树形数据节点
  */
diff --git a/src/types/modules/system.ts b/src/types/modules/system.ts
index 043153f..dd271cb 100644
--- a/src/types/modules/system.ts
+++ b/src/types/modules/system.ts
@@ -1,5 +1,72 @@
 import { TreeNode } from '@/types/global'
 
+export interface LoginData {
+  username: string
+  password: string
+}
+
+export interface ResToken {
+  access_token: string,
+  token_type: string,
+  refresh_token: string,
+  scope: string
+}
+
+export interface UserInfo {
+  id?: number
+  username?: string
+  nickname?: string
+  avatar?: string
+  phone?: string
+  email?: string
+  gender?: number
+  createTime?: string
+  updateTime?: string
+  roles: string[]
+  authorities: string[]
+}
+
+export interface RoleVo extends TreeNode{
+  name?: string
+  code?: string
+  createTime?: string
+  updateTime?: string
+}
+
+export interface UserVO {
+  id?: number
+  username?: string
+  nickname?: string
+  gender?: number
+  phone?: string
+  email?: string
+  avatar?: string
+  roles: RoleVo[]
+  nonLocked?: boolean
+  enabled?: boolean
+  createTime?: string
+  updateTime?: string
+}
+
+export interface UserDto {
+  id?: number
+  username?: string
+  nickname?: string
+  password?: string
+  gender?: number
+  phone?: string
+  email?: string
+  avatar?: string
+  rolesId: number[]
+  nonLocked?: boolean
+  enabled?: boolean
+}
+
+export interface RoleDto extends TreeNode{
+  name?: string
+  code?: string
+}
+
 export interface Meta {
   locale?: string
   icon?: string
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
index 132aeda..4d720c2 100644
--- a/src/utils/auth.ts
+++ b/src/utils/auth.ts
@@ -1,4 +1,4 @@
-import { ResToken } from '@/api/system/types'
+import { ResToken } from '@/types/modules/system'
 
 const TOKEN_KEY = 'token'
 
diff --git a/src/views/login/components/login-form.vue b/src/views/login/components/login-form.vue
index f63bd4b..b38ab1e 100644
--- a/src/views/login/components/login-form.vue
+++ b/src/views/login/components/login-form.vue
@@ -72,7 +72,7 @@ import { useI18n } from 'vue-i18n'
 import { useStorage } from '@vueuse/core'
 import { useUserStore } from '@/store'
 import useLoading from '@/hooks/loading'
-import type { LoginData } from '@/api/system/types'
+import type { LoginData } from '@/types/modules/types'
 
 const router = useRouter()
 const { t } = useI18n()
diff --git a/src/views/system/authority/components/info-modal.vue b/src/views/system/authority/components/info-modal.vue
index 7de3fe3..af1b6af 100644
--- a/src/views/system/authority/components/info-modal.vue
+++ b/src/views/system/authority/components/info-modal.vue
@@ -47,7 +47,7 @@
             </a-radio-group>
           </a-form-item>
         </a-col>
-        <a-col :md="24">
+        <a-col v-show="!modalForm.type" :md="24">
           <a-form-item field="path" label="路径">
             <a-input v-model="modalForm.path" placeholder="请输入路径..." />
           </a-form-item>
diff --git a/src/views/system/role/components/authority-modal.vue b/src/views/system/role/components/authority-modal.vue
index d3a0af5..21c0473 100644
--- a/src/views/system/role/components/authority-modal.vue
+++ b/src/views/system/role/components/authority-modal.vue
@@ -3,9 +3,6 @@
     v-model:visible="modalConfig.visible"
     :title="modalConfig.title"
     @ok="okHandle"
-    @cancel="cancelHandle"
-    @before-open="beforeOpenHandle"
-    @before-close="beforeCloseHandle"
   >
     <a-tree
       v-model:checked-keys="checkedKeys"
@@ -39,18 +36,6 @@ const okHandle = async () => {
   treeData.value = []
 }
 
-const cancelHandle = () => {
-
-}
-
-const beforeOpenHandle = () => {
-
-}
-
-const beforeCloseHandle = () => {
-
-}
-
 const open = async (id: number) => {
   roleId.value = id
   treeData.value = (await getTreeData()).data
diff --git a/src/views/system/role/components/info-modal.vue b/src/views/system/role/components/info-modal.vue
index 74d8f6e..82fffae 100644
--- a/src/views/system/role/components/info-modal.vue
+++ b/src/views/system/role/components/info-modal.vue
@@ -40,7 +40,7 @@ import {
   getRolesTree,
   updateById,
 } from '@/api/system/role'
-import type { RoleDto, RoleVo } from '@/api/system/types'
+import type { RoleDto, RoleVo } from '@/types/modules/system'
 import { disableNode } from '@/utils/tree-utils'
 
 const defaultModalConfig = {
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 249cf6f..e689041 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -62,7 +62,7 @@
 import { onBeforeMount, ref } from 'vue'
 import useLoading from '@/hooks/loading'
 import { deleteById, getRolesTree } from '@/api/system/role'
-import type { RoleVo } from '@/api/system/types'
+import type { RoleVo } from '@/types/modules/system'
 import InfoModal from '@/views/system/role/components/info-modal.vue'
 import AuthorityModal from '@/views/system/role/components/authority-modal.vue'
 
diff --git a/src/views/system/user/components/info-modal.vue b/src/views/system/user/components/info-modal.vue
index 3440181..b81d433 100644
--- a/src/views/system/user/components/info-modal.vue
+++ b/src/views/system/user/components/info-modal.vue
@@ -78,9 +78,9 @@
 
 <script lang="ts" setup>
 import { defineEmits, reactive, ref } from 'vue'
-import type { RoleVo, UserDto } from '@/api/system/types'
 import { create, getById, updateById } from '@/api/system/user'
 import { getRolesTree } from '@/api/system/role'
+import type { RoleVo, UserDto } from '@/types/modules/types'
 
 const modalConfig = reactive({
   visible: false,
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 32927f3..386c270 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -225,11 +225,11 @@
 </template>
 
 <script lang="ts" setup>
-import { UserVO } from '@/api/system/types'
 import { onMounted, ref } from 'vue'
 import { deleteById, listWithPagination } from '@/api/system/user'
 import useLoading from '@/hooks/loading'
 import InfoModal from '@/views/system/user/components/info-modal.vue'
+import { UserVO } from '@/types/modules/system'
 
 const generateFormModel = () => ({
   id: '',
-- 
Gitee


From 802b770ed07ad0d13a2c4a492ec701efbdea69fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BB=A4?= <2603820757@qq.com>
Date: Thu, 1 Sep 2022 21:30:52 +0800
Subject: [PATCH 04/11] =?UTF-8?q?:bug:=20=E8=A7=92=E8=89=B2=E5=8F=8A?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83=E7=AE=A1=E7=90=86=EF=BC=8C=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E4=B8=8D=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/interceptor.ts                               | 3 +--
 src/views/system/authority/components/info-modal.vue | 5 +++++
 src/views/system/role/index.vue                      | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/api/interceptor.ts b/src/api/interceptor.ts
index 9e7fddb..93314fd 100644
--- a/src/api/interceptor.ts
+++ b/src/api/interceptor.ts
@@ -27,8 +27,7 @@ axios.interceptors.request.use(
   (error) => {
     // do something
     Promise.reject(error)
-  }
-  ,
+  },
 )
 // add response interceptors
 axios.interceptors.response.use(
diff --git a/src/views/system/authority/components/info-modal.vue b/src/views/system/authority/components/info-modal.vue
index af1b6af..46237cf 100644
--- a/src/views/system/authority/components/info-modal.vue
+++ b/src/views/system/authority/components/info-modal.vue
@@ -47,6 +47,11 @@
             </a-radio-group>
           </a-form-item>
         </a-col>
+        <a-col :md="12">
+          <a-form-item field="order" label="排序">
+            <a-input-number v-model="modalForm.order" placeholder="请输入路径..." />
+          </a-form-item>
+        </a-col>
         <a-col v-show="!modalForm.type" :md="24">
           <a-form-item field="path" label="路径">
             <a-input v-model="modalForm.path" placeholder="请输入路径..." />
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index e689041..dd8d217 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -53,7 +53,7 @@
         </template>
       </a-table>
     </a-card>
-    <info-modal ref="infoModal" />
+    <info-modal ref="infoModal" @load-data="onSearch"/>
     <authority-modal ref="authorityModal" />
   </div>
 </template>
-- 
Gitee


From ecfdc3f16b325ce0a80963f45754c3e936ff6803 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BB=A4?= <2603820757@qq.com>
Date: Sun, 4 Sep 2022 20:04:19 +0800
Subject: [PATCH 05/11] =?UTF-8?q?:art:=20=E8=B0=83=E6=95=B4api=E5=8C=85?=
 =?UTF-8?q?=E4=B8=8B=E6=8E=A5=E5=8F=A3=E7=BC=96=E5=86=99=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/interceptor.ts                        |  2 +-
 src/api/system/authority/index.ts             | 19 ++++++---
 .../index.ts}                                 |  6 ++-
 src/api/system/role/index.ts                  | 24 ++++++-----
 src/api/system/user/index.ts                  | 41 +++++++++----------
 src/store/modules/app/index.ts                |  2 +-
 .../authority/components/info-modal.vue       |  7 +++-
 .../system/role/components/info-modal.vue     |  4 +-
 src/views/system/role/index.vue               |  2 +-
 9 files changed, 59 insertions(+), 48 deletions(-)
 rename src/api/system/{role-authority.ts => role-authority/index.ts} (47%)

diff --git a/src/api/interceptor.ts b/src/api/interceptor.ts
index 93314fd..ff1834b 100644
--- a/src/api/interceptor.ts
+++ b/src/api/interceptor.ts
@@ -63,7 +63,7 @@ axios.interceptors.response.use(
   },
   (error) => {
     Message.error({
-      content: error.msg || 'Request Error',
+      content: error.message || 'Request Error',
       duration: 5 * 1000,
     })
     return Promise.reject(error)
diff --git a/src/api/system/authority/index.ts b/src/api/system/authority/index.ts
index b6ee74f..e5bf249 100644
--- a/src/api/system/authority/index.ts
+++ b/src/api/system/authority/index.ts
@@ -1,22 +1,29 @@
 import axios from 'axios'
-import { AuthorityDto, AuthorityVo } from '@/types/modules/system'
+import type { AuthorityDto, AuthorityVo } from '@/types/modules/system'
+import type { RouteRecordNormalized } from 'vue-router'
+
+const contentPath = '/system/authority'
 
 export function create(authorityDto: AuthorityDto) {
-  return axios.post<boolean>('/system/authority', authorityDto)
+  return axios.post<boolean>(`${contentPath}`, authorityDto)
 }
 
 export function updateById(authorityDto: AuthorityDto) {
-  return axios.put<boolean>('/system/authority', authorityDto)
+  return axios.put<boolean>(`${contentPath}`, authorityDto)
 }
 
 export function deleteById(id: number) {
-  return axios.delete<boolean>(`/system/authority/${id}`)
+  return axios.delete<boolean>(`${contentPath}/${id}`)
 }
 
 export function getById(id: number) {
-  return axios.get<AuthorityVo>(`/system/authority/${id}`)
+  return axios.get<AuthorityVo>(`${contentPath}/${id}`)
 }
 
 export function getTreeData() {
-  return axios.get<AuthorityVo[]>('/system/authority/tree')
+  return axios.get<AuthorityVo[]>(`${contentPath}/tree`)
+}
+
+export function getMenuList() {
+  return axios.get<RouteRecordNormalized[]>(`${contentPath}/menu`)
 }
diff --git a/src/api/system/role-authority.ts b/src/api/system/role-authority/index.ts
similarity index 47%
rename from src/api/system/role-authority.ts
rename to src/api/system/role-authority/index.ts
index f899cc3..7ef8b1e 100644
--- a/src/api/system/role-authority.ts
+++ b/src/api/system/role-authority/index.ts
@@ -1,9 +1,11 @@
 import axios from 'axios'
 
+const contentPath = '/system/role-authority'
+
 export function getAuthoritiesIdByRoleId(id: number) {
-  return axios.get<number[]>(`/system/role-authority/${id}`)
+  return axios.get<number[]>(`${contentPath}/${id}`)
 }
 
 export function grantAuthorities(roleId: number, authoritiesId: number[]) {
-  return axios.post<boolean>(`/system/role-authority/grant/${roleId}`, authoritiesId)
+  return axios.post<boolean>(`${contentPath}/grant/${roleId}`, authoritiesId)
 }
diff --git a/src/api/system/role/index.ts b/src/api/system/role/index.ts
index 4f3156d..1288dca 100644
--- a/src/api/system/role/index.ts
+++ b/src/api/system/role/index.ts
@@ -1,22 +1,24 @@
 import axios from 'axios'
-import { RoleDto, RoleVo } from '@/types/modules/system'
+import type { RoleDto, RoleVo } from '@/types/modules/system'
 
-export function getRolesTree(deep = 3) {
-  return axios.get<RoleVo[]>(`/system/role/tree/${deep}`)
-}
-
-export function getById(id: number) {
-  return axios.get<RoleVo>(`/system/role/${id}`)
-}
+const contentPath = '/system/role'
 
 export function create(roleDto: RoleDto) {
-  return axios.post<boolean>('/system/role/', roleDto)
+  return axios.post<boolean>(`${contentPath}`, roleDto)
 }
 
 export function updateById(roleDto: RoleDto) {
-  return axios.put<boolean>('/system/role/', roleDto)
+  return axios.put<boolean>(`${contentPath}`, roleDto)
 }
 
 export function deleteById(id: number) {
-  return axios.delete<boolean>(`/system/role/${id}`)
+  return axios.delete<boolean>(`${contentPath}/${id}`)
+}
+
+export function getRolesTree(deep = 3) {
+  return axios.get<RoleVo[]>(`${contentPath}/tree/${deep}`)
+}
+
+export function getById(id: number) {
+  return axios.get<RoleVo>(`${contentPath}/${id}`)
 }
diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts
index 2c54dad..dadd7a3 100644
--- a/src/api/system/user/index.ts
+++ b/src/api/system/user/index.ts
@@ -1,15 +1,16 @@
 import axios from 'axios'
-import type { RouteRecordNormalized } from 'vue-router'
 import qs from 'query-string'
 import website from '@/config/website'
-import { Pagination } from '@/types/global'
-import {
+import type { Pagination } from '@/types/global'
+import type {
   LoginData,
   ResToken, UserDto,
   UserInfo,
   UserVO,
 } from '@/types/modules/system'
 
+const contentPath = '/system/user'
+
 export function login(data: LoginData) {
   const grantType = website?.grantTypes?.password || 'password'
   const basicAuth = `Basic ${window.btoa(website.traditionLoginClient)}`
@@ -41,16 +42,24 @@ export function logout() {
   return axios.post<boolean>('/api/user/logout')
 }
 
-export function getUserInfo() {
-  return axios.get<UserInfo>('/system/user/info')
+export function create(userDto: UserDto) {
+  return axios.post<boolean>(`${contentPath}`, userDto)
 }
 
-export function getMenuList() {
-  return axios.get<RouteRecordNormalized[]>('/system/authority/menu')
+export function updateById(userDto: UserDto) {
+  return axios.put<boolean>(`${contentPath}`, userDto)
+}
+
+export function deleteById(id: number) {
+  return axios.delete<boolean>(`${contentPath}/${id}`)
+}
+
+export function getById(id: number) {
+  return axios.get<UserVO>(`${contentPath}/${id}`)
 }
 
 export function listWithPagination(page: number, size: number, params: object) {
-  return axios.get<Pagination>('/system/user/pagination', {
+  return axios.get<Pagination>(`${contentPath}/pagination`, {
     params: {
       page,
       size,
@@ -59,18 +68,6 @@ export function listWithPagination(page: number, size: number, params: object) {
   })
 }
 
-export function getById(id: number) {
-  return axios.get<UserVO>(`/system/user/${id}`)
-}
-
-export function deleteById(id: number) {
-  return axios.delete<boolean>(`/system/user/${id}`)
-}
-
-export function create(userDto: UserDto) {
-  return axios.post<boolean>('/system/user/', userDto)
-}
-
-export function updateById(userDto: UserDto) {
-  return axios.put<boolean>('/system/user/', userDto)
+export function getUserInfo() {
+  return axios.get<UserInfo>(`${contentPath}/info`)
 }
diff --git a/src/store/modules/app/index.ts b/src/store/modules/app/index.ts
index 6651067..2d0ca72 100644
--- a/src/store/modules/app/index.ts
+++ b/src/store/modules/app/index.ts
@@ -3,7 +3,7 @@ import { Notification } from '@arco-design/web-vue'
 import type { NotificationReturn } from '@arco-design/web-vue/es/notification/interface'
 import type { RouteRecordNormalized } from 'vue-router'
 import defaultSettings from '@/config/settings.json'
-import { getMenuList } from '@/api/system/user'
+import { getMenuList } from '@/api/system/authority'
 import { AppState } from './types'
 
 const useAppStore = defineStore('app', {
diff --git a/src/views/system/authority/components/info-modal.vue b/src/views/system/authority/components/info-modal.vue
index 46237cf..ac0ae60 100644
--- a/src/views/system/authority/components/info-modal.vue
+++ b/src/views/system/authority/components/info-modal.vue
@@ -24,7 +24,7 @@
           </a-form-item>
         </a-col>
         <a-col :md="12">
-          <a-form-item field="parentId" label="上级资源">
+          <a-form-item field="parentId" label="上级项">
             <a-tree-select
               v-model="modalForm.parentId"
               :allow-clear="true"
@@ -78,6 +78,7 @@ import {
 import iconPicker from '@/components/icon-picker/index.vue'
 import { deepClone } from '@/utils/objutils'
 import type { AuthorityDto, AuthorityVo } from '@/types/modules/system'
+import { disableNode } from '@/utils/tree-utils'
 
 const generateFormModel = (): AuthorityDto => ({
   name: '',
@@ -116,10 +117,12 @@ const handleCancel = () => {
 }
 
 const open = async (type: 0 | 1 | 2, title: string, id?: number) => {
+  const treeData = (await getTreeData()).data
   if (type !== 1 && id) {
     Object.assign(modalForm, deepClone((await getById(id)).data))
+    disableNode(id, treeData)
   }
-  topNode.children = (await getTreeData()).data
+  topNode.children = treeData
   authorities.value = [topNode]
   modalConfig.disabled = !Boolean(type)
   Object.assign(modalConfig, {
diff --git a/src/views/system/role/components/info-modal.vue b/src/views/system/role/components/info-modal.vue
index 82fffae..32af4a1 100644
--- a/src/views/system/role/components/info-modal.vue
+++ b/src/views/system/role/components/info-modal.vue
@@ -5,14 +5,14 @@
     :on-before-ok="onBeforeOkHandle"
     @cancel="handleCancel"
   >
-    <a-form :model="roleForm" :disabled="modalConfig.disabled">
+    <a-form :model="roleForm" :disabled="modalConfig.disabled" auto-label-width>
       <a-form-item field="name" label="角色名">
         <a-input v-model="roleForm.name" placeholder="请输入角色名..." />
       </a-form-item>
       <a-form-item field="code" label="角色编码">
         <a-input v-model="roleForm.code" placeholder="请输入角色编码..." />
       </a-form-item>
-      <a-form-item field="parentId" label="上级角色">
+      <a-form-item field="parentId" label="上级项">
         <a-tree-select
           v-model="roleForm.parentId"
           :allow-clear="true"
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index dd8d217..802db87 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -53,7 +53,7 @@
         </template>
       </a-table>
     </a-card>
-    <info-modal ref="infoModal" @load-data="onSearch"/>
+    <info-modal ref="infoModal" @load-data="onSearch" />
     <authority-modal ref="authorityModal" />
   </div>
 </template>
-- 
Gitee


From c135dc625ac74a461230f6a0f68e2fccaf3f6a78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BB=A4?= <2603820757@qq.com>
Date: Tue, 6 Sep 2022 17:22:12 +0800
Subject: [PATCH 06/11] =?UTF-8?q?:fire:=20=E5=88=A0=E9=99=A4=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E9=81=97=E7=95=99=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/icon-picker/index.vue                 | 2 +-
 src/views/system/role/components/authority-modal.vue | 4 +++-
 src/views/system/user/components/info-modal.vue      | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/icon-picker/index.vue b/src/components/icon-picker/index.vue
index 53b1e40..88e6455 100644
--- a/src/components/icon-picker/index.vue
+++ b/src/components/icon-picker/index.vue
@@ -30,7 +30,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, defineProps, ref } from 'vue'
+import { computed, ref } from 'vue'
 
 const props = defineProps({ value: String })
 const toggle = ref<boolean>(false)
diff --git a/src/views/system/role/components/authority-modal.vue b/src/views/system/role/components/authority-modal.vue
index 21c0473..6f3e474 100644
--- a/src/views/system/role/components/authority-modal.vue
+++ b/src/views/system/role/components/authority-modal.vue
@@ -11,7 +11,7 @@
       :field-names="{
         key: 'id',
         title: 'name',
-        icon: ''
+        icon: '',
       }"
     />
   </a-modal>
@@ -23,7 +23,9 @@ import { AModalConfig, initAModalConfig } from '@/types/global'
 import type { AuthorityVo } from '@/types/modules/system'
 import { getTreeData } from '@/api/system/authority'
 import { getAuthoritiesIdByRoleId, grantAuthorities } from '@/api/system/role-authority'
+import { TreeFieldNames } from '@arco-design/web-vue'
 
+const x: TreeFieldNames = ref()
 const modalConfig = reactive<AModalConfig>(initAModalConfig)
 const treeData = ref<AuthorityVo[]>([])
 const checkedKeys = ref<number[]>([])
diff --git a/src/views/system/user/components/info-modal.vue b/src/views/system/user/components/info-modal.vue
index b81d433..4d1bc65 100644
--- a/src/views/system/user/components/info-modal.vue
+++ b/src/views/system/user/components/info-modal.vue
@@ -77,10 +77,10 @@
 </template>
 
 <script lang="ts" setup>
-import { defineEmits, reactive, ref } from 'vue'
+import { reactive, ref } from 'vue'
 import { create, getById, updateById } from '@/api/system/user'
 import { getRolesTree } from '@/api/system/role'
-import type { RoleVo, UserDto } from '@/types/modules/types'
+import type { RoleVo, UserDto } from '@/types/modules/system'
 
 const modalConfig = reactive({
   visible: false,
-- 
Gitee


From 2546bb8422175683f9470170a6eddf6bec9bf5da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BB=A4?= <2603820757@qq.com>
Date: Tue, 20 Sep 2022 21:09:09 +0800
Subject: [PATCH 07/11] =?UTF-8?q?:necktie:=20=E7=99=BB=E5=87=BA=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth/index.ts           | 39 +++++++++++++++++++++++++++++++++
 src/api/interceptor.ts          |  7 ++++--
 src/api/system/user/index.ts    | 31 --------------------------
 src/hooks/user.ts               |  4 +++-
 src/store/modules/user/index.ts |  9 +++-----
 5 files changed, 50 insertions(+), 40 deletions(-)
 create mode 100644 src/api/auth/index.ts

diff --git a/src/api/auth/index.ts b/src/api/auth/index.ts
new file mode 100644
index 0000000..fe47e68
--- /dev/null
+++ b/src/api/auth/index.ts
@@ -0,0 +1,39 @@
+import axios from 'axios'
+import website from '@/config/website'
+import { LoginData, ResToken } from '@/types/modules/system'
+import qs from 'query-string'
+import { clearToken } from '@/utils/auth'
+
+const contentPath = '/auth/oauth'
+
+export function login(data: LoginData) {
+  clearToken()
+  const grantType = website?.grantTypes?.password || 'password'
+  const basicAuth = `Basic ${window.btoa(website.traditionLoginClient)}`
+  return axios.post<ResToken>('/auth/oauth/token', qs.stringify(data), {
+    headers: {
+      Authorization: basicAuth,
+    },
+    params: {
+      grant_type: grantType,
+    },
+  })
+}
+
+export function refreshToken(refresh_token: string) {
+  const grantType = website?.grantTypes?.refresh_token || 'refresh_token'
+  const basicAuth = `Basic ${window.btoa(website.traditionLoginClient)}`
+  return axios.post<ResToken>('/auth/oauth/token', {
+    headers: {
+      Authorization: basicAuth,
+    },
+    params: {
+      grant_type: grantType,
+      refresh_token,
+    },
+  })
+}
+
+export function logout() {
+  return axios.post<boolean>(`${contentPath}/logout`)
+}
diff --git a/src/api/interceptor.ts b/src/api/interceptor.ts
index ff1834b..29168b2 100644
--- a/src/api/interceptor.ts
+++ b/src/api/interceptor.ts
@@ -2,7 +2,7 @@ import axios from 'axios'
 import type { AxiosRequestConfig, AxiosResponse } from 'axios'
 import { Message, Modal } from '@arco-design/web-vue'
 import { useUserStore } from '@/store'
-import { getToken } from '@/utils/auth'
+import { clearToken, getToken } from '@/utils/auth'
 import { Response } from '@/types/global'
 
 if (import.meta.env.VITE_API_BASE_URL) {
@@ -62,8 +62,11 @@ axios.interceptors.response.use(
     return res
   },
   (error) => {
+    if ([40101].includes(error?.response?.data?.code)) {
+      clearToken()
+    }
     Message.error({
-      content: error.message || 'Request Error',
+      content: error?.response?.data?.message || 'Request Error',
       duration: 5 * 1000,
     })
     return Promise.reject(error)
diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts
index dadd7a3..25d02fd 100644
--- a/src/api/system/user/index.ts
+++ b/src/api/system/user/index.ts
@@ -11,37 +11,6 @@ import type {
 
 const contentPath = '/system/user'
 
-export function login(data: LoginData) {
-  const grantType = website?.grantTypes?.password || 'password'
-  const basicAuth = `Basic ${window.btoa(website.traditionLoginClient)}`
-  return axios.post<ResToken>('/auth/oauth/token', qs.stringify(data), {
-    headers: {
-      Authorization: basicAuth,
-    },
-    params: {
-      grant_type: grantType,
-    },
-  })
-}
-
-export function refreshToken(refresh_token: string) {
-  const grantType = website?.grantTypes?.refresh_token || 'refresh_token'
-  const basicAuth = `Basic ${window.btoa(website.traditionLoginClient)}`
-  return axios.post<ResToken>('/auth/oauth/token', {
-    headers: {
-      Authorization: basicAuth,
-    },
-    params: {
-      grant_type: grantType,
-      refresh_token,
-    },
-  })
-}
-
-export function logout() {
-  return axios.post<boolean>('/api/user/logout')
-}
-
 export function create(userDto: UserDto) {
   return axios.post<boolean>(`${contentPath}`, userDto)
 }
diff --git a/src/hooks/user.ts b/src/hooks/user.ts
index 03e46d8..5ef92b2 100644
--- a/src/hooks/user.ts
+++ b/src/hooks/user.ts
@@ -2,6 +2,7 @@ import { useRouter } from 'vue-router'
 import { Message } from '@arco-design/web-vue'
 
 import { useUserStore } from '@/store'
+import { clearToken } from '@/utils/auth'
 
 export default function useUser() {
   const router = useRouter()
@@ -10,7 +11,8 @@ export default function useUser() {
     await userStore.logout()
     const currentRoute = router.currentRoute.value
     Message.success('登出成功')
-    router.push({
+    clearToken()
+    await router.push({
       name: logoutTo || 'login',
       query: {
         ...router.currentRoute.value.query,
diff --git a/src/store/modules/user/index.ts b/src/store/modules/user/index.ts
index 904ad11..3f54570 100644
--- a/src/store/modules/user/index.ts
+++ b/src/store/modules/user/index.ts
@@ -2,11 +2,8 @@ import { defineStore } from 'pinia'
 import { setToken, clearToken } from '@/utils/auth'
 import { removeRouteListener } from '@/utils/route-listener'
 import { LoginData, UserInfo } from '@/types/modules/system'
-import {
-  login as userLogin,
-  logout as userLogout,
-  getUserInfo,
-} from '@/api/system/user'
+import { getUserInfo } from '@/api/system/user'
+import { login as userLogin, logout as logoutApi } from '@/api/auth'
 import useAppStore from '../app'
 
 const useUserStore = defineStore('user', {
@@ -67,7 +64,7 @@ const useUserStore = defineStore('user', {
     // Logout
     async logout() {
       try {
-        await userLogout()
+        await logoutApi()
       } finally {
         this.logoutCallBack()
       }
-- 
Gitee


From 74547974841a0257c5f5fdb56dadb09427471787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BB=A4?= <2603820757@qq.com>
Date: Wed, 21 Sep 2022 20:51:25 +0800
Subject: [PATCH 08/11] =?UTF-8?q?:bug:=20=E8=B7=AF=E7=94=B1=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E6=94=B9=E9=80=A0=E9=81=97=E6=BC=8F=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/permission.ts           |  4 ++--
 src/hooks/user.ts                 | 25 +++++++++++++------------
 src/router/guard/permission.ts    |  2 +-
 src/router/guard/userLoginInfo.ts |  2 +-
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/hooks/permission.ts b/src/hooks/permission.ts
index 1e600c0..7f6650f 100644
--- a/src/hooks/permission.ts
+++ b/src/hooks/permission.ts
@@ -12,12 +12,12 @@ export default function usePermission() {
         || Boolean(route.meta?.roles?.filter(role => userStore.roles?.includes(role)).length)
       )
     },
-    findFirstPermissionRoute(_routers: any, role = 'admin') {
+    findFirstPermissionRoute(_routers: any, _roles: string[]) {
       const cloneRouters = [..._routers]
       while (cloneRouters.length) {
         const firstElement = cloneRouters.shift()
         if (
-          firstElement?.meta?.roles?.find((el: string[]) => el.includes('*') || el.includes(role))
+          firstElement?.meta?.roles?.find((role: string) => role === '*' || _roles.includes(role))
         ) return { name: firstElement.name }
         if (firstElement?.children) {
           cloneRouters.push(...firstElement.children)
diff --git a/src/hooks/user.ts b/src/hooks/user.ts
index 5ef92b2..79875c1 100644
--- a/src/hooks/user.ts
+++ b/src/hooks/user.ts
@@ -2,23 +2,24 @@ import { useRouter } from 'vue-router'
 import { Message } from '@arco-design/web-vue'
 
 import { useUserStore } from '@/store'
-import { clearToken } from '@/utils/auth'
 
 export default function useUser() {
   const router = useRouter()
   const userStore = useUserStore()
   const logout = async (logoutTo?: string) => {
-    await userStore.logout()
-    const currentRoute = router.currentRoute.value
-    Message.success('登出成功')
-    clearToken()
-    await router.push({
-      name: logoutTo || 'login',
-      query: {
-        ...router.currentRoute.value.query,
-        redirect: currentRoute.name as string,
-      },
-    })
+    try {
+      await userStore.logout()
+      Message.success('登出成功')
+    } finally {
+      const currentRoute = router.currentRoute.value
+      await router.push({
+        name: logoutTo || 'login',
+        query: {
+          ...router.currentRoute.value.query,
+          redirect: currentRoute.name as string,
+        },
+      })
+    }
   }
   return {
     logout,
diff --git a/src/router/guard/permission.ts b/src/router/guard/permission.ts
index fd56600..2741377 100644
--- a/src/router/guard/permission.ts
+++ b/src/router/guard/permission.ts
@@ -44,7 +44,7 @@ export default function setupPermissionGuard(router: Router) {
       // eslint-disable-next-line no-lonely-if
       if (permissionsAllow) next()
       else {
-        const destination = Permission.findFirstPermissionRoute(appRoutes, userStore.role)
+        const destination = Permission.findFirstPermissionRoute(appRoutes, userStore.roles)
           || NOT_FOUND
         next(destination)
       }
diff --git a/src/router/guard/userLoginInfo.ts b/src/router/guard/userLoginInfo.ts
index 0d7526b..91480fd 100644
--- a/src/router/guard/userLoginInfo.ts
+++ b/src/router/guard/userLoginInfo.ts
@@ -9,7 +9,7 @@ export default function setupUserLoginInfoGuard(router: Router) {
     NProgress.start()
     const userStore = useUserStore()
     if (isLogin()) {
-      if (userStore.role) {
+      if (userStore.roles.length) {
         next()
       } else {
         try {
-- 
Gitee


From 876f9d68c1ec186310d1bf4a062082db1b7de662 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BB=A4?= <2603820757@qq.com>
Date: Wed, 21 Sep 2022 23:04:58 +0800
Subject: [PATCH 09/11] =?UTF-8?q?:recycle:=20=E5=88=A0=E9=99=A4=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96=E8=B5=84=E6=BA=90=EF=BC=8C=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/vite.config.base.ts                    |  4 --
 config/vite.config.prod.ts                    |  2 +-
 package.json                                  |  1 -
 src/App.vue                                   | 17 +----
 src/components/breadcrumb/index.vue           |  2 +-
 src/components/chart/index.vue                |  7 +--
 src/components/global-setting/block.vue       |  2 +-
 src/components/global-setting/index.vue       | 30 +++++----
 src/components/menu/index.vue                 |  8 +--
 .../menu/{useMenuTree.ts => use-menu-tree.ts} |  0
 src/components/message-box/index.vue          | 15 +++--
 src/components/message-box/list.vue           |  4 +-
 src/components/message-box/locale/en-US.ts    | 13 ----
 src/components/message-box/locale/zh-CN.ts    | 13 ----
 src/components/navbar/index.vue               | 63 ++++---------------
 src/components/tab-bar/locale/en-US.ts        |  7 ---
 src/components/tab-bar/locale/zh-CN.ts        |  7 ---
 src/components/tab-bar/tab-item.vue           | 15 +++--
 src/hooks/locale.ts                           | 17 -----
 src/locale/common/en-US.ts                    |  5 --
 src/locale/common/zh-CN.ts                    |  5 --
 src/locale/en-US.ts                           | 37 -----------
 src/locale/en-US/settings.ts                  | 28 ---------
 src/locale/index.ts                           | 21 -------
 src/locale/zh-CN.ts                           | 37 -----------
 src/locale/zh-CN/settings.ts                  | 28 ---------
 src/main.ts                                   |  2 -
 src/mock/user.ts                              |  3 -
 src/router/routes/index.ts                    |  2 +-
 src/router/routes/modules/dashboard.ts        |  2 -
 src/router/routes/modules/system.ts           |  4 --
 src/types/modules/system.ts                   |  6 +-
 .../workplace/components/announcement.vue     |  4 +-
 .../dashboard/workplace/components/banner.vue |  2 +-
 .../components/categories-percent.vue         |  2 +-
 .../workplace/components/content-chart.vue    |  4 +-
 .../workplace/components/data-panel.vue       | 14 ++---
 .../dashboard/workplace/components/docs.vue   | 12 ++--
 .../workplace/components/popular-content.vue  | 10 +--
 .../workplace/components/quick-operation.vue  | 16 ++---
 .../workplace/components/recently-visited.vue | 10 +--
 src/views/dashboard/workplace/locale/en-US.ts | 38 -----------
 src/views/dashboard/workplace/locale/zh-CN.ts | 37 -----------
 src/views/login/components/banner.vue         | 14 ++---
 src/views/login/components/login-form.vue     | 26 ++++----
 src/views/login/locale/en-US.ts               | 21 -------
 src/views/login/locale/zh-CN.ts               | 19 ------
 src/views/system/authority/index.vue          | 10 +--
 src/views/system/authority/locale/en-US.ts    |  3 -
 src/views/system/authority/locale/zh-CN.ts    |  3 -
 .../role/components/authority-modal.vue       |  2 -
 src/views/system/role/index.vue               | 10 +--
 src/views/system/role/locale/en-US.ts         |  3 -
 src/views/system/role/locale/zh-CN.ts         |  3 -
 src/views/system/user/index.vue               | 42 ++++++-------
 src/views/system/user/locale/en-US.ts         | 21 -------
 src/views/system/user/locale/zh-CN.ts         | 21 -------
 57 files changed, 139 insertions(+), 615 deletions(-)
 rename src/components/menu/{useMenuTree.ts => use-menu-tree.ts} (100%)
 delete mode 100644 src/components/message-box/locale/en-US.ts
 delete mode 100644 src/components/message-box/locale/zh-CN.ts
 delete mode 100644 src/components/tab-bar/locale/en-US.ts
 delete mode 100644 src/components/tab-bar/locale/zh-CN.ts
 delete mode 100644 src/hooks/locale.ts
 delete mode 100644 src/locale/common/en-US.ts
 delete mode 100644 src/locale/common/zh-CN.ts
 delete mode 100644 src/locale/en-US.ts
 delete mode 100644 src/locale/en-US/settings.ts
 delete mode 100644 src/locale/index.ts
 delete mode 100644 src/locale/zh-CN.ts
 delete mode 100644 src/locale/zh-CN/settings.ts
 delete mode 100644 src/views/dashboard/workplace/locale/en-US.ts
 delete mode 100644 src/views/dashboard/workplace/locale/zh-CN.ts
 delete mode 100644 src/views/login/locale/en-US.ts
 delete mode 100644 src/views/login/locale/zh-CN.ts
 delete mode 100644 src/views/system/authority/locale/en-US.ts
 delete mode 100644 src/views/system/authority/locale/zh-CN.ts
 delete mode 100644 src/views/system/role/locale/en-US.ts
 delete mode 100644 src/views/system/role/locale/zh-CN.ts
 delete mode 100644 src/views/system/user/locale/en-US.ts
 delete mode 100644 src/views/system/user/locale/zh-CN.ts

diff --git a/config/vite.config.base.ts b/config/vite.config.base.ts
index 25cfa36..c17d93c 100644
--- a/config/vite.config.base.ts
+++ b/config/vite.config.base.ts
@@ -16,10 +16,6 @@ export default defineConfig({
         find: 'assets',
         replacement: resolve(__dirname, '../src/assets'),
       },
-      {
-        find: 'vue-i18n',
-        replacement: 'vue-i18n/dist/vue-i18n.cjs.js', // Resolve the i18n warning issue
-      },
       {
         find: 'vue',
         replacement: 'vue/dist/vue.esm-bundler.js', // compile template
diff --git a/config/vite.config.prod.ts b/config/vite.config.prod.ts
index d87d78a..bf7593b 100644
--- a/config/vite.config.prod.ts
+++ b/config/vite.config.prod.ts
@@ -22,7 +22,7 @@ export default mergeConfig(
           manualChunks: {
             arco: ['@arco-design/web-vue'],
             chart: ['echarts', 'vue-echarts'],
-            vue: ['vue', 'vue-router', 'pinia', '@vueuse/core', 'vue-i18n'],
+            vue: ['vue', 'vue-router', 'pinia', '@vueuse/core'],
           },
         },
       },
diff --git a/package.json b/package.json
index 662cd08..d240677 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,6 @@
     "query-string": "^7.0.1",
     "vue": "^3.2.31",
     "vue-echarts": "^6.0.0",
-    "vue-i18n": "^9.2.0-beta.17",
     "vue-router": "^4.0.14"
   },
   "devDependencies": {
diff --git a/src/App.vue b/src/App.vue
index e0629b1..b4f72f8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,26 +1,11 @@
 <template>
-  <a-config-provider :locale="locale">
+  <a-config-provider>
     <router-view />
     <global-setting />
   </a-config-provider>
 </template>
 
 <script lang="ts" setup>
-import { computed } from 'vue'
-import enUS from '@arco-design/web-vue/es/locale/lang/en-us'
-import zhCN from '@arco-design/web-vue/es/locale/lang/zh-cn'
 import GlobalSetting from '@/components/global-setting/index.vue'
-import useLocale from '@/hooks/locale'
 
-const { currentLocale } = useLocale()
-const locale = computed(() => {
-  switch (currentLocale.value) {
-    case 'zh-CN':
-      return zhCN
-    case 'en-US':
-      return enUS
-    default:
-      return enUS
-  }
-})
 </script>
diff --git a/src/components/breadcrumb/index.vue b/src/components/breadcrumb/index.vue
index 0cf6adf..30f5615 100644
--- a/src/components/breadcrumb/index.vue
+++ b/src/components/breadcrumb/index.vue
@@ -4,7 +4,7 @@
       <icon-apps />
     </a-breadcrumb-item>
     <a-breadcrumb-item v-for="item in items" :key="item">
-      {{ $t(item) }}
+      {{ item }}
     </a-breadcrumb-item>
   </a-breadcrumb>
 </template>
diff --git a/src/components/chart/index.vue b/src/components/chart/index.vue
index 8ea3f41..81246da 100644
--- a/src/components/chart/index.vue
+++ b/src/components/chart/index.vue
@@ -10,7 +10,6 @@
 <script lang="ts" setup>
 import { ref, nextTick } from 'vue'
 import VCharts from 'vue-echarts'
-// import { useAppStore } from '@/store';
 
 defineProps({
   options: {
@@ -32,11 +31,7 @@ defineProps({
     default: '100%',
   },
 })
-// const appStore = useAppStore();
-// const theme = computed(() => {
-//   if (appStore.theme === 'dark') return 'dark';
-//   return '';
-// });
+
 const renderChart = ref(false)
 // wait container expand
 nextTick(() => {
diff --git a/src/components/global-setting/block.vue b/src/components/global-setting/block.vue
index 483405b..adc6807 100644
--- a/src/components/global-setting/block.vue
+++ b/src/components/global-setting/block.vue
@@ -2,7 +2,7 @@
   <div class="block">
     <h5 class="title">{{ title }}</h5>
     <div v-for="option in options" :key="option.name" class="switch-wrapper">
-      <span>{{ $t(option.name) }}</span>
+      <span>{{ option.name }}</span>
       <form-wrapper
         :type="option.type || 'switch'"
         :name="option.key"
diff --git a/src/components/global-setting/index.vue b/src/components/global-setting/index.vue
index 94818f4..375b89c 100644
--- a/src/components/global-setting/index.vue
+++ b/src/components/global-setting/index.vue
@@ -10,22 +10,21 @@
     :width="300"
     unmount-on-close
     :visible="visible"
-    :cancel-text="$t('settings.close')"
-    :ok-text="$t('settings.copySettings')"
+    cancel-text="关闭"
+    ok-text="复制配置"
     @ok="copySettings"
     @cancel="cancel"
   >
-    <template #title> {{ $t('settings.title') }} </template>
-    <Block :options="contentOpts" :title="$t('settings.content')" />
-    <Block :options="othersOpts" :title="$t('settings.otherSettings')" />
-    <a-alert>{{ $t('settings.alertContent') }}</a-alert>
+    <template #title> 页面配置 </template>
+    <Block :options="contentOpts" title="内容区域" />
+    <Block :options="othersOpts" title="其他设置" />
+    <a-alert>配置之后仅是临时生效，要想真正作用于项目，点击下方的 "复制配置" 按钮，将配置替换到 settings.json 中即可。</a-alert>
   </a-drawer>
 </template>
 
 <script lang="ts" setup>
 import { computed } from 'vue'
 import { Message } from '@arco-design/web-vue'
-import { useI18n } from 'vue-i18n'
 import { useClipboard } from '@vueuse/core'
 import { useAppStore } from '@/store'
 import Block from './block.vue'
@@ -33,25 +32,24 @@ import Block from './block.vue'
 const emit = defineEmits(['cancel'])
 
 const appStore = useAppStore()
-const { t } = useI18n()
 const { copy } = useClipboard()
 const visible = computed(() => appStore.globalSettings)
 const contentOpts = computed(() => [
-  { name: 'settings.navbar', key: 'navbar', defaultVal: appStore.navbar },
+  { name: '导航栏', key: 'navbar', defaultVal: appStore.navbar },
   {
-    name: 'settings.menu',
+    name: '菜单栏',
     key: 'menu',
     defaultVal: appStore.menu,
   },
-  { name: 'settings.footer', key: 'footer', defaultVal: appStore.footer },
-  { name: 'settings.tabBar', key: 'tabBar', defaultVal: appStore.tabBar },
+  { name: '底部', key: 'footer', defaultVal: appStore.footer },
+  { name: '多页签', key: 'tabBar', defaultVal: appStore.tabBar },
   {
-    name: 'settings.menuFromServer',
+    name: '菜单来源于后台',
     key: 'menuFromServer',
     defaultVal: appStore.menuFromServer,
   },
   {
-    name: 'settings.menuWidth',
+    name: '菜单宽度 (px)',
     key: 'menuWidth',
     defaultVal: appStore.menuWidth,
     type: 'number',
@@ -59,7 +57,7 @@ const contentOpts = computed(() => [
 ])
 const othersOpts = computed(() => [
   {
-    name: 'settings.colorWeak',
+    name: '色弱模式',
     key: 'colorWeak',
     defaultVal: appStore.colorWeak,
   },
@@ -72,7 +70,7 @@ const cancel = () => {
 const copySettings = async () => {
   const text = JSON.stringify(appStore.$state, null, 2)
   await copy(text)
-  Message.success(t('settings.copySettings.message'))
+  Message.success('复制成功，请粘贴到 src/settings.json 文件中')
 }
 const setVisible = () => {
   appStore.updateSettings({ globalSettings: true })
diff --git a/src/components/menu/index.vue b/src/components/menu/index.vue
index 4ab3fb1..05d0346 100644
--- a/src/components/menu/index.vue
+++ b/src/components/menu/index.vue
@@ -2,18 +2,16 @@
   import {
     defineComponent, ref, h, compile, computed,
   } from 'vue'
-  import { useI18n } from 'vue-i18n'
   import { useRoute, useRouter, RouteRecordRaw } from 'vue-router'
   import type { RouteMeta } from 'vue-router'
   import { useAppStore } from '@/store'
   import { listenerRouteChange } from '@/utils/route-listener'
   import { openWindow, regexUrl } from '@/utils'
-  import useMenuTree from './useMenuTree'
+  import useMenuTree from './use-menu-tree'
 
   export default defineComponent({
     emit: ['collapse'],
     setup() {
-      const { t } = useI18n()
       const appStore = useAppStore()
       const router = useRouter()
       const route = useRoute()
@@ -106,7 +104,7 @@
                     key={element?.name}
                     v-slots={{
                       icon,
-                      title: () => h(compile(t(element?.meta?.locale || ''))),
+                      title: () => h(compile(element?.meta?.locale || '')),
                     }}
                   >
                     {travel(element?.children)}
@@ -117,7 +115,7 @@
                     v-slots={{ icon }}
                     onClick={() => goto(element)}
                   >
-                    {t(element?.meta?.locale || '')}
+                    {element?.meta?.locale || ''}
                   </a-menu-item>
               )
               nodes.push(node as never)
diff --git a/src/components/menu/useMenuTree.ts b/src/components/menu/use-menu-tree.ts
similarity index 100%
rename from src/components/menu/useMenuTree.ts
rename to src/components/menu/use-menu-tree.ts
diff --git a/src/components/message-box/index.vue b/src/components/message-box/index.vue
index 35e851e..a9ab3cc 100644
--- a/src/components/message-box/index.vue
+++ b/src/components/message-box/index.vue
@@ -3,10 +3,10 @@
     <a-tabs v-model:activeKey="messageType" type="rounded" destroy-on-hide>
       <a-tab-pane v-for="item in tabList" :key="item.key">
         <template #title>
-          <span> {{ $t(item.title ) }} {{ formatUnreadLength(item.key) }} </span>
+          <span> {{ item.title }} {{ formatUnreadLength(item.key) }} </span>
         </template>
         <a-result v-if="!renderList.length" status="404">
-          <template #subtitle> {{ $t('messageBox.noContent') }} </template>
+          <template #subtitle> 暂无内容 </template>
         </a-result>
         <List
           :render-list="renderList"
@@ -16,7 +16,7 @@
       </a-tab-pane>
       <template #extra>
         <a-button type="text" @click="emptyList">
-          {{ $t('messageBox.tab.button') }}
+          清空
         </a-button>
       </template>
     </a-tabs>
@@ -27,7 +27,6 @@
 import {
   ref, reactive, toRefs, computed,
 } from 'vue'
-import { useI18n } from 'vue-i18n'
 import {
   queryMessageList,
   setMessageStatus,
@@ -55,15 +54,15 @@ toRefs(messageData)
 const tabList: TabItem[] = [
   {
     key: 'message',
-    title: 'messageBox.tab.title.message',
+    title: '消息',
   },
   {
     key: 'notice',
-    title: 'messageBox.tab.title.notice',
+    title: '通知',
   },
   {
     key: 'todo',
-    title: 'messageBox.tab.title.todo',
+    title: '待办',
   },
 ]
 async function fetchSourceData() {
@@ -80,7 +79,7 @@ async function fetchSourceData() {
 async function readMessage(data: MessageListType) {
   const ids = data.map((item) => item.id)
   await setMessageStatus({ ids })
-  fetchSourceData()
+  await fetchSourceData()
 }
 const renderList = computed(() => messageData.messageList.filter(
   (item) => messageType.value === item.type,
diff --git a/src/components/message-box/list.vue b/src/components/message-box/list.vue
index 60e75fe..f3c8477 100644
--- a/src/components/message-box/list.vue
+++ b/src/components/message-box/list.vue
@@ -57,10 +57,10 @@
         :class="{ 'add-border-top': renderList.length < showMax }"
       >
         <div class="footer-wrap">
-          <a-link @click="allRead">{{ $t('messageBox.allRead') }}</a-link>
+          <a-link @click="allRead">全部已读</a-link>
         </div>
         <div class="footer-wrap">
-          <a-link>{{ $t('messageBox.viewMore') }}</a-link>
+          <a-link>查看更多</a-link>
         </div>
       </a-space>
     </template>
diff --git a/src/components/message-box/locale/en-US.ts b/src/components/message-box/locale/en-US.ts
deleted file mode 100644
index 92d8583..0000000
--- a/src/components/message-box/locale/en-US.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export default {
-  'messageBox.tab.title.message': 'Message',
-  'messageBox.tab.title.notice': 'Notice',
-  'messageBox.tab.title.todo': 'Todo',
-  'messageBox.tab.button': 'empty',
-  'messageBox.allRead': 'All Read',
-  'messageBox.viewMore': 'View More',
-  'messageBox.noContent': 'No Content',
-  'messageBox.switchRoles': 'Switch Roles',
-  'messageBox.userCenter': 'User Center',
-  'messageBox.userSettings': 'User Settings',
-  'messageBox.logout': 'Logout',
-}
diff --git a/src/components/message-box/locale/zh-CN.ts b/src/components/message-box/locale/zh-CN.ts
deleted file mode 100644
index dca6efb..0000000
--- a/src/components/message-box/locale/zh-CN.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export default {
-  'messageBox.tab.title.message': '消息',
-  'messageBox.tab.title.notice': '通知',
-  'messageBox.tab.title.todo': '待办',
-  'messageBox.tab.button': '清空',
-  'messageBox.allRead': '全部已读',
-  'messageBox.viewMore': '查看更多',
-  'messageBox.noContent': '暂无内容',
-  'messageBox.switchRoles': '切换角色',
-  'messageBox.userCenter': '用户中心',
-  'messageBox.userSettings': '用户设置',
-  'messageBox.logout': '登出登录',
-}
diff --git a/src/components/navbar/index.vue b/src/components/navbar/index.vue
index f59800e..411bc1b 100644
--- a/src/components/navbar/index.vue
+++ b/src/components/navbar/index.vue
@@ -21,7 +21,7 @@
     </div>
     <ul class="right-side">
       <li>
-        <a-tooltip :content="$t('settings.search')">
+        <a-tooltip content="搜索">
           <a-button class="nav-btn" type="outline" :shape="'circle'">
             <template #icon>
               <icon-search />
@@ -29,38 +29,12 @@
           </a-button>
         </a-tooltip>
       </li>
-      <li>
-        <a-tooltip :content="$t('settings.language')">
-          <a-button
-            class="nav-btn"
-            type="outline"
-            :shape="'circle'"
-            @click="setDropDownVisible"
-          >
-            <template #icon>
-              <icon-language />
-            </template>
-          </a-button>
-        </a-tooltip>
-        <a-dropdown trigger="click" @select="changeLocale as any">
-          <div ref="triggerBtn" class="trigger-btn" />
-          <template #content>
-            <a-doption
-              v-for="item in locales"
-              :key="item.value"
-              :value="item.value"
-            >
-              {{ item.label }}
-            </a-doption>
-          </template>
-        </a-dropdown>
-      </li>
       <li>
         <a-tooltip
           :content="
             theme === 'light'
-              ? $t('settings.navbar.theme.toDark')
-              : $t('settings.navbar.theme.toLight')
+              ? '点击切换为暗黑模式'
+              : '点击切换为亮色模式'
           "
         >
           <a-button
@@ -77,7 +51,7 @@
         </a-tooltip>
       </li>
       <li>
-        <a-tooltip :content="$t('settings.navbar.alerts')">
+        <a-tooltip content="消息通知">
           <div class="message-box-trigger">
             <a-badge :count="9" dot>
               <a-button
@@ -107,8 +81,8 @@
         <a-tooltip
           :content="
             isFullscreen
-              ? $t('settings.navbar.screen.toExit')
-              : $t('settings.navbar.screen.toFull')
+              ? '点击退出全屏模式'
+              : '点击切换全屏模式'
           "
         >
           <a-button
@@ -125,7 +99,7 @@
         </a-tooltip>
       </li>
       <li>
-        <a-tooltip :content="$t('settings.title')">
+        <a-tooltip content="页面配置">
           <a-button
             class="nav-btn"
             type="outline"
@@ -147,19 +121,11 @@
             <img alt="avatar" :src="avatar">
           </a-avatar>
           <template #content>
-            <!--            <a-doption>-->
-            <!--              <a-space @click="switchRoles">-->
-            <!--                <icon-tag />-->
-            <!--                <span>-->
-            <!--                  {{ $t('messageBox.switchRoles') }}-->
-            <!--                </span>-->
-            <!--              </a-space>-->
-            <!--            </a-doption>-->
             <a-doption>
               <a-space @click="$router.push({ name: 'Info' })">
                 <icon-user />
                 <span>
-                  {{ $t('messageBox.userCenter') }}
+                  用户中心
                 </span>
               </a-space>
             </a-doption>
@@ -167,7 +133,7 @@
               <a-space @click="$router.push({ name: 'Setting' })">
                 <icon-settings />
                 <span>
-                  {{ $t('messageBox.userSettings') }}
+                  用户设置
                 </span>
               </a-space>
             </a-doption>
@@ -175,7 +141,7 @@
               <a-space @click="handleLogout">
                 <icon-export />
                 <span>
-                  {{ $t('messageBox.logout') }}
+                  登出登录
                 </span>
               </a-space>
             </a-doption>
@@ -191,17 +157,13 @@ import { computed, ref, inject } from 'vue'
 import { Message } from '@arco-design/web-vue'
 import { useDark, useToggle, useFullscreen } from '@vueuse/core'
 import { useAppStore, useUserStore } from '@/store'
-import { LOCALE_OPTIONS } from '@/locale'
-import useLocale from '@/hooks/locale'
 import useUser from '@/hooks/user'
 import MessageBox from '../message-box/index.vue'
 
 const appStore = useAppStore()
 const userStore = useUserStore()
 const { logout } = useUser()
-const { changeLocale } = useLocale()
 const { isFullscreen, toggle: toggleFullScreen } = useFullscreen()
-const locales = [...LOCALE_OPTIONS]
 const avatar = computed(() => userStore.avatar)
 const theme = computed(() => appStore.theme)
 const isDark = useDark({
@@ -243,10 +205,7 @@ const setDropDownVisible = () => {
   })
   triggerBtn.value.dispatchEvent(event)
 }
-// const switchRoles = async () => {
-//   const res = await userStore.switchRoles()
-//   Message.success(res as string)
-// }
+
 const toggleDrawerMenu = inject('toggleDrawerMenu')
 </script>
 
diff --git a/src/components/tab-bar/locale/en-US.ts b/src/components/tab-bar/locale/en-US.ts
deleted file mode 100644
index 68076c2..0000000
--- a/src/components/tab-bar/locale/en-US.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export default {
-  'close.current.tab': 'closeCurrentTab',
-  'close.left.tabs': 'closeLeftTabs',
-  'close.right.tabs': 'closeRightTabs',
-  'close.other.tabs': 'closeOtherTabs',
-  'close.all.tabs': 'closeAllTabs',
-}
diff --git a/src/components/tab-bar/locale/zh-CN.ts b/src/components/tab-bar/locale/zh-CN.ts
deleted file mode 100644
index cb9bad6..0000000
--- a/src/components/tab-bar/locale/zh-CN.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export default {
-  'close.current.tab': '关闭当前标签页',
-  'close.left.tabs': '关闭左侧标签页',
-  'close.right.tabs': '关闭右侧标签页',
-  'close.other.tabs': '关闭其它标签页',
-  'close.all.tabs': '关闭全部标签页',
-}
diff --git a/src/components/tab-bar/tab-item.vue b/src/components/tab-bar/tab-item.vue
index a342167..a82269b 100644
--- a/src/components/tab-bar/tab-item.vue
+++ b/src/components/tab-bar/tab-item.vue
@@ -6,7 +6,7 @@
       @click="goto(itemData)"
     >
       <span class="tag-link">
-        {{ $t(itemData.title) }}
+        {{ itemData.title }}
       </span>
       <span
         class="arco-icon-hover arco-tag-icon-hover arco-icon-hover-size-medium arco-tag-close-btn"
@@ -18,23 +18,23 @@
     <template #content>
       <a-doption :disabled="disabledCurrent" :value="Eaction.current">
         <icon-close />
-        <span>{{ $t('close.current.tab') }}</span>
+        <span>关闭当前标签页</span>
       </a-doption>
       <a-doption :disabled="disabledLeft" :value="Eaction.left">
         <icon-to-left />
-        <span>{{ $t('close.left.tabs') }}</span>
+        <span>关闭左侧标签页</span>
       </a-doption>
       <a-doption :disabled="disabledRight" :value="Eaction.right">
         <icon-to-right />
-        <span>{{ $t('close.right.tabs') }}</span>
+        <span>关闭右侧标签页</span>
       </a-doption>
       <a-doption :value="Eaction.others">
         <icon-swap />
-        <span>{{ $t('close.other.tabs') }}</span>
+        <span>关闭其它标签页</span>
       </a-doption>
       <a-doption :value="Eaction.all">
         <icon-folder-delete />
-        <span>{{ $t('close.all.tabs') }}</span>
+        <span>关闭全部标签页</span>
       </a-doption>
     </template>
   </a-dropdown>
@@ -45,8 +45,7 @@ import { computed, PropType } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { useTabBarStore } from '@/store'
 import type { TagProps } from '@/store/modules/tab-bar/types'
-import { DEFAULT_ROUTE_NAME } from '@/router/routes/index'
-
+import { DEFAULT_ROUTE_NAME } from '@/router/routes'
   // eslint-disable-next-line no-shadow
   enum Eaction {
     current = 'current',
diff --git a/src/hooks/locale.ts b/src/hooks/locale.ts
deleted file mode 100644
index aafb1f2..0000000
--- a/src/hooks/locale.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { computed } from 'vue'
-import { useI18n } from 'vue-i18n'
-import { Message } from '@arco-design/web-vue'
-
-export default function useLocale() {
-  const i18 = useI18n()
-  const currentLocale = computed(() => i18.locale.value)
-  const changeLocale = (value: string) => {
-    i18.locale.value = value
-    localStorage.setItem('arco-locale', value)
-    Message.success(i18.t('navbar.action.locale'))
-  }
-  return {
-    currentLocale,
-    changeLocale,
-  }
-}
diff --git a/src/locale/common/en-US.ts b/src/locale/common/en-US.ts
deleted file mode 100644
index 78c4a86..0000000
--- a/src/locale/common/en-US.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export default {
-  'search': 'Search',
-  'reset': 'Reset',
-  'create': 'Create',
-}
diff --git a/src/locale/common/zh-CN.ts b/src/locale/common/zh-CN.ts
deleted file mode 100644
index e5bb5e7..0000000
--- a/src/locale/common/zh-CN.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export default {
-  'search': '搜索',
-  'reset': '重置',
-  'create': '添加',
-}
diff --git a/src/locale/en-US.ts b/src/locale/en-US.ts
deleted file mode 100644
index b4f60bf..0000000
--- a/src/locale/en-US.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import localeMessageBox from '@/components/message-box/locale/en-US'
-import localeTabBar from '@/components/tab-bar/locale/en-US'
-import localeLogin from '@/views/login/locale/en-US'
-
-import localeWorkplace from '@/views/dashboard/workplace/locale/en-US'
-import localeUserSystem from '@/views/system/user/locale/en-US'
-import localeRoleSystem from '@/views/system/role/locale/en-US'
-import localeAuthoritySystem from '@/views/system/authority/locale/en-US'
-
-import localeCommon from './common/en-US'
-import localeSettings from './en-US/settings'
-
-export default {
-  'menu.dashboard': 'Dashboard',
-  'menu.monitor': 'Monitor',
-  'menu.list': 'List',
-  'menu.result': 'Result',
-  'menu.exception': 'Exception',
-  'menu.form': 'Form',
-  'menu.profile': 'Profile',
-  'menu.visualization': 'Data Visualization',
-  'menu.user': 'User Center',
-  'menu.arcoWebsite': 'Arco Design',
-  'menu.faq': 'FAQ',
-  'navbar.docs': 'Docs',
-  'navbar.action.locale': 'Switch to English',
-  ...localeTabBar,
-  ...localeSettings,
-  ...localeMessageBox,
-  ...localeLogin,
-  ...localeWorkplace,
-  ...localeUserSystem,
-  ...localeRoleSystem,
-  ...localeAuthoritySystem,
-  ...localeCommon,
-  'menu.system': 'System',
-}
diff --git a/src/locale/en-US/settings.ts b/src/locale/en-US/settings.ts
deleted file mode 100644
index 7f8b369..0000000
--- a/src/locale/en-US/settings.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-export default {
-  'settings.title': 'Settings',
-  'settings.themeColor': 'Theme Color',
-  'settings.content': 'Content Setting',
-  'settings.search': 'Search',
-  'settings.language': 'Language',
-  'settings.navbar': 'Navbar',
-  'settings.menuWidth': 'Menu Width (px)',
-  'settings.navbar.theme.toLight': 'Click to use light mode',
-  'settings.navbar.theme.toDark': 'Click to use dark mode',
-  'settings.navbar.screen.toFull': 'Click to switch to full screen mode',
-  'settings.navbar.screen.toExit': 'Click to exit the full screen mode',
-  'settings.navbar.alerts': 'alerts',
-  'settings.menu': 'Menu',
-  'settings.tabBar': 'Tab Bar',
-  'settings.footer': 'Footer',
-  'settings.otherSettings': 'Other Settings',
-  'settings.colorWeak': 'Color Weak',
-  // eslint-disable-next-line max-len
-  'settings.alertContent': 'After the configuration is only temporarily effective, if you want to really affect the project, click the "Copy Settings" button below and replace the configuration in settings.json.',
-  'settings.copySettings': 'Copy Settings',
-  'settings.copySettings.message':
-    'Copy succeeded, please paste to file src/settings.json.',
-  'settings.close': 'Close',
-  'settings.color.tooltip':
-    '10 gradient colors generated according to the theme color',
-  'settings.menuFromServer': 'Menu From Server',
-}
diff --git a/src/locale/index.ts b/src/locale/index.ts
deleted file mode 100644
index 8781a55..0000000
--- a/src/locale/index.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { createI18n } from 'vue-i18n'
-import en from './en-US'
-import cn from './zh-CN'
-
-export const LOCALE_OPTIONS = [
-  { label: '中文', value: 'zh-CN' },
-  { label: 'English', value: 'en-US' },
-]
-const defaultLocale = localStorage.getItem('arco-locale') || 'zh-CN'
-
-const i18n = createI18n({
-  locale: defaultLocale,
-  fallbackLocale: 'en-US',
-  allowComposition: true,
-  messages: {
-    'en-US': en,
-    'zh-CN': cn,
-  },
-})
-
-export default i18n
diff --git a/src/locale/zh-CN.ts b/src/locale/zh-CN.ts
deleted file mode 100644
index 0ab465a..0000000
--- a/src/locale/zh-CN.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import localeMessageBox from '@/components/message-box/locale/zh-CN'
-import localeTabBar from '@/components/tab-bar/locale/zh-CN'
-import localeLogin from '@/views/login/locale/zh-CN'
-
-import localeWorkplace from '@/views/dashboard/workplace/locale/zh-CN'
-import localeUserSystem from '@/views/system/user/locale/zh-CN'
-import localeRoleSystem from '@/views/system/role/locale/zh-CN'
-import localeAuthoritySystem from '@/views/system/authority/locale/zh-CN'
-
-import localeCommon from './common/zh-CN'
-import localeSettings from './zh-CN/settings'
-
-export default {
-  'menu.dashboard': '仪表盘',
-  'menu.monitor': '实时监控',
-  'menu.list': '列表页',
-  'menu.result': '结果页',
-  'menu.exception': '异常页',
-  'menu.form': '表单页',
-  'menu.profile': '详情页',
-  'menu.visualization': '数据可视化',
-  'menu.user': '个人中心',
-  'menu.arcoWebsite': 'Arco Design',
-  'menu.faq': '常见问题',
-  'navbar.docs': '文档中心',
-  'navbar.action.locale': '切换为中文',
-  ...localeTabBar,
-  ...localeSettings,
-  ...localeMessageBox,
-  ...localeLogin,
-  ...localeWorkplace,
-  ...localeUserSystem,
-  ...localeRoleSystem,
-  ...localeAuthoritySystem,
-  ...localeCommon,
-  'menu.system': '系统管理',
-}
diff --git a/src/locale/zh-CN/settings.ts b/src/locale/zh-CN/settings.ts
deleted file mode 100644
index af2a7b4..0000000
--- a/src/locale/zh-CN/settings.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-export default {
-  'settings.title': '页面配置',
-  'settings.themeColor': '主题色',
-  'settings.content': '内容区域',
-  'settings.search': '搜索',
-  'settings.language': '语言',
-  'settings.navbar': '导航栏',
-  'settings.menuWidth': '菜单宽度 (px)',
-  'settings.navbar.theme.toLight': '点击切换为亮色模式',
-  'settings.navbar.theme.toDark': '点击切换为暗黑模式',
-  'settings.navbar.screen.toFull': '点击切换全屏模式',
-  'settings.navbar.screen.toExit': '点击退出全屏模式',
-  'settings.navbar.alerts': '消息通知',
-  'settings.menu': '菜单栏',
-  'settings.tabBar': '多页签',
-  'settings.footer': '底部',
-  'settings.otherSettings': '其他设置',
-  'settings.colorWeak': '色弱模式',
-  'settings.alertContent':
-    '配置之后仅是临时生效，要想真正作用于项目，点击下方的 "复制配置" 按钮，将配置替换到 settings.json 中即可。',
-  'settings.copySettings': '复制配置',
-  'settings.copySettings.message':
-    '复制成功，请粘贴到 src/settings.json 文件中',
-  'settings.close': '关闭',
-  'settings.color.tooltip':
-    '根据主题颜色生成的 10 个梯度色（将配置复制到项目中，主题色才能对亮色 / 暗黑模式同时生效）',
-  'settings.menuFromServer': '菜单来源于后台',
-}
diff --git a/src/main.ts b/src/main.ts
index 8b1b401..f6f211b 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -4,7 +4,6 @@ import ArcoVueIcon from '@arco-design/web-vue/es/icon'
 import globalComponents from '@/components'
 import router from './router'
 import store from './store'
-import i18n from './locale'
 import directives from './directives'
 import './mock'
 import App from './App.vue'
@@ -19,7 +18,6 @@ app.use(ArcoVueIcon)
 
 app.use(router)
 app.use(store)
-app.use(i18n)
 app.use(globalComponents)
 app.use(directives)
 
diff --git a/src/mock/user.ts b/src/mock/user.ts
index 0abfe2f..7d42358 100644
--- a/src/mock/user.ts
+++ b/src/mock/user.ts
@@ -73,7 +73,6 @@ setupMock({
           path: '/dashboard',
           name: 'dashboard',
           meta: {
-            locale: 'menu.dashboard',
             requiresAuth: true,
             icon: 'icon-dashboard',
             order: 1,
@@ -83,7 +82,6 @@ setupMock({
               path: 'workplace',
               name: 'workplace',
               meta: {
-                locale: 'menu.workplace',
                 requiresAuth: true,
               },
             },
@@ -91,7 +89,6 @@ setupMock({
               path: 'https://arco.design',
               name: 'arcoWebsite',
               meta: {
-                locale: 'menu.arcoWebsite',
                 requiresAuth: true,
               },
             },
diff --git a/src/router/routes/index.ts b/src/router/routes/index.ts
index 9b4a904..9025ced 100644
--- a/src/router/routes/index.ts
+++ b/src/router/routes/index.ts
@@ -21,7 +21,7 @@ export const appRoutes: RouteRecordNormalized[] = formatModules(modules, [])
 export const DEFAULT_ROUTE_NAME = 'workplace'
 
 export const DEFAULT_ROUTE = {
-  title: 'menu.dashboard.workplace',
+  title: '工作台',
   name: DEFAULT_ROUTE_NAME,
   fullPath: '/dashboard/workplace',
 }
diff --git a/src/router/routes/modules/dashboard.ts b/src/router/routes/modules/dashboard.ts
index 5619966..a1939cb 100644
--- a/src/router/routes/modules/dashboard.ts
+++ b/src/router/routes/modules/dashboard.ts
@@ -6,7 +6,6 @@ const DASHBOARD: AppRouteRecordRaw = {
   name: 'dashboard',
   component: DEFAULT_LAYOUT,
   meta: {
-    locale: 'menu.dashboard',
     requiresAuth: true,
     icon: 'icon-dashboard',
     order: 0,
@@ -17,7 +16,6 @@ const DASHBOARD: AppRouteRecordRaw = {
       name: 'workplace',
       component: () => import('@/views/dashboard/workplace/index.vue'),
       meta: {
-        locale: 'menu.dashboard.workplace',
         requiresAuth: true,
       },
     },
diff --git a/src/router/routes/modules/system.ts b/src/router/routes/modules/system.ts
index 9bea66f..e1d2027 100644
--- a/src/router/routes/modules/system.ts
+++ b/src/router/routes/modules/system.ts
@@ -6,7 +6,6 @@ const SYSTEM: AppRouteRecordRaw = {
   name: 'system',
   component: DEFAULT_LAYOUT,
   meta: {
-    locale: 'menu.system',
     requiresAuth: true,
   },
   children: [
@@ -15,7 +14,6 @@ const SYSTEM: AppRouteRecordRaw = {
       name: 'user',
       component: () => import('@/views/system/user/index.vue'),
       meta: {
-        locale: 'menu.system.user',
         requiresAuth: true,
       },
     },
@@ -24,7 +22,6 @@ const SYSTEM: AppRouteRecordRaw = {
       name: 'role',
       component: () => import('@/views/system/role/index.vue'),
       meta: {
-        locale: 'menu.system.role',
         requiresAuth: true,
       },
     },
@@ -33,7 +30,6 @@ const SYSTEM: AppRouteRecordRaw = {
       name: 'authority',
       component: () => import('@/views/system/authority/index.vue'),
       meta: {
-        locale: 'menu.system.authority',
         requiresAuth: true,
       },
     },
diff --git a/src/types/modules/system.ts b/src/types/modules/system.ts
index dd271cb..8b91210 100644
--- a/src/types/modules/system.ts
+++ b/src/types/modules/system.ts
@@ -26,7 +26,7 @@ export interface UserInfo {
   authorities: string[]
 }
 
-export interface RoleVo extends TreeNode{
+export interface RoleVo extends TreeNode {
   name?: string
   code?: string
   createTime?: string
@@ -62,7 +62,7 @@ export interface UserDto {
   enabled?: boolean
 }
 
-export interface RoleDto extends TreeNode{
+export interface RoleDto extends TreeNode {
   name?: string
   code?: string
 }
@@ -84,7 +84,7 @@ export interface AuthorityVo extends TreeNode {
   meta?: Meta
 }
 
-export interface AuthorityDto extends TreeNode{
+export interface AuthorityDto extends TreeNode {
   id?: number
   name?: string
   code?: string
diff --git a/src/views/dashboard/workplace/components/announcement.vue b/src/views/dashboard/workplace/components/announcement.vue
index 3d96db3..5c18c1c 100644
--- a/src/views/dashboard/workplace/components/announcement.vue
+++ b/src/views/dashboard/workplace/components/announcement.vue
@@ -1,12 +1,12 @@
 <template>
   <a-card
     class="general-card"
-    :title="$t('workplace.announcement')"
+    title="公告"
     :header-style="{ paddingBottom: '0' }"
     :body-style="{ padding: '15px 20px 13px 20px' }"
   >
     <template #extra>
-      <a-link>{{ $t('workplace.viewMore') }}</a-link>
+      <a-link>查看更多</a-link>
     </template>
     <div>
       <div v-for="(item, idx) in list" :key="idx" class="item">
diff --git a/src/views/dashboard/workplace/components/banner.vue b/src/views/dashboard/workplace/components/banner.vue
index 0921598..e596d46 100644
--- a/src/views/dashboard/workplace/components/banner.vue
+++ b/src/views/dashboard/workplace/components/banner.vue
@@ -2,7 +2,7 @@
   <a-col class="banner">
     <a-col :span="8">
       <a-typography-title :heading="5" style="margin-top: 0">
-        {{ $t('workplace.welcome') }} {{ userInfo.nickname }}
+        欢迎回来！ {{ userInfo.nickname }}
       </a-typography-title>
     </a-col>
     <a-divider class="panel-border" />
diff --git a/src/views/dashboard/workplace/components/categories-percent.vue b/src/views/dashboard/workplace/components/categories-percent.vue
index 76bb51e..52258b8 100644
--- a/src/views/dashboard/workplace/components/categories-percent.vue
+++ b/src/views/dashboard/workplace/components/categories-percent.vue
@@ -8,7 +8,7 @@
       }"
     >
       <template #title>
-        {{ $t('workplace.categoriesPercent') }}
+        内容类型占比
       </template>
       <Chart height="310px" :option="chartOption" />
     </a-card>
diff --git a/src/views/dashboard/workplace/components/content-chart.vue b/src/views/dashboard/workplace/components/content-chart.vue
index 9d64538..5ada61c 100644
--- a/src/views/dashboard/workplace/components/content-chart.vue
+++ b/src/views/dashboard/workplace/components/content-chart.vue
@@ -6,10 +6,10 @@
       :body-style="{
         paddingTop: '20px',
       }"
-      :title="$t('workplace.contentData')"
+      title="内容数据"
     >
       <template #extra>
-        <a-link>{{ $t('workplace.viewMore') }}</a-link>
+        <a-link>查看更多</a-link>
       </template>
       <Chart height="289px" :option="chartOption" />
     </a-card>
diff --git a/src/views/dashboard/workplace/components/data-panel.vue b/src/views/dashboard/workplace/components/data-panel.vue
index e3dbeb6..37cbd9d 100644
--- a/src/views/dashboard/workplace/components/data-panel.vue
+++ b/src/views/dashboard/workplace/components/data-panel.vue
@@ -12,7 +12,7 @@
           >
         </a-avatar>
         <a-statistic
-          :title="$t('workplace.onlineContent')"
+          title="线上总内容"
           :value="373.5"
           :precision="1"
           :value-from="0"
@@ -20,7 +20,7 @@
           show-group-separator
         >
           <template #suffix>
-            W+ <span class="unit">{{ $t('workplace.pecs') }}</span>
+            W+ <span class="unit">个</span>
           </template>
         </a-statistic>
       </a-space>
@@ -37,14 +37,14 @@
           >
         </a-avatar>
         <a-statistic
-          :title="$t('workplace.putIn')"
+          title="投放中内容"
           :value="368"
           :value-from="0"
           animation
           show-group-separator
         >
           <template #suffix>
-            <span class="unit">{{ $t('workplace.pecs') }}</span>
+            <span class="unit">个</span>
           </template>
         </a-statistic>
       </a-space>
@@ -61,14 +61,14 @@
           >
         </a-avatar>
         <a-statistic
-          :title="$t('workplace.newDay')"
+          title="日新增评论"
           :value="8874"
           :value-from="0"
           animation
           show-group-separator
         >
           <template #suffix>
-            <span class="unit">{{ $t('workplace.pecs') }}</span>
+            <span class="unit">个</span>
           </template>
         </a-statistic>
       </a-space>
@@ -86,7 +86,7 @@
           >
         </a-avatar>
         <a-statistic
-          :title="$t('workplace.newFromYesterday')"
+          title="较昨日新增"
           :value="2.8"
           :precision="1"
           :value-from="0"
diff --git a/src/views/dashboard/workplace/components/docs.vue b/src/views/dashboard/workplace/components/docs.vue
index 506fae2..e98dd06 100644
--- a/src/views/dashboard/workplace/components/docs.vue
+++ b/src/views/dashboard/workplace/components/docs.vue
@@ -1,33 +1,33 @@
 <template>
   <a-card
     class="general-card"
-    :title="$t('workplace.docs')"
+    title="帮助文档"
     :header-style="{ paddingBottom: 0 }"
     :body-style="{ paddingTop: 0 }"
     style="height: 166px"
   >
     <template #extra>
-      <a-link>{{ $t('workplace.viewMore') }}</a-link>
+      <a-link>查看更多</a-link>
     </template>
     <a-row>
       <a-col :span="12">
         <a-link>
-          {{ $t('workplace.docs.productOverview') }}
+          产品概要
         </a-link>
       </a-col>
       <a-col :span="12">
         <a-link>
-          {{ $t('workplace.docs.userGuide') }}
+          使用指南
         </a-link>
       </a-col>
       <a-col :span="12">
         <a-link>
-          {{ $t('workplace.docs.workflow') }}
+          接入流程
         </a-link>
       </a-col>
       <a-col :span="12">
         <a-link>
-          {{ $t('workplace.docs.interfaceDocs') }}
+          接口文档
         </a-link>
       </a-col>
     </a-row>
diff --git a/src/views/dashboard/workplace/components/popular-content.vue b/src/views/dashboard/workplace/components/popular-content.vue
index 94bcbb1..fc7a716 100644
--- a/src/views/dashboard/workplace/components/popular-content.vue
+++ b/src/views/dashboard/workplace/components/popular-content.vue
@@ -6,10 +6,10 @@
       :body-style="{ padding: '17px 20px 21px 20px' }"
     >
       <template #title>
-        {{ $t('workplace.popularContent') }}
+        线上热门内容
       </template>
       <template #extra>
-        <a-link>{{ $t('workplace.viewMore') }}</a-link>
+        <a-link>查看更多</a-link>
       </template>
       <a-space direction="vertical" :size="10" fill>
         <a-radio-group
@@ -18,13 +18,13 @@
           @change="(typeChange as any)"
         >
           <a-radio value="text">
-            {{ $t('workplace.popularContent.text') }}
+            文本
           </a-radio>
           <a-radio value="image">
-            {{ $t('workplace.popularContent.image') }}
+            图片
           </a-radio>
           <a-radio value="video">
-            {{ $t('workplace.popularContent.video') }}
+            视频
           </a-radio>
         </a-radio-group>
         <a-table
diff --git a/src/views/dashboard/workplace/components/quick-operation.vue b/src/views/dashboard/workplace/components/quick-operation.vue
index de988ad..03a42df 100644
--- a/src/views/dashboard/workplace/components/quick-operation.vue
+++ b/src/views/dashboard/workplace/components/quick-operation.vue
@@ -1,12 +1,12 @@
 <template>
   <a-card
     class="general-card"
-    :title="$t('workplace.quick.operation')"
+    title="快捷操作"
     :header-style="{ paddingBottom: '0' }"
     :body-style="{ padding: '24px 20px 0 20px' }"
   >
     <template #extra>
-      <a-link>{{ $t('workplace.quickOperation.setup') }}</a-link>
+      <a-link>管理</a-link>
     </template>
     <a-row :gutter="8">
       <a-col v-for="link in links" :key="link.text" :span="8" class="wrapper">
@@ -14,7 +14,7 @@
           <component :is="link.icon" />
         </div>
         <a-typography-paragraph class="text">
-          {{ $t(link.text) }}
+          {{ link.text }}
         </a-typography-paragraph>
       </a-col>
     </a-row>
@@ -24,11 +24,11 @@
 
 <script lang="ts" setup>
 const links = [
-  { text: 'workplace.contentManagement', icon: 'icon-file' },
-  { text: 'workplace.contentStatistical', icon: 'icon-storage' },
-  { text: 'workplace.advanced', icon: 'icon-settings' },
-  { text: 'workplace.onlinePromotion', icon: 'icon-mobile' },
-  { text: 'workplace.contentPutIn', icon: 'icon-fire' },
+  { text: '内容管理', icon: 'icon-file' },
+  { text: '内容分析', icon: 'icon-storage' },
+  { text: '高级管理', icon: 'icon-settings' },
+  { text: '线上推广', icon: 'icon-mobile' },
+  { text: '内容投放', icon: 'icon-fire' },
 ]
 </script>
 
diff --git a/src/views/dashboard/workplace/components/recently-visited.vue b/src/views/dashboard/workplace/components/recently-visited.vue
index 8532b68..b042cb2 100644
--- a/src/views/dashboard/workplace/components/recently-visited.vue
+++ b/src/views/dashboard/workplace/components/recently-visited.vue
@@ -1,7 +1,7 @@
 <template>
   <a-card
     class="general-card"
-    :title="$t('workplace.recently.visited')"
+    title="最近访问"
     :header-style="{ paddingBottom: '0' }"
     :body-style="{ paddingTop: '26px' }"
   >
@@ -12,7 +12,7 @@
             <component :is="link.icon" />
           </div>
           <a-typography-paragraph class="text">
-            {{ $t(link.text) }}
+            {{ link.text }}
           </a-typography-paragraph>
         </a-col>
       </a-row>
@@ -23,15 +23,15 @@
 <script lang="ts" setup>
 const links = [
   {
-    text: 'workplace.contentManagement',
+    text: '内容管理',
     icon: 'icon-storage',
   },
   {
-    text: 'workplace.contentStatistical',
+    text: '内容分析',
     icon: 'icon-file',
   },
   {
-    text: 'workplace.advanced',
+    text: '高级管理',
     icon: 'icon-settings',
   },
 ]
diff --git a/src/views/dashboard/workplace/locale/en-US.ts b/src/views/dashboard/workplace/locale/en-US.ts
deleted file mode 100644
index f154d6a..0000000
--- a/src/views/dashboard/workplace/locale/en-US.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-export default {
-  'menu.dashboard.workplace': 'Workplace',
-  'workplace.welcome': 'Welcome!',
-  'workplace.balance': 'Balance (CNY)',
-  'workplace.order.pending': 'Pending',
-  'workplace.order.pendingRenewal': 'Renewal Order',
-  'workplace.onlineContent': 'Online Content',
-  'workplace.putIn': 'Put In',
-  'workplace.newDay': 'Daily Additional Comments',
-  'workplace.newFromYesterday': 'New From Yesterday',
-  'workplace.minute': 'Min',
-  'workplace.docs': 'Documents',
-  'workplace.docs.productOverview': 'Product Overview',
-  'workplace.docs.userGuide': 'User Guide',
-  'workplace.docs.workflow': 'Workflow',
-  'workplace.docs.interfaceDocs': 'Interface Docs',
-  //
-  'workplace.contentManagement': 'Content Management',
-  'workplace.contentStatistical': 'Content Statistical',
-  'workplace.advanced': 'Advanced',
-  'workplace.onlinePromotion': 'Online Promotion',
-  'workplace.contentPutIn': 'Put In',
-  'workplace.announcement': 'Announcement',
-  'workplace.recently.visited': 'Recently Visited',
-  'workplace.record.nodata': 'No data',
-  'workplace.quick.operation': 'Quick Operation',
-  'workplace.quickOperation.setup': 'Setup',
-  'workplace.allProject': 'All',
-  'workplace.loadMore': 'More',
-  'workplace.viewMore': 'More',
-  'workplace.contentData': 'Content Data',
-  'workplace.popularContent': 'Popular Content',
-  'workplace.popularContent.text': 'text',
-  'workplace.popularContent.image': 'image',
-  'workplace.popularContent.video': 'video',
-  'workplace.categoriesPercent': 'Categories Percent',
-  'workplace.pecs': 'pecs',
-}
diff --git a/src/views/dashboard/workplace/locale/zh-CN.ts b/src/views/dashboard/workplace/locale/zh-CN.ts
deleted file mode 100644
index f2f23d3..0000000
--- a/src/views/dashboard/workplace/locale/zh-CN.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-export default {
-  'menu.dashboard.workplace': '工作台',
-  'workplace.welcome': '欢迎回来！',
-  'workplace.balance': '余额（元）',
-  'workplace.order.pending': '待支付',
-  'workplace.order.pendingRenewal': '待续费订单',
-  'workplace.onlineContent': '线上总内容',
-  'workplace.putIn': '投放中内容',
-  'workplace.newDay': '日新增评论',
-  'workplace.newFromYesterday': '较昨日新增',
-  'workplace.minute': '分钟',
-  'workplace.docs': '帮助文档',
-  'workplace.docs.productOverview': '产品概要',
-  'workplace.docs.userGuide': '使用指南',
-  'workplace.docs.workflow': '接入流程',
-  'workplace.docs.interfaceDocs': '接口文档',
-  'workplace.contentManagement': '内容管理',
-  'workplace.contentStatistical': '内容分析',
-  'workplace.advanced': '高级管理',
-  'workplace.onlinePromotion': '线上推广',
-  'workplace.contentPutIn': '内容投放',
-  'workplace.announcement': '公告',
-  'workplace.recently.visited': '最近访问',
-  'workplace.record.nodata': '暂无数据',
-  'workplace.quick.operation': '快捷操作',
-  'workplace.quickOperation.setup': '管理',
-  'workplace.allProject': '所有项目',
-  'workplace.loadMore': '加载更多',
-  'workplace.viewMore': '查看更多',
-  'workplace.contentData': '内容数据',
-  'workplace.popularContent': '线上热门内容',
-  'workplace.popularContent.text': '文本',
-  'workplace.popularContent.image': '图片',
-  'workplace.popularContent.video': '视频',
-  'workplace.categoriesPercent': '内容类型占比',
-  'workplace.pecs': '个',
-}
diff --git a/src/views/login/components/banner.vue b/src/views/login/components/banner.vue
index e2b54a1..00d3247 100644
--- a/src/views/login/components/banner.vue
+++ b/src/views/login/components/banner.vue
@@ -16,24 +16,22 @@
 
 <script lang="ts" setup>
 import { computed } from 'vue'
-import { useI18n } from 'vue-i18n'
 import bannerImage from '@/assets/images/login-banner.png'
 
-const { t } = useI18n()
 const carouselItem = computed(() => [
   {
-    slogan: t('login.banner.slogan1'),
-    subSlogan: t('login.banner.subSlogan1'),
+    slogan: '开箱即用的高质量模板',
+    subSlogan: '丰富的的页面模板，覆盖大多数典型业务场景',
     image: bannerImage,
   },
   {
-    slogan: t('login.banner.slogan2'),
-    subSlogan: t('login.banner.subSlogan2'),
+    slogan: '内置了常见问题的解决方案',
+    subSlogan: '国际化，路由配置，状态管理应有尽有',
     image: bannerImage,
   },
   {
-    slogan: t('login.banner.slogan3'),
-    subSlogan: t('login.banner.subSlogan3'),
+    slogan: '接入可视化增强工具AUX',
+    subSlogan: '实现灵活的区块式开发',
     image: bannerImage,
   },
 ])
diff --git a/src/views/login/components/login-form.vue b/src/views/login/components/login-form.vue
index b38ab1e..34fdf6c 100644
--- a/src/views/login/components/login-form.vue
+++ b/src/views/login/components/login-form.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="login-form-wrapper">
-    <div class="login-form-title">{{ $t('login.form.title') }}</div>
-    <div class="login-form-sub-title">{{ $t('login.form.title') }}</div>
+    <div class="login-form-title">登录 Arco Design Pro</div>
+    <div class="login-form-sub-title">登录 Arco Design Pro</div>
     <div class="login-form-error-msg">{{ errorMessage }}</div>
     <a-form
       ref="loginForm"
@@ -12,13 +12,13 @@
     >
       <a-form-item
         field="username"
-        :rules="[{ required: true, message: $t('login.form.userName.errMsg') }]"
+        :rules="[{ required: true, message: '用户名不能为空' }]"
         :validate-trigger="['change', 'blur']"
         hide-label
       >
         <a-input
           v-model="userInfo.username"
-          :placeholder="$t('login.form.userName.placeholder')"
+          placeholder="用户名：admin"
         >
           <template #prefix>
             <icon-user />
@@ -27,13 +27,13 @@
       </a-form-item>
       <a-form-item
         field="password"
-        :rules="[{ required: true, message: $t('login.form.password.errMsg') }]"
+        :rules="[{ required: true, message: '密码不能为空' }]"
         :validate-trigger="['change', 'blur']"
         hide-label
       >
         <a-input-password
           v-model="userInfo.password"
-          :placeholder="$t('login.form.password.placeholder')"
+          placeholder="密码：admin"
           allow-clear
         >
           <template #prefix>
@@ -48,15 +48,15 @@
             :model-value="loginConfig.rememberPassword"
             @change="(setRememberPassword as any)"
           >
-            {{ $t('login.form.rememberPassword') }}
+            记住密码
           </a-checkbox>
-          <a-link>{{ $t('login.form.forgetPassword') }}</a-link>
+          <a-link>忘记密码</a-link>
         </div>
         <a-button type="primary" html-type="submit" long :loading="loading">
-          {{ $t('login.form.login') }}
+          登录
         </a-button>
         <a-button type="text" long class="login-form-register-btn">
-          {{ $t('login.form.register') }}
+          注册账号
         </a-button>
       </a-space>
     </a-form>
@@ -68,14 +68,12 @@ import { ref, reactive } from 'vue'
 import { useRouter } from 'vue-router'
 import { Message } from '@arco-design/web-vue'
 import { ValidatedError } from '@arco-design/web-vue/es/form/interface'
-import { useI18n } from 'vue-i18n'
 import { useStorage } from '@vueuse/core'
 import { useUserStore } from '@/store'
 import useLoading from '@/hooks/loading'
-import type { LoginData } from '@/types/modules/types'
+import type { LoginData } from '@/types/modules/system'
 
 const router = useRouter()
-const { t } = useI18n()
 const errorMessage = ref('')
 const { loading, setLoading } = useLoading()
 const userStore = useUserStore()
@@ -108,7 +106,7 @@ const handleSubmit = async ({
           ...othersQuery,
         },
       })
-      Message.success(t('login.form.login.success'))
+      Message.success('欢迎使用')
       const { rememberPassword } = loginConfig.value
       const { username, password } = values
       // 实际生产环境需要进行加密存储。
diff --git a/src/views/login/locale/en-US.ts b/src/views/login/locale/en-US.ts
deleted file mode 100644
index f624017..0000000
--- a/src/views/login/locale/en-US.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-export default {
-  'login.form.title': 'Login to Arco Design Pro',
-  'login.form.userName.errMsg': 'Username cannot be empty',
-  'login.form.password.errMsg': 'Password cannot be empty',
-  'login.form.login.errMsg': 'Login error, refresh and try again',
-  'login.form.login.success': 'welcome to use',
-  'login.form.userName.placeholder': 'Username: admin',
-  'login.form.password.placeholder': 'Password: admin',
-  'login.form.rememberPassword': 'Remember password',
-  'login.form.forgetPassword': 'Forgot password',
-  'login.form.login': 'login',
-  'login.form.register': 'register account',
-  'login.banner.slogan1': 'Out-of-the-box high-quality template',
-  'login.banner.subSlogan1':
-    'Rich page templates, covering most typical business scenarios',
-  'login.banner.slogan2': 'Built-in solutions to common problems',
-  'login.banner.subSlogan2':
-    'Internationalization, routing configuration, state management everything',
-  'login.banner.slogan3': 'Access visualization enhancement tool AUX',
-  'login.banner.subSlogan3': 'Realize flexible block development',
-}
diff --git a/src/views/login/locale/zh-CN.ts b/src/views/login/locale/zh-CN.ts
deleted file mode 100644
index 8fd1cf5..0000000
--- a/src/views/login/locale/zh-CN.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-export default {
-  'login.form.title': '登录 Arco Design Pro',
-  'login.form.userName.errMsg': '用户名不能为空',
-  'login.form.password.errMsg': '密码不能为空',
-  'login.form.login.errMsg': '登录出错，轻刷新重试',
-  'login.form.login.success': '欢迎使用',
-  'login.form.userName.placeholder': '用户名：admin',
-  'login.form.password.placeholder': '密码：admin',
-  'login.form.rememberPassword': '记住密码',
-  'login.form.forgetPassword': '忘记密码',
-  'login.form.login': '登录',
-  'login.form.register': '注册账号',
-  'login.banner.slogan1': '开箱即用的高质量模板',
-  'login.banner.subSlogan1': '丰富的的页面模板，覆盖大多数典型业务场景',
-  'login.banner.slogan2': '内置了常见问题的解决方案',
-  'login.banner.subSlogan2': '国际化，路由配置，状态管理应有尽有',
-  'login.banner.slogan3': '接入可视化增强工具AUX',
-  'login.banner.subSlogan3': '实现灵活的区块式开发',
-}
diff --git a/src/views/system/authority/index.vue b/src/views/system/authority/index.vue
index 7619b2f..ef6c52f 100644
--- a/src/views/system/authority/index.vue
+++ b/src/views/system/authority/index.vue
@@ -1,20 +1,20 @@
 <template>
   <div class="container">
-    <Breadcrumb :items="['menu.system', 'menu.system.authority']" />
-    <a-card class="general-card" :title="$t('menu.system.authority')">
+    <Breadcrumb :items="['系统管理', '权限与菜单管理']" />
+    <a-card class="general-card" title="权限与菜单管理">
       <template #extra>
         <a-space direction="horizontal" :size="18">
           <a-button type="primary">
             <template #icon>
               <icon-search />
             </template>
-            {{ $t('search') }}
+            搜索
           </a-button>
           <a-button>
             <template #icon>
               <icon-refresh />
             </template>
-            {{ $t('reset') }}
+            重置
           </a-button>
         </a-space>
       </template>
@@ -26,7 +26,7 @@
               <template #icon>
                 <icon-plus />
               </template>
-              {{ $t('create') }}
+              新增
             </a-button>
           </a-space>
         </a-col>
diff --git a/src/views/system/authority/locale/en-US.ts b/src/views/system/authority/locale/en-US.ts
deleted file mode 100644
index 2e7d45e..0000000
--- a/src/views/system/authority/locale/en-US.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export default {
-  'menu.system.authority': 'Authority System',
-}
diff --git a/src/views/system/authority/locale/zh-CN.ts b/src/views/system/authority/locale/zh-CN.ts
deleted file mode 100644
index 81f199d..0000000
--- a/src/views/system/authority/locale/zh-CN.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export default {
-  'menu.system.authority': '权限与菜单管理',
-}
diff --git a/src/views/system/role/components/authority-modal.vue b/src/views/system/role/components/authority-modal.vue
index 6f3e474..f2123a1 100644
--- a/src/views/system/role/components/authority-modal.vue
+++ b/src/views/system/role/components/authority-modal.vue
@@ -23,9 +23,7 @@ import { AModalConfig, initAModalConfig } from '@/types/global'
 import type { AuthorityVo } from '@/types/modules/system'
 import { getTreeData } from '@/api/system/authority'
 import { getAuthoritiesIdByRoleId, grantAuthorities } from '@/api/system/role-authority'
-import { TreeFieldNames } from '@arco-design/web-vue'
 
-const x: TreeFieldNames = ref()
 const modalConfig = reactive<AModalConfig>(initAModalConfig)
 const treeData = ref<AuthorityVo[]>([])
 const checkedKeys = ref<number[]>([])
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 802db87..8d73d17 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -1,20 +1,20 @@
 <template>
   <div class="container">
-    <Breadcrumb :items="['menu.system', 'menu.system.role']" />
-    <a-card class="general-card" :title="$t('menu.system.role')">
+    <Breadcrumb :items="['系统管理', '角色及授权管理']" />
+    <a-card class="general-card" title="角色及授权管理">
       <template #extra>
         <a-space direction="horizontal" :size="18">
           <a-button type="primary" @click="onSearch">
             <template #icon>
               <icon-search />
             </template>
-            {{ $t('search') }}
+            搜索
           </a-button>
           <a-button @click="onReset">
             <template #icon>
               <icon-refresh />
             </template>
-            {{ $t('reset') }}
+            重置
           </a-button>
         </a-space>
       </template>
@@ -27,7 +27,7 @@
               <template #icon>
                 <icon-plus />
               </template>
-              {{ $t('create') }}
+              新建
             </a-button>
           </a-space>
         </a-col>
diff --git a/src/views/system/role/locale/en-US.ts b/src/views/system/role/locale/en-US.ts
deleted file mode 100644
index e3372a9..0000000
--- a/src/views/system/role/locale/en-US.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export default {
-  'menu.system.role': 'Role System',
-}
diff --git a/src/views/system/role/locale/zh-CN.ts b/src/views/system/role/locale/zh-CN.ts
deleted file mode 100644
index 1f4862e..0000000
--- a/src/views/system/role/locale/zh-CN.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export default {
-  'menu.system.role': '角色及授权管理',
-}
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 386c270..e274b9b 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -1,20 +1,20 @@
 <template>
   <div class="container">
-    <Breadcrumb :items="['menu.system', 'menu.system.user']" />
-    <a-card class="general-card" :title="$t('menu.system.user')">
+    <Breadcrumb :items="['系统管理', '用户管理']" />
+    <a-card class="general-card" title="用户管理">
       <template #extra>
         <a-space direction="horizontal" :size="18">
           <a-button type="primary" @click="onSearch">
             <template #icon>
               <icon-search />
             </template>
-            {{ $t('search') }}
+            搜索
           </a-button>
           <a-button @click="onReset">
             <template #icon>
               <icon-refresh />
             </template>
-            {{ $t('reset') }}
+            重置
           </a-button>
         </a-space>
       </template>
@@ -26,50 +26,50 @@
       >
         <a-row :gutter="16">
           <a-col :xs="24" :sm="20" :md="12" :lg="8">
-            <a-form-item field="id" :label="$t('userTable.form.label.id')">
+            <a-form-item field="id" label="用户管理">
               <a-input
                 v-model="formModel.id"
                 allow-clear
-                :placeholder="$t('userTable.form.placeholder.id')"
+                placeholder="请输入用户编号"
               />
             </a-form-item>
           </a-col>
           <a-col :xs="24" :sm="20" :md="12" :lg="8">
             <a-form-item
               field="username"
-              :label="$t('userTable.form.label.username')"
+              label="用户名"
             >
               <a-input
                 v-model="formModel.username"
                 allow-clear
-                :placeholder="$t('userTable.form.placeholder.username')"
+                placeholder="请输入用户名"
               />
             </a-form-item>
           </a-col>
           <a-col :xs="24" :sm="20" :md="12" :lg="8">
             <a-form-item
               field="phone"
-              :label="$t('userTable.form.label.phone')"
+              label="手机号"
             >
               <a-input
                 v-model="formModel.phone"
                 allow-clear
-                :placeholder="$t('userTable.form.placeholder.phone')"
+                placeholder="请输入用户手机号"
               />
             </a-form-item>
           </a-col>
           <a-col :xs="24" :sm="20" :md="12" :lg="8">
             <a-form-item
               field="gender"
-              :label="$t('userTable.form.label.gender')"
+              label="性别"
             >
               <a-select
                 v-model="formModel.gender"
                 allow-clear
-                :placeholder="$t('all')"
+                placeholder="全部"
               >
-                <a-option :value="1">{{ $t('male') }}</a-option>
-                <a-option :value="0">{{ $t('female') }}</a-option>
+                <a-option :value="1">男</a-option>
+                <a-option :value="0">女</a-option>
               </a-select>
             </a-form-item>
           </a-col>
@@ -84,12 +84,12 @@
               <template #icon>
                 <icon-plus />
               </template>
-              {{ $t('userTable.operation.create') }}
+              新建
             </a-button>
             <a-upload action="/">
               <template #upload-button>
                 <a-button>
-                  {{ $t('userTable.operation.import') }}
+                  批量导入
                 </a-button>
               </template>
             </a-upload>
@@ -100,7 +100,7 @@
             <template #icon>
               <icon-download />
             </template>
-            {{ $t('userTable.operation.download') }}
+            下载
           </a-button>
         </a-col>
       </a-row>
@@ -197,7 +197,7 @@
           >
           </a-table-column>
           <a-table-column
-            :title="$t('userTable.columns.operations')"
+            title="操作"
             data-index="operations"
             :width="220"
             align="right"
@@ -205,14 +205,14 @@
           >
             <template #cell="{ record }">
               <a-button type="text" size="small" @click="openModalHandle(0, '用户信息预览', record.id)">
-                {{ $t('userTable.columns.operations.info') }}
+                预览
               </a-button>
               <a-button v-roles="['superadmin']" type="text" size="small" @click="openModalHandle(2, '用户信息编辑', record.id)">
-                {{ $t('userTable.columns.operations.edit') }}
+                编辑
               </a-button>
               <a-popconfirm :content="`确定删除 '${record.nickname}' 吗?`" type="warning" @ok="removeHandle(record.id)">
                 <a-button v-roles="['superadmin']" type="text" size="small" status="danger">
-                  {{ $t('userTable.columns.operations.delete') }}
+                  删除
                 </a-button>
               </a-popconfirm>
             </template>
diff --git a/src/views/system/user/locale/en-US.ts b/src/views/system/user/locale/en-US.ts
deleted file mode 100644
index cd66244..0000000
--- a/src/views/system/user/locale/en-US.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-export default {
-  'menu.system.user': 'User System',
-  'userTable.form.label.id': 'number',
-  'userTable.form.label.username': 'username',
-  'userTable.form.label.phone': 'phone',
-  'userTable.form.label.gender': 'gender',
-  'userTable.form.placeholder.id': 'Please enter user number',
-  'userTable.form.placeholder.username': 'Please enter username',
-  'userTable.form.placeholder.phone': 'Please enter user phone',
-  'userTable.form.placeholder.gender': 'Please enter user gender',
-  'all': 'All',
-  'male': 'male',
-  'female': 'female',
-  'userTable.operation.create': 'Create',
-  'userTable.operation.import': 'Import',
-  'userTable.operation.download': 'Download',
-  'userTable.columns.operations': 'Operations',
-  'userTable.columns.operations.info': 'Info',
-  'userTable.columns.operations.edit': 'Edit',
-  'userTable.columns.operations.delete': 'Delete',
-}
diff --git a/src/views/system/user/locale/zh-CN.ts b/src/views/system/user/locale/zh-CN.ts
deleted file mode 100644
index 0f86e03..0000000
--- a/src/views/system/user/locale/zh-CN.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-export default {
-  'menu.system.user': '用户管理',
-  'userTable.form.label.id': '编号',
-  'userTable.form.label.username': '用户名',
-  'userTable.form.label.phone': '手机号',
-  'userTable.form.label.gender': '性别',
-  'userTable.form.placeholder.id': '请输入用户编号',
-  'userTable.form.placeholder.username': '请输入用户名',
-  'userTable.form.placeholder.phone': '请输入用户手机号',
-  'userTable.form.placeholder.gender': '请输入用户性别',
-  'all': '全部',
-  'male': '男',
-  'female': '女',
-  'userTable.operation.create': '新建',
-  'userTable.operation.import': '批量导入',
-  'userTable.operation.download': '下载',
-  'userTable.columns.operations': '操作',
-  'userTable.columns.operations.info': '预览',
-  'userTable.columns.operations.edit': '编辑',
-  'userTable.columns.operations.delete': '删除',
-}
-- 
Gitee


From f30138cc1b596955e7d7aed8701032d059efbbc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BB=A4?= <2603820757@qq.com>
Date: Thu, 22 Sep 2022 19:34:27 +0800
Subject: [PATCH 10/11] =?UTF-8?q?:bug:=20=E5=88=B7=E6=96=B0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=8D=E6=98=BE=E7=A4=BAloading...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/user/index.ts         |  5 +----
 src/views/system/authority/index.vue |  8 ++++----
 src/views/system/role/index.vue      |  8 ++++----
 src/views/system/user/index.vue      | 12 ++++++------
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts
index 25d02fd..3ca3a84 100644
--- a/src/api/system/user/index.ts
+++ b/src/api/system/user/index.ts
@@ -1,10 +1,7 @@
 import axios from 'axios'
-import qs from 'query-string'
-import website from '@/config/website'
 import type { Pagination } from '@/types/global'
 import type {
-  LoginData,
-  ResToken, UserDto,
+  UserDto,
   UserInfo,
   UserVO,
 } from '@/types/modules/system'
diff --git a/src/views/system/authority/index.vue b/src/views/system/authority/index.vue
index ef6c52f..6269498 100644
--- a/src/views/system/authority/index.vue
+++ b/src/views/system/authority/index.vue
@@ -114,9 +114,9 @@ const openModalHandle = (type: 0 | 1 | 2, title: string, id = 0) => {
   infoModel.value.open(type, title, id)
 }
 
-const onSearch = () => {
+const onSearch = async () => {
   setLoading(true)
-  fetchData()
+  await fetchData()
   setLoading(false)
 }
 
@@ -127,9 +127,9 @@ const removeHandle = async (id: number) => {
   setLoading(false)
 }
 
-onBeforeMount(() => {
+onBeforeMount(async () => {
   setLoading(true)
-  fetchData()
+  await fetchData()
   setLoading(false)
 })
 </script>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 8d73d17..855c9f1 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -123,9 +123,9 @@ const grantAuthority = (id: number) => {
   authorityModal.value.open(id)
 }
 
-const onSearch = () => {
+const onSearch = async () => {
   setLoading(true)
-  fetchData()
+  await fetchData()
   setLoading(false)
 }
 
@@ -140,9 +140,9 @@ const removeHandle = async (id: number) => {
   setLoading(false)
 }
 
-onBeforeMount(() => {
+onBeforeMount(async () => {
   setLoading(true)
-  fetchData()
+  await fetchData()
   setLoading(false)
 })
 </script>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index e274b9b..f7ad0ea 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -247,9 +247,9 @@ const fetchData = async (page = 0, size = 10) => {
   renderData.value = data.content
 }
 
-const onSearch = () => {
+const onSearch = async () => {
   setLoading(true)
-  fetchData(0, 10)
+  await fetchData(0, 10)
   setLoading(false)
 }
 
@@ -258,9 +258,9 @@ const onReset = () => {
 }
 const pagination = { pageSize: 5, page: 1 }
 
-const pageChangeHandle = (page: number) => {
+const pageChangeHandle = async (page: number) => {
   setLoading(true)
-  fetchData(0, 10)
+  await fetchData(0, 10)
   setLoading(false)
 }
 
@@ -275,9 +275,9 @@ const openModalHandle = (type: 0 | 1 | 2, title: string, id?: number) => {
   infoModal.value.open(type, title, id)
 }
 
-onMounted(() => {
+onMounted(async () => {
   setLoading(true)
-  fetchData(0, 10)
+  await fetchData(0, 10)
   setLoading(false)
 })
 </script>
-- 
Gitee


From f00cdb53eea038219048768d633832e2a33b7fcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BB=A4?= <2603820757@qq.com>
Date: Sat, 24 Sep 2022 13:20:43 +0800
Subject: [PATCH 11/11] =?UTF-8?q?:bug:=20=E5=A4=9A=E7=AD=BE=E9=A1=B5?=
 =?UTF-8?q?=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/menu/index.vue      | 8 +++++++-
 src/store/modules/tab-bar/index.ts | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/menu/index.vue b/src/components/menu/index.vue
index 05d0346..8a48c5f 100644
--- a/src/components/menu/index.vue
+++ b/src/components/menu/index.vue
@@ -37,12 +37,18 @@
           return
         }
         // Eliminate external link side effects
-        const { hideInMenu, activeMenu } = item.meta as RouteMeta
+        const { hideInMenu, activeMenu, locale } = item.meta as RouteMeta
         if (route.name === item.name && !hideInMenu && !activeMenu) {
           selectedKey.value = [item.name as string]
           return
         }
         // Trigger router change
+        // router.getRoutes().some(r => r.name === item.name && !r.meta.locale).meta.locale = locale
+        router.getRoutes().forEach(r => {
+          if (r.name === item.name && !r.meta.locale) {
+            r.meta.locale = locale
+          }
+        })
         router.push({
           name: item.name,
         })
diff --git a/src/store/modules/tab-bar/index.ts b/src/store/modules/tab-bar/index.ts
index e6a9fdc..2fd981f 100644
--- a/src/store/modules/tab-bar/index.ts
+++ b/src/store/modules/tab-bar/index.ts
@@ -8,7 +8,7 @@ const formatTag = (route: RouteLocationNormalized): TagProps => {
     name, meta, fullPath, query,
   } = route
   return {
-    title: meta.locale || '',
+    title: meta.locale || String(name) || '',
     name: String(name),
     fullPath,
     query,
-- 
Gitee