From 0b239daba298bd129238dec89da5bc5660cba5e3 Mon Sep 17 00:00:00 2001
From: "aoli.qu" <408346101@qq.com>
Date: Thu, 2 Nov 2023 15:58:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E7=99=BB=E5=BD=95=E7=9A=84=E5=B0=B1?=
 =?UTF-8?q?=E8=83=BD=E7=9C=8B=E5=88=B0=E6=89=80=E6=9C=89=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/system/service/SysLoginService.java   |  7 ++--
 src/main/resources/logback.xml                | 37 +++++++++++++++++++
 2 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 src/main/resources/logback.xml

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<String> 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 @@
+<?xml version="1.0"?>
+<configuration debug="false" scan="true" scanPeriod="30 seconds">
+    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径 -->
+    <property name="LOG_HOME" value="logs"/>
+    <!-- 定义日志文件名称 -->
+    <property name="LOG_FILENAME" value="welfare"/>
+    <!-- 日志输出格式 -->
+    <property name="LOG_PATTERN" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
+
+    <!-- 控制台输出 -->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+    <!-- 系统日志输出 -->
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_HOME}/${LOG_FILENAME}.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${LOG_HOME}/${LOG_FILENAME}.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+    <!-- 日志输出级别 -->
+    <root level="INFO">
+        <appender-ref ref="FILE"/>
+        <appender-ref ref="CONSOLE"/>
+    </root>
+</configuration>