diff --git a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/LogManagerApi.java b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/ApiLogManagerApi.java similarity index 89% rename from kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/LogManagerApi.java rename to kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/ApiLogManagerApi.java index d1c798b64..64dabacb2 100644 --- a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/LogManagerApi.java +++ b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/ApiLogManagerApi.java @@ -29,14 +29,12 @@ import cn.stylefeng.roses.kernel.log.api.pojo.manage.LogManagerRequest; import cn.stylefeng.roses.kernel.log.api.pojo.record.LogRecordDTO; /** - * 日志管理相关的接口 - *

- * 接口有多种实现,例如基于文件存储的日志,基于数据库存储的日志,基于es存储的日志 + * API日志管理相关的接口 * * @author fengshuonan * @since 2020/10/27 16:19 */ -public interface LogManagerApi { +public interface ApiLogManagerApi { /** * 日志管理 分页查询api日志记录 diff --git a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/context/LogRecordContext.java b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/context/LogRecordContext.java deleted file mode 100644 index f507d2f2a..000000000 --- a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/context/LogRecordContext.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright [2020-2030] [https://www.stylefeng.cn] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Guns采用APACHE LICENSE 2.0开源协议,您在使用过程中,需要注意以下几点: - * - * 1.请不要删除和修改根目录下的LICENSE文件。 - * 2.请不要删除和修改Guns源码头部的版权声明。 - * 3.请保留源码和相关描述文件的项目出处,作者声明等。 - * 4.分发源码时候,请注明软件出处 https://gitee.com/stylefeng/guns - * 5.在修改包名,模块名称,项目代码等时,请注明软件出处 https://gitee.com/stylefeng/guns - * 6.若您的项目无法满足以上几点,可申请商业授权 - */ -package cn.stylefeng.roses.kernel.log.api.context; - -import cn.hutool.extra.spring.SpringUtil; -import cn.stylefeng.roses.kernel.log.api.LogRecordApi; - -/** - * 日志操作api的获取 - * - * @author fengshuonan - * @since 2020/10/27 16:19 - */ -public class LogRecordContext { - - /** - * 获取日志操作api - * - * @author fengshuonan - * @since 2020/10/27 16:19 - */ - public static LogRecordApi me() { - return SpringUtil.getBean(LogRecordApi.class); - } - -} diff --git a/kernel-d-log/log-business-requestapi/src/main/java/cn/stylefeng/roses/kernel/log/requestapi/DbLogRecordServiceImpl.java b/kernel-d-log/log-business-requestapi/src/main/java/cn/stylefeng/roses/kernel/log/requestapi/DbLogRecordServiceImpl.java index b14fee175..0bd2932e2 100644 --- a/kernel-d-log/log-business-requestapi/src/main/java/cn/stylefeng/roses/kernel/log/requestapi/DbLogRecordServiceImpl.java +++ b/kernel-d-log/log-business-requestapi/src/main/java/cn/stylefeng/roses/kernel/log/requestapi/DbLogRecordServiceImpl.java @@ -28,7 +28,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import cn.stylefeng.roses.kernel.log.api.LogRecordApi; import cn.stylefeng.roses.kernel.log.api.constants.LogConstants; import cn.stylefeng.roses.kernel.log.api.pojo.record.LogRecordDTO; import cn.stylefeng.roses.kernel.log.api.threadpool.LogManagerThreadPool; diff --git a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/LogRecordApi.java b/kernel-d-log/log-business-requestapi/src/main/java/cn/stylefeng/roses/kernel/log/requestapi/LogRecordApi.java similarity index 97% rename from kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/LogRecordApi.java rename to kernel-d-log/log-business-requestapi/src/main/java/cn/stylefeng/roses/kernel/log/requestapi/LogRecordApi.java index a5a38669f..0ef483ab8 100644 --- a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/LogRecordApi.java +++ b/kernel-d-log/log-business-requestapi/src/main/java/cn/stylefeng/roses/kernel/log/requestapi/LogRecordApi.java @@ -22,7 +22,7 @@ * 5.在修改包名,模块名称,项目代码等时,请注明软件出处 https://gitee.com/stylefeng/guns * 6.若您的项目无法满足以上几点,可申请商业授权 */ -package cn.stylefeng.roses.kernel.log.api; +package cn.stylefeng.roses.kernel.log.requestapi; import cn.stylefeng.roses.kernel.log.api.pojo.record.LogRecordDTO; diff --git a/kernel-d-log/log-business-requestapi/src/main/java/cn/stylefeng/roses/kernel/log/requestapi/aop/RequestApiLogRecordAop.java b/kernel-d-log/log-business-requestapi/src/main/java/cn/stylefeng/roses/kernel/log/requestapi/aop/RequestApiLogRecordAop.java index ef7384d93..3ccfcfd5c 100644 --- a/kernel-d-log/log-business-requestapi/src/main/java/cn/stylefeng/roses/kernel/log/requestapi/aop/RequestApiLogRecordAop.java +++ b/kernel-d-log/log-business-requestapi/src/main/java/cn/stylefeng/roses/kernel/log/requestapi/aop/RequestApiLogRecordAop.java @@ -27,7 +27,6 @@ package cn.stylefeng.roses.kernel.log.requestapi.aop; import cn.hutool.core.util.ObjectUtil; import cn.stylefeng.roses.kernel.auth.api.context.LoginContext; import cn.stylefeng.roses.kernel.auth.api.pojo.login.LoginUser; -import cn.stylefeng.roses.kernel.log.api.LogRecordApi; import cn.stylefeng.roses.kernel.log.api.constants.LogFileConstants; import cn.stylefeng.roses.kernel.log.api.expander.LogConfigExpander; import cn.stylefeng.roses.kernel.log.api.factory.LogRecordFactory; @@ -35,6 +34,7 @@ import cn.stylefeng.roses.kernel.log.api.factory.appender.AuthedLogAppender; import cn.stylefeng.roses.kernel.log.api.factory.appender.HttpLogAppender; import cn.stylefeng.roses.kernel.log.api.factory.appender.ParamsLogAppender; import cn.stylefeng.roses.kernel.log.api.pojo.record.LogRecordDTO; +import cn.stylefeng.roses.kernel.log.requestapi.LogRecordApi; import cn.stylefeng.roses.kernel.rule.annotation.BusinessLog; import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource; diff --git a/kernel-d-log/log-business-requestapi/src/main/java/cn/stylefeng/roses/kernel/log/requestapi/service/SysLogService.java b/kernel-d-log/log-business-requestapi/src/main/java/cn/stylefeng/roses/kernel/log/requestapi/service/SysLogService.java index b6152bea0..b478ec1de 100644 --- a/kernel-d-log/log-business-requestapi/src/main/java/cn/stylefeng/roses/kernel/log/requestapi/service/SysLogService.java +++ b/kernel-d-log/log-business-requestapi/src/main/java/cn/stylefeng/roses/kernel/log/requestapi/service/SysLogService.java @@ -24,7 +24,7 @@ */ package cn.stylefeng.roses.kernel.log.requestapi.service; -import cn.stylefeng.roses.kernel.log.api.LogManagerApi; +import cn.stylefeng.roses.kernel.log.api.ApiLogManagerApi; import cn.stylefeng.roses.kernel.log.api.pojo.manage.LogManagerRequest; import cn.stylefeng.roses.kernel.log.requestapi.entity.SysLog; import com.baomidou.mybatisplus.extension.service.IService; @@ -35,7 +35,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * @author luojie * @since 2020/11/2 17:44 */ -public interface SysLogService extends IService, LogManagerApi { +public interface SysLogService extends IService, ApiLogManagerApi { /** * 新增 diff --git a/kernel-d-log/log-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/log/starter/ProjectLogAutoConfiguration.java b/kernel-d-log/log-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/log/starter/ProjectLogAutoConfiguration.java index 548c87023..f730f12b8 100644 --- a/kernel-d-log/log-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/log/starter/ProjectLogAutoConfiguration.java +++ b/kernel-d-log/log-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/log/starter/ProjectLogAutoConfiguration.java @@ -24,9 +24,9 @@ */ package cn.stylefeng.roses.kernel.log.starter; -import cn.stylefeng.roses.kernel.log.api.LogRecordApi; import cn.stylefeng.roses.kernel.log.api.threadpool.LogManagerThreadPool; import cn.stylefeng.roses.kernel.log.requestapi.DbLogRecordServiceImpl; +import cn.stylefeng.roses.kernel.log.requestapi.LogRecordApi; import cn.stylefeng.roses.kernel.log.requestapi.aop.RequestApiLogRecordAop; import cn.stylefeng.roses.kernel.log.requestapi.service.SysLogService; import cn.stylefeng.roses.kernel.log.requestapi.service.impl.SysLogServiceImpl; diff --git a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/log/HomeLogController.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/log/HomeLogController.java index eb566574e..308d70888 100644 --- a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/log/HomeLogController.java +++ b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/log/HomeLogController.java @@ -2,7 +2,7 @@ package cn.stylefeng.roses.kernel.sys.modular.log; import cn.stylefeng.roses.kernel.auth.api.context.LoginContext; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; -import cn.stylefeng.roses.kernel.log.api.LogManagerApi; +import cn.stylefeng.roses.kernel.log.api.ApiLogManagerApi; import cn.stylefeng.roses.kernel.log.api.pojo.manage.LogManagerRequest; import cn.stylefeng.roses.kernel.log.api.pojo.record.LogRecordDTO; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; @@ -25,7 +25,7 @@ import java.util.List; public class HomeLogController { @Resource - private LogManagerApi logManagerApi; + private ApiLogManagerApi logManagerApi; /** * 查询最近操作日志列表