Explorar el Código

feat:修改登录相关接口

photo
xmzhao71 hace 1 año
padre
commit
a0566a2adc
Se han modificado 4 ficheros con 2 adiciones y 20 borrados
  1. +2
    -2
      suimangAdmin/src/main/java/com/iformall/config/ShiroConfig.java
  2. +0
    -1
      suimangAdmin/src/main/java/com/iformall/controller/sys/HomeController.java
  3. +0
    -2
      suimangAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java
  4. +0
    -15
      suimangAdmin/src/main/java/com/iformall/shiro/MyShiroRealm.java

+ 2
- 2
suimangAdmin/src/main/java/com/iformall/config/ShiroConfig.java Ver fichero

@@ -149,8 +149,8 @@ public class ShiroConfig {
//配置退出 过滤器,其中的具体的退出代码Shiro已经替我们实现了
filterChainDefinitionMap.put("/logout", "authc");

// filterChainDefinitionMap.put("/**", "corsFilter,token,authc");
filterChainDefinitionMap.put("/**", "anon");
filterChainDefinitionMap.put("/**", "corsFilter,token,authc");
// filterChainDefinitionMap.put("/**", "anon");


shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap);


+ 0
- 1
suimangAdmin/src/main/java/com/iformall/controller/sys/HomeController.java Ver fichero

@@ -110,7 +110,6 @@ public class HomeController extends BaseController {
}

if (StringUtils.isBlank(user.getUsername()) || StringUtils.isBlank(user.getPassword())) {
// throw new SystemException(ErrorCode.LOGIN_USER_OR_PWD_ERROR);
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
}
// check user


+ 0
- 2
suimangAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java Ver fichero

@@ -45,11 +45,9 @@ public class MallRoleController extends BaseController {

@ApiOperation("角色列表")
@GetMapping("list")
//@RequiresPermissions("sys:role:list")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "用户管理-role列表")
public ResultData list(MallRole sysRole, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] MallRoleController::list");
sysRole.updateTenantInfo(getTenantInfo());


+ 0
- 15
suimangAdmin/src/main/java/com/iformall/shiro/MyShiroRealm.java Ver fichero

@@ -46,11 +46,6 @@ public class MyShiroRealm extends AuthorizingRealm {
if(user == null) {
throw new UnknownAccountException(ErrorCode.USER_IS_EMPTY.getMessage());
}
// 租户1为预留系统管理端
// if(user.getTenantId().equals("1")) {
// // 只支持租户为1的用户
// throw new UnknownAccountException("租户不支持");
// }

if(user.getStatus()==null ||
!EnumMallUserStatus.VALID.getCode().equals(user.getStatus())) {//用户被禁用
@@ -67,16 +62,6 @@ public class MyShiroRealm extends AuthorizingRealm {
session.setAttribute(UserSession.userInfo, user);
session.setAttribute(UserSession.userId, user.getId());
session.setAttribute(UserSession.tenantId, user.getTenantId());
if (StringUtils.isNotBlank(user.getParentTenantId())) {
session.setAttribute(UserSession.parentTenantId, user.getParentTenantId());
}else{
session.setAttribute(UserSession.parentTenantId, null);
// String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId);
// if(StringUtils.isNotBlank(parentTenantId)){
// session.removeAttribute(UserSession.parentTenantId);
// }
}
return authenticationInfo;
}



Cargando…
Cancelar
Guardar