manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微不足道的修改

Browse Source
This commit is contained in:
thinkgem
2018-08-21 21:32:06 +08:00
parent 437220e34a
commit 145e0b6b07
3 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/core/src/main/java/com/jeesite/common/shiro/realm/CasAuthorizingRealm.java
View File

@@ -46,7 +46,6 @@ public class CasAuthorizingRealm extends BaseAuthorizingRealm {
private UserService userService; private UserService userService;
private EmpUserService empUserService; private EmpUserService empUserService;
///////////// CAS /////////////
private CasOutHandler casOutHandler; private CasOutHandler casOutHandler;
private String casServerUrl; // CAS 服务器地址 private String casServerUrl; // CAS 服务器地址
private String casServerCallbackUrl; // CAS 服务器回调地址 private String casServerCallbackUrl; // CAS 服务器回调地址
@@ -56,10 +55,7 @@ public class CasAuthorizingRealm extends BaseAuthorizingRealm {
super(); super();
this.setAuthenticationTokenClass(CasToken.class); this.setAuthenticationTokenClass(CasToken.class);
} }
/*
* 获取登录令牌
*/
@Override @Override
protected FormToken getFormToken(AuthenticationToken authcToken) { protected FormToken getFormToken(AuthenticationToken authcToken) {
@@ -105,9 +101,6 @@ public class CasAuthorizingRealm extends BaseAuthorizingRealm {
return token; return token;
} }
/*
* 获取用户信息
*/
@Override @Override
protected User getUserInfo(FormToken token) { protected User getUserInfo(FormToken token) {
@@ -117,7 +110,7 @@ public class CasAuthorizingRealm extends BaseAuthorizingRealm {
// 如果允许客户端创建账号，则创建账号 // 如果允许客户端创建账号，则创建账号
if (ObjectUtils.toBoolean(attrs.get("isAllowClientCreateUser"))){ if (ObjectUtils.toBoolean(attrs.get("isAllowClientCreateUser"))){
// 获取CAS传递过来的用户属性信息 // 获取CAS传递过来的用户属性信息
user = new User(EncodeUtils.decodeUrl(ObjectUtils.toString(attrs.get("userCode")))); user = new User(EncodeUtils.decodeUrl(ObjectUtils.toString(attrs.get("userCode"))));
user.setLoginCode(EncodeUtils.decodeUrl(ObjectUtils.toString(attrs.get("loginCode")))); user.setLoginCode(EncodeUtils.decodeUrl(ObjectUtils.toString(attrs.get("loginCode"))));
@@ -178,9 +171,6 @@ public class CasAuthorizingRealm extends BaseAuthorizingRealm {
return user; return user;
} }
/*
* 认证密码匹配调用方法
*/
@Override @Override
protected void assertCredentialsMatch(AuthenticationToken authcToken, protected void assertCredentialsMatch(AuthenticationToken authcToken,
AuthenticationInfo info) throws AuthenticationException { AuthenticationInfo info) throws AuthenticationException {

2
modules/core/src/main/resources/static/ueditor/1.4/dialogs/preview/preview.html
View File

@@ -9,7 +9,7 @@
</style> </style>
<link rel="stylesheet" href="../../themes/iframe.css" /> <link rel="stylesheet" href="../../themes/iframe.css" />
<script type="text/javascript" src="../internal.js"></script> <script type="text/javascript" src="../internal.js"></script>
<script src="../../ueditor.parse.min.js"></script> <script src="../../ueditor.parse.js"></script>
<title></title> <title></title>
</head> </head>
<body class="view"> <body class="view">

2
modules/core/src/main/resources/views/modules/sys/user/empUserList.html
View File

@@ -205,7 +205,7 @@ $('#btnImport').click(function(){
<div class="col-xs-12 col-xs-offset-1"> <div class="col-xs-12 col-xs-offset-1">
<input type="file" id="file" name="file" class="form-file"/> <input type="file" id="file" name="file" class="form-file"/>
<div class="mt10 pt5"> <div class="mt10 pt5">
<#form:checkbox name="updateSupport" label="${text('否更新已经存在的用户数据')}" class="form-control" <#form:checkbox name="updateSupport" label="${text('是否更新已经存在的用户数据')}" class="form-control"
title="${text('如果用户编码已经存在，更新这条数据。')}"/> &nbsp; title="${text('如果用户编码已经存在，更新这条数据。')}"/> &nbsp;
<a href="${ctx}/sys/empUser/importTemplate" class="btn btn-default btn-xs"><i class="fa fa-file-excel-o"></i> ${text('下载模板')}</a> <a href="${ctx}/sys/empUser/importTemplate" class="btn btn-default btn-xs"><i class="fa fa-file-excel-o"></i> ${text('下载模板')}</a>
</div> </div>