diff --git a/axzo-auth-spring-boot-starter/pom.xml b/axzo-auth-spring-boot-starter/pom.xml
index 701fcb9..e40be13 100644
--- a/axzo-auth-spring-boot-starter/pom.xml
+++ b/axzo-auth-spring-boot-starter/pom.xml
@@ -1,134 +1,79 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.6.6</version>
-        <relativePath/> <!-- lookup parent from repository -->
-    </parent>
-    <groupId>cn.axzo.framework</groupId>
-    <artifactId>axzo-auth-spring-boot-starter</artifactId>
-    <version>1.1.6-SNAPSHOT</version>
-    <name>axzo-auth-spring-boot-starter</name>
-    <description>axzo-auth-spring-boot-starter</description>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-        <javax.servlet.version>4.0.1</javax.servlet.version>
-        <sa-token.version>1.30.0</sa-token.version>
-    </properties>
+	<parent>
+		<groupId>cn.axzo.framework</groupId>
+		<artifactId>axzo-framework</artifactId>
+		<version>${revision}</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-configuration-processor</artifactId>
-            <optional>true</optional>
-            <scope>provided</scope>
-        </dependency>
+	<artifactId>axzo-auth-spring-boot-starter</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<name>axzo-auth-spring-boot-starter</name>
+	<description>axzo-auth-spring-boot-starter</description>
+	
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-configuration-processor</artifactId>
+			<optional>true</optional>
+			<scope>provided</scope>
+		</dependency>
 
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>5.7.22</version>
-        </dependency>
-        <!--lombok-->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.18</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- 获取request和response-->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-            <version>5.1.5.RELEASE</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.servlet.version}</version>
-            <scope>provided</scope>
+		<dependency>
+			<groupId>cn.hutool</groupId>
+			<artifactId>hutool-all</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
 
-        </dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjrt</artifactId>
+			<scope>provided</scope>
+		</dependency>
 
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>5.0.5.RELEASE</version>
-            <scope>provided</scope>
-        </dependency>
-        <!--    aop的一个依赖-->
-        <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjrt</artifactId>
-            <version>1.7.3</version>
-            <scope>provided</scope>
-        </dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
 
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>2.0.0-alpha1</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>cn.axzo.framework</groupId>
-            <artifactId>common-common</artifactId>
-            <version>1.1.7</version>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>transmittable-thread-local</artifactId>
-            <version>2.12.6</version>
-        </dependency>
-        <!-- Sa-Token 权限认证, 在线文档：http://sa-token.dev33.cn/ -->
-<!--	    <dependency>-->
-<!--	      <groupId>cn.dev33</groupId>-->
-<!--	      <artifactId>sa-token-spring-boot-starter</artifactId>-->
-<!--	      <version>${sa-token.version}</version>-->
-<!--	    </dependency>-->
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <distributionManagement>
-        <!-- 两个ID必须与 setting.xml中的<server><id>Releases</id></server>保持一致 -->
-        <repository>
-            <id>rdc-releases</id>
-            <name>Nexus Release Repository</name>
-            <url>https://packages.aliyun.com/maven/repository/2005773-release-XI7cl5/</url>
-        </repository>
-        <snapshotRepository>
-            <id>rdc-snapshots</id>
-            <name>Nexus Snapshot Repository</name>
-            <url>https://packages.aliyun.com/maven/repository/2005773-snapshot-V5Gjdf/</url>
-        </snapshotRepository>
-    </distributionManagement>
+		<dependency>
+			<groupId>cn.axzo.framework</groupId>
+			<artifactId>axzo-common</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>transmittable-thread-local</artifactId>
+		</dependency>
+	</dependencies>
 
 </project>
