diff --git a/src/main/java/com/org/system/service/SysLoginService.java b/src/main/java/com/org/system/service/SysLoginService.java index 7545959..afa5976 100644 --- a/src/main/java/com/org/system/service/SysLoginService.java +++ b/src/main/java/com/org/system/service/SysLoginService.java @@ -9,7 +9,6 @@ import com.org.system.pojo.LoginMenuTreeNode; import com.org.utils.Constants; import com.org.utils.MessageUtil; import com.org.utils.SecurityUtil; -import com.org.utils.StringUtils; import com.org.utils.exception.CustomException; import com.org.utils.exception.UserPasswordNotMatchException; import lombok.extern.slf4j.Slf4j; @@ -125,11 +124,13 @@ public class SysLoginService { // 获取当前登录账号当前角色的权限 Set permissions = new HashSet<>(); - if(SecurityUtil.getLoginUser().ifAdmin()){ + /*if(SecurityUtil.getLoginUser().ifAdmin()){ permissions.add(PermissionService.ALL_PERMISSION); } else { for (SysMenu sysMenu : sysMenuList) { if(StringUtils.isNotEmpty(sysMenu.getPermission())) permissions.add(sysMenu.getPermission()); } - } + }*/ + // todo 可登录的就能看到所有权限 + permissions.add(PermissionService.ALL_PERMISSION); SecurityUtil.getLoginUser().setPermissions(permissions); tokenService.refreshToken(SecurityUtil.getLoginUser()); diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml new file mode 100644 index 0000000..15216a1 --- /dev/null +++ b/src/main/resources/logback.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + ${LOG_PATTERN} + + + + + + ${LOG_HOME}/${LOG_FILENAME}.log + + + + ${LOG_HOME}/${LOG_FILENAME}.%d{yyyy-MM-dd}.log + + 60 + + + ${LOG_PATTERN} + + + + + + + + +