refactor: 适配 ContiNew Starter 日志及数据库工具的包结构优化

continew-org · Feb 19, 2024 · 3405868 · 3405868
1 parent 9f5049b
commit 3405868
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 14 deletions.
diff --git a/...n-monitor/src/main/java/top/charles7c/continew/admin/monitor/config/LogConfiguration.java b/...n-monitor/src/main/java/top/charles7c/continew/admin/monitor/config/LogConfiguration.java
@@ -21,7 +21,7 @@
 
 import top.charles7c.continew.admin.monitor.mapper.LogMapper;
 import top.charles7c.continew.admin.system.service.UserService;
-import top.charles7c.continew.starter.log.common.dao.LogDao;
+import top.charles7c.continew.starter.log.core.dao.LogDao;
 import top.charles7c.continew.starter.log.httptracepro.autoconfigure.ConditionalOnEnabledLog;
 import top.charles7c.continew.starter.web.autoconfigure.trace.TraceProperties;
 

diff --git a/...in-monitor/src/main/java/top/charles7c/continew/admin/monitor/config/LogDaoLocalImpl.java b/...in-monitor/src/main/java/top/charles7c/continew/admin/monitor/config/LogDaoLocalImpl.java
@@ -34,10 +34,10 @@
 import top.charles7c.continew.admin.system.service.UserService;
 import top.charles7c.continew.starter.core.constant.StringConstants;
 import top.charles7c.continew.starter.core.util.ExceptionUtils;
-import top.charles7c.continew.starter.log.common.dao.LogDao;
-import top.charles7c.continew.starter.log.common.model.LogRecord;
-import top.charles7c.continew.starter.log.common.model.LogRequest;
-import top.charles7c.continew.starter.log.common.model.LogResponse;
+import top.charles7c.continew.starter.log.core.dao.LogDao;
+import top.charles7c.continew.starter.log.core.model.LogRecord;
+import top.charles7c.continew.starter.log.core.model.LogRequest;
+import top.charles7c.continew.starter.log.core.model.LogResponse;
 import top.charles7c.continew.starter.web.autoconfigure.trace.TraceProperties;
 import top.charles7c.continew.starter.web.model.R;
 

diff --git a/...ol/src/main/java/top/charles7c/continew/admin/tool/service/impl/GeneratorServiceImpl.java b/...ol/src/main/java/top/charles7c/continew/admin/tool/service/impl/GeneratorServiceImpl.java
@@ -45,8 +45,8 @@
 import top.charles7c.continew.starter.core.constant.StringConstants;
 import top.charles7c.continew.starter.core.exception.BusinessException;
 import top.charles7c.continew.starter.core.util.TemplateUtils;
-import top.charles7c.continew.starter.core.util.db.MetaUtils;
-import top.charles7c.continew.starter.core.util.db.Table;
+import top.charles7c.continew.starter.data.core.util.MetaUtils;
+import top.charles7c.continew.starter.data.core.util.Table;
 import top.charles7c.continew.starter.core.util.validate.CheckUtils;
 import top.charles7c.continew.starter.extension.crud.model.query.PageQuery;
 import top.charles7c.continew.starter.extension.crud.model.resp.PageResp;

diff --git a/...w-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/AuthController.java b/...w-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/AuthController.java
@@ -43,7 +43,7 @@
 import top.charles7c.continew.starter.core.util.ExceptionUtils;
 import top.charles7c.continew.starter.core.util.validate.ValidationUtils;
 import top.charles7c.continew.starter.web.model.R;
-import top.charles7c.continew.starter.log.common.annotation.Log;
+import top.charles7c.continew.starter.log.core.annotation.Log;
 
 import java.util.List;
 

diff --git a/...n-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/SocialAuthController.java b/...n-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/SocialAuthController.java
@@ -35,7 +35,7 @@
 import top.charles7c.continew.starter.core.exception.BadRequestException;
 import top.charles7c.continew.starter.core.util.validate.ValidationUtils;
 import top.charles7c.continew.starter.web.model.R;
-import top.charles7c.continew.starter.log.common.annotation.Log;
+import top.charles7c.continew.starter.log.core.annotation.Log;
 
 import me.zhyd.oauth.model.AuthCallback;
 import me.zhyd.oauth.model.AuthResponse;

diff --git a/...in-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CaptchaController.java b/...in-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CaptchaController.java
@@ -52,7 +52,7 @@
 import top.charles7c.continew.starter.core.util.TemplateUtils;
 import top.charles7c.continew.starter.core.util.validate.CheckUtils;
 import top.charles7c.continew.starter.core.util.validate.ValidationUtils;
-import top.charles7c.continew.starter.log.common.annotation.Log;
+import top.charles7c.continew.starter.log.core.annotation.Log;
 import top.charles7c.continew.starter.messaging.mail.util.MailUtils;
 import top.charles7c.continew.starter.web.model.R;
 

diff --git a/...min-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CommonController.java b/...min-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CommonController.java
@@ -44,7 +44,7 @@
 import top.charles7c.continew.starter.core.util.validate.ValidationUtils;
 import top.charles7c.continew.starter.data.mybatis.plus.base.IBaseEnum;
 import top.charles7c.continew.starter.extension.crud.model.query.SortQuery;
-import top.charles7c.continew.starter.log.common.annotation.Log;
+import top.charles7c.continew.starter.log.core.annotation.Log;
 import top.charles7c.continew.starter.web.model.R;
 
 import java.io.Serializable;

diff --git a/...-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/DashboardController.java b/...-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/DashboardController.java
@@ -39,7 +39,7 @@
 import top.charles7c.continew.admin.system.model.resp.DashboardAnnouncementResp;
 import top.charles7c.continew.starter.core.util.validate.ValidationUtils;
 import top.charles7c.continew.starter.web.model.R;
-import top.charles7c.continew.starter.log.common.annotation.Log;
+import top.charles7c.continew.starter.log.core.annotation.Log;
 
 import java.util.List;
 

diff --git a/...admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/monitor/LogController.java b/...admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/monitor/LogController.java
@@ -40,7 +40,7 @@
 import top.charles7c.continew.starter.extension.crud.model.query.PageQuery;
 import top.charles7c.continew.starter.extension.crud.model.resp.PageResp;
 import top.charles7c.continew.starter.web.model.R;
-import top.charles7c.continew.starter.log.common.annotation.Log;
+import top.charles7c.continew.starter.log.core.annotation.Log;
 
 /**
  * 日志管理 API

diff --git a/...in-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/MessageController.java b/...in-webapi/src/main/java/top/charles7c/continew/admin/webapi/system/MessageController.java
@@ -32,7 +32,7 @@
 import top.charles7c.continew.starter.extension.crud.model.query.PageQuery;
 import top.charles7c.continew.starter.extension.crud.model.resp.PageResp;
 import top.charles7c.continew.starter.web.model.R;
-import top.charles7c.continew.starter.log.common.annotation.Log;
+import top.charles7c.continew.starter.log.core.annotation.Log;
 
 import java.util.List;