From 9e0407331a97477996ef3624fb30ec43c557b75c Mon Sep 17 00:00:00 2001
From: zhoutianchi <1305666981@qq.com>
Date: Sat, 28 Feb 2026 17:38:37 +0800
Subject: [PATCH 1/3] 1

---
 src/components/tools/commondict.vue           |  2 +-
 src/router/index.ts                           | 24 ++++++++++++++--
 src/stores/userInfo.ts                        | 28 +++++++++++--------
 src/views/professional/teacherbase/index.vue  |  4 +--
 .../recruitstudentsignup/detaiform.vue        |  4 +--
 .../recruit/recruitstudentsignup/dormFW.vue   |  2 +-
 .../recruitstudentsignup/majorChange.vue      |  2 +-
 .../recruit/recruitstudentsignup/showMap.vue  |  2 +-
 vite.config.ts                                |  1 +
 9 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/src/components/tools/commondict.vue b/src/components/tools/commondict.vue
index a5abb9c..ff623d1 100644
--- a/src/components/tools/commondict.vue
+++ b/src/components/tools/commondict.vue
@@ -17,7 +17,7 @@
 <script>
 
     const HEATH='heath'
-    const TEACHER_CATE='teacher_cate'
+    const TEACHER_CATE='professional_teacher_cate'
     const EXAM_STATUS="EXAM_STATUS"
 
     //技能提升
diff --git a/src/router/index.ts b/src/router/index.ts
index 7111cb6..9f64543 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -5,6 +5,7 @@ import pinia from '/@/stores/index';
 import { storeToRefs } from 'pinia';
 import { useKeepALiveNames } from '/@/stores/keepAliveNames';
 import { useRoutesList } from '/@/stores/routesList';
+import { useUserInfo } from '/@/stores/userInfo';
 import { Session } from '/@/utils/storage';
 import { staticRoutes, notFoundAndNoPower } from '/@/router/route';
 import { initBackEndControlRoutes } from '/@/router/backEnd';
