From c0e017668d780c40f85230f227ea0160b5d22d4d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 20 二月 2024 14:13:00 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/components/resetPassword/index.jsx | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/components/resetPassword/index.jsx b/src/components/resetPassword/index.jsx
index a72283a..71ca86a 100644
--- a/src/components/resetPassword/index.jsx
+++ b/src/components/resetPassword/index.jsx
@@ -60,10 +60,14 @@
func: 's_PwdUpt',
LText: `select '${res.originpwd}','${res.password}'`
}
+
+ if (window.GLOB.execType === 'x') {
+ _param.exec_type = 'x'
+ }
- _param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') // 鏃堕棿鎴�
- _param.LText = Utils.formatOptions(_param.LText) // 鍏抽敭瀛楃鏇挎崲锛宐ase64鍔犲瘑
- _param.secretkey = Utils.encrypt(_param.LText, _param.timestamp) // md5瀵嗛挜
+ _param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ _param.LText = Utils.formatOptions(_param.LText, _param.exec_type)
+ _param.secretkey = Utils.encrypt(window.GLOB.execType === 'x' ? '' : _param.LText, _param.timestamp)
Api.getSystemConfig(_param).then(result => {
if (result.status) {
@@ -125,10 +129,14 @@
mob: this.state.mob,
check_code: this.state.code
}
+
+ if (window.GLOB.execType === 'x') {
+ _param.exec_type = 'x'
+ }
- _param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') // 鏃堕棿鎴�
- _param.LText = Utils.formatOptions(_param.LText) // 鍏抽敭瀛楃鏇挎崲锛宐ase64鍔犲瘑
- _param.secretkey = Utils.encrypt(_param.LText, _param.timestamp) // md5瀵嗛挜
+ _param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
+ _param.LText = Utils.formatOptions(_param.LText, _param.exec_type)
+ _param.secretkey = Utils.encrypt(window.GLOB.execType === 'x' ? '' : _param.LText, _param.timestamp)
Api.getSystemConfig(_param).then(result => {
if (result.status) {
@@ -169,6 +177,7 @@
onOk={this.resetPwdSubmit}
onCancel={() => { this.setState({ visible: false })}}
okText={okText}
+ cancelText="鍙栨秷"
confirmLoading={loading}
destroyOnClose
>
--
Gitblit v1.8.0