From 33ca0619ee10adc9f307480a5f58bb77bb142ffd Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com.cn>
Date: 星期一, 01 四月 2024 15:04:37 +0800
Subject: [PATCH] PDA长时间未退出导致SessionID过期，提示‘登录已过期，请重新登录’改进
---
store/index.js | 397 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 362 insertions(+), 35 deletions(-)
diff --git a/store/index.js b/store/index.js
index e2dc6b0..157d1fb 100644
--- a/store/index.js
+++ b/store/index.js
@@ -31,7 +31,7 @@
DelObj:'',
username:"sa",
userpwd:"0000",
- url:"115.29.185.26:5000", //192.168.1.184:5200 36.33.24.94:5200
+ url:"139.159.144.10:8080/mobox3", //115.29.185.26:5000
OIOrgSAPI: '', //115.29.185.26:5101
OIMoboxSAPI: '', //115.29.185.26:5102
OIDataSAPI: '', //115.29.185.26:5103
@@ -185,10 +185,12 @@
var openinfo = "http://" + univerifyInfo.server + "/"; //+"/OrgWebS"
//璁剧疆鍏ㄥ眬鍙傛暟锛歶rl-鏈嶅姟鍣ㄥ湴鍧� commit("setUrl",openinfo);
- var ser = univerifyInfo.server.split('/');
- if(ser[1] == 'mobox3'){
- reject({"errMsg":"Mobox3鏆傛椂鏈敮鎸佽嚜鍔ㄦ洿鏂帮紒"});
- }
+ // var ser = univerifyInfo.server.split('/');
+ // if(ser[1] == 'mobox3'){
+ // // reject({"errMsg":"Mobox3鏆傛椂鏈敮鎸佽嚜鍔ㄦ洿鏂帮紒"});
+ // resolve({code:'00000',data:"",msg:""});
+ // return;
+ // }
uni.request({
url: openinfo + "PDA/GetApkVersionInfo",
data: {},
@@ -209,7 +211,7 @@
commit("setApkVersionInfo",ret);
resolve(ret);
} else {
- reject({"errMsg":ret.err_msg});
+ reject({"errMsg":ret.msg});
}
},
fail: (err) => {
@@ -273,13 +275,13 @@
dataType:"json",
header: header,
success: (res) => {
- // console.log(res);
+ console.log(res);
const ret = res.data
if (ret.code=='00000' || ret.err_code == 0) {
commit("login",ret);
resolve(ret);
} else {
- reject({"errMsg":ret.err_msg});
+ reject({"errMsg":ret.msg?ret.msg:ret.err_msg});
}
},
fail: (err) => {
@@ -296,6 +298,13 @@
}, univerifyInfo) {
return new Promise((resolve, reject) => {
// console.log(state.loginProvider.loginid.result.session_id);
+ univerifyInfo.loginInfo = JSON.stringify({
+ server: uni.getStorageSync('server'),
+ uname: uni.getStorageSync('account'),
+ pwd: uni.getStorageSync('password'),
+ cname: plus.device.model,
+ type: "0"
+ });
var url = state.url + "PDA/PDAArea";
var header = {'content-type': 'application/x-www-form-urlencoded'};
if(state.OIMoboxSAPI){ //鍒ゆ柇鏄惁鏄疢obox3
@@ -317,12 +326,18 @@
if(res.statusCode==404){
reject({"errMsg":"鍦板潃涓嶅锛岃妫�煡璇ュ湴鍧�細"+ openinfo});
}
- const ret = res.data
+ // if(JSON.stringify(res.data).includes('Login Page - Ace Admin')){
+ // uni.reLaunch({
+ // url: '../login/index'
+ // })
+ // reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�});
+ // }
+ const ret = res.data;
if (ret.code=='00000' || ret.err_code == 0) {
commit("areaFunc",ret);
resolve(ret);
} else {
- reject({"errMsg":ret.err_msg});
+ reject({"errMsg":ret.msg?ret.msg:ret.err_msg});
}
},
fail: (err) => {
@@ -368,6 +383,13 @@
}, univerifyInfo) {
return new Promise((resolve, reject) => {
// console.log(state.url);
+ univerifyInfo.loginInfo = JSON.stringify({
+ server: uni.getStorageSync('server'),
+ uname: uni.getStorageSync('account'),
+ pwd: uni.getStorageSync('password'),
+ cname: plus.device.model,
+ type: "0"
+ });
uni.request({
url: state.url + "PDA/PDAAttrList",
@@ -379,12 +401,18 @@
},
success: (res) => {
console.log(res);
+ // if(JSON.stringify(res.data).includes('Login Page - Ace Admin')){
+ // uni.reLaunch({
+ // url: '../login/index'
+ // })
+ // reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�});
+ // }
const ret = res.data
if (ret.code=='00000') {
commit("classAttrList",ret);
resolve(ret);
} else {
- reject({"errMsg":ret.err_msg});
+ reject({"errMsg":ret.msg});
}
},
fail: (err) => {
@@ -401,6 +429,13 @@
}, univerifyInfo) {
return new Promise((resolve, reject) => {
// console.log(state.url);
+ univerifyInfo.loginInfo = JSON.stringify({
+ server: uni.getStorageSync('server'),
+ uname: uni.getStorageSync('account'),
+ pwd: uni.getStorageSync('password'),
+ cname: plus.device.model,
+ type: "0"
+ });
uni.request({
url: state.url + "PDA/PDAGridStyleGetInfo",
@@ -412,6 +447,12 @@
},
success: (res) => {
console.log(res);
+ // if(JSON.stringify(res.data).includes('Login Page - Ace Admin')){
+ // uni.reLaunch({
+ // url: '../login/index'
+ // })
+ // reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�});
+ // }
const ret = res.data
if (ret.code=='00000') {
// var data ={};
@@ -419,7 +460,7 @@
commit("classGridStyleInfo",ret);
resolve(ret);
} else {
- reject({"errMsg":ret.err_msg});
+ reject({"errMsg":ret.msg});
}
},
fail: (err) => {
@@ -436,6 +477,13 @@
}, univerifyInfo) {
return new Promise((resolve, reject) => {
// console.log(state.url);
+ univerifyInfo.loginInfo = JSON.stringify({
+ server: uni.getStorageSync('server'),
+ uname: uni.getStorageSync('account'),
+ pwd: uni.getStorageSync('password'),
+ cname: plus.device.model,
+ type: "0"
+ });
uni.request({
url: state.url + "PDA/PDAAttrList",
@@ -447,12 +495,18 @@
},
success: (res) => {
console.log(res);
+ // if(JSON.stringify(res.data).includes('Login Page - Ace Admin')){
+ // uni.reLaunch({
+ // url: '../login/index'
+ // })
+ // reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�});
+ // }
const ret = res.data
if (ret.code=='00000') {
commit("subClassAttrList",ret);
resolve(ret);
} else {
- reject({"errMsg":ret.err_msg});
+ reject({"errMsg":ret.msg});
}
},
fail: (err) => {
@@ -469,6 +523,13 @@
}, univerifyInfo) {
return new Promise((resolve, reject) => {
// console.log(state.url);
+ univerifyInfo.loginInfo = JSON.stringify({
+ server: uni.getStorageSync('server'),
+ uname: uni.getStorageSync('account'),
+ pwd: uni.getStorageSync('password'),
+ cname: plus.device.model,
+ type: "0"
+ });
uni.request({
url: state.url + "PDA/PDAGridStyleGetInfo",
@@ -480,6 +541,12 @@
},
success: (res) => {
console.log(res);
+ // if(JSON.stringify(res.data).includes('Login Page - Ace Admin')){
+ // uni.reLaunch({
+ // url: '../login/index'
+ // })
+ // reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�});
+ // }
const ret = res.data
if (ret.code=='00000') {
// var data ={};
@@ -504,6 +571,13 @@
}, univerifyInfo) {
return new Promise((resolve, reject) => {
// console.log(state.url);
+ univerifyInfo.loginInfo = JSON.stringify({
+ server: uni.getStorageSync('server'),
+ uname: uni.getStorageSync('account'),
+ pwd: uni.getStorageSync('password'),
+ cname: plus.device.model,
+ type: "0"
+ });
uni.request({
url: state.url + "PDA/PDADicValueGetInfo",
@@ -521,7 +595,7 @@
commit("dicValueInfo",ret);
resolve(ret);
} else {
- reject({"errMsg":ret.err_msg});
+ reject({"errMsg":ret.msg});
}
},
fail: (err) => {
@@ -538,6 +612,13 @@
}, univerifyInfo) {
return new Promise((resolve, reject) => {
// console.log(state.url);
+ univerifyInfo.loginInfo = JSON.stringify({
+ server: uni.getStorageSync('server'),
+ uname: uni.getStorageSync('account'),
+ pwd: uni.getStorageSync('password'),
+ cname: plus.device.model,
+ type: "0"
+ });
uni.request({
url: state.url + "PDA/PDADataObjRunCustomEvent",
data: univerifyInfo,
@@ -547,13 +628,13 @@
'content-type': 'application/x-www-form-urlencoded'
},
success: (res) => {
- console.log(res);
+ // console.log(res);
const ret = res.data
if (ret.code=='00000') {
commit("DataObjRunCustomEventInfo",ret);
resolve(ret);
} else {
- reject({"errMsg":ret.err_msg});
+ reject({"errMsg":ret.msg});
}
},
fail: (err) => {
@@ -570,22 +651,34 @@
}, univerifyInfo) {
return new Promise((resolve, reject) => {
// console.log(state.url);
+ var url = state.url + "selpsn/queryjson";
+ var datajson = univerifyInfo;
+ var header = {'content-type': 'application/x-www-form-urlencoded'};
+ if(state.OIOrgSAPI){ //鍒ゆ柇鏄惁鏄疢obox3
+ url = state.OIOrgSAPI+'api/user/query/query?sessionid='+state.loginProvider.loginid.result.session_id;
+ datajson = {
+ query_str: univerifyInfo.jp,
+ };
+ header={};
+ }
uni.request({
- url: state.url + "selpsn/queryjson",
- data: univerifyInfo,
+ url: url,
+ data: datajson,
method: 'POST',
dataType:"json",
- header: {
- 'content-type': 'application/x-www-form-urlencoded'
- },
+ header: header,
success: (res) => {
// console.log(res);
- const ret = JSON.parse(res.data);
- if (ret.code=='00000') {
- commit("querySelpsn",ret);
- resolve(ret);
+ try{
+ res = JSON.parse(res.data);
+ }catch(e){
+ res = res.data;
+ }
+ if (res.code=='00000' || res.err_code == 0) {
+ commit("querySelpsn",res);
+ resolve(res);
} else {
- reject({"errMsg":ret.err_msg});
+ reject({"errMsg":res.msg?res.msg:res.err_msg});
}
},
fail: (err) => {
@@ -602,14 +695,25 @@
}, univerifyInfo) {
return new Promise((resolve, reject) => {
// console.log(state.url);
+ var url = state.url + "bpm/ProjectGetAnalysisList";
+ var header = {'content-type': 'application/x-www-form-urlencoded'};
+ if(state.OIMoboxSAPI){ //鍒ゆ柇鏄惁鏄疢obox3
+ // url = state.OIMoboxSAPI+'api/app/area/GetList?sessionid='+state.loginProvider.loginid.result.session_id;
+ // univerifyInfo = {
+ // app_type: "MES",
+ // };
+ // header={};
+ reject({"errMsg":"Mobox3鏆傛椂鏈敮鎸侀�鎷╅」鐩帴鍙ｏ紒"});
+ // resolve({code:'00000',data:"",msg:""});
+ return;
+ }
+
uni.request({
- url: state.url + "bpm/ProjectGetAnalysisList",
+ url: url,
data: univerifyInfo,
method: 'POST',
dataType:"json",
- header: {
- 'content-type': 'application/x-www-form-urlencoded'
- },
+ header: header,
success: (res) => {
console.log(res);
const ret = res.data;
@@ -617,7 +721,7 @@
commit("ProjectGetAnalysisList",ret);
resolve(ret);
} else {
- reject({"errMsg":ret.err_msg});
+ reject({"errMsg":ret.msg});
}
},
fail: (err) => {
@@ -633,9 +737,16 @@
state
}, univerifyInfo) {
return new Promise((resolve, reject) => {
- // console.log(state.url);
+ // console.log(state.url);
+ univerifyInfo.loginInfo = JSON.stringify({
+ server: uni.getStorageSync('server'),
+ uname: uni.getStorageSync('account'),
+ pwd: uni.getStorageSync('password'),
+ cname: plus.device.model,
+ type: "0"
+ });
uni.request({
- url: state.url + "workspace/addclassattr",
+ url: state.url + "PDA/addclassattr",
data: univerifyInfo,
method: 'POST',
dataType:"json",
@@ -643,7 +754,13 @@
'content-type': 'application/x-www-form-urlencoded'
},
success: (res) => {
- console.log(res);
+ // console.log(res);
+ // if(JSON.stringify(res.data).includes('Login Page - Ace Admin')){
+ // uni.reLaunch({
+ // url: '../login/index'
+ // })
+ // reject({"errMsg":"鐧诲綍宸茶繃鏈燂紝璇烽噸鏂扮櫥褰�});
+ // }
const ret = res.data;
if (ret.code=='00000') {
commit("addclassattr",ret);
@@ -692,6 +809,156 @@
})
},
+
+ // api/class/attr/GetList?sessionid=SESSION_ID
+ // Mobox3寰楀埌鏁版嵁绫诲睘鎬�+ classAttrGetList: function({
+ commit,
+ state
+ }, univerifyInfo) {
+ return new Promise((resolve, reject) => {
+ // console.log(state.url);
+ uni.request({
+ url: state.OIDataSAPI+'api/class/attr/GetList?sessionid='+state.loginProvider.loginid.result.session_id,
+ data: univerifyInfo,
+ method: 'POST',
+ dataType:"json",
+ success: (_res) => {
+ // console.log(_res);
+ const ret = _res.data
+ if (ret.err_code == 0) {
+ commit("classAttrList",ret);
+ resolve(ret);
+ } else {
+ reject({"errMsg":ret.err_msg});
+ }
+ },
+ fail: (err) => {
+ // console.log(err);
+ reject(err);
+ }
+ })
+ })
+ },
+ // api/class/attr/GetList?sessionid=SESSION_ID
+ // Mobox3寰楀埌鏁版嵁绫诲睘鎬�+ subClassAttrGetList: function({
+ commit,
+ state
+ }, univerifyInfo) {
+ return new Promise((resolve, reject) => {
+ // console.log(state.url);
+ uni.request({
+ url: state.OIDataSAPI+'api/class/attr/GetList?sessionid='+state.loginProvider.loginid.result.session_id,
+ data: univerifyInfo,
+ method: 'POST',
+ dataType:"json",
+ success: (_res) => {
+ // console.log(_res);
+ const ret = _res.data
+ if (ret.err_code == 0) {
+ commit("subClassAttrList",ret);
+ resolve(ret);
+ } else {
+ reject({"errMsg":ret.err_msg});
+ }
+ },
+ fail: (err) => {
+ // console.log(err);
+ reject(err);
+ }
+ })
+ })
+ },
+ // api/dict/item/GetInfo?sessionid=SESSION_ID
+ // Mobox3寰楀埌瀛楀吀椤瑰垪琛�+ DictItemGetList: function({
+ commit,
+ state
+ }, univerifyInfo) {
+ return new Promise((resolve, reject) => {
+ // console.log(state.url);
+ uni.request({
+ url: state.OIMoboxSAPI+'api/dict/item/GetInfo?sessionid='+state.loginProvider.loginid.result.session_id,
+ data: univerifyInfo,
+ method: 'POST',
+ dataType:"json",
+ success: (_res) => {
+ // console.log(_res);
+ const ret = _res.data
+ if (ret.err_code == 0) {
+ resolve(ret);
+ } else {
+ reject({"errMsg":ret.err_msg});
+ }
+ },
+ fail: (err) => {
+ // console.log(err);
+ reject(err);
+ }
+ })
+ })
+ },
+ // api/dict/GetInfo2?sessionid=SESSION_ID
+ // Mobox3寰楀埌瀛楀吀淇℃伅
+ DictGetInfo: function({
+ commit,
+ state
+ }, univerifyInfo) {
+ return new Promise((resolve, reject) => {
+ // console.log(state.url);
+ uni.request({
+ url: state.OIMoboxSAPI+'api/dict/GetInfo2?sessionid='+state.loginProvider.loginid.result.session_id,
+ data: univerifyInfo,
+ method: 'POST',
+ dataType:"json",
+ success: (_res) => {
+ // console.log(_res);
+ const ret = _res.data
+ if (ret.err_code == 0) {
+ resolve(ret);
+ } else {
+ reject({"errMsg":ret.err_msg});
+ }
+ },
+ fail: (err) => {
+ // console.log(err);
+ reject(err);
+ }
+ })
+ })
+ },
+
+ // api/dataobj/Create?sessionid=SESSION_ID
+ // Mobox3鍒涘缓鏁版嵁瀵硅薄
+ createDataObj: function({
+ commit,
+ state
+ }, univerifyInfo) {
+ return new Promise((resolve, reject) => {
+ // console.log(state.url);
+ uni.request({
+ url: state.OIDataSAPI+'api/dataobj/Create?sessionid='+state.loginProvider.loginid.result.session_id,
+ data: univerifyInfo,
+ method: 'POST',
+ dataType:"json",
+ success: (_res) => {
+ // console.log(_res);
+ const ret = _res.data
+ if (ret.err_code == 0) {
+ resolve(ret);
+ } else {
+ reject({"errMsg":ret.err_msg});
+ }
+ },
+ fail: (err) => {
+ console.log(err);
+ reject(err);
+ }
+ })
+ })
+ },
+
// api/class/uistyle/GetInfo?sessionid=SESSION_ID
// Mobox3寰楀埌鏁版嵁绫绘樉绀烘牱寮忎俊鎭� UIStyleGetInfo: function({
@@ -706,7 +973,7 @@
method: 'POST',
dataType:"json",
success: (_res) => {
- // console.log(_res);
+ console.log(_res);
const ret = _res.data
if (ret.err_code == 0) {
// commit("areaFunc",ret);
@@ -782,6 +1049,66 @@
})
})
},
+ // api/dataobj/query/Query?sessionid=SESSION_ID
+ // Mobox3鏌ヨ鏁版嵁瀵硅薄
+ dataObjQuery: function({
+ commit,
+ state
+ }, univerifyInfo) {
+ return new Promise((resolve, reject) => {
+ // console.log(state.loginProvider.loginid.result.session_id);
+ uni.request({
+ url: state.OIDataSAPI+'api/dataobj/query/Query?sessionid='+state.loginProvider.loginid.result.session_id,
+ data: univerifyInfo,
+ method: 'POST',
+ dataType:"json",
+ success: (_res) => {
+ // console.log(_res);
+ const ret = _res.data
+ if (ret.err_code == 0) {
+ // commit("areaFunc",ret);
+ resolve(ret);
+ } else {
+ reject({"errMsg":ret.err_msg});
+ }
+ },
+ fail: (err) => {
+ // console.log(err);
+ reject(err);
+ }
+ })
+ })
+ },
+ // api/app/GetInfo?sessionid=SESSION_ID
+ // Mobox3鑾峰彇鍔熻兘鐐逛俊鎭�+ appGetInfo: function({
+ commit,
+ state
+ }, univerifyInfo) {
+ return new Promise((resolve, reject) => {
+ // console.log(state.loginProvider.loginid.result.session_id);
+ uni.request({
+ url: state.OIMoboxSAPI+'api/app/GetInfo?sessionid='+state.loginProvider.loginid.result.session_id,
+ data: univerifyInfo,
+ method: 'POST',
+ dataType:"json",
+ success: (_res) => {
+ // console.log(_res);
+ const ret = _res.data
+ if (ret.err_code == 0) {
+ // commit("areaFunc",ret);
+ resolve(ret);
+ } else {
+ reject({"errMsg":ret.err_msg});
+ }
+ },
+ fail: (err) => {
+ // console.log(err);
+ reject(err);
+ }
+ })
+ })
+ },
}
})
--
Gitblit v1.9.1