@@ -91,6 +92,18 @@ export function formatTwoStageRoutes(arr: any) {
 router.beforeEach(async (to, from, next) => {
 	NProgress.configure({ showSpinner: false });
 	if (to.name) NProgress.start();
+
+	// 全局监听 URL 参数 token：若存在则写入缓存（与登录成功同一方法），不在此处 redirect，避免先跳转再 init 导致 tagsView 首次丢失
+	const urlToken = to.query?.token as string | undefined;
+	if (urlToken) {
+		useUserInfo().setTokenCache(urlToken, to.query?.refresh_token as string | undefined);
+	}
+	// 若上面刚写了 token，后续用去掉 token 的 query 做一次 replace（在 init 之后统一做，保证只一次导航、tagsView 能正确加 tag）
+	const stripTokenQuery =
+		urlToken && to.query
+			? Object.fromEntries(Object.entries(to.query).filter(([k]) => k !== 'token' && k !== 'refresh_token'))
+			: null;
+
 	const token = Session.getToken();
 	if (to.meta.isAuth !== undefined && !to.meta.isAuth) {
 		next();
@@ -117,9 +130,16 @@ router.beforeEach(async (to, from, next) => {
 			if (routesList.value.length === 0) {
 				// 后端控制路由：路由数据初始化，防止刷新时丢失
 				await initBackEndControlRoutes();
-				next({ path: to.path, query: to.query });
+				// 只传 path/params/query，让路由器用刚添加的动态路由重新解析，避免沿用进入守卫时解析到的 404
+				const query = stripTokenQuery ?? to.query;
+				next({ path: to.path, params: to.params, query, replace: true });
 			} else {
-				next();
+				// 已有路由列表，若本次是带 token 的 URL，做一次 replace 去掉地址栏 token
+				if (stripTokenQuery) {
+					next({ path: to.path, params: to.params, query: stripTokenQuery, replace: true });
+				} else {
+					next();
+				}
 			}
 		}
 	}
diff --git a/src/stores/userInfo.ts b/src/stores/userInfo.ts
index 986b0ca..8ed17a0 100644
--- a/src/stores/userInfo.ts
+++ b/src/stores/userInfo.ts
@@ -20,6 +20,18 @@ export const useUserInfo = defineStore('userInfo', {
 	}),
 
 	actions: {
+		/**
+		 * 统一写入 token 到缓存（登录成功、URL 参数 token 等共用）
+		 * @param token 访问令牌
+		 * @param refreshToken 刷新令牌，可选
+		 */
+		setTokenCache(token: string, refreshToken?: string) {
+			Session.set('token', token);
+			if (refreshToken != null && refreshToken !== '') {
+				Session.set('refresh_token', refreshToken);
+			}
+		},
+
 		/**
 		 * 登录方法
 		 * @function login
@@ -35,9 +47,7 @@ export const useUserInfo = defineStore('userInfo', {
 				login(data)
 					.then((res) => {
 						debugger
-						// 存储token 信息
-						Session.set('token', res.access_token);
-						Session.set('refresh_token', res.refresh_token);
+						this.setTokenCache(res.access_token, res.refresh_token);
 						Local.remove('roleCode');
 						Local.remove('roleName');
 						Local.remove('roleId');
@@ -61,9 +71,7 @@ export const useUserInfo = defineStore('userInfo', {
 			return new Promise((resolve, reject) => {
 				loginByMobile(data.mobile, data.code)
 					.then((res) => {
-						// 存储token 信息
-						Session.set('token', res.access_token);
-						Session.set('refresh_token', res.refresh_token);
+						this.setTokenCache(res.access_token, res.refresh_token);
 						resolve(res);
 					})
 					.catch((err) => {
@@ -85,9 +93,7 @@ export const useUserInfo = defineStore('userInfo', {
 			return new Promise((resolve, reject) => {
 				loginBySocial(state, code)
 					.then((res) => {
-						// 存储token 信息
-						Session.set('token', res.access_token);
-						Session.set('refresh_token', res.refresh_token);
+						this.setTokenCache(res.access_token, res.refresh_token);
 						resolve(res);
 					})
 					.catch((err) => {
@@ -108,9 +114,7 @@ export const useUserInfo = defineStore('userInfo', {
 				const refreshToken = Session.get('refresh_token');
 				refreshTokenApi(refreshToken)
 					.then((res) => {
-						// 存储token 信息
-						Session.set('token', res.access_token);
-						Session.set('refresh_token', res.refresh_token);
+						this.setTokenCache(res.access_token, res.refresh_token);
 						resolve(res);
 					})
 					.catch((err) => {
diff --git a/src/views/professional/teacherbase/index.vue b/src/views/professional/teacherbase/index.vue
index dbcd279..48c0a47 100644
--- a/src/views/professional/teacherbase/index.vue
+++ b/src/views/professional/teacherbase/index.vue
@@ -2248,10 +2248,10 @@
     fetchSecondTree()
     await Promise.all([
       // 批量获取字典数据 religious_belief宗教信仰  health健康状况 teacher_cate授课类型 teacher_classify职位类别 yes_no_type是否类型
-      getDictsByTypes(['religious_belief', 'heath', 'teacher_cate', 'teacher_classify', 'yes_no_type']).then((response: any) => {
+      getDictsByTypes(['religious_belief', 'heath', 'professional_teacher_cate', 'teacher_classify', 'yes_no_type']).then((response: any) => {
         religiousBeliefDic.value = response.data.religious_belief;
         healthList.value = response.data.heath;
-        teacherCateList.value = response.data.teacher_cate;
+        teacherCateList.value = response.data.professional_teacher_cate;
         teacherClassifyData.value = response.data.teacher_classify || [];
         inoutFlagOptions.value = response.data.yes_no_type || [];       
       }),
diff --git a/src/views/recruit/recruitstudentsignup/detaiform.vue b/src/views/recruit/recruitstudentsignup/detaiform.vue
index c39bb1c..13d9eab 100644
--- a/src/views/recruit/recruitstudentsignup/detaiform.vue
+++ b/src/views/recruit/recruitstudentsignup/detaiform.vue
@@ -1099,10 +1099,10 @@ const init = (id: string | null, typeParam: number, groupId?: string) => {
     areaHomeAreaList.value = []
     
     // 批量获取数据字典（新增和编辑都需要）  文化程度  学费 代办费  户口性质  学校归属地
-    getDictsByTypes(['id_type','finance_student_source', 'agency_fee', 'tuition_fee','house_hold_properties','recruit_school_form']).then((res: any) => {
+    getDictsByTypes(['id_type','finance_student_source', 'recruit_agency_fee', 'tuition_fee','house_hold_properties','recruit_school_form']).then((res: any) => {
       idCardTypeList.value = res.data.id_type || []
       eduList.value = res.data.finance_student_source || []
-      agencyFeeList.value = res.data.agency_fee || []
+      agencyFeeList.value = res.data.recruit_agency_fee || []
       tuitionFeeList.value = res.data.tuition_fee || []
       residenceTypeList.value = res.data.house_hold_properties || []
       schoolFromList.value = res.data.recruit_school_form || []
diff --git a/src/views/recruit/recruitstudentsignup/dormFW.vue b/src/views/recruit/recruitstudentsignup/dormFW.vue
index d787902..ab039cb 100644
--- a/src/views/recruit/recruitstudentsignup/dormFW.vue
+++ b/src/views/recruit/recruitstudentsignup/dormFW.vue
@@ -103,7 +103,7 @@ const init = () => {
   canSubmit.value = true
   circleShow.value = true
   nextTick(() => {
-    getDicts("dorm_jw").then((data: any) => {
+    getDicts("recruit_dorm_jw").then((data: any) => {
       const arr = data.data
       arr.forEach((e: any) => {
         if (e.label == 'bj') {
diff --git a/src/views/recruit/recruitstudentsignup/majorChange.vue b/src/views/recruit/recruitstudentsignup/majorChange.vue
index db1eee5..6d3153d 100644
--- a/src/views/recruit/recruitstudentsignup/majorChange.vue
+++ b/src/views/recruit/recruitstudentsignup/majorChange.vue
@@ -311,7 +311,7 @@ const init = (id: string | null) => {
     dataFormRef.value?.resetFields()
     if (dataForm.id) {
       // 获取数据字典代办费
-      getDicts('agency_fee').then((res: any) => {
+      getDicts('recruit_agency_fee').then((res: any) => {
         agencyFeeList.value = res.data
         getObj(dataForm.id).then((response: any) => {
           Object.assign(dataForm, response.data)
diff --git a/src/views/recruit/recruitstudentsignup/showMap.vue b/src/views/recruit/recruitstudentsignup/showMap.vue
index d5c6b34..e85e437 100644
--- a/src/views/recruit/recruitstudentsignup/showMap.vue
+++ b/src/views/recruit/recruitstudentsignup/showMap.vue
@@ -56,7 +56,7 @@ const init = (row: any) => {
   form.homeLng = row.homeLng || row.homeLongitude || 0
   form.homeLat = row.homeLat || row.homeLatitude || 0
   nextTick(() => {
-    getDicts("dorm_jw").then((data: any) => {
+    getDicts("recruit_dorm_jw").then((data: any) => {
       const arr = data.data
       arr.forEach((e: any) => {
         if (e.label == 'bj') {
diff --git a/vite.config.ts b/vite.config.ts
index 4eb67fc..7e8c2b9 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -62,6 +62,7 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
 			port: env.VITE_PORT as unknown as number, // 服务器端口号
 			open: env.VITE_OPEN === 'true', // 是否自动打开浏览器
 			hmr: true, // 启用热更新
+			allowedHosts: ['mycomputer.top'],
 			proxy: {
 				'/api': {
 					target: env.VITE_ADMIN_PROXY_PATH, // 目标服务器地址

From c24432ea9b56e4fce14352dc8bad07d84012acd6 Mon Sep 17 00:00:00 2001
From: zhoutianchi <1305666981@qq.com>
Date: Sat, 28 Feb 2026 18:40:13 +0800
Subject: [PATCH 2/3] 1

---
 .env                                          |  7 +++-
 src/api/login/index.ts                        | 20 ++++++++---
 src/stores/userInfo.ts                        |  1 -
 src/utils/other.ts                            | 16 ++++++++-
 .../home/widgets/components/calendar.vue      | 34 +++++++++----------
 5 files changed, 54 insertions(+), 24 deletions(-)

diff --git a/.env b/.env
index 4894efd..d4c866d 100644
--- a/.env
+++ b/.env
@@ -16,9 +16,14 @@ VITE_API_URL = /api
 # ADMIN 服务地址
 VITE_ADMIN_PROXY_PATH = http://scj-v3.zhxy.link/
 
-# 前端加密密钥
+# 前端加密密钥（AES，未启用 SM2 时使用）
 VITE_PWD_ENC_KEY='pigxpigxpigxpigx'
 
+# 登录使用 SM2 加密密码：设为 true 时密码用 SM2 公钥加密，需后端配置 security.sm2-private-key
+VITE_LOGIN_SM2_ENABLE=true
+# SM2 公钥（十六进制，04 开头 130 字符），与后端私钥成对
+VITE_SM2_PUBLIC_KEY=04de67d5234bb13b5bbe524a71d1e48ac302014be3c3c6ba74b33bb5a125717b0e8873ad3971a6082138e0556a7ec334d460458c6c46753b65acc93ec1b99bb8fd
+
 # OAUTH2 密码模式客户端信息
 VITE_OAUTH2_PASSWORD_CLIENT='pig:pig'
 
diff --git a/src/api/login/index.ts b/src/api/login/index.ts
index f1df6f4..167f009 100644
--- a/src/api/login/index.ts
+++ b/src/api/login/index.ts
@@ -2,7 +2,7 @@ import request from '/@/utils/request';
 import { Session } from '/@/utils/storage';
 import { validateNull } from '/@/utils/validate';
 import { useUserInfo } from '/@/stores/userInfo';
-import other from '/@/utils/other';
+import other, { sm2Encrypt } from '/@/utils/other';
 
 /**
  * https://www.ietf.org/rfc/rfc6749.txt
@@ -10,6 +10,11 @@ import other from '/@/utils/other';
  */
 const FORM_CONTENT_TYPE = 'application/x-www-form-urlencoded';
 
+/** 登录是否使用 SM2 加密密码（需后端配置 SM2 私钥并支持 Enc-Flag: sm2） */
+const LOGIN_SM2_ENABLE = import.meta.env.VITE_LOGIN_SM2_ENABLE === 'true';
+/** SM2 公钥（十六进制，与后端私钥成对），用于前端加密密码 */
+const SM2_PUBLIC_KEY = import.meta.env.VITE_SM2_PUBLIC_KEY || '';
+
 // 登录方式
 export enum LoginTypeEnum {
 	PASSWORD,
@@ -47,8 +52,15 @@ export enum SocialLoginEnum {
 export const login = (data: any) => {
 	const basicAuth = 'Basic ' + window.btoa(import.meta.env.VITE_OAUTH2_PASSWORD_CLIENT);
 	Session.set('basicAuth', basicAuth);
-	// 密码加密
-	const encPassword = other.encryption(data.password, import.meta.env.VITE_PWD_ENC_KEY);
+	let encPassword: string;
+	let encFlag: string;
+	if (LOGIN_SM2_ENABLE && SM2_PUBLIC_KEY) {
+		encPassword = sm2Encrypt(data.password, SM2_PUBLIC_KEY);
+		encFlag = 'sm2';
+	} else {
+		encPassword = other.encryption(data.password, import.meta.env.VITE_PWD_ENC_KEY);
+		encFlag = 'false';
+	}
 	const { username, randomStr, code, grant_type, scope } = data;
 	return request({
 		url: '/auth/oauth2/token',
@@ -59,7 +71,7 @@ export const login = (data: any) => {
 			skipToken: true,
 			Authorization: basicAuth,
 			'Content-Type': FORM_CONTENT_TYPE,
-			"Enc-Flag": "false",
+			'Enc-Flag': encFlag,
 		},
 	});
 };
diff --git a/src/stores/userInfo.ts b/src/stores/userInfo.ts
index 8ed17a0..fd43023 100644
--- a/src/stores/userInfo.ts
+++ b/src/stores/userInfo.ts
@@ -42,7 +42,6 @@ export const useUserInfo = defineStore('userInfo', {
 		async login(data:any) {
 			data.grant_type = 'password';
 			data.scope = 'server';
-
 			return new Promise((resolve, reject) => {
 				login(data)
 					.then((res) => {
diff --git a/src/utils/other.ts b/src/utils/other.ts
index cc226c1..31e2b51 100644
--- a/src/utils/other.ts
+++ b/src/utils/other.ts
@@ -9,7 +9,7 @@ import {verifyUrl} from '/@/utils/toolsValidate';
 import request from '/@/utils/request';
 import {useMessage} from '/@/hooks/message';
 import * as CryptoJS from 'crypto-js';
-import {sm4} from 'sm-crypto'
+import { sm4, sm2 } from 'sm-crypto'
 import {validateNull} from './validate';
 
 
@@ -240,6 +240,17 @@ export function sm4Decryption(src: string, keyWord: string) {
     return sm4.decrypt(src, keyWord);
 }
 
+/**
+ * SM2 加密（登录密码等，与后端 SM2 私钥解密配套）
+ * @param msg 明文
+ * @param publicKey 后端提供的 SM2 公钥（十六进制，04 开头 130 字符或 128 字符压缩格式）
+ * @returns 十六进制密文，格式 C1C3C2
+ */
+export function sm2Encrypt(msg: string, publicKey: string): string {
+    if (!msg || !publicKey) return msg;
+    return sm2.doEncrypt(msg, publicKey, 1);
+}
+
 /**
  * Base64 加密
  * @param {*} src  明文
@@ -370,6 +381,9 @@ const other = {
     decryption: (src: string, keyWord: string) => {
         return decryption(src, keyWord);
     },
+    sm2Encrypt: (msg: string, publicKey: string) => {
+        return sm2Encrypt(msg, publicKey);
+    },
     base64Encrypt: (data: any) => {
         return base64Encrypt(data);
     },
diff --git a/src/views/home/widgets/components/calendar.vue b/src/views/home/widgets/components/calendar.vue
index 88a1b1c..c3f9709 100644
--- a/src/views/home/widgets/components/calendar.vue
+++ b/src/views/home/widgets/components/calendar.vue
@@ -145,23 +145,23 @@ const changeSwitch = async (id: string) => {
 
 const initscheduleList = () => {
 	// 初始化日程列表
-	list({
-		startDate: startDateRef.value,
-		endDate: endDateRef.value,
-	}).then((res) => {
-		// 获取返回结果的数据并转换为合适的格式
-		reminders.value = res.data.map((item: any) => {
-			return {
-				key: item.id,
-				highlight: {
-					color: 'primary',
-					fillMode: 'outline',
-				},
-				dates: item.scheduleDate,
-				customData: item,
-			};
-		});
-	});
+	// list({
+	// 	startDate: startDateRef.value,
+	// 	endDate: endDateRef.value,
+	// }).then((res) => {
+	// 	// 获取返回结果的数据并转换为合适的格式
+	// 	reminders.value = res.data.map((item: any) => {
+	// 		return {
+	// 			key: item.id,
+	// 			highlight: {
+	// 				color: 'primary',
+	// 				fillMode: 'outline',
+	// 			},
+	// 			dates: item.scheduleDate,
+	// 			customData: item,
+	// 		};
+	// 	});
+	// });
 };
 
 // 过滤日历中选中的单元格是否有日程

From 9d6b11a414e418e8c2e5098ef9cab87b3c7e0acd Mon Sep 17 00:00:00 2001
From: zhoutianchi <1305666981@qq.com>
Date: Sat, 28 Feb 2026 18:43:18 +0800
Subject: [PATCH 3/3] 1

---
 src/api/admin/audit.ts                          | 11 ++++++-----
 src/views/home/widgets/components/flow-data.vue |  6 +++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/api/admin/audit.ts b/src/api/admin/audit.ts
index e42519d..554a61e 100644
--- a/src/api/admin/audit.ts
+++ b/src/api/admin/audit.ts
@@ -1,11 +1,12 @@
 import request from '/@/utils/request';
 
 export function fetchList(query?: Object) {
-	return request({
-		url: '/admin/audit/page',
-		method: 'get',
-		params: query,
-	});
+	// return request({
+	// 	url: '/admin/audit/page',
+	// 	method: 'get',
+	// 	params: query,
+	// });
+	return null
 }
 
 export function getObj(id?: string) {
diff --git a/src/views/home/widgets/components/flow-data.vue b/src/views/home/widgets/components/flow-data.vue
index ff15ea0..fff772d 100644
--- a/src/views/home/widgets/components/flow-data.vue
+++ b/src/views/home/widgets/components/flow-data.vue
@@ -80,9 +80,9 @@ const state = reactive({
 
 onMounted(async () => {
 	try {
-		const { data } = await queryTaskData();
-		state.pendingNum = Number.parseInt(data?.pendingNum || 0);
-		state.copyNum = Number.parseInt(data?.copyNum || 0);
+		// const { data } = await queryTaskData();
+		// state.pendingNum = Number.parseInt(data?.pendingNum || 0);
+		// state.copyNum = Number.parseInt(data?.copyNum || 0);
 	} catch (error) {
 		// 避免没有启动 flow模块 vue 组件渲染 warning
 	}