chore: merge dev into master

Author: lltx

.env

@@ -11,7 +11,7 @@ VITE_API_URL = /api
 VITE_ADMIN_PROXY_PATH = http://localhost:9999
 
 # 前端加密密钥
-VITE_PWD_ENC_KEY='pigpigpigpig0000'
+VITE_PWD_ENC_KEY='thanks,pig4cloud'
 
 # OAUTH2 密码模式客户端信息
 VITE_OAUTH2_PASSWORD_CLIENT='pig:pig'

package.json

@@ -25,7 +25,7 @@
 		"echarts": "5.6.0",
 		"element-plus": "2.13.7",
 		"js-base64": "3.7.8",
-		"js-cookie": "3.0.7",
+		"js-cookie": "3.0.8",
 		"lodash": "4.18.1",
 		"mitt": "3.0.1",
 		"nprogress": "0.2.0",
@@ -35,7 +35,7 @@
 		"sortablejs": "1.15.7",
 		"splitpanes": "3.2.0",
 		"v-calendar": "3.1.2",
-		"vue": "3.5.34",
+		"vue": "3.5.35",
 		"vue-clipboard3": "2.0.0",
 		"vue-echarts": "7.0.3",
 		"vue-i18n": "9.2.2",
@@ -45,14 +45,14 @@
 	},
 	"devDependencies": {
 		"@types/crypto-js": "4.2.2",
-		"@types/node": "22.19.19",
+		"@types/node": "22.19.20",
 		"@types/nprogress": "0.2.3",
 		"@types/sm-crypto": "0.3.4",
 		"@types/sortablejs": "1.15.9",
 		"@typescript-eslint/eslint-plugin": "5.53.0",
 		"@typescript-eslint/parser": "5.53.0",
 		"@vitejs/plugin-vue": "5.2.4",
-		"@vue/compiler-sfc": "3.5.34",
+		"@vue/compiler-sfc": "3.5.35",
 		"autoprefixer": "10.4.27",
 		"cross-env": "7.0.3",
 		"daisyui": "3.9.4",

src/stores/userInfo.ts

@@ -1,7 +1,6 @@
-import { Local, Session, STORAGE_KEYS } from '/@/utils/storage';
+import { Cookie, Local, Session, STORAGE_KEYS } from '/@/utils/storage';
 import { getUserInfo, login, loginByMobile, loginBySocial, refreshTokenApi, SocialLoginEnum } from '/@/api/login/index';
 import { useMessage } from '/@/hooks/message';
-import Cookies from 'js-cookie';
 
 /**
  * @function useUserInfo
@@ -148,13 +147,13 @@ export const useUserInfo = defineStore('userInfo', {
 		 * @function updateDeptInfo
 		 * @param {string} deptId - 部门ID
 		 */
-		updateDeptInfo(deptId: String) {
+		updateDeptInfo(deptId: string) {
 			this.userInfos.deptId = deptId;
 
 			// 保存部门信息到本地
 			Session.set(STORAGE_KEYS.DEPT_ID, deptId);
 			Local.set(STORAGE_KEYS.DEPT_ID, deptId);
-			Cookies.set(STORAGE_KEYS.DEPT_ID, deptId);
+			Cookie.set(STORAGE_KEYS.DEPT_ID, deptId);
 		},
 	},
 });

src/utils/storage.ts

