From c97d01f4d1c98bedec0e53aca91d21c78eecf9e6 Mon Sep 17 00:00:00 2001 From: 819527061@qq.com <123456> Date: 星期五, 26 七月 2024 08:48:23 +0800 Subject: [PATCH] feture:更改ip --- api/request.js | 58 +++++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 47 insertions(+), 11 deletions(-) diff --git a/api/request.js b/api/request.js index be2601b..269a97a 100644 --- a/api/request.js +++ b/api/request.js @@ -1,13 +1,35 @@ import { globalApi } from '@/api/globalApi.js'; +import { + apiLoginPassword +} from './publicInterface'; // 鎴愬姛 const responseOK = (response) => { const { data } = response; + test(data); return data; +} +const test = (obj) => { + if (obj instanceof Array) { + obj.forEach(e => { + test(e); + }) + } else if (obj instanceof Object) { + for (let key in obj) { + if (obj[key] == null) { + obj[key] = ""; + } else { + if (obj[key] instanceof Array || obj[key] instanceof Object) { + test(obj[key]) + } + } + } + } + } // 鍝嶅簲澶辫触鐨勪緷璧栨�� @@ -78,17 +100,22 @@ 500: responseError } -// const BaseUrl = "http://192.168.31.18:9997" -// const webSocketUrl = "ws://192.168.31.18:9997/wrzs/ws/info" +// const BaseUrl = "http://192.168.0.110:9896" +// const webSocketUrl = "ws://192.168.0.110:9896/wrzs/ws/info" -const BaseUrl = "http://192.168.31.14:9997"; -const webSocketUrl = "ws://192.168.31.14:9997/wrzs/ws/info" -// // 绾夸笂寮�鍙� -// const BaseUrl = "http://hesuancj.cn:9997"; -// const webSocketUrl = "ws://hesuancj.cn:9997/wrzs/ws/info" -// // 绾夸笂鐢熶骇 -// const BaseUrl = "https://mx.jzeg.cn:9095"; -// const webSocketUrl = "wss://mx.jzeg.cn:9095/wrzs/ws/info" +// const BaseUrl = "http://192.168.0.22:9896" +// const webSocketUrl = "ws://192.168.0.22:9896/wrzs/ws/info" + +// export const onlineurl = 'https://mx.jzeg.cn:9195'; +export const onlineurl = 'https://mr3.res.jzeg.cn:9195'; +// const BaseUrl = "http://192.168.0.100:9997"; +// const webSocketUrl = "ws://192.168.0.100:9997/wrzs/ws/info" + +// const BaseUrl = "http://192.168.0.108:9997"; +// const webSocketUrl = "ws://192.168.0.108:9997/wrzs/ws/info" +// 绾夸笂鐢熶骇 +const BaseUrl = 'https://mr3.res.jzeg.cn:9195'; +const webSocketUrl = "wss://mr3.res.jzeg.cn:9195/wrzs/ws/info" // 璇锋眰鎷︽埅 @@ -103,7 +130,8 @@ if (uni.getStorageSync('token')) { header = { "Authorization": "Bearer" + ' ' + uni.getStorageSync('token'), - "CLIENT_TOC": "Y", + "clientToc": "Y", + 'CLIENT_TOC': 'Y', } } @@ -117,9 +145,17 @@ return new Promise((resolve, reject) => { let options = {} + if (opt.data) { + Object.keys(opt.data).map(key => { + if (opt.data[key] == '' || opt.data[key] == "") { + opt.data[key] = null; + } + }); + } Object.keys(opt).map(key => { if (key !== "params") { + return options[key] = opt[key] } }) -- Gitblit v1.9.1