From fab7226afbe777d4dcec258f059813e6dadab141 Mon Sep 17 00:00:00 2001 From: jiang Date: Mon, 29 Jul 2024 19:23:39 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/bonus.js | 1 + src/utils/request.js | 16 ++++++++------- src/utils/validate.js | 4 ++-- src/views/login1.vue | 10 ++++++++-- src/views/register1.vue | 7 ++----- src/views/system/log/abnormalLog/index.vue | 2 +- src/views/system/log/businessLog/index.vue | 2 +- src/views/system/log/systemLog/index.vue | 2 +- src/views/system/menu/index.vue | 2 ++ src/views/system/role/index.vue | 14 ++++++------- src/views/system/user/index.vue | 23 +++++++++++++++------- vue.config.js | 2 +- 12 files changed, 51 insertions(+), 34 deletions(-) diff --git a/src/utils/bonus.js b/src/utils/bonus.js index 792bafcd..6087abac 100644 --- a/src/utils/bonus.js +++ b/src/utils/bonus.js @@ -206,6 +206,7 @@ export function handleTree(data, id, parentId, children) { * @param {*} params 参数 */ export function tansParams(params) { + console.log(params) let result = '' for (const propName of Object.keys(params)) { const value = params[propName]; diff --git a/src/utils/request.js b/src/utils/request.js index 7b7bec78..fb1ff47f 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -89,13 +89,12 @@ service.interceptors.request.use( let formData = tansParams(config.data) if (formData) { formData = formData.slice(0, -1) - const encryptedData = encryptCBC(formData) - config.data = { formData: encryptedData } + config.data = encryptCBC(formData) + console.log(config.data) config.headers['Params-Hash'] = hashWithSM3AndSalt(config.data) // 添加参数哈希到请求头 } } else { - const encryptedData = encryptCBC(JSON.stringify(config.data)) - config.data = `formData=${encryptedData}` + config.data = encryptCBC('formData=' + JSON.stringify(config.data)) config.headers['Params-Hash'] = hashWithSM3AndSalt(config.data) // 添加参数哈希到请求头 } } @@ -187,10 +186,13 @@ export function download(url, params, filename, config) { spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.7)' }) - + console.log(params) return service.post(url, params, { - transformRequest: [(params) => tansParams(params)], - headers: { 'Content-Type': 'application/x-www-form-urlencoded', encryption: 'encryption' }, + transformRequest: [(params) => params], + headers: { + 'Content-Type': 'application/x-www-form-urlencoded', + 'Params-Hash': hashWithSM3AndSalt(params) + }, responseType: 'blob', ...config }).then(async(data) => { diff --git a/src/utils/validate.js b/src/utils/validate.js index b0078bc7..8326c806 100644 --- a/src/utils/validate.js +++ b/src/utils/validate.js @@ -105,14 +105,14 @@ export function validatePassword(rule, value, callback) { return callback(new Error('请输入密码')) } - const lengthRegex = /^.{8,}$/ + const lengthRegex = /^.{8,20}$/; const uppercaseRegex = /[A-Z]/ const lowercaseRegex = /[a-z]/ const digitRegex = /\d/ const specialCharRegex = /[!@#$%^&*(),.?":{}|<>]/ if (!lengthRegex.test(value)) { - return callback(new Error('密码必须至少为8个字符')) + return callback(new Error('密码长度必须为8到20位')); } const checks = [ diff --git a/src/views/login1.vue b/src/views/login1.vue index 7ebbbe8e..46cf73c7 100644 --- a/src/views/login1.vue +++ b/src/views/login1.vue @@ -75,7 +75,7 @@ :disabled="isSendingCode || !loginForm.code" class="send-code-button" > - {{ isSendingCode ? `${countdown}s` : '获取验证码' }} + {{ countdown === 0 ? '获取验证码' : `${countdown}s` }} @@ -226,6 +226,12 @@ export default { }) }, sendCode() { + let form = new FormData + + form.append('13123', '123123') + console.log(form.getAll("13123")) + + if (!this.loginForm.code) { this.$message.error('请先填写验证码') return @@ -243,7 +249,7 @@ export default { this.countdown -= 1 if (this.countdown <= 0) { clearInterval(timer) - this.isSendingCode = false + /* this.isSendingCode = false */ } }, 1000) }) diff --git a/src/views/register1.vue b/src/views/register1.vue index a76900c8..9dee5f7a 100644 --- a/src/views/register1.vue +++ b/src/views/register1.vue @@ -98,6 +98,7 @@