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 logRecordDtoPageResult = logManagerApi.queryLogListPage(logManagerParam); return new SuccessResponseData(logRecordDtoPageResult);