From d8872903e30f0a53abefcd279ae03258341e931f Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期四, 20 三月 2025 09:10:31 +0800
Subject: [PATCH] test
---
api/index.js | 200 +++++++++++++++++++++++++++++--------------------
1 files changed, 119 insertions(+), 81 deletions(-)
diff --git a/api/index.js b/api/index.js
index 79459df..1f064d6 100644
--- a/api/index.js
+++ b/api/index.js
@@ -63,7 +63,7 @@
let verCode = versionInfo[2].replace(".apk", "").replace(".", "").replace(
".", ""); //鏈嶅姟绔増鏈彿
let dldUrl = openinfo +
- "/Program/" +
+ "Program/" +
verName; //app涓嬭浇閾炬帴this.
resolve({
verName,
@@ -72,7 +72,8 @@
dldUrl
});
} else {
- return reject("璁块棶澶辫触锛岀姸鎬佺爜锛� + res.statusCode);
+ // return reject("璁块棶澶辫触锛岀姸鎬佺爜锛� + res.statusCode);
+ resolve({})
}
},
@@ -111,7 +112,7 @@
const verCode = ret.data?.VersionCode || ""; //鐗堟湰缂栫爜
const verNum = ret.data?.Version || ""; //鏈嶅姟绔増鏈彿
let dldUrl = openinfo +
- "/Program/" +
+ "Program/" +
verName; //app涓嬭浇閾炬帴this.
resolve({
verName,
@@ -148,70 +149,80 @@
*/
export const login = (server, id, pwd) => {
- if (!server) {
- reject({
- "errMsg": '鏈嶅姟鍣ㄥ湴鍧�笉鑳戒负绌�'
- });
- }
- if (!id || id.length < 2) {
- reject({
- "errMsg": '璐﹀彿鏈�煭涓�2 涓瓧绗�'
- });
- }
- if (!pwd || pwd.length < 1) {
- reject({
- "errMsg": '瀵嗙爜鏈�煭涓�1涓瓧绗�'
- });
- }
- const app = getApp()
- var openinfo = "http://" + server + "/";
- if (server.includes("://")) {
- openinfo = server + "/"
- }
- var ser = server.toLowerCase().split('/');
- 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
-
- var orgSApi = "http://" + ser[0].split(':')[0] + ":" + orgsport + "/";
- var mobxoSApi = "http://" + ser[0].split(':')[0] + ":" + moboxsport + "/";
- var dataSApi = "http://" + ser[0].split(':')[0] + ":" + datasport + "/";
+ return new Promise(async (resolve, reject) => {
+ if (!server) {
+ reject({
+ "errMsg": '鏈嶅姟鍣ㄥ湴鍧�笉鑳戒负绌�'
+ });
+ }
+ if (!id || id.length < 2) {
+ reject({
+ "errMsg": '璐﹀彿鏈�煭涓�2 涓瓧绗�'
+ });
+ }
+ if (!pwd || pwd.length < 1) {
+ reject({
+ "errMsg": '瀵嗙爜鏈�煭涓�1涓瓧绗�'
+ });
+ }
+ const app = getApp()
+ var openinfo = "http://" + server + "/";
if (server.includes("://")) {
- orgSApi = ser[0] + "//" + ser[2].split(':')[0] + ":" + orgsport + "/";
- mobxoSApi = ser[0] + "//" + ser[2].split(':')[0] + ":" + moboxsport + "/";
- dataSApi = ser[0] + "//" + ser[2].split(':')[0] + ":" + datasport + "/";
+ openinfo = server + "/"
}
- app.globalData.mobox3ApiUrl = {
- org: orgSApi,
- data: dataSApi,
- mobox: mobxoSApi,
- }
- return loginOrg(id, pwd)
- } else {
- var header = {
- 'content-type': 'application/x-www-form-urlencoded'
- };
- var url = openinfo + "PDA/SignIn";
+ var ser = server.toLowerCase().split('/');
+ 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
- var data = {}
- app.globalData.mobox2ApiUrl = openinfo
- data = {
- uname: id || "",
- pwd: pwd || "",
- cname: app.globalData.cname,
- type: "0"
- }
- return http.request2({
- method: "POST",
- url,
- header,
- data,
- })
- }
+ var orgSApi = "http://" + ser[0].split(':')[0] + ":" + orgsport + "/";
+ var mobxoSApi = "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 + "/";
+ dataSApi = ser[0] + "//" + ser[2].split(':')[0] + ":" + datasport + "/";
+ }
+ app.globalData.mobox3ApiUrl = {
+ org: orgSApi,
+ data: dataSApi,
+ mobox: mobxoSApi,
+ }
+ loginOrg(id, pwd).then((res)=>{
+ resolve(res)
+ }).catch((rej)=>{
+ reject(rej)
+ })
+
+ } else {
+ var header = {
+ 'content-type': 'application/x-www-form-urlencoded'
+ };
+ var url = openinfo + "PDA/SignIn";
+ var data = {}
+ app.globalData.mobox2ApiUrl = openinfo
+ data = {
+ uname: id || "",
+ pwd: pwd || "",
+ cname: app.globalData.cname || "",
+ type: "0"
+ }
+ http.request2({
+ method: "POST",
+ url,
+ header,
+ data,
+ }).then((res)=>{
+ resolve(res)
+ }).catch((rej)=>{
+ reject(rej)
+ })
+ }
+ })
}
/**
@@ -231,13 +242,14 @@
'content-type': 'application/x-www-form-urlencoded'
};
var url = app.globalData.mobox2ApiUrl + "PDA/PDAArea";
+ let loginInfo = {
+ uname: app.globalData.loginUser.id || "",
+ pwd: app.globalData.loginUser.pwd || "",
+ cname: app.globalData.cname || "",
+ type: "0",
+ }
var data = {
- loginInfo: {
- uname: app.globalData.loginUser.id || "",
- pwd: app.globalData.loginUser.pwd || "",
- cname: app.globalData.cname,
- type: "0",
- },
+ loginInfo: JSON.stringify(loginInfo),
app_type: app_type || "MES",
need_ace: need_ace
}
@@ -269,12 +281,14 @@
'content-type': 'application/x-www-form-urlencoded'
};
var url = app.globalData.mobox2ApiUrl + "PDA/PDAAttrList";
- data.loginInfo = {
+ let loginInfo = {
uname: app.globalData.loginUser.id || "",
pwd: app.globalData.loginUser.pwd || "",
- cname: app.globalData.cname,
+ cname: app.globalData.cname || "",
type: "0",
}
+
+ data.loginInfo = JSON.stringify(loginInfo)
return http.request2({
method: "POST",
url,
@@ -305,12 +319,14 @@
'content-type': 'application/x-www-form-urlencoded'
};
var url = app.globalData.mobox2ApiUrl + "PDA/PDAGridStyleGetInfo";
- data.loginInfo = {
+ let loginInfo = {
uname: app.globalData.loginUser.id || "",
pwd: app.globalData.loginUser.pwd || "",
- cname: app.globalData.cname,
+ cname: app.globalData.cname || "",
type: "0",
}
+
+ data.loginInfo = JSON.stringify(loginInfo)
return http.request2({
method: "POST",
url,
@@ -338,12 +354,14 @@
'content-type': 'application/x-www-form-urlencoded'
};
var url = app.globalData.mobox2ApiUrl + "PDA/PDAGridStyleGetInfo";
- data.loginInfo = {
+ let loginInfo = {
uname: app.globalData.loginUser.id || "",
pwd: app.globalData.loginUser.pwd || "",
- cname: app.globalData.cname,
+ cname: app.globalData.cname || "",
type: "0",
}
+
+ data.loginInfo = JSON.stringify(loginInfo)
return http.request2({
method: "POST",
url,
@@ -370,12 +388,14 @@
'content-type': 'application/x-www-form-urlencoded'
};
var url = app.globalData.mobox2ApiUrl + "PDA/PDADataObjRunCustomEvent";
- data.loginInfo = {
+ let loginInfo = {
uname: app.globalData.loginUser.id || "",
pwd: app.globalData.loginUser.pwd || "",
- cname: app.globalData.cname,
+ cname: app.globalData.cname || "",
type: "0",
}
+
+ data.loginInfo = JSON.stringify(loginInfo)
return http.request2({
method: "POST",
url,
@@ -401,7 +421,14 @@
'content-type': 'application/x-www-form-urlencoded'
};
var url = app.globalData.mobox2ApiUrl + "selpsn/queryjson";
+ let loginInfo = {
+ uname: app.globalData.loginUser.id || "",
+ pwd: app.globalData.loginUser.pwd || "",
+ cname: app.globalData.cname || "",
+ type: "0",
+ }
+ data.loginInfo = JSON.stringify(loginInfo)
return http.request2({
method: "POST",
url,
@@ -432,7 +459,14 @@
'content-type': 'application/x-www-form-urlencoded'
};
var url = app.globalData.mobox2ApiUrl + "bpm/ProjectGetAnalysisList";
+ let loginInfo = {
+ uname: app.globalData.loginUser.id || "",
+ pwd: app.globalData.loginUser.pwd || "",
+ cname: app.globalData.cname || "",
+ type: "0",
+ }
+ data.loginInfo = JSON.stringify(loginInfo)
return http.request2({
method: "POST",
url,
@@ -459,12 +493,14 @@
'content-type': 'application/x-www-form-urlencoded'
};
var url = app.globalData.mobox2ApiUrl + "PDA/addclassattr";
- data.loginInfo = {
+ let loginInfo = {
uname: app.globalData.loginUser.id || "",
pwd: app.globalData.loginUser.pwd || "",
- cname: app.globalData.cname,
+ cname: app.globalData.cname || "",
type: "0",
}
+
+ data.loginInfo = JSON.stringify(loginInfo)
return http.request2({
method: "POST",
url,
@@ -492,12 +528,14 @@
'content-type': 'application/x-www-form-urlencoded'
};
var url = app.globalData.mobox2ApiUrl + "PDA/DelObj";
- data.loginInfo = {
+ let loginInfo = {
uname: app.globalData.loginUser.id || "",
pwd: app.globalData.loginUser.pwd || "",
- cname: app.globalData.cname,
+ cname: app.globalData.cname || "",
type: "0",
}
+
+ data.loginInfo = JSON.stringify(loginInfo)
return http.request2({
method: "POST",
url,
--
Gitblit v1.9.1