From 203ccd33602c8a2b3a51f29a1de1901af5348533 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 13 Jun 2020 22:54:35 +0800
Subject: [PATCH] =?UTF-8?q?mybatis=20=E7=B1=BB=E5=9E=8B=E5=88=AB=E5=90=8D?=
 =?UTF-8?q?=E6=89=AB=E6=8F=8F=20=E6=9C=89=E5=8E=9F=E6=9D=A5=E7=9A=84=20Bas?=
 =?UTF-8?q?eEntity=20=E6=9B=BF=E6=8D=A2=E4=B8=BA=20@Table=20=E6=B3=A8?=
 =?UTF-8?q?=E8=A7=A3=E6=89=AB=E6=8F=8F=EF=BC=8C=E9=81=BF=E5=85=8D=E6=9C=89?=
 =?UTF-8?q?=E4=BA=9B=E4=B8=8D=E6=83=B3=E8=A2=AB=E6=89=AB=E6=8F=8F=E7=9A=84?=
 =?UTF-8?q?=E5=88=B0=E7=9A=84=E5=AE=9E=E4=BD=93=E4=BD=9C=E4=B8=BA=E5=88=AB?=
 =?UTF-8?q?=E5=90=8D=E3=80=82=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96=EF=BC=9A?=
 =?UTF-8?q?boot=202.2.8=E3=80=81mybatis=203.5.5=E3=80=81shiro=201.5.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeesite/common/shiro/realm/AuthorizingRealm.java   |  8 +++++---
 .../views/themes/default/modules/sys/sysLogin.html     |  8 ++++++++
 parent/pom.xml                                         | 10 +++++-----
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/realm/AuthorizingRealm.java b/modules/core/src/main/java/com/jeesite/common/shiro/realm/AuthorizingRealm.java
index 0b5b2930..a47f0144 100644
--- a/modules/core/src/main/java/com/jeesite/common/shiro/realm/AuthorizingRealm.java
+++ b/modules/core/src/main/java/com/jeesite/common/shiro/realm/AuthorizingRealm.java
@@ -41,7 +41,7 @@ public class AuthorizingRealm extends BaseAuthorizingRealm  {
 	}
 	
 	/**
-	 * 获取登录令牌
+	 * 获取登录凭证，将 authcToken 转换为 FormToken，参考 CAS 实现
 	 */
 	@Override
 	protected FormToken getFormToken(AuthenticationToken authcToken) {
@@ -49,7 +49,9 @@ public class AuthorizingRealm extends BaseAuthorizingRealm  {
 	}
 	
 	/**
-	 * 获取用户信息
+	 * 用于用户根据登录信息获取用户信息<br>
+	 * 1、默认根据登录账号登录信息，如：UserUtils.getByLoginCode(token.getUsername(), token.getParam("corpCode"));<br>
+	 * 2、如果增加其它登录，请重写此方法，如根据手机号或邮箱登录返回用户信息。
 	 */
 	@Override
 	protected User getUserInfo(FormToken token) {
@@ -57,7 +59,7 @@ public class AuthorizingRealm extends BaseAuthorizingRealm  {
 	}
 	
 	/**
-	 * 校验登录凭证
+	 * 校验登录凭证，如密码验证，token验证，验证失败抛出 AuthenticationException 异常
 	 */
 	@Override
 	protected void assertCredentialsMatch(AuthenticationToken authcToken, AuthenticationInfo authcInfo) throws AuthenticationException {
diff --git a/modules/core/src/main/resources/views/themes/default/modules/sys/sysLogin.html b/modules/core/src/main/resources/views/themes/default/modules/sys/sysLogin.html
index e2f225e6..e065503d 100644
--- a/modules/core/src/main/resources/views/themes/default/modules/sys/sysLogin.html
+++ b/modules/core/src/main/resources/views/themes/default/modules/sys/sysLogin.html
@@ -11,6 +11,14 @@
 	<div class="login-box-body">
 		<#form:form id="loginForm" model="${user!}" action="${ctx}/login" method="post">
 			<h4 class="login-box-msg">${isNotBlank(message!)?message:text('欢迎回来')+'！'}</h4>
+			<!-- <ul class="nav nav-tabs mb20">
+				<li class="active"><a href="#tab-1" data-toggle="tab">账号登录</a></li>
+				<li><a href="#tab-2" data-toggle="tab">邮箱登录</a></li>
+			</ul>
+			<div class="tab-content">
+				<div class="tab-pane active" id="tab-1"></div>
+				<div class="tab-pane" id="tab-2"></div>
+			</div> -->
 			<div class="form-group has-feedback">
 				<span class="glyphicon glyphicon-user form-control-feedback" title="${text('登录账号')}"></span>
 				<#form:input type="text" name="username" class="form-control required"
diff --git a/parent/pom.xml b/parent/pom.xml
index 5e602d07..f4071b25 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.7.RELEASE</version>
+		<version>2.2.8.RELEASE</version>
 	</parent>
 	
 	<groupId>com.jeesite</groupId>
@@ -45,11 +45,11 @@
 		<groovy.version>3.0.2</groovy.version>
 		
 		<!-- framework version setting -->
-		<mybatis.version>3.5.4</mybatis.version>
-		<mybatis-spring.version>2.0.3</mybatis-spring.version>
+		<mybatis.version>3.5.5</mybatis.version>
+		<mybatis-spring.version>2.0.5</mybatis-spring.version>
 		<jsqlparser.version>3.1</jsqlparser.version>
-		<druid.version>1.1.21</druid.version>
-		<shiro.version>1.5.1</shiro.version>
+		<druid.version>1.1.22</druid.version>
+		<shiro.version>1.5.3</shiro.version>
 		<j2cache.version>2.8.0-release</j2cache.version>
 		<beetl.version>3.1-SNAPSHOT</beetl.version>
 		<swagger.version>1.6.0</swagger.version>