From d705c1fff4f6dcb08eda795229c98567dd5ec9f8 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期一, 31 七月 2023 10:42:21 +0800
Subject: [PATCH] Merge tag 'v1.1.5发布' into develop
---
h5/apph5/request/api.js | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/h5/apph5/request/api.js b/h5/apph5/request/api.js
index ead5e02..f7e443d 100644
--- a/h5/apph5/request/api.js
+++ b/h5/apph5/request/api.js
@@ -1,12 +1,13 @@
import Request from './index.js'
import md5 from'../utils/md5.js'
+import comUtils from '../utils/ComUtils.js'
let request = new Request().http;
function get(url, data) {
//鑾峰彇token
let header={
- token:getUrlPar("token")
+ dfgsessionkey:comUtils.getUrlPar("dfgtoken")
}
return request({
url: url,
@@ -18,9 +19,7 @@
function post(url, data) {
//鑾峰彇token
- let header={
- token:getUrlPar("token")
- }
+
let keysList=Object.keys(data);
let enstr="";
if(keysList&&keysList.length>0)
@@ -30,24 +29,22 @@
enstr+=value+ (JSON.stringify(data[value]).replace(/^\"|\"$/g,''));
})
}
- enstr="dfg"+enstr+"apph5";
+ let userToken=comUtils.getUrlPar("dfgtoken");
+ enstr="dfg"+enstr+"apph5"+userToken;
enstr=md5.hex_md5(enstr);
- header = Object.assign({
+ enstr+='.'+userToken
+ /* header = Object.assign({
'dfgsessionkey': enstr
- },header)
+ },header) */
+ let header={
+ dfgsessionkey:enstr
+ }
return request({
url: url,
method: 'POST',
data: data,
header: header,
})
-}
-
-function getUrlPar(name) {
- var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
- var r = window.location.search.substr(1).match(reg);
- if (r != null) return unescape(r[2]);
- return null;
}
let api = {
--
Gitblit v1.9.3