From b1694e84d944caede47cc816483b38bdba1f0cb4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 26 二月 2024 15:04:08 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/utils/timer-task.js | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/utils/timer-task.js b/src/utils/timer-task.js
index d9e54bc..8faff16 100644
--- a/src/utils/timer-task.js
+++ b/src/utils/timer-task.js
@@ -26,14 +26,18 @@
} else {
let _param = {
func: 's_get_timers_role',
- LText: `select '${window.GLOB.appkey || ''}','${uuid}'`,
+ LText: `select '${window.GLOB.appkey || ''}','${uuid}'`, // 鍙敤鍋氬瘑閽ラ獙璇侊紝宸叉棤鏁�
timer_type: interval,
component_id: uuid
}
+
+ 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) {
--
Gitblit v1.8.0