diff --git a/novalon-manage-api/manage-db/pom.xml b/novalon-manage-api/manage-db/pom.xml
index d91a43b..fe7a31b 100644
--- a/novalon-manage-api/manage-db/pom.xml
+++ b/novalon-manage-api/manage-db/pom.xml
@@ -17,6 +17,11 @@
Database module for Novalon Manage API
+
+ cn.novalon.manage
+ manage-common
+ ${project.version}
+
org.springframework.boot
spring-boot-starter-data-r2dbc
@@ -48,6 +53,14 @@
1.5.5.Final
provided
+
+ org.apache.commons
+ commons-collections4
+
+
+ org.apache.commons
+ commons-lang3
+
org.springframework.boot
spring-boot-starter-test
diff --git a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/BaseDomain.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/BaseDomain.java
similarity index 96%
rename from novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/BaseDomain.java
rename to novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/BaseDomain.java
index 706f9b0..46cd864 100644
--- a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/BaseDomain.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/BaseDomain.java
@@ -1,4 +1,4 @@
-package cn.novalon.manage.sys.core.domain;
+package cn.novalon.manage.db.domain;
import java.time.LocalDateTime;
diff --git a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/Dictionary.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/Dictionary.java
similarity index 98%
rename from novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/Dictionary.java
rename to novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/Dictionary.java
index 4f4aad5..593a875 100644
--- a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/Dictionary.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/Dictionary.java
@@ -1,4 +1,4 @@
-package cn.novalon.manage.sys.core.domain;
+package cn.novalon.manage.db.domain;
import java.time.LocalDateTime;
diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/DictionaryDao.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/DictionaryDao.java
index 5feba23..be1b1ac 100644
--- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/DictionaryDao.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/DictionaryDao.java
@@ -1,6 +1,6 @@
package cn.novalon.manage.db;
-import cn.novalon.manage.sys.infrastructure.db.entity.DictionaryEntity;
+import cn.novalon.manage.db.entity.DictionaryEntity;
import org.springframework.data.r2dbc.repository.R2dbcRepository;
import org.springframework.stereotype.Repository;
import reactor.core.publisher.Flux;
diff --git a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/OperationLog.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/OperationLog.java
similarity index 97%
rename from novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/OperationLog.java
rename to novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/OperationLog.java
index a812863..67d29ce 100644
--- a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/OperationLog.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/OperationLog.java
@@ -1,4 +1,4 @@
-package cn.novalon.manage.sys.core.domain;
+package cn.novalon.manage.db.domain;
public class OperationLog extends BaseDomain {
diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/OperationLogDao.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/OperationLogDao.java
index 987e73d..4376a9c 100644
--- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/OperationLogDao.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/OperationLogDao.java
@@ -1,6 +1,6 @@
package cn.novalon.manage.db;
-import cn.novalon.manage.sys.infrastructure.db.entity.OperationLogEntity;
+import cn.novalon.manage.db.entity.OperationLogEntity;
import org.springframework.data.r2dbc.repository.R2dbcRepository;
import org.springframework.stereotype.Repository;
import reactor.core.publisher.Flux;
diff --git a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/infrastructure/db/utils/QueryField.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/QueryField.java
similarity index 93%
rename from novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/infrastructure/db/utils/QueryField.java
rename to novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/QueryField.java
index 74507a1..902557c 100644
--- a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/infrastructure/db/utils/QueryField.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/QueryField.java
@@ -1,4 +1,4 @@
-package cn.novalon.manage.sys.infrastructure.db.utils;
+package cn.novalon.manage.db;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/infrastructure/db/utils/QueryUtil.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/QueryUtil.java
similarity index 99%
rename from novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/infrastructure/db/utils/QueryUtil.java
rename to novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/QueryUtil.java
index 525d984..543e6c8 100644
--- a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/infrastructure/db/utils/QueryUtil.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/QueryUtil.java
@@ -1,4 +1,4 @@
-package cn.novalon.manage.sys.infrastructure.db.utils;
+package cn.novalon.manage.db;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
diff --git a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysConfig.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysConfig.java
similarity index 97%
rename from novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysConfig.java
rename to novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysConfig.java
index 6716e99..2aaa99e 100644
--- a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysConfig.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysConfig.java
@@ -1,4 +1,4 @@
-package cn.novalon.manage.sys.core.domain;
+package cn.novalon.manage.db.domain;
import java.time.LocalDateTime;
diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysConfigDao.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysConfigDao.java
index db226e2..fa23367 100644
--- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysConfigDao.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysConfigDao.java
@@ -1,6 +1,6 @@
package cn.novalon.manage.db;
-import cn.novalon.manage.sys.infrastructure.db.entity.SysConfigEntity;
+import cn.novalon.manage.db.entity.SysConfigEntity;
import org.springframework.data.domain.Sort;
import org.springframework.data.r2dbc.repository.R2dbcRepository;
import org.springframework.stereotype.Repository;
diff --git a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysDictData.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysDictData.java
similarity index 98%
rename from novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysDictData.java
rename to novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysDictData.java
index e05c1f0..d7614a4 100644
--- a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysDictData.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysDictData.java
@@ -1,4 +1,4 @@
-package cn.novalon.manage.sys.core.domain;
+package cn.novalon.manage.db.domain;
import java.time.LocalDateTime;
diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysDictDataDao.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysDictDataDao.java
index 0ccf4b2..1b4196f 100644
--- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysDictDataDao.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysDictDataDao.java
@@ -1,6 +1,6 @@
package cn.novalon.manage.db;
-import cn.novalon.manage.sys.infrastructure.db.entity.SysDictDataEntity;
+import cn.novalon.manage.db.entity.SysDictDataEntity;
import org.springframework.data.domain.Sort;
import org.springframework.data.r2dbc.repository.R2dbcRepository;
import org.springframework.stereotype.Repository;
diff --git a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysDictType.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysDictType.java
similarity index 97%
rename from novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysDictType.java
rename to novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysDictType.java
index 478b590..919fc83 100644
--- a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysDictType.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysDictType.java
@@ -1,4 +1,4 @@
-package cn.novalon.manage.sys.core.domain;
+package cn.novalon.manage.db.domain;
import java.time.LocalDateTime;
diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysDictTypeDao.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysDictTypeDao.java
index 4d03306..2707406 100644
--- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysDictTypeDao.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysDictTypeDao.java
@@ -1,6 +1,6 @@
package cn.novalon.manage.db;
-import cn.novalon.manage.sys.infrastructure.db.entity.SysDictTypeEntity;
+import cn.novalon.manage.db.entity.SysDictTypeEntity;
import org.springframework.data.domain.Sort;
import org.springframework.data.r2dbc.repository.R2dbcRepository;
import org.springframework.stereotype.Repository;
diff --git a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysExceptionLog.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysExceptionLog.java
similarity index 97%
rename from novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysExceptionLog.java
rename to novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysExceptionLog.java
index 8c060f0..8537bdc 100644
--- a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysExceptionLog.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysExceptionLog.java
@@ -1,4 +1,4 @@
-package cn.novalon.manage.sys.core.domain;
+package cn.novalon.manage.db.domain;
import java.time.LocalDateTime;
diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysExceptionLogDao.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysExceptionLogDao.java
index 5e65d88..bb81f50 100644
--- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysExceptionLogDao.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysExceptionLogDao.java
@@ -1,6 +1,6 @@
package cn.novalon.manage.db;
-import cn.novalon.manage.sys.infrastructure.db.entity.SysExceptionLogEntity;
+import cn.novalon.manage.db.entity.SysExceptionLogEntity;
import org.springframework.data.r2dbc.repository.R2dbcRepository;
import org.springframework.stereotype.Repository;
import reactor.core.publisher.Flux;
diff --git a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysFile.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysFile.java
similarity index 97%
rename from novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysFile.java
rename to novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysFile.java
index f94fc29..8d21176 100644
--- a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysFile.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysFile.java
@@ -1,4 +1,4 @@
-package cn.novalon.manage.sys.core.domain;
+package cn.novalon.manage.db.domain;
import java.time.LocalDateTime;
diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysFileDao.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysFileDao.java
index 449c5ab..eb2ca4f 100644
--- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysFileDao.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysFileDao.java
@@ -1,6 +1,6 @@
package cn.novalon.manage.db;
-import cn.novalon.manage.sys.infrastructure.db.entity.SysFileEntity;
+import cn.novalon.manage.db.entity.SysFileEntity;
import org.springframework.data.domain.Sort;
import org.springframework.data.r2dbc.repository.R2dbcRepository;
import org.springframework.stereotype.Repository;
diff --git a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysLoginLog.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysLoginLog.java
similarity index 96%
rename from novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysLoginLog.java
rename to novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysLoginLog.java
index 10cd230..b76bf9c 100644
--- a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysLoginLog.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysLoginLog.java
@@ -1,4 +1,4 @@
-package cn.novalon.manage.sys.core.domain;
+package cn.novalon.manage.db.domain;
import java.time.LocalDateTime;
diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysLoginLogDao.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysLoginLogDao.java
index 9f015d1..00295c3 100644
--- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysLoginLogDao.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysLoginLogDao.java
@@ -1,6 +1,6 @@
package cn.novalon.manage.db;
-import cn.novalon.manage.sys.infrastructure.db.entity.SysLoginLogEntity;
+import cn.novalon.manage.db.entity.SysLoginLogEntity;
import org.springframework.data.r2dbc.repository.R2dbcRepository;
import org.springframework.stereotype.Repository;
import reactor.core.publisher.Flux;
diff --git a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysMenu.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysMenu.java
similarity index 97%
rename from novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysMenu.java
rename to novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysMenu.java
index 6681b2c..3abee89 100644
--- a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysMenu.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysMenu.java
@@ -1,4 +1,4 @@
-package cn.novalon.manage.sys.core.domain;
+package cn.novalon.manage.db.domain;
import java.util.List;
diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysMenuDao.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysMenuDao.java
index 6ee93c5..666bf38 100644
--- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysMenuDao.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysMenuDao.java
@@ -1,6 +1,6 @@
package cn.novalon.manage.db;
-import cn.novalon.manage.sys.infrastructure.db.entity.SysMenuEntity;
+import cn.novalon.manage.db.entity.SysMenuEntity;
import org.springframework.data.r2dbc.repository.R2dbcRepository;
import org.springframework.stereotype.Repository;
import reactor.core.publisher.Flux;
diff --git a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/query/SysMenuQuery.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysMenuQuery.java
similarity index 93%
rename from novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/query/SysMenuQuery.java
rename to novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysMenuQuery.java
index 03a280a..c293864 100644
--- a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/query/SysMenuQuery.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysMenuQuery.java
@@ -1,4 +1,4 @@
-package cn.novalon.manage.sys.core.domain.query;
+package cn.novalon.manage.db;
/**
* @author zhangxiang
diff --git a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysNotice.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysNotice.java
similarity index 97%
rename from novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysNotice.java
rename to novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysNotice.java
index d0c9f51..bc8ea08 100644
--- a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysNotice.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysNotice.java
@@ -1,4 +1,4 @@
-package cn.novalon.manage.sys.core.domain;
+package cn.novalon.manage.db.domain;
import java.time.LocalDateTime;
diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysNoticeDao.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysNoticeDao.java
index 1aefb41..d47dc21 100644
--- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysNoticeDao.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysNoticeDao.java
@@ -1,6 +1,6 @@
package cn.novalon.manage.db;
-import cn.novalon.manage.sys.infrastructure.db.entity.SysNoticeEntity;
+import cn.novalon.manage.db.entity.SysNoticeEntity;
import org.springframework.data.domain.Sort;
import org.springframework.data.r2dbc.repository.R2dbcRepository;
import org.springframework.stereotype.Repository;
diff --git a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysRole.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysRole.java
similarity index 93%
rename from novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysRole.java
rename to novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysRole.java
index ed7c39f..72bc45a 100644
--- a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysRole.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysRole.java
@@ -1,6 +1,6 @@
-package cn.novalon.manage.sys.core.domain;
+package cn.novalon.manage.db.domain;
-import cn.novalon.manage.sys.core.utils.SnowflakeId;
+import cn.novalon.manage.common.util.SnowflakeId;
import java.time.LocalDateTime;
diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysRoleDao.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysRoleDao.java
index ef2d98c..6f7a953 100644
--- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysRoleDao.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysRoleDao.java
@@ -1,6 +1,6 @@
package cn.novalon.manage.db;
-import cn.novalon.manage.sys.infrastructure.db.entity.SysRoleEntity;
+import cn.novalon.manage.db.entity.SysRoleEntity;
import org.springframework.data.domain.Sort;
import org.springframework.data.r2dbc.repository.R2dbcRepository;
import org.springframework.stereotype.Repository;
diff --git a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/query/SysRoleQuery.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysRoleQuery.java
similarity index 93%
rename from novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/query/SysRoleQuery.java
rename to novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysRoleQuery.java
index 9f40c13..7918c0d 100644
--- a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/query/SysRoleQuery.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysRoleQuery.java
@@ -1,4 +1,4 @@
-package cn.novalon.manage.sys.core.domain.query;
+package cn.novalon.manage.db;
/**
* @author zhangxiang
diff --git a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysUser.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysUser.java
similarity index 93%
rename from novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysUser.java
rename to novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysUser.java
index 2e9a0e0..58ae202 100644
--- a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysUser.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysUser.java
@@ -1,6 +1,6 @@
-package cn.novalon.manage.sys.core.domain;
+package cn.novalon.manage.db.domain;
-import cn.novalon.manage.sys.core.utils.SnowflakeId;
+import cn.novalon.manage.common.util.SnowflakeId;
import java.time.LocalDateTime;
diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysUserDao.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysUserDao.java
index 958b454..5d7793a 100644
--- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysUserDao.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysUserDao.java
@@ -1,6 +1,6 @@
package cn.novalon.manage.db;
-import cn.novalon.manage.sys.infrastructure.db.entity.SysUserEntity;
+import cn.novalon.manage.db.entity.SysUserEntity;
import org.springframework.data.domain.Sort;
import org.springframework.data.r2dbc.repository.R2dbcRepository;
import org.springframework.stereotype.Repository;
diff --git a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysUserMessage.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysUserMessage.java
similarity index 96%
rename from novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysUserMessage.java
rename to novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysUserMessage.java
index 4eebbe2..ea813bb 100644
--- a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/SysUserMessage.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysUserMessage.java
@@ -1,4 +1,4 @@
-package cn.novalon.manage.sys.core.domain;
+package cn.novalon.manage.db.domain;
import java.time.LocalDateTime;
diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysUserMessageDao.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysUserMessageDao.java
index 8f60195..39b3f5e 100644
--- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysUserMessageDao.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysUserMessageDao.java
@@ -1,6 +1,6 @@
package cn.novalon.manage.db;
-import cn.novalon.manage.sys.infrastructure.db.entity.SysUserMessageEntity;
+import cn.novalon.manage.db.entity.SysUserMessageEntity;
import org.springframework.data.r2dbc.repository.R2dbcRepository;
import org.springframework.stereotype.Repository;
import reactor.core.publisher.Flux;
diff --git a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/query/SysUserQuery.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysUserQuery.java
similarity index 94%
rename from novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/query/SysUserQuery.java
rename to novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysUserQuery.java
index 5cc215b..98611d9 100644
--- a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/domain/query/SysUserQuery.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/SysUserQuery.java
@@ -1,4 +1,4 @@
-package cn.novalon.manage.sys.core.domain.query;
+package cn.novalon.manage.db;
/**
* @author zhangxiang
diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/DictionaryConverter.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/DictionaryConverter.java
index d2607d7..043d326 100644
--- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/DictionaryConverter.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/DictionaryConverter.java
@@ -1,6 +1,6 @@
package cn.novalon.manage.db.converter;
-import cn.novalon.manage.sys.core.domain.Dictionary;
+import cn.novalon.manage.db.domain.Dictionary;
import cn.novalon.manage.db.entity.DictionaryEntity;
import org.springframework.stereotype.Component;
diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/OperationLogConverter.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/OperationLogConverter.java
index ae3c504..4db80e0 100644
--- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/OperationLogConverter.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/OperationLogConverter.java
@@ -1,6 +1,6 @@
package cn.novalon.manage.db.converter;
-import cn.novalon.manage.sys.core.domain.OperationLog;
+import cn.novalon.manage.db.domain.OperationLog;
import cn.novalon.manage.db.entity.OperationLogEntity;
import org.springframework.stereotype.Component;
diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysConfigConverter.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysConfigConverter.java
index aa48f95..c350fbe 100644
--- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysConfigConverter.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysConfigConverter.java
@@ -1,6 +1,6 @@
package cn.novalon.manage.db.converter;
-import cn.novalon.manage.sys.core.domain.SysConfig;
+import cn.novalon.manage.db.domain.SysConfig;
import cn.novalon.manage.db.entity.SysConfigEntity;
import org.springframework.stereotype.Component;
diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysDictDataConverter.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysDictDataConverter.java
index 3a624c4..161227b 100644
--- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysDictDataConverter.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysDictDataConverter.java
@@ -1,6 +1,6 @@
package cn.novalon.manage.db.converter;
-import cn.novalon.manage.sys.core.domain.SysDictData;
+import cn.novalon.manage.db.domain.SysDictData;
import cn.novalon.manage.db.entity.SysDictDataEntity;
import org.springframework.stereotype.Component;
diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysDictTypeConverter.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysDictTypeConverter.java
index fa8fb34..dc448ca 100644
--- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysDictTypeConverter.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysDictTypeConverter.java
@@ -1,6 +1,6 @@
package cn.novalon.manage.db.converter;
-import cn.novalon.manage.sys.core.domain.SysDictType;
+import cn.novalon.manage.db.domain.SysDictType;
import cn.novalon.manage.db.entity.SysDictTypeEntity;
import org.springframework.stereotype.Component;
diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysExceptionLogConverter.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysExceptionLogConverter.java
index 3e8560a..4c1618f 100644
--- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysExceptionLogConverter.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysExceptionLogConverter.java
@@ -1,6 +1,6 @@
package cn.novalon.manage.db.converter;
-import cn.novalon.manage.sys.core.domain.SysExceptionLog;
+import cn.novalon.manage.db.domain.SysExceptionLog;
import cn.novalon.manage.db.entity.SysExceptionLogEntity;
import org.springframework.stereotype.Component;
diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysFileConverter.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysFileConverter.java
index 2390c2c..abc156a 100644
--- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysFileConverter.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysFileConverter.java
@@ -1,6 +1,6 @@
package cn.novalon.manage.db.converter;
-import cn.novalon.manage.sys.core.domain.SysFile;
+import cn.novalon.manage.db.domain.SysFile;
import cn.novalon.manage.db.entity.SysFileEntity;
import org.springframework.stereotype.Component;
diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysLoginLogConverter.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysLoginLogConverter.java
index b6bf502..9a99abb 100644
--- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysLoginLogConverter.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysLoginLogConverter.java
@@ -1,6 +1,6 @@
package cn.novalon.manage.db.converter;
-import cn.novalon.manage.sys.core.domain.SysLoginLog;
+import cn.novalon.manage.db.domain.SysLoginLog;
import cn.novalon.manage.db.entity.SysLoginLogEntity;
import org.springframework.stereotype.Component;
diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysMenuConverter.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysMenuConverter.java
index f2e55c3..e2bf901 100644
--- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysMenuConverter.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysMenuConverter.java
@@ -1,6 +1,6 @@
package cn.novalon.manage.db.converter;
-import cn.novalon.manage.sys.core.domain.SysMenu;
+import cn.novalon.manage.db.domain.SysMenu;
import cn.novalon.manage.db.entity.SysMenuEntity;
import org.springframework.stereotype.Component;
diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysNoticeConverter.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysNoticeConverter.java
index 66a3e72..e139d55 100644
--- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysNoticeConverter.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysNoticeConverter.java
@@ -1,6 +1,6 @@
package cn.novalon.manage.db.converter;
-import cn.novalon.manage.sys.core.domain.SysNotice;
+import cn.novalon.manage.db.domain.SysNotice;
import cn.novalon.manage.db.entity.SysNoticeEntity;
import org.springframework.stereotype.Component;
diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysRoleConverter.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysRoleConverter.java
index a684aeb..057a286 100644
--- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysRoleConverter.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysRoleConverter.java
@@ -1,6 +1,6 @@
package cn.novalon.manage.db.converter;
-import cn.novalon.manage.sys.core.domain.SysRole;
+import cn.novalon.manage.db.domain.SysRole;
import cn.novalon.manage.db.entity.SysRoleEntity;
import org.springframework.stereotype.Component;
diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysUserConverter.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysUserConverter.java
index fd78f23..b7e24d1 100644
--- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysUserConverter.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysUserConverter.java
@@ -1,6 +1,6 @@
package cn.novalon.manage.db.converter;
-import cn.novalon.manage.sys.core.domain.SysUser;
+import cn.novalon.manage.db.domain.SysUser;
import cn.novalon.manage.db.entity.SysUserEntity;
import org.springframework.stereotype.Component;
diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysUserMessageConverter.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysUserMessageConverter.java
index 1736902..4bb0574 100644
--- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysUserMessageConverter.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/converter/SysUserMessageConverter.java
@@ -1,6 +1,6 @@
package cn.novalon.manage.db.converter;
-import cn.novalon.manage.sys.core.domain.SysUserMessage;
+import cn.novalon.manage.db.domain.SysUserMessage;
import cn.novalon.manage.db.entity.SysUserMessageEntity;
import org.springframework.stereotype.Component;
diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/entity/SysMenuQueryCriteria.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/entity/SysMenuQueryCriteria.java
index dc1a4f8..48a1478 100644
--- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/entity/SysMenuQueryCriteria.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/entity/SysMenuQueryCriteria.java
@@ -1,7 +1,7 @@
package cn.novalon.manage.db.entity;
-import cn.novalon.manage.sys.core.domain.query.SysMenuQuery;
-import cn.novalon.manage.sys.infrastructure.db.utils.QueryField;
+import cn.novalon.manage.db.SysMenuQuery;
+import cn.novalon.manage.db.QueryField;
/**
* @author zhangxiang
diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/entity/SysRoleQueryCriteria.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/entity/SysRoleQueryCriteria.java
index 0b850a2..78cf69e 100644
--- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/entity/SysRoleQueryCriteria.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/entity/SysRoleQueryCriteria.java
@@ -1,7 +1,7 @@
package cn.novalon.manage.db.entity;
-import cn.novalon.manage.sys.core.domain.query.SysRoleQuery;
-import cn.novalon.manage.sys.infrastructure.db.utils.QueryField;
+import cn.novalon.manage.db.SysRoleQuery;
+import cn.novalon.manage.db.QueryField;
/**
* @author zhangxiang
diff --git a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/entity/SysUserQueryCriteria.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/entity/SysUserQueryCriteria.java
index 0f4c9bc..744363a 100644
--- a/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/entity/SysUserQueryCriteria.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/entity/SysUserQueryCriteria.java
@@ -1,7 +1,7 @@
package cn.novalon.manage.db.entity;
-import cn.novalon.manage.sys.core.domain.query.SysUserQuery;
-import cn.novalon.manage.sys.infrastructure.db.utils.QueryField;
+import cn.novalon.manage.db.SysUserQuery;
+import cn.novalon.manage.db.QueryField;
/**
* @author zhangxiang
diff --git a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/repository/IOperationLogRepository.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/repository/IOperationLogRepository.java
similarity index 82%
rename from novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/repository/IOperationLogRepository.java
rename to novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/repository/IOperationLogRepository.java
index cf13aac..85ff191 100644
--- a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/repository/IOperationLogRepository.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/repository/IOperationLogRepository.java
@@ -1,6 +1,6 @@
-package cn.novalon.manage.sys.core.repository;
+package cn.novalon.manage.db.repository;
-import cn.novalon.manage.sys.core.domain.OperationLog;
+import cn.novalon.manage.db.domain.OperationLog;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
diff --git a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/repository/ISysMenuRepository.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/repository/ISysMenuRepository.java
similarity index 76%
rename from novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/repository/ISysMenuRepository.java
rename to novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/repository/ISysMenuRepository.java
index 9ae903c..f8d6023 100644
--- a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/repository/ISysMenuRepository.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/repository/ISysMenuRepository.java
@@ -1,6 +1,6 @@
-package cn.novalon.manage.sys.core.repository;
+package cn.novalon.manage.db.repository;
-import cn.novalon.manage.sys.core.domain.SysMenu;
+import cn.novalon.manage.db.domain.SysMenu;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
diff --git a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/repository/ISysRoleRepository.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/repository/ISysRoleRepository.java
similarity index 81%
rename from novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/repository/ISysRoleRepository.java
rename to novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/repository/ISysRoleRepository.java
index d641cee..d50ce2d 100644
--- a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/repository/ISysRoleRepository.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/repository/ISysRoleRepository.java
@@ -1,8 +1,8 @@
-package cn.novalon.manage.sys.core.repository;
+package cn.novalon.manage.db.repository;
-import cn.novalon.manage.sys.core.domain.SysRole;
-import cn.novalon.manage.sys.dto.request.PageRequest;
-import cn.novalon.manage.sys.dto.response.PageResponse;
+import cn.novalon.manage.db.domain.SysRole;
+import cn.novalon.manage.common.dto.PageRequest;
+import cn.novalon.manage.common.dto.PageResponse;
import org.springframework.data.domain.Sort;
import org.springframework.data.relational.core.query.Query;
import reactor.core.publisher.Flux;
diff --git a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/repository/ISysUserRepository.java b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/repository/ISysUserRepository.java
similarity index 83%
rename from novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/repository/ISysUserRepository.java
rename to novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/repository/ISysUserRepository.java
index f0058d4..50b7912 100644
--- a/novalon-manage-api/manage-sys/src/main/java/cn/novalon/manage/sys/core/repository/ISysUserRepository.java
+++ b/novalon-manage-api/manage-db/src/main/java/cn/novalon/manage/db/repository/ISysUserRepository.java
@@ -1,8 +1,8 @@
-package cn.novalon.manage.sys.core.repository;
+package cn.novalon.manage.db.repository;
-import cn.novalon.manage.sys.core.domain.SysUser;
-import cn.novalon.manage.sys.dto.request.PageRequest;
-import cn.novalon.manage.sys.dto.response.PageResponse;
+import cn.novalon.manage.db.domain.SysUser;
+import cn.novalon.manage.common.dto.PageRequest;
+import cn.novalon.manage.common.dto.PageResponse;
import org.springframework.data.domain.Sort;
import org.springframework.data.relational.core.query.Query;
import reactor.core.publisher.Flux;
diff --git a/novalon-manage-api/pom.xml b/novalon-manage-api/pom.xml
index 08f51aa..c4f7b86 100644
--- a/novalon-manage-api/pom.xml
+++ b/novalon-manage-api/pom.xml
@@ -94,6 +94,11 @@
commons-lang3
3.17.0
+
+ org.apache.commons
+ commons-collections4
+ 4.4
+
io.jsonwebtoken
jjwt-api