diff --git a/common-common/.gitignore b/axzo-common/.gitignore
similarity index 100%
rename from common-common/.gitignore
rename to axzo-common/.gitignore
diff --git a/axzo-common/pom.xml b/axzo-common/pom.xml
new file mode 100644
index 0000000..7125cf0
--- /dev/null
+++ b/axzo-common/pom.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+
+	<parent>
+		<groupId>cn.axzo.framework</groupId>
+		<artifactId>axzo-framework</artifactId>
+		<version>${revision}</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>axzo-common</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjrt</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjweaver</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>aopalliance</groupId>
+			<artifactId>aopalliance</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>fastjson</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.validation</groupId>
+			<artifactId>validation-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>cn.hutool</groupId>
+			<artifactId>hutool-all</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus-core</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-tx</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-core</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.skywalking</groupId>
+			<artifactId>apm-toolkit-trace</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+</project>
diff --git a/common-common/src/main/java/cn/azxo/framework/common/annotation/ChainDataContextCheck.java b/axzo-common/src/main/java/cn/azxo/framework/common/annotation/ChainDataContextCheck.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/annotation/ChainDataContextCheck.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/annotation/ChainDataContextCheck.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/annotation/DateFormatCheck.java b/axzo-common/src/main/java/cn/azxo/framework/common/annotation/DateFormatCheck.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/annotation/DateFormatCheck.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/annotation/DateFormatCheck.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/annotation/EnableEnum.java b/axzo-common/src/main/java/cn/azxo/framework/common/annotation/EnableEnum.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/annotation/EnableEnum.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/annotation/EnableEnum.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/annotation/UrlValidation.java b/axzo-common/src/main/java/cn/azxo/framework/common/annotation/UrlValidation.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/annotation/UrlValidation.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/annotation/UrlValidation.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/annotation/ValidNumberValue.java b/axzo-common/src/main/java/cn/azxo/framework/common/annotation/ValidNumberValue.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/annotation/ValidNumberValue.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/annotation/ValidNumberValue.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/annotation/ValidValue.java b/axzo-common/src/main/java/cn/azxo/framework/common/annotation/ValidValue.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/annotation/ValidValue.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/annotation/ValidValue.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/annotation/support/ChainDataContextCheckValidator.java b/axzo-common/src/main/java/cn/azxo/framework/common/annotation/support/ChainDataContextCheckValidator.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/annotation/support/ChainDataContextCheckValidator.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/annotation/support/ChainDataContextCheckValidator.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/annotation/support/DataFormatCheckValidator.java b/axzo-common/src/main/java/cn/azxo/framework/common/annotation/support/DataFormatCheckValidator.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/annotation/support/DataFormatCheckValidator.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/annotation/support/DataFormatCheckValidator.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/annotation/support/EnableEnumValidator.java b/axzo-common/src/main/java/cn/azxo/framework/common/annotation/support/EnableEnumValidator.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/annotation/support/EnableEnumValidator.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/annotation/support/EnableEnumValidator.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/annotation/support/UrlValidationValidator.java b/axzo-common/src/main/java/cn/azxo/framework/common/annotation/support/UrlValidationValidator.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/annotation/support/UrlValidationValidator.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/annotation/support/UrlValidationValidator.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/annotation/support/ValidNumberValueValidator.java b/axzo-common/src/main/java/cn/azxo/framework/common/annotation/support/ValidNumberValueValidator.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/annotation/support/ValidNumberValueValidator.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/annotation/support/ValidNumberValueValidator.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/annotation/support/ValidValueValidator.java b/axzo-common/src/main/java/cn/azxo/framework/common/annotation/support/ValidValueValidator.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/annotation/support/ValidValueValidator.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/annotation/support/ValidValueValidator.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/constatns/Constants.java b/axzo-common/src/main/java/cn/azxo/framework/common/constatns/Constants.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/constatns/Constants.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/constatns/Constants.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/logger/JobLoggerCallback.java b/axzo-common/src/main/java/cn/azxo/framework/common/logger/JobLoggerCallback.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/logger/JobLoggerCallback.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/logger/JobLoggerCallback.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/logger/JobLoggerCallbackWithoutResult.java b/axzo-common/src/main/java/cn/azxo/framework/common/logger/JobLoggerCallbackWithoutResult.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/logger/JobLoggerCallbackWithoutResult.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/logger/JobLoggerCallbackWithoutResult.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/logger/JobLoggerTemplate.java b/axzo-common/src/main/java/cn/azxo/framework/common/logger/JobLoggerTemplate.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/logger/JobLoggerTemplate.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/logger/JobLoggerTemplate.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/logger/MethodAroundLog.java b/axzo-common/src/main/java/cn/azxo/framework/common/logger/MethodAroundLog.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/logger/MethodAroundLog.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/logger/MethodAroundLog.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/logger/MethodAroundLogAspect.java b/axzo-common/src/main/java/cn/azxo/framework/common/logger/MethodAroundLogAspect.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/logger/MethodAroundLogAspect.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/logger/MethodAroundLogAspect.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/logger/WebLogMdcHandlerInterceptor.java b/axzo-common/src/main/java/cn/azxo/framework/common/logger/WebLogMdcHandlerInterceptor.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/logger/WebLogMdcHandlerInterceptor.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/logger/WebLogMdcHandlerInterceptor.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/logger/logback/CanonicalHostNamePropertyDefiner.java b/axzo-common/src/main/java/cn/azxo/framework/common/logger/logback/CanonicalHostNamePropertyDefiner.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/logger/logback/CanonicalHostNamePropertyDefiner.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/logger/logback/CanonicalHostNamePropertyDefiner.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/logger/logback/LogPrefixPropertyDefiner.java b/axzo-common/src/main/java/cn/azxo/framework/common/logger/logback/LogPrefixPropertyDefiner.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/logger/logback/LogPrefixPropertyDefiner.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/logger/logback/LogPrefixPropertyDefiner.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/logger/logback/PodNamespacePropertyDefiner.java b/axzo-common/src/main/java/cn/azxo/framework/common/logger/logback/PodNamespacePropertyDefiner.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/logger/logback/PodNamespacePropertyDefiner.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/logger/logback/PodNamespacePropertyDefiner.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/model/CommonPageResponse.java b/axzo-common/src/main/java/cn/azxo/framework/common/model/CommonPageResponse.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/model/CommonPageResponse.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/model/CommonPageResponse.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/model/CommonResponse.java b/axzo-common/src/main/java/cn/azxo/framework/common/model/CommonResponse.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/model/CommonResponse.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/model/CommonResponse.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/model/EnumBase.java b/axzo-common/src/main/java/cn/azxo/framework/common/model/EnumBase.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/model/EnumBase.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/model/EnumBase.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/model/JobPageRequest.java b/axzo-common/src/main/java/cn/azxo/framework/common/model/JobPageRequest.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/model/JobPageRequest.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/model/JobPageRequest.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/model/JobParamModel.java b/axzo-common/src/main/java/cn/azxo/framework/common/model/JobParamModel.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/model/JobParamModel.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/model/JobParamModel.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/model/Page.java b/axzo-common/src/main/java/cn/azxo/framework/common/model/Page.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/model/Page.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/model/Page.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/security/MD5.java b/axzo-common/src/main/java/cn/azxo/framework/common/security/MD5.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/security/MD5.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/security/MD5.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/security/RSA.java b/axzo-common/src/main/java/cn/azxo/framework/common/security/RSA.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/security/RSA.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/security/RSA.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/service/JobParamResolver.java b/axzo-common/src/main/java/cn/azxo/framework/common/service/JobParamResolver.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/service/JobParamResolver.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/service/JobParamResolver.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/service/SnowflakeIdWorker.java b/axzo-common/src/main/java/cn/azxo/framework/common/service/SnowflakeIdWorker.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/service/SnowflakeIdWorker.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/service/SnowflakeIdWorker.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/spring/AbstractSimpleRegisterableServiceFactory.java b/axzo-common/src/main/java/cn/azxo/framework/common/spring/AbstractSimpleRegisterableServiceFactory.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/spring/AbstractSimpleRegisterableServiceFactory.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/spring/AbstractSimpleRegisterableServiceFactory.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/spring/SimpleRegisterableService.java b/axzo-common/src/main/java/cn/azxo/framework/common/spring/SimpleRegisterableService.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/spring/SimpleRegisterableService.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/spring/SimpleRegisterableService.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/spring/condition/NonLocalEnvironment.java b/axzo-common/src/main/java/cn/azxo/framework/common/spring/condition/NonLocalEnvironment.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/spring/condition/NonLocalEnvironment.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/spring/condition/NonLocalEnvironment.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/spring/condition/NonLocalEnvironmentCondition.java b/axzo-common/src/main/java/cn/azxo/framework/common/spring/condition/NonLocalEnvironmentCondition.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/spring/condition/NonLocalEnvironmentCondition.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/spring/condition/NonLocalEnvironmentCondition.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/utils/ArrayUtils.java b/axzo-common/src/main/java/cn/azxo/framework/common/utils/ArrayUtils.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/utils/ArrayUtils.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/utils/ArrayUtils.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/utils/DateUtils.java b/axzo-common/src/main/java/cn/azxo/framework/common/utils/DateUtils.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/utils/DateUtils.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/utils/DateUtils.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/utils/LogUtil.java b/axzo-common/src/main/java/cn/azxo/framework/common/utils/LogUtil.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/utils/LogUtil.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/utils/LogUtil.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/utils/RegulateSign.java b/axzo-common/src/main/java/cn/azxo/framework/common/utils/RegulateSign.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/utils/RegulateSign.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/utils/RegulateSign.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/utils/SignUtils.java b/axzo-common/src/main/java/cn/azxo/framework/common/utils/SignUtils.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/utils/SignUtils.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/utils/SignUtils.java
diff --git a/common-common/src/main/java/cn/azxo/framework/common/utils/StringUtils.java b/axzo-common/src/main/java/cn/azxo/framework/common/utils/StringUtils.java
similarity index 100%
rename from common-common/src/main/java/cn/azxo/framework/common/utils/StringUtils.java
rename to axzo-common/src/main/java/cn/azxo/framework/common/utils/StringUtils.java
diff --git a/axzo-test-spring-boot-starter/pom.xml b/axzo-test-spring-boot-starter/pom.xml
index 1cdcc36..639b058 100644
--- a/axzo-test-spring-boot-starter/pom.xml
+++ b/axzo-test-spring-boot-starter/pom.xml
@@ -1,91 +1,78 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>cn.axzo.framework</groupId>
-        <artifactId>axzo-parent</artifactId>
-        <version>2.4.13</version>
-        <relativePath/>
-    </parent>
-    
-    <artifactId>axzo-test-spring-boot-starter</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    
-    <name>axzo-test-spring-boot-starter</name>
-    <description>安心筑单元测试支持库</description>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
+	<parent>
+		<groupId>cn.axzo.framework</groupId>
+		<artifactId>axzo-framework</artifactId>
+		<version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
+	</parent>
+	
+	<artifactId>axzo-test-spring-boot-starter</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
 
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>org.springframework.boot</groupId>
-          <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>org.springframework.boot</groupId>
-          <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-test</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.skywalking</groupId>
-            <artifactId>apm-toolkit-logback-1.x</artifactId>
-            <version>8.5.0</version>
-        </dependency>
-         <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.wix</groupId>
-            <artifactId>wix-embedded-mysql</artifactId>
-            <version>4.6.2</version>
-            <optional>true</optional>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.commons</groupId>
-                    <artifactId>commons-compress</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-    </dependencies>
+	<name>axzo-test-spring-boot-starter</name>
+	<description>安心筑单元测试支持库</description>
+	
+	<properties>
+        <testcontainers.version>1.17.3</testcontainers.version>
+    </properties>
     
