From ba4d6e414fbb37121e80815d3f5ab1aca7a60b08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 28 十月 2024 13:59:34 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/views/interface/workspace/request/index.jsx |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/views/interface/workspace/request/index.jsx b/src/views/interface/workspace/request/index.jsx
index 5c2536c..a73885e 100644
--- a/src/views/interface/workspace/request/index.jsx
+++ b/src/views/interface/workspace/request/index.jsx
@@ -95,7 +95,8 @@
     } else if (config.active === 'raw') {
       if (config.raw) {
         try {
-          raws = JSON.parse(config.raw)
+          raws = config.raw.replace(/@userid@/ig, sessionStorage.getItem('UserID') || '').replace(/@LoginUID@/ig, sessionStorage.getItem('LoginUID') || '')
+          raws = JSON.parse(raws)
         } catch (e) {
           Modal.error({
             title: '鍙傛暟鏍煎紡閿欒锛屽繀椤讳负JSON鏍煎紡锛�'
@@ -157,6 +158,7 @@
     } else if (/dostars/ig.test(url)) {
       if (n) {
         n = JSON.parse(n)
+
         n = this.encryptParam(n)
         n = JSON.stringify(n)
       }
@@ -200,13 +202,13 @@
   }
 
   encryptParam (param) {
-    param.nonc = Utils.getuuid()
+    param.nonc = param.nonc || Utils.getuuid()
       
     let keys = Object.keys(param).sort()
     let values = ''
     keys.forEach(key => {
-      if (key.toLowerCase() === 'rduri') return
-      if (key.toLowerCase() === 't' || key.toLowerCase() === 'sign' || param[key] === undefined) {
+      if (key.toLowerCase() === 'rduri' || key === 't') return
+      if (key.toLowerCase() === 'sign' || param[key] === undefined) {
         delete param[key]
         return
       }
@@ -220,8 +222,12 @@
         values += key + param[key]
       }
     })
+
     param.sign = md5(values)
-    param.t = new Date().getTime()
+    param.t = param.t || new Date().getTime()
+
+    window.mkInfo(values)
+    window.mkInfo(param.sign)
 
     return param
   }
@@ -279,6 +285,7 @@
                 <Radio value={'formData'}>formData</Radio>
                 <Radio value={'raw'}>raw</Radio>
               </Radio.Group>
+              {active === 'raw' ? <span style={{float: 'right', color: '#a5a5a5', fontSize: '13px'}}>娉細浣跨敤@userid@銆丂loginuid@鏃跺皢鑷姩鏇挎崲銆�</span> : null}
             </div>
             <div className={'body-content ' + (active === 'none' ? 'show' : '')}>
               <div className="no-body">This request does not have a body</div>

--
Gitblit v1.8.0