From 17b68cbc951e5e59d991a4b9fb455833c0b41d81 Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Tue, 19 Nov 2024 16:01:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
frontend/src/api/index.ts | 3 ++-
frontend/src/api/user/interface/user.ts | 3 +++
.../src/layouts/components/Header/components/Avatar.vue | 4 ++++
frontend/src/stores/modules/dict.ts | 3 +++
frontend/src/views/login/components/LoginForm.vue | 7 +++----
5 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/frontend/src/api/index.ts b/frontend/src/api/index.ts
index c52f972..cf1c55d 100644
--- a/frontend/src/api/index.ts
+++ b/frontend/src/api/index.ts
@@ -42,7 +42,7 @@ class RequestHttp {
config.loading ?? (config.loading = true)
config.loading && showFullScreenLoading()
if (config.headers && typeof config.headers.set === 'function') {
- config.headers.set('x-access-token', userStore.token)
+ config.headers.set('Authorization', 'Bearer '+userStore.token)
}
return config
},
@@ -63,6 +63,7 @@ class RequestHttp {
// 登陆失效
if (data.code == ResultEnum.OVERDUE) {
userStore.setToken('')
+ userStore.setUserInfo({name: ''})
router.replace(LOGIN_URL)
ElMessage.error(data.message)
return Promise.reject(data)
diff --git a/frontend/src/api/user/interface/user.ts b/frontend/src/api/user/interface/user.ts
index 19e900a..362ce4b 100644
--- a/frontend/src/api/user/interface/user.ts
+++ b/frontend/src/api/user/interface/user.ts
@@ -8,6 +8,9 @@ export namespace Login {
}
export interface ResLogin {
accessToken: string;
+ userInfo:{
+ name: string;
+ }
}
export interface ResAuthButtons {
[key: string]: string[];
diff --git a/frontend/src/layouts/components/Header/components/Avatar.vue b/frontend/src/layouts/components/Header/components/Avatar.vue
index dcfa024..4beee31 100644
--- a/frontend/src/layouts/components/Header/components/Avatar.vue
+++ b/frontend/src/layouts/components/Header/components/Avatar.vue
@@ -49,7 +49,9 @@ import ThemeSetting from "./components/ThemeSetting.vue";
import Message from "./components/Message.vue";
import Fullscreen from "./components/Fullscreen.vue";
import { useAuthStore } from "@/stores/modules/auth";
+import {useDictStore} from "@/stores/modules/dict";
const userStore = useUserStore();
+const dictStore = useDictStore();
const username = computed(() => userStore.userInfo.name);
const router = useRouter();
const authStore = useAuthStore();
@@ -64,6 +66,8 @@ const logout = () => {
await logoutApi();
// 2.清除 Token
userStore.setToken("");
+ userStore.setUserInfo({name: ""});
+ dictStore.setDictData([]);
// 3.重定向到登陆页
router.replace(LOGIN_URL);
ElMessage.success("退出登录成功!");
diff --git a/frontend/src/stores/modules/dict.ts b/frontend/src/stores/modules/dict.ts
index fb869e2..e37e779 100644
--- a/frontend/src/stores/modules/dict.ts
+++ b/frontend/src/stores/modules/dict.ts
@@ -13,6 +13,9 @@ export const useDictStore = defineStore({
}),
getters: {},
actions: {
+ setDictData(data: Dict[]) {
+ this.dictData = data
+ },
// 获取字典数据数组,如果为空则返回空数组
getDictData(code: string) {
if (!this.dictData.length) {
diff --git a/frontend/src/views/login/components/LoginForm.vue b/frontend/src/views/login/components/LoginForm.vue
index f8fae69..e0b1087 100644
--- a/frontend/src/views/login/components/LoginForm.vue
+++ b/frontend/src/views/login/components/LoginForm.vue
@@ -67,15 +67,13 @@ import { initDynamicRouter } from '@/routers/modules/dynamicRouter'
import { CircleClose, UserFilled } from '@element-plus/icons-vue'
import { useAuthStore } from '@/stores/modules/auth'
import type { ElForm } from 'element-plus'
-import md5 from 'md5'
+import {useDictStore} from "@/stores/modules/dict";
const authStore = useAuthStore()
const router = useRouter()
const userStore = useUserStore()
const tabsStore = useTabsStore()
const keepAliveStore = useKeepAliveStore()
-import { useDictStore } from '@/stores/modules/dict'
-import { onMounted } from 'vue'
const dictStore = useDictStore()
@@ -103,9 +101,10 @@ const login = (formEl: FormInstance | undefined) => {
// 1.执行登录接口
const { data } = await loginApi({
...loginForm,
- password: md5(loginForm.password),
+ password: loginForm.password,
})
userStore.setToken(data.accessToken)
+ userStore.setUserInfo(data.userInfo)
const response = await getDictList()
const dictData = response.data as unknown as Dict[]
await dictStore.initDictData(dictData)
From f6595f784adee2255276f8c82b7e0cec948ab9df Mon Sep 17 00:00:00 2001
From: sjl <1716605279@qq.com>
Date: Wed, 20 Nov 2024 11:02:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
frontend/src/languages/modules/en.ts | 1 +
frontend/src/languages/modules/zh.ts | 1 +
.../components/Header/components/Avatar.vue | 9 +++
frontend/src/stores/modules/mode.ts | 26 +++++++
.../resource/components/resourcePopup.vue | 17 +++-
.../authority/user/components/userPopup.vue | 1 -
frontend/src/views/home/index.vue | 1 +
frontend/src/views/home/tabs/model.vue | 8 +-
frontend/src/views/system/base/index.vue | 77 ++++++++++++++-----
.../src/views/system/versionRegister/index.ts | 0
.../views/system/versionRegister/index.vue | 54 +++++++++++++
11 files changed, 168 insertions(+), 27 deletions(-)
create mode 100644 frontend/src/stores/modules/mode.ts
delete mode 100644 frontend/src/views/system/versionRegister/index.ts
create mode 100644 frontend/src/views/system/versionRegister/index.vue
diff --git a/frontend/src/languages/modules/en.ts b/frontend/src/languages/modules/en.ts
index 2ea0a70..8653fb0 100644
--- a/frontend/src/languages/modules/en.ts
+++ b/frontend/src/languages/modules/en.ts
@@ -25,6 +25,7 @@ export default {
personalData: "Personal Data",
changePassword: "Change Password",
changeMode:"Change Mode",
+ versionRegister:"Version Register",
logout: "Logout"
}
};
diff --git a/frontend/src/languages/modules/zh.ts b/frontend/src/languages/modules/zh.ts
index ce576f1..ea95310 100644
--- a/frontend/src/languages/modules/zh.ts
+++ b/frontend/src/languages/modules/zh.ts
@@ -25,6 +25,7 @@ export default {
personalData: "个人信息",
changePassword: "修改密码",
changeMode:"模式切换",
+ versionRegister:"版本注册",
logout: "退出登录"
}
};
diff --git a/frontend/src/layouts/components/Header/components/Avatar.vue b/frontend/src/layouts/components/Header/components/Avatar.vue
index dcfa024..ce7c60e 100644
--- a/frontend/src/layouts/components/Header/components/Avatar.vue
+++ b/frontend/src/layouts/components/Header/components/Avatar.vue
@@ -19,6 +19,9 @@
{{ $t("header.changeMode") }}
+
+ {{ $t("header.versionRegister") }}
+
@@ -29,6 +32,8 @@
+
+
\ No newline at end of file