+	<dependencies>
+	    <!-- junit4 -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>testcontainers</artifactId>
+			<version>${testcontainers.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<version>${testcontainers.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.skywalking</groupId>
+			<artifactId>apm-toolkit-logback-1.x</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-test</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-openfeign</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-bootstrap</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.alibaba.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+		</dependency>
+	</dependencies>
+
 </project>
diff --git a/common-common/pom.xml b/common-common/pom.xml
deleted file mode 100644
index ef40b3c..0000000
--- a/common-common/pom.xml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>cn.axzo.framework</groupId>
-    <artifactId>common-common</artifactId>
-    <!-- release -->
-        <version>1.1.7</version>
-    <!-- snapshot -->
-<!--    <version>1.0.0-SNAPSHOT</version>-->
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <!-- tool -->
-        <aspectj.version>1.7.3</aspectj.version>
-        <logback-core.version>1.2.3</logback-core.version>
-        <aopalliance.version>1.0</aopalliance.version>
-        <lombok.version>1.18.18</lombok.version>
-        <commons-codec.version>1.8</commons-codec.version>
-        <slf4j-api.version>1.7.5</slf4j-api.version>
-        <mybatis-plus.version>3.3.2</mybatis-plus.version>
-        <lombok.version>1.18.18</lombok.version>
-        <fastjson.version>1.2.47</fastjson.version>
-        <hutool-all.version>5.5.7</hutool-all.version>
-        <jackson-databind.version>2.10.2</jackson-databind.version>
-        <apm-toolkit-trace.version>6.5.0</apm-toolkit-trace.version>
-        <javax.servlet-api.version>3.0.1</javax.servlet-api.version>
-        <spring.version>4.3.19.RELEASE</spring.version>
-        <javax.validation.version>2.0.0.Final</javax.validation.version>
-        <hibernate.validator.version>6.0.16.Final</hibernate.validator.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjrt</artifactId>
-            <version>${aspectj.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjweaver</artifactId>
-            <version>${aspectj.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>aopalliance</groupId>
-            <artifactId>aopalliance</artifactId>
-            <version>${aopalliance.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>${slf4j-api.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>${fastjson.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>${commons-codec.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-            <version>${javax.validation.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-validator</artifactId>
-            <version>${hibernate.validator.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>${hutool-all.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-core</artifactId>
-            <version>${mybatis-plus.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-tx</artifactId>
-            <version>${spring.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>${spring.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.servlet-api.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson-databind.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-            <version>${spring.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <version>${logback-core.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.skywalking</groupId>
-            <artifactId>apm-toolkit-trace</artifactId>
-            <version>${apm-toolkit-trace.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <distributionManagement>
-        <!-- 两个ID必须与 setting.xml中的<server><id>Releases</id></server>保持一致 -->
-        <repository>
-            <id>rdc-releases</id>
-            <name>Nexus Release Repository</name>
-            <url>https://packages.aliyun.com/maven/repository/2005773-release-XI7cl5/</url>
-        </repository>
-        <snapshotRepository>
-            <id>rdc-snapshots</id>
-            <name>Nexus Snapshot Repository</name>
-            <url>https://packages.aliyun.com/maven/repository/2005773-snapshot-V5Gjdf/</url>
-        </snapshotRepository>
-    </distributionManagement>
-
-</project>
diff --git a/pom.xml b/pom.xml
index 7c40e34..0865485 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,55 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
-    <groupId>cn.axzo.framework</groupId>
-    <artifactId>axzo-framework</artifactId>
-    <version>1.0.0</version>
-    <packaging>pom</packaging>
+	<parent>
+		<groupId>cn.axzo.infra</groupId>
+		<artifactId>axzo-parent</artifactId>
+		<version>2.4.13</version>
+		<relativePath />
+	</parent>
 
-    <modules>
-        <module>archetype-simple</module>
-        <module>archetype-standard</module>
-        <module>common-common</module>
-        <module>smart-datasource</module>
-        <module>asyncTool</module>
-        <module>alarm-spring-boot-starter</module>
-        <module>canal-alarm</module>
-        <module>axzo-auth-spring-boot-starter</module>
-        <module>axzo-test-spring-boot-starter</module>
-    </modules>
+	<groupId>cn.axzo.framework</groupId>
+	<artifactId>axzo-framework</artifactId>
+	<version>${revision}</version>
+	<packaging>pom</packaging>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.8.2</version>
-                <configuration>
-                    <skip>false</skip>
-                </configuration>
-            </plugin>
+	<properties>
+		<revision>2.0.0-SNAPSHOT</revision>
+		<axzo-bom.version>2.0.0-SNAPSHOT</axzo-bom.version>
+	</properties>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>3.0.0</version>
-                <configuration>
-                    <attach>true</attach>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
+	<modules>
+		<module>archetype-simple</module>
+		<module>archetype-standard</module>
+		<module>axzo-common</module>
+		<module>smart-datasource</module>
+		<module>asyncTool</module>
+		<module>alarm-spring-boot-starter</module>
+		<module>canal-alarm</module>
+		<module>axzo-auth-spring-boot-starter</module>
+		<module>axzo-test-spring-boot-starter</module>
+	</modules>
 
-    </build>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+                <groupId>cn.axzo.infra</groupId>
+                <artifactId>axzo-bom</artifactId>
+                <version>${axzo-bom.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+		</dependencies>
+	</dependencyManagement>
 
 </project>
\ No newline at end of file