From 6296a502594cbdac1df37c4df82393c9d9fd4d19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Mon, 10 Apr 2023 13:03:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E6=9E=81?= =?UTF-8?q?=E7=AB=AF=E6=83=85=E5=86=B5=E8=8E=B7=E5=8F=96LoginUser=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E4=B8=BAnull=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/handler/CreateAndUpdateMetaObjectHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java index 6d7c977de..3f0e122ec 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java +++ b/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; } } From 77407899e850b6f3226b60c3e18320c2cf4bb4ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Mon, 10 Apr 2023 18:37:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E7=B3=BB=E7=BB=9F=E6=89=80=E6=9C=89=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E4=B8=BA=20logback-plus.xml=20=E9=81=BF=E5=85=8D?= =?UTF-8?q?=E4=B8=8E=E5=85=B6=E4=BB=96=E6=A1=86=E6=9E=B6=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/application.yml | 2 +- .../src/main/resources/{logback.xml => logback-plus.xml} | 0 .../ruoyi-monitor-admin/src/main/resources/application.yml | 3 +++ .../src/main/resources/{logback.xml => logback-plus.xml} | 0 .../ruoyi-xxl-job-admin/src/main/resources/application.yml | 3 +++ .../src/main/resources/{logback.xml => logback-plus.xml} | 0 6 files changed, 7 insertions(+), 1 deletion(-) rename ruoyi-admin/src/main/resources/{logback.xml => logback-plus.xml} (100%) rename ruoyi-extend/ruoyi-monitor-admin/src/main/resources/{logback.xml => logback-plus.xml} (100%) rename ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/{logback.xml => logback-plus.xml} (100%) diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 6f229d87f..a6617bc6f 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/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: diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback-plus.xml similarity index 100% rename from ruoyi-admin/src/main/resources/logback.xml rename to ruoyi-admin/src/main/resources/logback-plus.xml diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml index 22ef1abfc..1b729ef1b 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml +++ b/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: diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback.xml b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback-plus.xml similarity index 100% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback.xml rename to ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback-plus.xml diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml index d4fda939a..6d0829217 100644 --- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml +++ b/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 diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/logback.xml b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/logback-plus.xml similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/logback.xml rename to ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/logback-plus.xml