From 245895f78be2ed25a615608a092490a4042a906b Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期一, 29 九月 2025 17:43:08 +0800
Subject: [PATCH] test
---
api/index.js | 49 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 37 insertions(+), 12 deletions(-)
diff --git a/api/index.js b/api/index.js
index 30d2fdb..d058214 100644
--- a/api/index.js
+++ b/api/index.js
@@ -1,7 +1,7 @@
import http from '../libs/mobox.api.js';
import {
Base64
-} from '@/js/Base64.js';
+} from '@/js/Base64.js';
import utils from "@/js/utils.js"
import {
login as loginOrg,
@@ -176,29 +176,54 @@
isMobox3Web(server)
if (app.globalData.isMobox3) { //鍒ゆ柇鍦板潃鏄惁鏄疢obox3
const mobox3Ports = utils.session.getValue('mobox3_port');
- const orgsport = mobox3Ports.org || 5101
- const moboxsport = mobox3Ports.mobox || 5102
- const datasport = mobox3Ports.data || 5103
+ const mobox3Servers = utils.session.getValue('mobox3_server');
+
+ const orgsport = mobox3Ports?.org || 5101
+ const moboxsport = mobox3Ports?.mobox || 5102
+ const datasport = mobox3Ports?.data || 5103
+
+ const orgsIp = mobox3Servers?.org || ""
+ const moboxsIp = mobox3Servers?.mobox || ""
+ const datasIp = mobox3Servers?.data || ""
var orgSApi = "http://" + ser[0].split(':')[0] + ":" + orgsport + "/";
- var mobxoSApi = "http://" + ser[0].split(':')[0] + ":" + moboxsport + "/";
+ var moboxSApi = "http://" + ser[0].split(':')[0] + ":" + moboxsport + "/";
var dataSApi = "http://" + ser[0].split(':')[0] + ":" + datasport + "/";
+
if (server.includes("://")) {
orgSApi = ser[0] + "//" + ser[2].split(':')[0] + ":" + orgsport + "/";
- mobxoSApi = ser[0] + "//" + ser[2].split(':')[0] + ":" + moboxsport + "/";
+ moboxSApi = ser[0] + "//" + ser[2].split(':')[0] + ":" + moboxsport + "/";
dataSApi = ser[0] + "//" + ser[2].split(':')[0] + ":" + datasport + "/";
+ }
+ if (orgsIp) {
+ orgSApi = "http://" + orgsIp + ":" + orgsport + "/";
+ if (orgsIp.includes("://")) {
+ orgSApi = orgsIp + ":" + orgsport + "/";
+ }
+ }
+ if (moboxsIp) {
+ moboxSApi = "http://" + moboxsIp + ":" + moboxsport + "/";
+ if (moboxsIp.includes("://")) {
+ moboxSApi = moboxsIp + ":" + moboxsport + "/";
+ }
+ }
+ if (datasIp) {
+ dataSApi = "http://" + datasIp + ":" + datasport + "/";
+ if (datasIp.includes("://")) {
+ dataSApi = datasIp + ":" + datasport + "/";
+ }
}
app.globalData.mobox3ApiUrl = {
org: orgSApi,
data: dataSApi,
- mobox: mobxoSApi,
+ mobox: moboxSApi,
}
- loginOrg(id, pwd).then((res)=>{
+ loginOrg(id, pwd).then((res) => {
resolve(res)
- }).catch((rej)=>{
+ }).catch((rej) => {
reject(rej)
})
-
+
} else {
var header = {
'content-type': 'application/x-www-form-urlencoded'
@@ -218,9 +243,9 @@
url,
header,
data,
- }).then((res)=>{
+ }).then((res) => {
resolve(res)
- }).catch((rej)=>{
+ }).catch((rej) => {
reject(rej)
})
}
--
Gitblit v1.9.1