tieshengkeji/npm-tool
1
0
Fork 0
Code Pull Requests Actions Packages Releases Activity

fix：修复全局参数加密时不生效

Browse Source
This commit is contained in:
曾文豪
2025-01-03 17:03:57 +08:00
parent 471a76568c
commit ab15a55d7d
1 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/https/TsHttpUtil.js
View File

@@ -87,8 +87,7 @@ async function req(url, options) {
} }
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
request(url, { request(url, {
...dealParamsBody(options), ...dealParamsBody(options), headers: {
headers: {
...options.headers, token: Storage.getUserToken() || '', ...options.headers, token: Storage.getUserToken() || '',
}, },
}) })
@@ -123,12 +122,12 @@ async function req(url, options) {
*/ */
async function get(url, params = {}, options = {}) { async function get(url, params = {}, options = {}) {
let obj = {...params} let obj = {...params}
if(GlobalConfig.getConfig().httpParams){ if (GlobalConfig.getConfig().httpParams) {
obj = {...params,...GlobalConfig.getConfig().httpParams()}; obj = {...params, ...GlobalConfig.getConfig().httpParams()};
} }
return req(url, {...options, method: 'GET', params:obj}); return req(url, {...options, method: 'GET', params: obj});
} }
/** /**
@@ -139,19 +138,15 @@ async function get(url, params = {}, options = {}) {
*/ */
async function post(url, data = {}, options = {}) { async function post(url, data = {}, options = {}) {
let newData = {} let newData = {...data};
if (GlobalConfig.getConfig().httpParams) {
newData = {...data, ...GlobalConfig.getConfig().httpParams()};
}
if (Storage.getEncryptBody()) { if (Storage.getEncryptBody()) {
newData.encryptData = crypto.encrypt(JSON.stringify(data)); newData = {
} else { 'encryptData': crypto.encrypt(JSON.stringify(newData))
};
newData = {...data};
if(GlobalConfig.getConfig().httpParams){
newData = {...data,...GlobalConfig.getConfig().httpParams()};
}
} }
return req(url, {...options, method: 'POST', data: newData}); return req(url, {...options, method: 'POST', data: newData});
@@ -170,8 +165,5 @@ async function form(url, data = {}, options = {}) {
module.exports = { module.exports = {
req, req, get, post, form,
get,
post,
form,
} }