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 |  132 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 127 insertions(+), 5 deletions(-)

diff --git a/store/index.js b/store/index.js
index a7dacb3..157d1fb 100644
--- a/store/index.js
+++ b/store/index.js
@@ -275,7 +275,7 @@
 					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);
@@ -298,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
@@ -319,7 +326,13 @@
 						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);
@@ -370,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",
@@ -381,6 +401,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') {
 							commit("classAttrList",ret);
@@ -403,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",
@@ -414,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 ={};
@@ -438,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",
@@ -449,6 +495,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') {
 							commit("subClassAttrList",ret);
@@ -471,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",
@@ -482,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 ={};
@@ -506,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",
@@ -540,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,
@@ -658,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",
@@ -668,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);
@@ -987,6 +1079,36 @@
 				})
 			})
 		},
+		// 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