修改配置，获取token、userId直接跳转到首页处理。

forstlogin/index.html

@@ -124,16 +124,18 @@
 		<script src="../layui/layui.js" type="text/javascript" charset="utf-8"></script>
 		<script src="../js/ajaxhook.min.js" type="text/javascript" charset="utf-8"></script>
 		<script>
-			var SYS_VER = Math.random() * 100000;
+      var SYS_VER = Math.random() * 100000;
 			function loadJS(url) {
 				document.write("<script src='" + url + "?ver=" + SYS_VER + "'><\/script>")
 			}
 			loadJS("../js/config.js");
+    </script>
+		<script>
 			layui.config({
 				base: "../js/layuiPlugins/"
 			}).use(['form', 'laytpl', 'jquery', 'md5'], function () {
 				//清除token
-				((window.hywa || {}).sessionTable || {}).tableName && layui.sessionData((window.hywa.sessionTable || {}).tableName, null);
+				// ((window.hywa || {}).sessionTable || {}).tableName && layui.sessionData((window.hywa.sessionTable || {}).tableName, null);
 				var form = layui.form,
 					laytpl = layui.laytpl,
 					$ = layui.$,
@@ -154,22 +156,29 @@
 				// 获取URL参数
 				const urlParams = new URLSearchParams(window.location.search);
 				// 获取xxl_sso_sessionid的值
-				const sessionId = urlParams.get('xxl_sso_sessionid');
-				// console.log('sessionId', sessionId);
-				if (sessionId) {
+				// const sessionId = urlParams.get('xxl_sso_sessionid');
+				const token = urlParams.get('token');
+		    const userId = urlParams.get('userId');
+				if (token) {
+					console.log('111',window.hywa);
+					//存储token
+					layui.sessionData(window.hywa.sessionTable.tableName, {
+						key: 'token',
+						value: token
+					});
+					// console.log('111',window.hywa);
 				    $('#loading').css('display','block');
-				    let data = {sessionId:sessionId}
 					$.ajax({
-					    url: 'ssoLogin',
-					    type: 'post',
-					    data: JSON.stringify(data),
+					    url: 'login_info?guid=' + userId,
+					    type: 'get',
 					    contentType: 'application/json',
 					    success: function (data) {
-					       // console.log('success data', data);
-					       var code = data.code,
+					      console.log('success data111', data);
+					      var code = data.code,
 								user = { userId: ((((data.data || [])[0] || {}).CurrentUser || {}).guid || ""), name: ((((data.data || [])[0] || {}).CurrentUser || {}).account || ""), realName: ((((data.data || [])[0] || {}).CurrentUser || {}).userName || ""), menus: (((data.data || [])[0] || {}).authMenuObj || {}) },
-								token = ((data.data || [])[0] || {}).accessToken || null,
-								systemLable = { systemName: (((data.data || [])[0] || {}).orgObject || {}).systemName || "蔬菜质量安全溯源平台管理后台" };
+								// user = { userId: data.data[0].guid, name: data.data[0].account, realName: data.data[0].userName, menus: [] },
+								// token = ((data.data || [])[0] || {}).accessToken || null,
+								// systemLable = { systemName: (((data.data || [])[0] || {}).orgObject || {}).systemName || "蔬菜质量安全溯源平台管理后台" };
 								systemLable = { systemName:"蔬菜质量安全溯源平台管理后台"}
 							if (!(code - 0)) {
 								//储存用户信息
@@ -182,11 +191,11 @@
 									key: 'sys',
 									value: systemLable
 								});
-								//存储token
-								layui.sessionData(window.hywa.sessionTable.tableName, {
-									key: 'token',
-									value: token
-								});
+								// //存储token
+								// layui.sessionData(window.hywa.sessionTable.tableName, {
+								// 	key: 'token',
+								// 	value: token
+								// });
 								$('#loading').css('display','none');
 								//存储数组
 								location.href = window.hywa.jumpPage.home;
@@ -194,6 +203,46 @@
 					    }
 					})
 				}
+
+				// console.log('sessionId', sessionId);
+				// if (sessionId) {
+				//     $('#loading').css('display','block');
+				//     let data = {sessionId:sessionId}
+				// 	$.ajax({
+				// 	    url: 'ssoLogin',
+				// 	    type: 'post',
+				// 	    data: JSON.stringify(data),
+				// 	    contentType: 'application/json',
+				// 	    success: function (data) {
+				// 	       // console.log('success data', data);
+				// 	       var code = data.code,
+				// 				user = { userId: ((((data.data || [])[0] || {}).CurrentUser || {}).guid || ""), name: ((((data.data || [])[0] || {}).CurrentUser || {}).account || ""), realName: ((((data.data || [])[0] || {}).CurrentUser || {}).userName || ""), menus: (((data.data || [])[0] || {}).authMenuObj || {}) },
+				// 				token = ((data.data || [])[0] || {}).accessToken || null,
+				// 				systemLable = { systemName: (((data.data || [])[0] || {}).orgObject || {}).systemName || "蔬菜质量安全溯源平台管理后台" };
+				// 				systemLable = { systemName:"蔬菜质量安全溯源平台管理后台"}
+				// 			if (!(code - 0)) {
+				// 				//储存用户信息
+				// 				layui.sessionData(window.hywa.sessionTable.tableName, {
+				// 					key: window.hywa.sessionTable.userData,
+				// 					value: user
+				// 				});
+				// 				//存储系统名称
+				// 				layui.sessionData(window.hywa.sessionTable.tableName, {
+				// 					key: 'sys',
+				// 					value: systemLable
+				// 				});
+				// 				//存储token
+				// 				layui.sessionData(window.hywa.sessionTable.tableName, {
+				// 					key: 'token',
+				// 					value: token
+				// 				});
+				// 				$('#loading').css('display','none');
+				// 				//存储数组
+				// 				location.href = window.hywa.jumpPage.home;
+				// 			}
+				// 	    }
+				// 	})
+				// }
 				// 统一登录改造
 
 				function ajaxLogin(data) {

index.html

@@ -11,13 +11,20 @@
 	<script type="text/javascript">
 	    const urlParams = new URLSearchParams(window.location.search);
 		// 获取xxl_sso_sessionid的值
-		const sessionId = urlParams.get('xxl_sso_sessionid');
-// 		console.log('sessionId', sessionId);
-		if (sessionId) {
-		    window.location.href = "forstlogin/index.html?ver=" + new Date().getTime() + '&xxl_sso_sessionid=' +sessionId;
-		}else{
+		// const sessionId = urlParams.get('xxl_sso_sessionid');
+		const token = urlParams.get('token');
+		const userId = urlParams.get('userId');
+		if (token) {
+		    window.location.href = "forstlogin/index.html?ver=" + new Date().getTime() + '&userId=' + userId + '&token=' +token;
+		} else {
 		    window.location.href = "forstlogin/index.html?ver=" + new Date().getTime();
 		}
+    // console.log('sessionId', sessionId);
+		// if (sessionId) {
+		//     window.location.href = "forstlogin/index.html?ver=" + new Date().getTime() + '&xxl_sso_sessionid=' +sessionId;
+		// }else{
+		//     window.location.href = "forstlogin/index.html?ver=" + new Date().getTime();
+		// }
 		
 	</script>
 </body>

js/config.js

@@ -39,6 +39,7 @@ function loadJS(url) {
 				edit_user: "/web/user/edit", //修改
 				delete_user: "/web/user/del", //删除
 				select_user: "/web/user/searchById", //查询单个
+				login_info: "/web/user/getLoginInfo", //查询单个
 				forbidUser: '/web/user/forbidden', //禁止用户
 				restPwd: "/web/user/restPwd",//重置密码
 				//首页