From 145e0b6b07870014d157faa6eda4a5947f498ef5 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Tue, 21 Aug 2018 21:32:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=B8=8D=E8=B6=B3=E9=81=93=E7=9A=84?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/shiro/realm/CasAuthorizingRealm.java | 14 ++------------ .../ueditor/1.4/dialogs/preview/preview.html | 2 +- .../views/modules/sys/user/empUserList.html | 2 +- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/realm/CasAuthorizingRealm.java b/modules/core/src/main/java/com/jeesite/common/shiro/realm/CasAuthorizingRealm.java index e6b11359..3db3f135 100644 --- a/modules/core/src/main/java/com/jeesite/common/shiro/realm/CasAuthorizingRealm.java +++ b/modules/core/src/main/java/com/jeesite/common/shiro/realm/CasAuthorizingRealm.java @@ -46,7 +46,6 @@ public class CasAuthorizingRealm extends BaseAuthorizingRealm { private UserService userService; private EmpUserService empUserService; - ///////////// CAS ///////////// private CasOutHandler casOutHandler; private String casServerUrl; // CAS 服务器地址 private String casServerCallbackUrl; // CAS 服务器回调地址 @@ -56,10 +55,7 @@ public class CasAuthorizingRealm extends BaseAuthorizingRealm { super(); this.setAuthenticationTokenClass(CasToken.class); } - - /* - * 获取登录令牌 - */ + @Override protected FormToken getFormToken(AuthenticationToken authcToken) { @@ -105,9 +101,6 @@ public class CasAuthorizingRealm extends BaseAuthorizingRealm { return token; } - /* - * 获取用户信息 - */ @Override protected User getUserInfo(FormToken token) { @@ -117,7 +110,7 @@ public class CasAuthorizingRealm extends BaseAuthorizingRealm { // 如果允许客户端创建账号，则创建账号 if (ObjectUtils.toBoolean(attrs.get("isAllowClientCreateUser"))){ - + // 获取CAS传递过来的用户属性信息 user = new User(EncodeUtils.decodeUrl(ObjectUtils.toString(attrs.get("userCode")))); user.setLoginCode(EncodeUtils.decodeUrl(ObjectUtils.toString(attrs.get("loginCode")))); @@ -178,9 +171,6 @@ public class CasAuthorizingRealm extends BaseAuthorizingRealm { return user; } - /* - * 认证密码匹配调用方法 - */ @Override protected void assertCredentialsMatch(AuthenticationToken authcToken, AuthenticationInfo info) throws AuthenticationException { diff --git a/modules/core/src/main/resources/static/ueditor/1.4/dialogs/preview/preview.html b/modules/core/src/main/resources/static/ueditor/1.4/dialogs/preview/preview.html index 122b6ae5..d35c67f8 100644 --- a/modules/core/src/main/resources/static/ueditor/1.4/dialogs/preview/preview.html +++ b/modules/core/src/main/resources/static/ueditor/1.4/dialogs/preview/preview.html @@ -9,7 +9,7 @@ - + diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserList.html b/modules/core/src/main/resources/views/modules/sys/user/empUserList.html index 0d9d597e..beb6d7b5 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/empUserList.html +++ b/modules/core/src/main/resources/views/modules/sys/user/empUserList.html @@ -205,7 +205,7 @@ $('#btnImport').click(function(){
- <#form:checkbox name="updateSupport" label="${text('否更新已经存在的用户数据')}" class="form-control" + <#form:checkbox name="updateSupport" label="${text('是否更新已经存在的用户数据')}" class="form-control" title="${text('如果用户编码已经存在，更新这条数据。')}"/>   ${text('下载模板')}