From 68dc07466a4a79129d655df7a6fbe5c22825759d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Tue, 20 Jul 2021 09:17:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=9B=9E=E8=AF=9D=E5=A4=B1?=
 =?UTF-8?q?=E6=95=88=E6=97=B6404=20=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/java110/api/Java110SessionApi.js | 42 +++++++++++++++-------------
 pages/login/login.vue                |  4 ++-
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/lib/java110/api/Java110SessionApi.js b/lib/java110/api/Java110SessionApi.js
index 2395f30..3fa5ff0 100644
--- a/lib/java110/api/Java110SessionApi.js
+++ b/lib/java110/api/Java110SessionApi.js
@@ -22,7 +22,6 @@ import {isNull} from '../utils/StringUtil.js'
 const loginUrl = conf.baseUrl + 'app/loginProperty'
 
 
-
 /**
  * 登录处理
  */
@@ -65,6 +64,24 @@ export function login(userName, passwd) {
 	});
 }
 
+export function reLogin(){
+	let userInfo = uni.getStorageSync(java110Config.USER_INFO);
+	
+	if (isNull(userInfo)) {
+		return;
+	}
+	let _userInfo = JSON.parse(desDecrypt(userInfo));
+	//重新登录
+	login(_userInfo.username, _userInfo.password)
+		.then((res) => {
+			uni.reLaunch({
+				url:'/pages/index/index'
+			})
+		}, err => {
+			return;
+		})
+}
+
 export function hasSession() {
 	return new Promise((resolve, reject) => {
 		let loginFlag = uni.getStorageSync(java110Config.LOGIN_FLAG);
@@ -73,25 +90,10 @@ export function hasSession() {
 			resolve();
 			return;
 		}
-		let userInfo = uni.getStorageSync(java110Config.USER_INFO);
-
-		if (isNull(userInfo)) {
-			uni.reLaunch({
-				url: '/pages/login/login'
-			});
-			return;
-		}
-		let _userInfo = JSON.parse(desDecrypt(userInfo));
-		//重新登录
-		login(_userInfo.username, _userInfo.password)
-			.then((res) => {
-				resolve();
-			}, err => {
-				uni.reLaunch({
-					url: '/pages/login/login'
-				});
-				return;
-			})
+		//跳转至登录页面
+		uni.reLaunch({
+			url: '/pages/login/login'
+		});
 	})
 
 }
diff --git a/pages/login/login.vue b/pages/login/login.vue
index ad8951b..a1900a2 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -33,8 +33,9 @@
 
 <script>
 	
-	import {login} from '../../lib/java110/api/Java110SessionApi.js'
+	import {login,reLogin} from '../../lib/java110/api/Java110SessionApi.js'
 	import conf from '../../conf/config.js'
+	
 	export default {
 		data() {
 			return {
@@ -47,6 +48,7 @@
 			uni.hideTabBar({
 				animation: false
 			});
+			reLogin();
 
 			this.logoUrl = conf.baseUrl + 'logo.png';