před 4 roky · c039775386
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 
				 # 版本升级日志
			
 
				 
			
 
				+## 1.6.4 - 2020年10月23日
			
 
				+
			
 
				+- 规范项目和模块命名规则
			
 
				+
			
 
				 ## 1.6.3 - 2020年10月22日
			
 
				 
			
 
				 - 添加docker脚本
			
--- a/pom.xml
+++ b/pom.xml
@@ -4,14 +4,14 @@
 
				          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>com.alvin</groupId>
			
 
				+    <groupId>com.alvin.springboot</groupId>
			
 
				     <artifactId>springboot-parent</artifactId>
			
 
				     <packaging>pom</packaging>
			
 
				     <version>1.0-SNAPSHOT</version>
			
 
				     <modules>
			
 
				-        <module>common</module>
			
 
				-        <module>app</module>
			
 
				-        <module>dao</module>
			
 
				+        <module>springboot-common</module>
			
 
				+        <module>springboot-main</module>
			
 
				+        <module>springboot-dao</module>
			
 
				     </modules>
			
 
				 
			
 
				     <parent>
			
--- a/springboot-common/pom.xml
+++ b/springboot-common/pom.xml
@@ -4,12 +4,12 @@
 
				          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
			
 
				     <parent>
			
 
				         <artifactId>springboot-parent</artifactId>
			
 
				-        <groupId>com.alvin</groupId>
			
 
				+        <groupId>com.alvin.springboot</groupId>
			
 
				         <version>1.0-SNAPSHOT</version>
			
 
				     </parent>
			
 
				     <modelVersion>4.0.0</modelVersion>
			
 
				 
			
 
				-    <artifactId>common</artifactId>
			
 
				+    <artifactId>springboot-common</artifactId>
			
 
				 
			
 
				     <dependencies>
			
 
				         <!-- lombok -->
			
--- a/springboot-common/src/main/java/com/alvin/common/entity/PageResult.java
+++ b/springboot-common/src/main/java/com/alvin/common/entity/PageResult.java
--- a/springboot-common/src/main/java/com/alvin/common/entity/Result.java
+++ b/springboot-common/src/main/java/com/alvin/common/entity/Result.java
--- a/springboot-common/src/main/java/com/alvin/common/entity/ResultCode.java
+++ b/springboot-common/src/main/java/com/alvin/common/entity/ResultCode.java
--- a/springboot-common/src/main/java/com/alvin/common/util/DateUtil.java
+++ b/springboot-common/src/main/java/com/alvin/common/util/DateUtil.java
--- a/springboot-common/src/main/java/com/alvin/common/util/EmailUtil.java
+++ b/springboot-common/src/main/java/com/alvin/common/util/EmailUtil.java
--- a/springboot-common/src/main/java/com/alvin/common/util/HttpUtil.java
+++ b/springboot-common/src/main/java/com/alvin/common/util/HttpUtil.java
--- a/springboot-common/src/main/java/com/alvin/common/util/JsonUtil.java
+++ b/springboot-common/src/main/java/com/alvin/common/util/JsonUtil.java
--- a/springboot-common/src/main/java/com/alvin/common/util/SnowflakeIdWorker.java
+++ b/springboot-common/src/main/java/com/alvin/common/util/SnowflakeIdWorker.java
--- a/springboot-dao/pom.xml
+++ b/springboot-dao/pom.xml
@@ -4,12 +4,12 @@
 
				          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
			
 
				     <parent>
			
 
				         <artifactId>springboot-parent</artifactId>
			
 
				-        <groupId>com.alvin</groupId>
			
 
				+        <groupId>com.alvin.springboot</groupId>
			
 
				         <version>1.0-SNAPSHOT</version>
			
 
				     </parent>
			
 
				     <modelVersion>4.0.0</modelVersion>
			
 
				 
			
 
				-    <artifactId>dao</artifactId>
			
 
				+    <artifactId>springboot-dao</artifactId>
			
 
				 
			
 
				     <dependencies>
			
 
				 
			
