From 6de9145036f4b435f39b02c22bea0a0294a6dc10 Mon Sep 17 00:00:00 2001
From: liuhanqing <447067298@qq.com>
Date: Sun, 20 Dec 2020 18:46:57 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90log=E3=80=91=E6=95=B4=E7=90=86log?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97appName=E4=B8=BA=E9=BB=98=E8=AE=A4=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E3=80=82=E8=8E=B7=E5=8F=96=E6=97=A5=E5=BF=97=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=94=B9=E4=B8=BAGET=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roses/kernel/log/api/factory/LogRecordFactory.java        | 4 +++-
 .../log/modular/manage/controller/LogManagerController.java   | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/factory/LogRecordFactory.java b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/factory/LogRecordFactory.java
index 2c92366be..9e0984a08 100644
--- a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/factory/LogRecordFactory.java
+++ b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/factory/LogRecordFactory.java
@@ -35,7 +35,9 @@ public class LogRecordFactory {
         // 设置appName
         String applicationName = null;
         try {
-            applicationName = SpringUtil.getApplicationContext().getApplicationName();
+            // 修改直接从上下文环境中获取spring.application.name
+            // 解决获取applicationName为空问题
+            applicationName = SpringUtil.getApplicationContext().getEnvironment().getProperty("spring.application.name");
         } catch (Exception e) {
             applicationName = LogConstants.LOG_DEFAULT_APP_NAME;
         }
diff --git a/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/modular/manage/controller/LogManagerController.java b/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/modular/manage/controller/LogManagerController.java
index f9d32d2a0..f33e6ea2c 100644
--- a/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/modular/manage/controller/LogManagerController.java
+++ b/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/modular/manage/controller/LogManagerController.java
@@ -5,6 +5,7 @@ import cn.stylefeng.roses.kernel.log.api.LogManagerApi;
 import cn.stylefeng.roses.kernel.log.api.pojo.manage.LogManagerParam;
 import cn.stylefeng.roses.kernel.log.api.pojo.record.LogRecordDTO;
 import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
 import cn.stylefeng.roses.kernel.resource.api.annotation.PostResource;
 import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
 import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
@@ -35,7 +36,7 @@ public class LogManagerController {
      * @author luojie
      * @date 2020/11/3 12:58
      */
-    @PostResource(name = "查询日志列表", path = "/logManager/list")
+    @GetResource(name = "查询日志列表", path = "/logManager/list")
     public ResponseData list(@RequestBody LogManagerParam logManagerParam) {
         PageResult<LogRecordDTO> logRecordDtoPageResult = logManagerApi.queryLogListPage(logManagerParam);
         return new SuccessResponseData(logRecordDtoPageResult);