common-frame/hcframe
17
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

修改失效时间，修复RoleUser，roleIds为空状态

Browse Source
This commit is contained in:
lhc
2021-04-20 16:11:27 +08:00
parent 92c96e46b6
commit 88717194e0
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/CustomRealm.java
View File

@@ -45,6 +45,7 @@ public class CustomRealm extends AuthorizingRealm {
if (frameConfig.getCas()) {
Map<Object, Object> hashMap = (Map<Object, Object>) redisUtil.hget("session", accessToken);
Long expireTime = (Long) hashMap.get("expireTime");
expireTime = expireTime * 1000;
AssertionImpl assertion = (AssertionImpl) hashMap.get("_const_cas_assertion_");
Date validDate = assertion.getAuthenticationDate();
AttributePrincipal attributePrincipal = assertion.getPrincipal();

27
hcframe-parent/hcframe-user/src/main/java/com/hcframe/user/module/auth/service/impl/RoleUserServiceImpl.java
View File

@@ -11,6 +11,7 @@ import com.hcframe.user.module.auth.service.RoleUserService;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import java.util.HashMap;
import java.util.List;
@@ -46,15 +47,16 @@ public class RoleUserServiceImpl implements RoleUserService {
@Transactional(rollbackFor = Exception.class)
public ResultVO<Object> roleUserBind(String userId, String roleIds) {
JudgeException.isNull(userId,"userId 不能为空");
JudgeException.isNull(roleIds,"roleIds 不能为空");
OsSysTable osSysTable = OsSysTable.builder().tableName(OS_REL_USER_ROLE).tablePk(USER_ROLE_ID).build();
Condition condition = Condition.creatCriteria().andEqual("USER_ID",userId).build();
baseMapper.deleteByCondition(OS_REL_USER_ROLE, condition);
for (String roleId : roleIds.split(COMMA)) {
Map<String, Object> map = new HashMap<>(2);
map.put("USER_ID", userId.replaceAll("\"",""));
map.put("ROLE_ID", Integer.parseInt(roleId));
tableService.save(osSysTable, map);
if (!StringUtils.isEmpty(roleIds)) {
for (String roleId : roleIds.split(COMMA)) {
Map<String, Object> map = new HashMap<>(2);
map.put("USER_ID", userId.replaceAll("\"",""));
map.put("ROLE_ID", Integer.parseInt(roleId));
tableService.save(osSysTable, map);
}
}
return ResultVO.getSuccess();
}
@@ -63,15 +65,16 @@ public class RoleUserServiceImpl implements RoleUserService {
@Transactional(rollbackFor = Exception.class)
public ResultVO<Object> roleGroupBind(String userId, String groupIds) {
JudgeException.isNull(userId,"userId 不能为空");
JudgeException.isNull(groupIds,"roleIds 不能为空");
Condition condition = Condition.creatCriteria().andEqual("USER_ID",userId).build();
baseMapper.deleteByCondition(OS_REL_USER_GROUP, condition);
OsSysTable osSysTable = OsSysTable.builder().tableName(OS_REL_USER_GROUP).tablePk(USER_GROUP_ID).build();
for (String groupId : groupIds.split(COMMA)) {
Map<String, Object> map = new HashMap<>(2);
map.put("USER_ID", userId.replaceAll("\"",""));
map.put("GROUP_ID", groupId);
tableService.save(osSysTable, map);
if (!StringUtils.isEmpty(groupIds)) {
for (String groupId : groupIds.split(COMMA)) {
Map<String, Object> map = new HashMap<>(2);
map.put("USER_ID", userId.replaceAll("\"",""));
map.put("GROUP_ID", groupId);
tableService.save(osSysTable, map);
}
}
return ResultVO.getSuccess();
}