!336 合并 功能

Merge pull request !336 from 疯狂的狮子Li/main

ruoyi-admin/src/main/resources/application.yml

@@ -51,7 +51,7 @@ logging:
   level:
     com.ruoyi: @logging.level@
     org.springframework: warn
-  config: classpath:logback.xml
+  config: classpath:logback-plus.xml
 
 # 用户配置
 user:

ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml

@@ -6,6 +6,9 @@ spring:
   profiles:
     active: @profiles.active@
 
+logging:
+  config: classpath:logback-plus.xml
+
 --- # 监控中心服务端配置
 spring:
   security:

ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml

@@ -16,6 +16,9 @@ spring:
     resources:
       static-locations: classpath:/static/
 
+logging:
+  config: classpath:logback-plus.xml
+
 --- # mybatis 配置
 mybatis:
   mapper-locations: classpath:/mybatis-mapper/*Mapper.xml

ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java

@@ -73,7 +73,7 @@ public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
             log.warn("自动注入警告 => 用户未登录");
             return null;
         }
-        return loginUser.getUsername();
+        return ObjectUtil.isNotNull(loginUser) ? loginUser.getUsername() : null;
     }
 
 }