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 { } /** - * 获取用户信息 + * 用于用户根据登录信息获取用户信息
+ * 1、默认根据登录账号登录信息,如:UserUtils.getByLoginCode(token.getUsername(), token.getParam("corpCode"));
+ * 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 @@
<#form:form id="loginForm" model="${user!}" action="${ctx}/login" method="post">

${isNotBlank(message!)?message:text('欢迎回来')+'!'}

+
<#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 @@ org.springframework.boot spring-boot-starter-parent - 2.2.7.RELEASE + 2.2.8.RELEASE com.jeesite @@ -45,11 +45,11 @@ 3.0.2 - 3.5.4 - 2.0.3 + 3.5.5 + 2.0.5 3.1 - 1.1.21 - 1.5.1 + 1.1.22 + 1.5.3 2.8.0-release 3.1-SNAPSHOT 1.6.0