RISE/school-developer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/developer' into developer

Browse Source
This commit is contained in:
吴红兵
2026-03-01 11:23:00 +08:00
parent 3bfa9889c4 9d6b11a414
commit e723377c70
15 changed files with 110 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/api/admin/audit.ts
View File

@@ -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) {

20
src/api/login/index.ts
View File

@@ -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,
},
});
};

2
src/components/tools/commondict.vue
View File

@@ -17,7 +17,7 @@
<script>
const HEATH='heath'
const TEACHER_CATE='teacher_cate'
const TEACHER_CATE='professional_teacher_cate'
const EXAM_STATUS="EXAM_STATUS"
//技能提升

24
src/router/index.ts
View File

@@ -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();
}
}
}
}

29
src/stores/userInfo.ts
View File

@@ -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
@@ -30,14 +42,11 @@ 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) => {
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 +70,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 +92,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 +113,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) => {

16
src/utils/other.ts
View File

@@ -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);
},

34
src/views/home/widgets/components/calendar.vue
View File

@@ -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,
// };
// });
// });
};
// 过滤日历中选中的单元格是否有日程

6
src/views/home/widgets/components/flow-data.vue
View File

@@ -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
}

4
src/views/professional/teacherbase/index.vue
View File

@@ -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 || [];
}),

4
src/views/recruit/recruitstudentsignup/detaiform.vue
View File

@@ -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 || []

2
src/views/recruit/recruitstudentsignup/dormFW.vue
View File

@@ -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') {

2
src/views/recruit/recruitstudentsignup/majorChange.vue
View File

@@ -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)

2
src/views/recruit/recruitstudentsignup/showMap.vue
View File

@@ -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') {