@@ -12,6 +12,26 @@ export const STORAGE_KEYS = {
 
 const LOCAL_STORAGE_KEY_PREFIX = `${__NEXT_NAME__}${__VERSION__}:`;
 
+/**
+ * js-cookie 统一包装
+ * @description 全局 Cookie 读写统一走此对象，业务代码不直接 import 'js-cookie'，
+ * 便于后续统一调整 Cookie 属性（path、expires、secure 等）
+ */
+export const Cookie = {
+	// 写入 Cookie，options 透传 js-cookie 的属性配置
+	set(key: string, val: string, options?: object) {
+		Cookies.set(key, val, options);
+	},
+	// 读取 Cookie，不存在时返回 undefined
+	get(key: string): string | undefined {
+		return Cookies.get(key);
+	},
+	// 移除 Cookie
+	remove(key: string) {
+		Cookies.remove(key);
+	},
+};
+
 /**
  * 判断 key 是否需要同步写入 Cookie
  * @description token、refresh_token、deptId 在写入 sessionStorage 的同时也需要写入 Cookie，
@@ -22,6 +42,17 @@ function isCookieBackedSessionKey(key: string) {
 	return key === STORAGE_KEYS.TOKEN || key === STORAGE_KEYS.REFRESH_TOKEN || key === STORAGE_KEYS.DEPT_ID;
 }
 
+/**
+ * 为存储键统一追加应用前缀，localStorage 与 sessionStorage 共用
+ * @description 已带前缀的 key 原样返回，避免重复拼接
+ */
+function setStorageKey(key: string) {
+	if (key.startsWith(LOCAL_STORAGE_KEY_PREFIX)) {
+		return key;
+	}
+	return `${LOCAL_STORAGE_KEY_PREFIX}${key}`;
+}
+
 /**
  * 安全读取并解析 sessionStorage 中的 JSON 值
  * @description Session.get 和 cookie-backed key 的兜底逻辑共用此函数，
@@ -49,7 +80,7 @@ function getSessionStorageValue(key: string) {
 export const Local = {
 	// 查看 v2.4.3版本更新日志
 	setKey(key: string) {
-		return `${LOCAL_STORAGE_KEY_PREFIX}${key}`;
+		return setStorageKey(key);
 	},
 	// 设置永久缓存
 	set<T>(key: string, val: T) {
@@ -86,39 +117,43 @@ export const Local = {
  * @method clear 移除全部临时缓存
  */
 export const Session = {
+	// 与 Local 保持一致的键名前缀规则；Cookie 键保持原名，供网关和请求拦截器按原名读取
+	setKey(key: string) {
+		return setStorageKey(key);
+	},
 	// 设置临时缓存
 	set(key: string, val: any) {
 		if (val === undefined || val === null) {
 			return;
 		}
 		if (isCookieBackedSessionKey(key)) {
-			Cookies.set(key, val);
+			Cookie.set(key, val);
 		}
-		window.sessionStorage.setItem(key, JSON.stringify(val));
+		window.sessionStorage.setItem(Session.setKey(key), JSON.stringify(val));
 	},
 	// 获取临时缓存
 	get(key: string) {
-		if (isCookieBackedSessionKey(key)) return Cookies.get(key) || getSessionStorageValue(key);
-		return getSessionStorageValue(key);
+		if (isCookieBackedSessionKey(key)) return Cookie.get(key) || getSessionStorageValue(Session.setKey(key));
+		return getSessionStorageValue(Session.setKey(key));
 	},
 	// 移除临时缓存
 	remove(key: string) {
-		if (isCookieBackedSessionKey(key)) Cookies.remove(key);
-		window.sessionStorage.removeItem(key);
+		if (isCookieBackedSessionKey(key)) Cookie.remove(key);
+		window.sessionStorage.removeItem(Session.setKey(key));
 	},
 	// 移除全部临时缓存
-		clear() {
-			Cookies.remove(STORAGE_KEYS.TOKEN);
-			Cookies.remove(STORAGE_KEYS.REFRESH_TOKEN);
-			Cookies.remove(STORAGE_KEYS.DEPT_ID);
-			window.sessionStorage.clear();
-		},
+	clear() {
+		Cookie.remove(STORAGE_KEYS.TOKEN);
+		Cookie.remove(STORAGE_KEYS.REFRESH_TOKEN);
+		Cookie.remove(STORAGE_KEYS.DEPT_ID);
+		window.sessionStorage.clear();
+	},
 	// 获取当前存储的 token
 	getToken() {
 		return this.get(STORAGE_KEYS.TOKEN);
 	},
-		// 获取当前的部门
-		getDeptId() {
+	// 获取当前的部门
+	getDeptId() {
 		return Local.get(STORAGE_KEYS.DEPT_ID) ? Local.get(STORAGE_KEYS.DEPT_ID) : '';
 	},
 };

src/views/login/component/social.vue

@@ -68,7 +68,7 @@
 </template>
 
 <script setup lang="ts" name="loginSocial">
-import Cookies from 'js-cookie';
+import { Cookie, STORAGE_KEYS } from '/@/utils/storage';
 import other from '/@/utils/other';
 import { getLoginAppList } from '/@/api/admin/social';
 import { useMessage } from '/@/hooks/message';
@@ -167,7 +167,7 @@ const { pause, resume } = useIntervalFn(
 		// 检查弹出窗口是否已关闭
 		if (winOpen.value && winOpen.value.closed) {
 			cleanup();
-			if (Cookies.get('token')) {
+			if (Cookie.get(STORAGE_KEYS.TOKEN)) {
 				emit('signInSuccess');
 			}
 		}