修改统一身份认证登录首页跳转到业务系统

spring-cloud/server-basic/src/main/java/com/jd/controller/SsoUserController.java

@@ -37,16 +37,15 @@ public class SsoUserController {
      * @param loginAccount
      * @param loginPwd
      * @param clientId
-     * @param redirect
      * @return
      */
     @PostMapping("userLogin")
     @ApiOperation(value = "SSO用户登录")
-    public Map<String, Object> ssoUserLogin(String loginAccount, String loginPwd, String clientId, String redirect) {
+    public Map<String, Object> ssoUserLogin(String loginAccount, String loginPwd, String clientId) {
         if (Blank.isEmpty(loginAccount, loginPwd)) {
             return SendUtil.send(false, ConstString.REQUEST_WRONGPARAMS);
         }
-        return ssoUserService.userLogin(loginAccount, loginPwd, clientId, redirect, oauth2Pwd);
+        return ssoUserService.userLogin(loginAccount, loginPwd, clientId, oauth2Pwd);
     }
 
     /**

spring-cloud/server-basic/src/main/java/com/jd/service/SsoUserService.java

@@ -14,10 +14,9 @@ public interface SsoUserService {
      * @param loginAccount
      * @param loginPwd
      * @param clientId
-     * @param redirect
      * @return
      */
-    Map<String, Object> userLogin(String loginAccount, String loginPwd, String clientId, String redirect, String oauth2Pwd);
+    Map<String, Object> userLogin(String loginAccount, String loginPwd, String clientId, String oauth2Pwd);
 
     /**
      * 查询当前登录用户信息

spring-cloud/server-basic/src/main/java/com/jd/service/impl/SsoUserServiceImpl.java

@@ -41,7 +41,7 @@ public class SsoUserServiceImpl implements SsoUserService {
     }
 
     @Override
-    public Map<String, Object> userLogin(String loginAccount, String loginPwd, String clientId, String redirect, String oauth2Pwd) {
+    public Map<String, Object> userLogin(String loginAccount, String loginPwd, String clientId, String oauth2Pwd) {
         if (Blank.isNotEmpty(clientId)) {
             // 判断clientId是否存在
             Map<String, Object> map = ssoSystemMapper.getSsoSystemByClient(clientId);
@@ -75,6 +75,7 @@ public class SsoUserServiceImpl implements SsoUserService {
         result.put("access_token", accessToken);
         result.put("refresh_token", refreshToken);
         result.put("token_type", tokenType);
+        result.put("redirect_url", user.get("redirect_url"));
         System.err.println("result::" + result);
         // 保存到Redis
         redisTemplate.opsForValue().set(Convert.toStr(user.get("user_id")), result);

spring-cloud/server-basic/src/main/resources/mapper/SsoSystemMapper.xml

@@ -5,18 +5,24 @@
     <!-- 查询SSO业务系统列表 -->
     <select id="getSsoSystemList" resultType="map" parameterType="map">
         SELECT
-            s.id,
-            s.appid,
-            s.`name`,
-            s.title_img,
-            s.redirect_url,
-            us.login_account
-        FROM sso_system s,
-            sso_user_system us
-        WHERE s.id = us.system_id
+        s.id,
+        s.`name`,
+        s.appid,
+        s.redirect_url,
+        s.title_img,
+        s.create_time
         <if test="userId != null">
-            AND us.user_id = #{userId}
+            , u.login_account
         </if>
+        FROM sso_system AS s
+        <if test="userId != null">
+            INNER JOIN sso_user AS u ON s.id = u.system_id
+        </if>
+        <where>
+            <if test="userId != null">
+                AND u.user_id = #{userId}
+            </if>
+        </where>
     </select>
 
     <select id="getSsoSystemByClient" resultType="java.util.Map">

spring-cloud/server-basic/src/main/resources/mapper/SsoUserMapper.xml

@@ -3,9 +3,24 @@
 <mapper namespace="com.jd.mapper.SsoUserMapper">
     <!--根据登录帐号查询统一身份认证用户信息-->
     <select id="getSsoUserInfoByAccount" resultType="java.util.Map">
-        SELECT su.*
-        FROM sso_user su
-        JOIN sso_system ss ON ss.id = su.system_id
+        SELECT
+            su.user_id,
+            su.system_id,
+            su.login_account,
+            su.login_pwd,
+            su.user_status,
+            su.create_time,
+            su.mobile,
+            su.card_no,
+            su.card_type,
+            su.birthday,
+            su.address,
+            ss.`name`,
+            ss.appid,
+            ss.redirect_url,
+            ss.title_img
+        FROM sso_user AS su
+        JOIN sso_system AS ss ON ss.id = su.system_id
         WHERE su.login_account = #{loginAccount}
         AND ss.appid = #{clientId}
     </select>

spring-cloud/server-page/src/main/resources/static/page/js/basic/ssoSystem.js

@@ -84,14 +84,11 @@ layui.config({
             }
         },
         redirectUrl: function (value, item) {
-            if (value.trim()) {
-                if (/\s/.test(value)) {
-                    return "回调地址中不能存在空格";
-                }
+            if (!value.trim()) {
+                return '回调地址不能为空！';
             }
-        },
-        titleImg: function (value, item) {
-            if (value.trim()) {
+            if (/\s/.test(value)) {
+                return "回调地址中不能存在空格";
             }
         },
     });

spring-cloud/server-page/src/main/resources/static/page/login.html

@@ -4,7 +4,7 @@
 		<meta charset="utf-8">
 		<title>登录</title>
 		<link rel="stylesheet" href="layui/css/layui.css">
-	
+
 	<style>
 		*{
 			margin: 0;
@@ -110,7 +110,7 @@
 	</style>
 	</head>
 	<script>
-		window.location.href = 'http://192.168.0.235:8888/sso/login.html?clientId=I34U4QF4D&redirect=http://192.168.0.235:8888/page/preLogin.html';
+		window.location.href = 'http://192.168.0.235:8888/sso/login.html?clientId=I34U4QF4D&redirect=true';
 	</script>
 	<body>
 		<div class="loginBox layui-form">
@@ -131,5 +131,5 @@
 		<script src="js/constants.js"></script>
 		<script src="js/basic/login.js"></script>
 	</body>
-	
+
 </html>

spring-cloud/server-page/src/main/resources/static/page/ssoSystem.html

@@ -59,7 +59,7 @@
                 </div>
             </div>
             <div class="layui-form-item">
-                <label class="layui-form-label">回调地址：</label>
+                <label class="layui-form-label"><span class="font-red">*</span>回调地址：</label>
                 <div class="layui-input-inline">
                     <input type="text" class="layui-input" id="redirectUrl" name="redirectUrl" lay-verify="redirectUrl" autocomplete="off" placeholder="请输入回调地址" maxlength="200">
                 </div>

spring-cloud/server-page/src/main/resources/static/sso/index.html

@@ -1,152 +1,151 @@
 <!DOCTYPE html>
 <html>
 
-	<head>
-		<meta charset="UTF-8">
-		<meta name="renderer" content="webkit">
-		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
-		<title>指挥中心统一认证平台</title>
-		<link rel="stylesheet" type="text/css" href="layui/css/layui.css" />
-		<link rel="stylesheet" type="text/css" href="css/admin.css" />
-		<link rel="stylesheet" type="text/css" href="css/index.css" />
-		<link rel="stylesheet" type="text/css" href="css/common.css" />
-		<link rel="stylesheet" type="text/css" href="css/animate.css" />
-	</head>
-	<style>
-		.main-layout-side::-webkit-scrollbar {
-			display: none;
-		}
-		
-		.main-layout-side {
-			scrollbar-color: transparent transparent;
-			scrollbar-track-color: transparent;
-			-ms-scrollbar-track-color: transparent;
-			scrollbar-width: none;
-			-ms-overflow-style: none;
-		}
-		#edit_password .star{
-			color: red;
-			font-size: 22px;
-			display: inline-block;
-			vertical-align: bottom;
-			margin-bottom: -5px;
-			margin-right: 10px;
-		}
-		#edit_password .layui-form-item {
-			margin: 15px 0;
-		}
-	</style>
+<head>
+    <meta charset="UTF-8">
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"/>
+    <title>指挥中心统一认证平台</title>
+    <link rel="stylesheet" type="text/css" href="layui/css/layui.css"/>
+    <link rel="stylesheet" type="text/css" href="css/admin.css"/>
+    <link rel="stylesheet" type="text/css" href="css/index.css"/>
+    <link rel="stylesheet" type="text/css" href="css/common.css"/>
+    <link rel="stylesheet" type="text/css" href="css/animate.css"/>
+</head>
+<style>
+    .main-layout-side::-webkit-scrollbar {
+        display: none;
+    }
 
-	<body>
-		<div class="main-layout" id='main-layout'>
-			<!--侧边栏-->
-			<div class="main-layout-side">
-				<div class="m-logo" style="position: fixed;z-index: 99;width: 215px;font-size: 18px;padding-left: 2px;">指挥中心统一认证平台</div>
-				<ul class="layui-nav layui-nav-tree" lay-filter="leftNav" id="left-menu" style="margin-top: 60px;"></ul>
-			</div>
+    .main-layout-side {
+        scrollbar-color: transparent transparent;
+        scrollbar-track-color: transparent;
+        -ms-scrollbar-track-color: transparent;
+        scrollbar-width: none;
+        -ms-overflow-style: none;
+    }
 
-			<!--右侧内容-->
-			<div class="main-layout-container">
-				<!--头部-->
-				<div class="main-layout-header">
-					<div class="menu-btn" id="hideBtn">
-						<a href="javascript:;">
-							<span class="iconfont nav_hide">&#xe61e;</span>
-						</a>
-					</div>
-					<ul class="layui-nav" lay-filter="rightNav">
-						<li class="layui-nav-item">
-							<a href="javascript:;" id="ref">刷新当前</a>
-						</li>
-						<li class="layui-nav-item">
-							<a href="javascript:;">你好，<span id="userName">超级管理员</span></a>
-						</li>
-						<li class="layui-nav-item">
-							<a href="javascript:;" class="select_space">账户设置</a>
-							<dl class="layui-nav-child" style="margin-left: -10px;">
-								<dd>
-									<a href="javascript:;" data-url="" data-id='10' data-text="修改密码" class="edit_password">修改密码</a>
-								</dd>
-							</dl>
-						</li>
-						<li class="layui-nav-item">
-							<a href="javascript:;" class="right_line">|</a>
-						</li>
-						<li class="layui-nav-item">
-							<a href="javascript:;" id="outBtn">退出</a>
-						</li>
-					</ul>
-				</div>
-				<!--主体内容-->
-				<div class="main-layout-body">
-					<!--tab 切换-->
-					<div class="layui-tab layui-tab-brief main-layout-tab" lay-filter="tab" lay-allowClose="true">
-						<ul class="layui-tab-title" style="display: none;">
-							<li class="layui-this welcome">后台主页</li>
-						</ul>
-						<div class="top_title">指挥中心统一认证平台<span class="new-chat-tips layui-hide"><b>Tips：您有新的消息待查收！！！</b></span></div>
-						<div class="layui-tab-content">
-							<div class="layui-tab-item layui-show">
-								<!--1-->
-								<iframe id="welcomeIframe" src="welcome.html" width="100%" height="100%" name="iframe" scrolling="auto" class="iframe"
-								 framborder="0"></iframe>
-								<!--1end-->
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-			<!--遮罩-->
-			<div class="main-mask">
+    #edit_password .star {
+        color: red;
+        font-size: 22px;
+        display: inline-block;
+        vertical-align: bottom;
+        margin-bottom: -5px;
+        margin-right: 10px;
+    }
 
-			</div>
-		</div>
+    #edit_password .layui-form-item {
+        margin: 15px 0;
+    }
+</style>
 
-		<!-- 修改密码 -->
-		<div id="edit_password" style="display: none;">
-			<form class="layui-form edit_password_form" action="">
-				<div class="layui-form-item">
-					<div class="layui-inline">
-						<label class="layui-form-label"><span class="star">*</span>原密码</label>
-						<div class="layui-input-inline">
-							<input type="password" name="oldPassword" lay-verify="oldpassword" id="oldpassword" autocomplete="off" class="layui-input"
-							 placeholder="请输入原密码">
-						</div>
-					</div>
-				</div>
-				<div class="layui-form-item">
-					<div class="layui-inline">
-						<label class="layui-form-label"><span class="star">*</span>新密码</label>
-						<div class="layui-input-inline">
-							<input type="password" name="password" lay-verify="password" id="password" autocomplete="off" class="layui-input"
-							 placeholder="请输入新密码">
-						</div>
-					</div>
-				</div>
-				<div class="layui-form-item">
-					<div class="layui-inline">
-						<label class="layui-form-label"><span class="star">*</span>确认密码</label>
-						<div class="layui-input-inline">
-							<input type="password" name="repassword" lay-verify="repassword" autocomplete="off" class="layui-input"
-							 placeholder="请输入确认密码">
-						</div>
-					</div>
-				</div>
-				<div class="layui-form-item">
-					<div class="layui-input-block" style="text-align: center;margin-left: 0;">
-						<button type="button" class="layui-btn" lay-submit lay-filter="editPasswordBtn" style="background-color: #40a227;">确认</button>
-						<button type="button" class="layui-btn layui-btn-primary" id="editPasswordCancleBtn">取消</button>
-					</div>
-				</div>
-			</form>
-		</div>
-		<script src="layui/layui.js" type="text/javascript" charset="utf-8"></script>
-		<script src="js/common.js" type="text/javascript" charset="utf-8"></script>
-		<script src="js/main.js" type="text/javascript" charset="utf-8"></script>
-		<script src="js/constants.js" type="text/javascript" charset="utf-8"></script>
-		<script src="js/js-util.js" type="text/javascript" charset="utf-8"></script>
-		<script src="js/basic/index.js" type="text/javascript" charset="UTF-8"></script>
-	</body>
+<body>
+<div class="main-layout" id='main-layout'>
+    <!--侧边栏-->
+    <div class="main-layout-side">
+        <div class="m-logo" style="position: fixed;z-index: 99;width: 215px;font-size: 18px;padding-left: 2px;">指挥中心统一认证平台</div>
+        <ul class="layui-nav layui-nav-tree" lay-filter="leftNav" id="left-menu" style="margin-top: 60px;"></ul>
+    </div>
+
+    <!--右侧内容-->
+    <div class="main-layout-container">
+        <!--头部-->
+        <div class="main-layout-header">
+            <div class="menu-btn" id="hideBtn">
+                <a href="javascript:;">
+                    <span class="iconfont nav_hide">&#xe61e;</span>
+                </a>
+            </div>
+            <ul class="layui-nav" lay-filter="rightNav">
+                <li class="layui-nav-item">
+                    <a href="javascript:;" id="ref">刷新当前</a>
+                </li>
+                <li class="layui-nav-item">
+                    <a href="javascript:;">你好，<span id="userName">超级管理员</span></a>
+                </li>
+                <!--<li class="layui-nav-item">
+                    <a href="javascript:;" class="select_space">账户设置</a>
+                    <dl class="layui-nav-child" style="margin-left: -10px;">
+                        <dd>
+                            <a href="javascript:;" data-url="" data-id='10' data-text="修改密码" class="edit_password">修改密码</a>
+                        </dd>
+                    </dl>
+                </li>-->
+                <li class="layui-nav-item">
+                    <a href="javascript:;" class="right_line">|</a>
+                </li>
+                <li class="layui-nav-item">
+                    <a href="javascript:;" id="outBtn">退出</a>
+                </li>
+            </ul>
+        </div>
+        <!--主体内容-->
+        <div class="main-layout-body">
+            <!--tab 切换-->
+            <div class="layui-tab layui-tab-brief main-layout-tab" lay-filter="tab" lay-allowClose="true">
+                <ul class="layui-tab-title" style="display: none;">
+                    <li class="layui-this welcome">后台主页</li>
+                </ul>
+                <div class="top_title">指挥中心统一认证平台<span class="new-chat-tips layui-hide"><b>Tips：您有新的消息待查收！！！</b></span></div>
+                <div class="layui-tab-content">
+                    <div class="layui-tab-item layui-show">
+                        <!--1-->
+                        <iframe id="welcomeIframe" src="welcome.html" width="100%" height="100%" name="iframe" scrolling="auto" class="iframe" framborder="0"></iframe>
+                        <!--1end-->
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!--遮罩-->
+    <div class="main-mask"></div>
+</div>
+
+<!-- 修改密码 -->
+<div id="edit_password" style="display: none;">
+    <form class="layui-form edit_password_form" action="">
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <label class="layui-form-label"><span class="star">*</span>原密码</label>
+                <div class="layui-input-inline">
+                    <input type="password" name="oldPassword" lay-verify="oldpassword" id="oldpassword" autocomplete="off" class="layui-input"
+                           placeholder="请输入原密码">
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <label class="layui-form-label"><span class="star">*</span>新密码</label>
+                <div class="layui-input-inline">
+                    <input type="password" name="password" lay-verify="password" id="password" autocomplete="off" class="layui-input" placeholder="请输入新密码">
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <div class="layui-inline">
+                <label class="layui-form-label"><span class="star">*</span>确认密码</label>
+                <div class="layui-input-inline">
+                    <input type="password" name="repassword" lay-verify="repassword" autocomplete="off" class="layui-input" placeholder="请输入确认密码">
+                </div>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <div class="layui-input-block" style="text-align: center;margin-left: 0;">
+                <button type="button" class="layui-btn" lay-submit lay-filter="editPasswordBtn" style="background-color: #40a227;">确认</button>
+                <button type="button" class="layui-btn layui-btn-primary" id="editPasswordCancleBtn">取消</button>
+            </div>
+        </div>
+    </form>
+</div>
+
+<script src="layui/layui.js" type="text/javascript" charset="utf-8"></script>
+<script src="js/common.js" type="text/javascript" charset="utf-8"></script>
+<script src="js/main.js" type="text/javascript" charset="utf-8"></script>
+<script src="js/constants.js" type="text/javascript" charset="utf-8"></script>
+<script src="js/js-util.js" type="text/javascript" charset="utf-8"></script>
+<script src="js/basic/index.js" type="text/javascript" charset="UTF-8"></script>
+
+</body>
 
 </html>

spring-cloud/server-page/src/main/resources/static/sso/js/basic/index.js

@@ -2,146 +2,148 @@ var idArr = new Array();
 var currIndex = 0;
 var mp3_dkbc = 0;
 var mp3_dkbc_s = null;
+
 layui.config({
-	base: 'js/encryption/'
-}).use(['table', 'element', 'form', 'layer', 'ajax', 'jquery'], function() {
-	$ = layui.jquery,
-	table = layui.table,
-	form = layui.form,
-	layer = layui.layer,
-	element = layui.element;
-	ly = layui.ajax;
-	IEVersion();
-	// 用户
-	$('#userName').text(sessionStorage.LOGIN_USERNAME);
-	// $('.userName').text(sessionStorage.LOGIN_ROLENAME);
-	// 请求加载左侧菜单
-	requestMenu();
+    base: 'js/encryption/'
+}).use(['table', 'element', 'form', 'layer', 'ajax', 'jquery'], function () {
+    $ = layui.jquery;
+    table = layui.table;
+    form = layui.form;
+    layer = layui.layer;
+    element = layui.element;
+    ly = layui.ajax;
+    IEVersion();
+
+    // 用户
+    $('#userName').text(sessionStorage.LOGIN_USERNAME);
+    // $('.userName').text(sessionStorage.LOGIN_ROLENAME);
+    // 请求加载左侧菜单
+    // requestMenu();
 
-	// 退出
-	$('#outBtn').on('click', function() {
-		layer.confirm('确认退出？', {
-			icon: 3,
-			title: '提示'
-		}, function(index) {
-			logout(sessionStorage.LOGIN_USERID);
-		})
-	});
+    // 退出
+    $('#outBtn').on('click', function () {
+        layer.confirm('确认退出？', {
+            icon: 3,
+            title: '提示'
+        }, function (index) {
+            logout();
+        });
+    });
 
-	var editOpenIndex;
+    var editOpenIndex;
 
-	//修改密码
-	$(".edit_password").click(function() {
-		editOpenIndex = layer.open({
-			type: 1,
-			title: "修改密码",
-			area: ['535px', '300px'],
-			content: $('#edit_password')
-		});
-	});
+    //修改密码
+    $(".edit_password").click(function () {
+        editOpenIndex = layer.open({
+            type: 1,
+            title: "修改密码",
+            area: ['535px', '300px'],
+            content: $('#edit_password')
+        });
+    });
 
-	// 修改密码提交
-	form.on('submit(editPasswordBtn)', function(data) {
-		data.field.userId = sessionStorage.LOGIN_USERID;
-		editPassword(data.field);
-	});
+    // 修改密码提交
+    form.on('submit(editPasswordBtn)', function (data) {
+        data.field.userId = sessionStorage.LOGIN_USERID;
+        editPassword(data.field);
+    });
 
-	// 修改密码取消按钮
-	$('#editPasswordCancleBtn').click(function() {
-		layer.close(editOpenIndex);
-	});
+    // 修改密码取消按钮
+    $('#editPasswordCancleBtn').click(function () {
+        layer.close(editOpenIndex);
+    });
 
 
-	// 表单验证
-	form.verify({
-		oldpassword: function(value, item) { // value：表单的值、item：表单的DOM对象
-			if (!value.trim()) {
-				return '原密码不能为空！';
-			}
-			if (value.length < 6 || value.length > 20) {
-				return '密码长度为6到20位';
-			}
-			if (value.length < 6 || value.length > 20) {
-				return '密码长度为6到20位';
-			}
-			if (!new RegExp("^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?!([^(0-9a-zA-Z)])+$)^.{6,20}$").test(value)) {
-				return '密码需包含数字、字母、特殊字符中至少两种';
-			}
-		},
-		repassword: function(value, item) { // value：表单的值、item：表单的DOM对象
-			if (!value.trim()) {
-				return '密码不能为空！';
-			}
-			if (value.length < 6 || value.length > 20) {
-				return '密码长度为6到20位';
-			}
-			var pass = $('#password').val();
-			if (value != pass) {
-				return '确认密码与新密码不相同';
-			}
-			var oldpass = $('#oldpassword').val();
-			if (value == oldpass) {
-				return '新密码与原密码不能相同';
-			}
-			if (value.length < 6 || value.length > 20) {
-				return '密码长度为6到20位';
-			}
-			if (!new RegExp("^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?!([^(0-9a-zA-Z)])+$)^.{6,20}$").test(value)) {
-				return '密码需包含数字、字母、特殊字符中至少两种';
-			}
-		}
-	});
-	// 提交表单
-	form.on('submit(changeSubmit)', function(data) {
-		changePassword();
-	});
+    // 表单验证
+    form.verify({
+        oldpassword: function (value, item) { // value：表单的值、item：表单的DOM对象
+            if (!value.trim()) {
+                return '原密码不能为空！';
+            }
+            if (value.length < 6 || value.length > 20) {
+                return '密码长度为6到20位';
+            }
+            if (value.length < 6 || value.length > 20) {
+                return '密码长度为6到20位';
+            }
+            if (!new RegExp("^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?!([^(0-9a-zA-Z)])+$)^.{6,20}$").test(value)) {
+                return '密码需包含数字、字母、特殊字符中至少两种';
+            }
+        },
+        repassword: function (value, item) { // value：表单的值、item：表单的DOM对象
+            if (!value.trim()) {
+                return '密码不能为空！';
+            }
+            if (value.length < 6 || value.length > 20) {
+                return '密码长度为6到20位';
+            }
+            var pass = $('#password').val();
+            if (value != pass) {
+                return '确认密码与新密码不相同';
+            }
+            var oldpass = $('#oldpassword').val();
+            if (value == oldpass) {
+                return '新密码与原密码不能相同';
+            }
+            if (value.length < 6 || value.length > 20) {
+                return '密码长度为6到20位';
+            }
+            if (!new RegExp("^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?!([^(0-9a-zA-Z)])+$)^.{6,20}$").test(value)) {
+                return '密码需包含数字、字母、特殊字符中至少两种';
+            }
+        }
+    });
+    // 提交表单
+    form.on('submit(changeSubmit)', function (data) {
+        changePassword();
+    });
 
 });
 
 /** 请求所有菜单 * */
 function requestMenu() {
-	ly.ajax({
-		type: 'GET',
-		url: PAGE_BASIC + '/menu/getMenuListByRole',
-		dataType: 'json',
-		data: {
-			"roleId": sessionStorage.ROLE_ID
-		},
-		success: function(json) {
-			var data = json.data;
-			// 清楚菜单按钮session
-			var sessionKeys = Object.keys(sessionStorage);
-			for(var i = 0; i < sessionKeys.length; i++){
-				var key = sessionKeys[i];
-				if(key.indexOf("menuid-") == 0){
-					sessionStorage.removeItem(key);
-				}
-			}			
-			if (json.result) {
-				// 存储菜单按钮权限
-				for (var i in data) {
-					var buttons = data[i].buttons;
-					if (buttons) {
-						var buttons = buttons.split(',');
-						for (var j in buttons) {
-							if (buttons[j]) {
-								sessionStorage.setItem("menuid-" + data[i].menu_id + "-" + buttons[j], buttons[j]);
-							}
-						}
-					}
+    ly.ajax({
+        type: 'GET',
+        url: PAGE_BASIC + '/menu/getMenuListByRole',
+        dataType: 'json',
+        data: {
+            "roleId": sessionStorage.ROLE_ID
+        },
+        success: function (json) {
+            var data = json.data;
+            // 清楚菜单按钮session
+            var sessionKeys = Object.keys(sessionStorage);
+            for (var i = 0; i < sessionKeys.length; i++) {
+                var key = sessionKeys[i];
+                if (key.indexOf("menuid-") == 0) {
+                    sessionStorage.removeItem(key);
+                }
+            }
+            if (json.result) {
+                // 存储菜单按钮权限
+                for (var i in data) {
+                    var buttons = data[i].buttons;
+                    if (buttons) {
+                        var buttons = buttons.split(',');
+                        for (var j in buttons) {
+                            if (buttons[j]) {
+                                sessionStorage.setItem("menuid-" + data[i].menu_id + "-" + buttons[j], buttons[j]);
+                            }
+                        }
+                    }
 
-				}
-				// 初始化左侧菜单数据
-				initMenu(json.data);
-			} else {
-				sessionStorage.clear();
-				window.location.href = "login.html";
-			}
-		},
-		error: function(msg) {
-			goPage(msg, 1);
-		}
-	});
+                }
+                // 初始化左侧菜单数据
+                initMenu(json.data);
+            } else {
+                sessionStorage.clear();
+                window.location.href = "login.html";
+            }
+        },
+        error: function (msg) {
+            goPage(msg, 1);
+        }
+    });
 }
 
 /**
@@ -149,104 +151,104 @@ function requestMenu() {
  * @returns
  */
 function reLogin() {
-	index = layer.load(2);
-	ly.ajax({
-		type: 'GET',
-		url: PAGE_BASIC + '/menu/getMenuListByRole',
-		dataType: 'json',
-		data: {
-			"roleId": sessionStorage.ROLE_ID
-		},
-		success: function(json) {
-			if (!json.result) {
-				layer.alert('登录超时，请重新登录！', {
-					icon: 2,
-					title: '提示',
-					closeBtn: 0
-				}, function(index) {
-					layer.close(index);
-					sessionStorage.clear();
-					window.location.href = "login.html";
-				});
-			}
-			layer.close(index);
-		},
-		error: function(msg) {
-			layer.close(index);
-			goPage(msg, 1);
-		}
-	});
+    index = layer.load(2);
+    ly.ajax({
+        type: 'GET',
+        url: PAGE_BASIC + '/menu/getMenuListByRole',
+        dataType: 'json',
+        data: {
+            "roleId": sessionStorage.ROLE_ID
+        },
+        success: function (json) {
+            if (!json.result) {
+                layer.alert('登录超时，请重新登录！', {
+                    icon: 2,
+                    title: '提示',
+                    closeBtn: 0
+                }, function (index) {
+                    layer.close(index);
+                    sessionStorage.clear();
+                    window.location.href = "login.html";
+                });
+            }
+            layer.close(index);
+        },
+        error: function (msg) {
+            layer.close(index);
+            goPage(msg, 1);
+        }
+    });
 }
 
 /** 初始化首页左侧菜单数据 **/
 function initMenu(data) {
-	// 判断数据是否为空
-	if (!data) {
-		return false;
-	}
-	// 需要显示角标的菜单 ID
-	var menuShowIndex = [];
-	$("#left-menu").empty();
-	var pstr = '',
-		cstr = '';
-	for (var i in data) {
-		// 父节点菜单
-		if (data[i].parent_id == -1) {
-			pstr += '<li class="layui-nav-item layui-nav-itemed">';
-			pstr += '<a href="javascript:void(0);" class="parent-' + data[i].menu_id + '">';
-			pstr += '<i class="layui-icon ' + data[i].menu_icon + '"></i>';
-			pstr += '' + data[i].menu_name + '';
-			pstr += '</a>';
-			pstr += '<dl class="layui-nav-child" id="menuChild' + data[i].menu_id + '">';
-			pstr += '</dl>';
-		}
-	}
-	$("#left-menu").append(pstr);
-	for (var i in data) {
-		// 父节点菜单
-		if (data[i].parent_id != -1) {
-			cstr += '<dd>';
-			cstr += '<a data-url="' + data[i].menu_url + '" data-id="' + data[i].menu_id + '" data-title="' + data[i].menu_name +
-				'" data-text="' + data[i].menu_name +
-				'" href="javascript:void(0);" class="site-demo-active" style="text-align:center;">';
-			cstr += data[i].menu_name + '</a>';
-			cstr += '</dd>';
-			$("#menuChild" + data[i].parent_id).append(cstr);
-			cstr = '';
-		}
-	}
-	// 重新渲染 HTML
-	element.init();
-	// 当点击有site-demo-active属性的标签时，即左侧菜单栏中内容 ，触发点击事件
-	$('.site-demo-active').on('click', function() {
-		var dataid = $(this);
-		// 判断登录是否有效
-		reLogin();
-		// 这时会判断右侧.layui-tab-title属性下的有lay-id属性的li的数目，即已经打开的tab项数目
-		if ($(".layui-tab-title li[lay-id]").length <= 0) {
-			// 如果比零小，则直接打开新的tab项
-			active.tabAdd(dataid.attr("data-url"), dataid.attr("data-id"), dataid.attr("data-title"));
-		} else {
-			// 否则判断该tab项是否以及存在
-			var isData = false; //初始化一个标志，为false说明未打开该tab项 为true则说明已有
-			$.each($(".layui-tab-title li[lay-id]"), function() {
-				// 如果点击左侧菜单栏所传入的id 在右侧tab项中的lay-id属性可以找到，则说明该tab项已经打开
-				if ($(this).attr("lay-id") == dataid.attr("data-id")) {
-					//刷新iframe
-					var iframe = $('.layui-tab-content>.layui-tab-item>iframe[name="iframe' + dataid.attr("data-id") + '"]');
-					$(iframe).attr('src', $(iframe).attr('src'));
-					isData = true;
-				}
-			});
-			if (isData == false) {
-				//标志为false 新增一个tab项
-				active.tabAdd(dataid.attr("data-url"), dataid.attr("data-id"), dataid.attr("data-title"));
-			}
-		}
-		sessionStorage.MENU_ID = dataid.attr("data-id");
-		//最后不管是否新增tab，最后都转到要打开的选项页面上
-		// active.tabChange(dataid.attr("data-id"));
-	});
+    // 判断数据是否为空
+    if (!data) {
+        return false;
+    }
+    // 需要显示角标的菜单 ID
+    var menuShowIndex = [];
+    $("#left-menu").empty();
+    var pstr = '',
+        cstr = '';
+    for (var i in data) {
+        // 父节点菜单
+        if (data[i].parent_id == -1) {
+            pstr += '<li class="layui-nav-item layui-nav-itemed">';
+            pstr += '<a href="javascript:void(0);" class="parent-' + data[i].menu_id + '">';
+            pstr += '<i class="layui-icon ' + data[i].menu_icon + '"></i>';
+            pstr += '' + data[i].menu_name + '';
+            pstr += '</a>';
+            pstr += '<dl class="layui-nav-child" id="menuChild' + data[i].menu_id + '">';
+            pstr += '</dl>';
+        }
+    }
+    $("#left-menu").append(pstr);
+    for (var i in data) {
+        // 父节点菜单
+        if (data[i].parent_id != -1) {
+            cstr += '<dd>';
+            cstr += '<a data-url="' + data[i].menu_url + '" data-id="' + data[i].menu_id + '" data-title="' + data[i].menu_name +
+                '" data-text="' + data[i].menu_name +
+                '" href="javascript:void(0);" class="site-demo-active" style="text-align:center;">';
+            cstr += data[i].menu_name + '</a>';
+            cstr += '</dd>';
+            $("#menuChild" + data[i].parent_id).append(cstr);
+            cstr = '';
+        }
+    }
+    // 重新渲染 HTML
+    element.init();
+    // 当点击有site-demo-active属性的标签时，即左侧菜单栏中内容 ，触发点击事件
+    $('.site-demo-active').on('click', function () {
+        var dataid = $(this);
+        // 判断登录是否有效
+        reLogin();
+        // 这时会判断右侧.layui-tab-title属性下的有lay-id属性的li的数目，即已经打开的tab项数目
+        if ($(".layui-tab-title li[lay-id]").length <= 0) {
+            // 如果比零小，则直接打开新的tab项
+            active.tabAdd(dataid.attr("data-url"), dataid.attr("data-id"), dataid.attr("data-title"));
+        } else {
+            // 否则判断该tab项是否以及存在
+            var isData = false; //初始化一个标志，为false说明未打开该tab项 为true则说明已有
+            $.each($(".layui-tab-title li[lay-id]"), function () {
+                // 如果点击左侧菜单栏所传入的id 在右侧tab项中的lay-id属性可以找到，则说明该tab项已经打开
+                if ($(this).attr("lay-id") == dataid.attr("data-id")) {
+                    //刷新iframe
+                    var iframe = $('.layui-tab-content>.layui-tab-item>iframe[name="iframe' + dataid.attr("data-id") + '"]');
+                    $(iframe).attr('src', $(iframe).attr('src'));
+                    isData = true;
+                }
+            });
+            if (isData == false) {
+                //标志为false 新增一个tab项
+                active.tabAdd(dataid.attr("data-url"), dataid.attr("data-id"), dataid.attr("data-title"));
+            }
+        }
+        sessionStorage.MENU_ID = dataid.attr("data-id");
+        //最后不管是否新增tab，最后都转到要打开的选项页面上
+        // active.tabChange(dataid.attr("data-id"));
+    });
 }
 
 /**
@@ -254,83 +256,85 @@ function initMenu(data) {
  * @returns
  */
 function changePassword() {
-	var index = layer.load(2);
-	ly.ajax({
-		type: 'post',
-		url: PAGE_BASIC + '/user/changePassword',
-		data: {
-			'userId': sessionStorage.LOGIN_USERID,
-			'password': $('#password').val(),
-			'newPassword': $('#newPassword').val()
-		},
-		dataType: 'json',
-		success: function(json) {
-			layer.closeAll();
-			$("#changeForm")[0].reset();
-			if (json.result) {
-				alert('密码修改成功，请重新登录');
-				sessionStorage.clear();
-				window.location = "./login/login.html";
-			} else {
-				layer.msg('密码修改失败');
-			}
-			layer.close(index);
-		},
-		error: function(msg) {
-			layer.close(index);
-			goPage(msg, 1);
-		}
-	});
+    var index = layer.load(2);
+    ly.ajax({
+        type: 'post',
+        url: PAGE_BASIC + '/user/changePassword',
+        data: {
+            'userId': sessionStorage.LOGIN_USERID,
+            'password': $('#password').val(),
+            'newPassword': $('#newPassword').val()
+        },
+        dataType: 'json',
+        success: function (json) {
+            layer.closeAll();
+            $("#changeForm")[0].reset();
+            if (json.result) {
+                alert('密码修改成功，请重新登录');
+                sessionStorage.clear();
+                window.location = "./login/login.html";
+            } else {
+                layer.msg('密码修改失败');
+            }
+            layer.close(index);
+        },
+        error: function (msg) {
+            layer.close(index);
+            goPage(msg, 1);
+        }
+    });
 }
 
-/* 注销操作 */
-function logout(userId) {
-	console.log(userId);
-	index = layer.load(2);
-	ly.ajax({
-		type: 'GET',
-		url: PAGE_BASIC + '/user/logout',
-		dataType: 'json',
-		data: {
-			"userId": userId
-		},
-		success: function(json) {
-			sessionStorage.clear();
-			layer.close(index);
-			window.location = "login.html";
-		},
-		error: function(msg) {
-			layer.close(index);
-			goPage(msg, 1);
-		}
-	});
+/**
+ * 注销登录
+ */
+function logout() {
+    let index = layer.load(2);
+    ly.ajax({
+        type: 'GET',
+        url: PAGE_BASIC + '/ssoUser/logout',
+        dataType: 'json',
+        data: {
+            'clientId': sessionStorage.CLIENT_ID,
+            'loginAccount': sessionStorage.ACCOUNT
+        },
+        success: function (json) {
+            layer.close(index);
+            let clientId = sessionStorage.CLIENT_ID;
+            sessionStorage.clear();
+            window.location = "login.html?clientId=" + clientId;
+        },
+        error: function (msg) {
+            layer.close(index);
+        }
+    });
 }
 
 // 修改密码
 function editPassword(data) {
-	console.log(data);
-	index = layer.load(2);
-	ly.ajax({
-		type: 'POST',
-		url: PAGE_BASIC + '/user/changePassword',
-		dataType: 'json',
-		data: data,
-		success: function(json) {
-			$('.edit_password_form')[0].reset();
-			if (json.result) {
-				alert('密码修改成功，请重新登录');
-				layer.closeAll();
-				logout(sessionStorage.LOGIN_USERID);
-			} else if (json.msg == 'ERROEPASS') {
-				layer.msg('原密码错误请重新输入');
-			} else {
-				layer.msg('密码修改失败,' + json.msg);
-			}
-			layer.close(index);
-		},
-		error: function(msg) {
-			layer.close(index);
-			goPage(msg, 1);
-		}
-	});
+    console.log(data);
+    index = layer.load(2);
+    ly.ajax({
+        type: 'POST',
+        url: PAGE_BASIC + '/user/changePassword',
+        dataType: 'json',
+        data: data,
+        success: function (json) {
+            $('.edit_password_form')[0].reset();
+            if (json.result) {
+                alert('密码修改成功，请重新登录');
+                layer.closeAll();
+                logout();
+            } else if (json.msg == 'ERROEPASS') {
+                layer.msg('原密码错误请重新输入');
+            } else {
+                layer.msg('密码修改失败,' + json.msg);
+            }
+            layer.close(index);
+        },
+        error: function (msg) {
+            layer.close(index);
+            goPage(msg, 1);
+        }
+    });
 }

spring-cloud/server-page/src/main/resources/static/sso/js/basic/login.js

@@ -28,11 +28,6 @@ layui.config({
 
     // 监听提交
     form.on('submit(login)', function (data) {
-        // layer.alert(JSON.stringify(data.field), {
-        // title: '最终的提交信息'
-        // });
-        // window.location.href = 'index.html';
-
         submitLogin();
         return false;
     });
@@ -64,34 +59,29 @@ function submitLogin() {
             "loginAccount": $.trim($("#loginAccount").val()),
             "loginPwd": $.trim($("#password").val()),
             "clientType": 1,
-            'clientId': clientId,
-            'redirect': redirect
+            'clientId': clientId
         },
         success: function (json) {
             layer.close(index);
             if (json.result) {
                 if (json.data.access_token) {
-                    sessionStorage.TOKEN_TYPE = json.data.token_type;
-                    sessionStorage.ACCESS_TOKEN = json.data.access_token;
-                    sessionStorage.REFRESH_TOKEN = json.data.refresh_token;
                     //SSO管理后台
                     if (redirect) {
-                        sessionStorage.setItem("ACCOUNT", json.data.account);
-                        sessionStorage.setItem("CLIENT_ID", clientId);
                         window.name = JSON.stringify({
-                            TOKEN_TYPE: json.data.token_type,
                             ACCESS_TOKEN: json.data.access_token,
                             REFRESH_TOKEN: json.data.refresh_token,
+                            TOKEN_TYPE: json.data.token_type,
                             ACCOUNT: json.data.account,
                             CLIENT_ID: clientId
                         });
-                        window.location = redirect;
+                        window.location = json.data.redirect_url;
                     } else {
                         sessionStorage.LOGIN_USERID = json.data.userId;
-                        sessionStorage.ROLE_ID = json.data.roleId;
                         sessionStorage.ACCOUNT = json.data.account;
-                        sessionStorage.LOGIN_USERNAME = json.data.userName;
-                        sessionStorage.ROLE_TYPE = json.data.roleType;
+                        sessionStorage.ACCESS_TOKEN = json.data.access_token;
+                        sessionStorage.REFRESH_TOKEN = json.data.refresh_token;
+                        sessionStorage.TOKEN_TYPE = json.data.token_type;
+                        sessionStorage.CLIENT_ID = clientId;
 
                         window.location = 'index.html';
                     }
@@ -104,7 +94,6 @@ function submitLogin() {
                 } else {
                     layer.msg('帐号或密码有误！');
                 }
-                // clearInput();
             }
         },
         error: function (msg) {
@@ -114,14 +103,6 @@ function submitLogin() {
     });
 }
 
-/* 清空文本框内容 */
-function clearInput() {
-    // 清空帐号
-    $("#loginAccount").val("");
-    // 清空密码
-    $("#password").val("");
-}
-
 /**
  * 获取地址栏参数
  * @param name

spring-cloud/server-page/src/main/resources/static/sso/welcome.html

@@ -1,104 +1,103 @@
 <!DOCTYPE html>
 <html>
 
-	<head>
-		<meta charset="UTF-8">
-		<meta name="renderer" content="webkit">
-		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
-		<title>业务系统</title>
-		<link rel="stylesheet" type="text/css" href="layui/css/layui.css" />
-		<link rel="stylesheet" type="text/css" href="css/admin.css" />
-		<link rel="stylesheet" type="text/css" href="css/common.css" />
-		<link rel="stylesheet" type="text/css" href="css/animate.css" />
-	</head>
-	<style type="text/css">
-	</style>
+<head>
+    <meta charset="UTF-8">
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"/>
+    <title>业务系统</title>
+    <link rel="stylesheet" type="text/css" href="layui/css/layui.css"/>
+    <link rel="stylesheet" type="text/css" href="css/admin.css"/>
+    <link rel="stylesheet" type="text/css" href="css/common.css"/>
+    <link rel="stylesheet" type="text/css" href="css/animate.css"/>
+</head>
 
-	<body>
-		<div id="systemList">
-			
-		</div>
-		<script type="text/javascript" src="layui/layui.js"></script>
-		<script type="text/javascript" src="js/js-util.js"></script>
-		<script type="text/javascript" src="js/constants.js"></script>
-		<script type="text/javascript">
-			var $, layer, table, element;
-			layui.config({
-				base: 'js/encryption/'
-			}).use(['table', 'element', 'layer', 'ajax'], function() {
-				layer = layui.layer,
-					$ = layui.jquery,
-					element = layui.element,
-					table = layui.table;
-					ly = layui.ajax;	
-				
-				
-				
-				var index = layer.load(2);
-				ly.ajax({
-					type: 'POST',
-					url: PAGE_BASIC + '/ssoSystem/getSsoSystemList',
-					dataType: 'json',
-					data: {
-						"userId": sessionStorage.LOGIN_USERID
-					},
-					success: function(json) {
-						if (json.result) {
-							var data = json.data;
-							var str = "";
-							for(var i = 0; i < data.length; i++){
-								var redirectUrl = redirectUrlAddParam(data[i].redirectUrl, data[i].appid, data[i].loginAccount, sessionStorage.ACCESS_TOKEN);
-								str += `<div>
-											<a href="` + data[i].redirectUrl + `" target="_blank">
-												<img alt="` + data[i].name + `" src="` + data[i].titleImg + `">
-												<span>` + data[i].name + `</span>
-											</a>
-										</div>`;
-							}
-							$("#systemList").html(str);			
-						} else {
-							layer.msg(json.msg, {
-								icon: 5
-							});
-						}
-						layer.close(index);
-					},
-					error: function(msg) {
-						layer.close(index);
-						layer.msg("查询失败！");
-					}
-				});
-				
-			});
-			
-			function redirectUrlAddParam(redirectUrl, appid, loginAccount, accessToken){
-				if(!redirectUrl){
-					return "";
-				}
-				var params = "";
-				if(appid){
-					params += "&appid=" + appid;
-				}
-				if(loginAccount){
-					params += "&loginAccount=" + loginAccount;
-				}
-				if(accessToken){
-					params += "&accessToken=" + accessToken;
-				}
-				
-				if(params){
-					if(redirectUrl.indexOf("?") < 0){
-						redirectUrl += "?";
-					}
-					if(redirectUrl.indexOf("&") < 0){
-						params = params.substring(1);
-					}
-					redirectUrl += params;
-				}
-				return redirectUrl;
-			}
-		</script>
-	</body>
+<style>
+    #systemList {
+        width: 100%;
+        margin-top: 20px;
+    }
+
+    .titleImg {
+        width: 100%;
+        height: 100px;
+    }
+
+    .layui-col-md2 {
+        text-align: center;
+        cursor: pointer;
+    }
+</style>
+
+<body>
+<div class="layui-container" id="systemList"></div>
+
+<script type="text/javascript" src="layui/layui.js"></script>
+<script type="text/javascript" src="js/js-util.js"></script>
+<script type="text/javascript" src="js/constants.js"></script>
+<script type="text/javascript">
+    var $, layer, table, element;
+    layui.config({
+        base: 'js/encryption/'
+    }).use(['table', 'element', 'layer', 'ajax'], function () {
+        layer = layui.layer;
+        $ = layui.jquery;
+        element = layui.element;
+        table = layui.table;
+        ly = layui.ajax;
+
+        var index = layer.load(2);
+        ly.ajax({
+            type: 'GET',
+            url: PAGE_BASIC + '/ssoSystem/getSsoSystemList',
+            dataType: 'json',
+            data: {
+                "userId": sessionStorage.LOGIN_USERID
+            },
+            success: function (json) {
+                if (json.result) {
+                    let data = json.data;
+                    let str = "";
+                    for (let i = 0; i < data.length; i++) {
+                        if (i % 6 == 0) {
+                            str += `<div class="layui-row layui-col-space10">`;
+                        }
+                        str += `<div class="layui-col-md2" onclick="gotoPage('` + data[i].redirect_url + `');">
+                                    <img class="titleImg" alt="` + data[i].name + `" src="` + data[i].title_img + `">
+                                    <span class="titleName">` + data[i].name + `</span>
+                                </div>`;
+                        if (i % 6 == 5 || i == data.length - 1) {
+                            str += `</div>`;
+                        }
+                    }
+                    $("#systemList").html(str);
+                } else {
+                    layer.msg(json.msg, {icon: 5});
+                }
+                layer.close(index);
+            },
+            error: function (msg) {
+                layer.close(index);
+                layer.msg("查询失败！");
+            }
+        });
+
+    });
+
+    function gotoPage(redirectUrl) {
+        if (redirectUrl) {
+            parent.window.name = JSON.stringify({
+                ACCESS_TOKEN: sessionStorage.ACCESS_TOKEN,
+                REFRESH_TOKEN: sessionStorage.REFRESH_TOKEN,
+                TOKEN_TYPE: sessionStorage.TOKEN_TYPE,
+                ACCOUNT: sessionStorage.ACCOUNT,
+                CLIENT_ID: sessionStorage.CLIENT_ID
+            });
+            parent.window.location = redirectUrl;
+        }
+    }
+</script>
+</body>
 
 </html>