--- a/springboot-dao/src/main/java/com/alvin/dao/entity/Similar.java
+++ b/springboot-dao/src/main/java/com/alvin/dao/entity/Similar.java
--- a/springboot-dao/src/main/java/com/alvin/dao/entity/example/SimilarExample.java
+++ b/springboot-dao/src/main/java/com/alvin/dao/entity/example/SimilarExample.java
--- a/springboot-dao/src/main/java/com/alvin/dao/mapper/SimilarMapper.java
+++ b/springboot-dao/src/main/java/com/alvin/dao/mapper/SimilarMapper.java
--- a/springboot-dao/src/main/resources/mapper/SimilarMapper.xml
+++ b/springboot-dao/src/main/resources/mapper/SimilarMapper.xml
--- a/springboot-dao/src/main/resources/mybatis-generator.xml
+++ b/springboot-dao/src/main/resources/mybatis-generator.xml
--- a/springboot-main/Dockerfile
+++ b/springboot-main/Dockerfile
--- a/springboot-main/bin/boot.sh
+++ b/springboot-main/bin/boot.sh
--- a/springboot-main/bin/docker-build
+++ b/springboot-main/bin/docker-build
--- a/springboot-main/bin/push.sh
+++ b/springboot-main/bin/push.sh
--- a/springboot-main/pom.xml
+++ b/springboot-main/pom.xml
@@ -4,12 +4,12 @@
 
				          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
			
 
				     <parent>
			
 
				         <artifactId>springboot-parent</artifactId>
			
 
				-        <groupId>com.alvin</groupId>
			
 
				+        <groupId>com.alvin.springboot</groupId>
			
 
				         <version>1.0-SNAPSHOT</version>
			
 
				     </parent>
			
 
				     <modelVersion>4.0.0</modelVersion>
			
 
				 
			
 
				-    <artifactId>app</artifactId>
			
 
				+    <artifactId>springboot-main</artifactId>
			
 
				 
			
 
				     <build>
			
 
				         <plugins>
			
@@ -144,8 +144,8 @@
 
				 
			
 
				         <!--dao层mybatis-->
			
 
				         <dependency>
			
 
				-            <groupId>com.alvin</groupId>
			
 
				-            <artifactId>dao</artifactId>
			
 
				+            <groupId>com.alvin.springboot</groupId>
			
 
				+            <artifactId>springboot-dao</artifactId>
			
 
				             <version>1.0-SNAPSHOT</version>
			
 
				         </dependency>
			
 
				     </dependencies>
			
--- a/springboot-main/src/main/java/com/alvin/Application.java
+++ b/springboot-main/src/main/java/com/alvin/Application.java
--- a/springboot-main/src/main/java/com/alvin/aspect/LogAspect.java
+++ b/springboot-main/src/main/java/com/alvin/aspect/LogAspect.java
--- a/springboot-main/src/main/java/com/alvin/config/LongToStringJsonConfig.java
+++ b/springboot-main/src/main/java/com/alvin/config/LongToStringJsonConfig.java
--- a/springboot-main/src/main/java/com/alvin/controller/AppController.java
+++ b/springboot-main/src/main/java/com/alvin/controller/AppController.java
--- a/springboot-main/src/main/java/com/alvin/entity/User.java
+++ b/springboot-main/src/main/java/com/alvin/entity/User.java
--- a/springboot-main/src/main/java/com/alvin/handle/ExceptionHandle.java
+++ b/springboot-main/src/main/java/com/alvin/handle/ExceptionHandle.java
--- a/springboot-main/src/main/resources/application-dev.yml
+++ b/springboot-main/src/main/resources/application-dev.yml
--- a/springboot-main/src/main/resources/application-docker.yml
+++ b/springboot-main/src/main/resources/application-docker.yml
--- a/springboot-main/src/main/resources/application-prod.yml
+++ b/springboot-main/src/main/resources/application-prod.yml
--- a/springboot-main/src/main/resources/application.yml
+++ b/springboot-main/src/main/resources/application.yml
--- a/springboot-main/src/main/resources/log4j2.xml
+++ b/springboot-main/src/main/resources/log4j2.xml
--- a/springboot-main/src/test/java/com/alvin/controller/AppControllerTest.java
+++ b/springboot-main/src/test/java/com/alvin/controller/AppControllerTest.java
--- a/springboot-main/src/test/java/com/alvin/controller/TestBase.java
+++ b/springboot-main/src/test/java/com/alvin/controller/TestBase.java