Quellcode durchsuchen

Merge branch 'release/1.6.4'

tianyunperfect vor 4 Jahren
Ursprung
Commit
710e886b40
35 geänderte Dateien mit 16 neuen und 12 gelöschten Zeilen
  1. 4 0
      CHANGELOG.md
  2. 4 4
      pom.xml
  3. 2 2
      springboot-common/pom.xml
  4. 0 0
      springboot-common/src/main/java/com/alvin/common/entity/PageResult.java
  5. 0 0
      springboot-common/src/main/java/com/alvin/common/entity/Result.java
  6. 0 0
      springboot-common/src/main/java/com/alvin/common/entity/ResultCode.java
  7. 0 0
      springboot-common/src/main/java/com/alvin/common/util/DateUtil.java
  8. 0 0
      springboot-common/src/main/java/com/alvin/common/util/EmailUtil.java
  9. 0 0
      springboot-common/src/main/java/com/alvin/common/util/HttpUtil.java
  10. 0 0
      springboot-common/src/main/java/com/alvin/common/util/JsonUtil.java
  11. 0 0
      springboot-common/src/main/java/com/alvin/common/util/SnowflakeIdWorker.java
  12. 2 2
      springboot-dao/pom.xml
  13. 0 0
      springboot-dao/src/main/java/com/alvin/dao/entity/Similar.java
  14. 0 0
      springboot-dao/src/main/java/com/alvin/dao/entity/example/SimilarExample.java
  15. 0 0
      springboot-dao/src/main/java/com/alvin/dao/mapper/SimilarMapper.java
  16. 0 0
      springboot-dao/src/main/resources/mapper/SimilarMapper.xml
  17. 0 0
      springboot-dao/src/main/resources/mybatis-generator.xml
  18. 0 0
      springboot-main/Dockerfile
  19. 0 0
      springboot-main/bin/boot.sh
  20. 0 0
      springboot-main/bin/docker-build
  21. 0 0
      springboot-main/bin/push.sh
  22. 4 4
      springboot-main/pom.xml
  23. 0 0
      springboot-main/src/main/java/com/alvin/Application.java
  24. 0 0
      springboot-main/src/main/java/com/alvin/aspect/LogAspect.java
  25. 0 0
      springboot-main/src/main/java/com/alvin/config/LongToStringJsonConfig.java
  26. 0 0
      springboot-main/src/main/java/com/alvin/controller/AppController.java
  27. 0 0
      springboot-main/src/main/java/com/alvin/entity/User.java
  28. 0 0
      springboot-main/src/main/java/com/alvin/handle/ExceptionHandle.java
  29. 0 0
      springboot-main/src/main/resources/application-dev.yml
  30. 0 0
      springboot-main/src/main/resources/application-docker.yml
  31. 0 0
      springboot-main/src/main/resources/application-prod.yml
  32. 0 0
      springboot-main/src/main/resources/application.yml
  33. 0 0
      springboot-main/src/main/resources/log4j2.xml
  34. 0 0
      springboot-main/src/test/java/com/alvin/controller/AppControllerTest.java
  35. 0 0
      springboot-main/src/test/java/com/alvin/controller/TestBase.java

+ 4 - 0
CHANGELOG.md

@@ -1,5 +1,9 @@
 # 版本升级日志
 
+## 1.6.4 - 2020年10月23日
+
+- 规范项目和模块命名规则
+
 ## 1.6.3 - 2020年10月22日
 
 - 添加docker脚本

+ 4 - 4
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>

+ 2 - 2
common/pom.xml → 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 -->

+ 0 - 0
common/src/main/java/com/alvin/common/entity/PageResult.java → springboot-common/src/main/java/com/alvin/common/entity/PageResult.java


+ 0 - 0
common/src/main/java/com/alvin/common/entity/Result.java → springboot-common/src/main/java/com/alvin/common/entity/Result.java


+ 0 - 0
common/src/main/java/com/alvin/common/entity/ResultCode.java → springboot-common/src/main/java/com/alvin/common/entity/ResultCode.java


+ 0 - 0
common/src/main/java/com/alvin/common/util/DateUtil.java → springboot-common/src/main/java/com/alvin/common/util/DateUtil.java


+ 0 - 0
common/src/main/java/com/alvin/common/util/EmailUtil.java → springboot-common/src/main/java/com/alvin/common/util/EmailUtil.java


+ 0 - 0
common/src/main/java/com/alvin/common/util/HttpUtil.java → springboot-common/src/main/java/com/alvin/common/util/HttpUtil.java


+ 0 - 0
common/src/main/java/com/alvin/common/util/JsonUtil.java → springboot-common/src/main/java/com/alvin/common/util/JsonUtil.java


+ 0 - 0
common/src/main/java/com/alvin/common/util/SnowflakeIdWorker.java → springboot-common/src/main/java/com/alvin/common/util/SnowflakeIdWorker.java


+ 2 - 2
dao/pom.xml → 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>
 

+ 0 - 0
dao/src/main/java/com/alvin/dao/entity/Similar.java → springboot-dao/src/main/java/com/alvin/dao/entity/Similar.java


+ 0 - 0
dao/src/main/java/com/alvin/dao/entity/example/SimilarExample.java → springboot-dao/src/main/java/com/alvin/dao/entity/example/SimilarExample.java


+ 0 - 0
dao/src/main/java/com/alvin/dao/mapper/SimilarMapper.java → springboot-dao/src/main/java/com/alvin/dao/mapper/SimilarMapper.java


+ 0 - 0
dao/src/main/resources/mapper/SimilarMapper.xml → springboot-dao/src/main/resources/mapper/SimilarMapper.xml


+ 0 - 0
dao/src/main/resources/mybatis-generator.xml → springboot-dao/src/main/resources/mybatis-generator.xml


+ 0 - 0
app/Dockerfile → springboot-main/Dockerfile


+ 0 - 0
app/bin/boot.sh → springboot-main/bin/boot.sh


+ 0 - 0
app/bin/docker-build → springboot-main/bin/docker-build


+ 0 - 0
app/bin/push.sh → springboot-main/bin/push.sh


+ 4 - 4
app/pom.xml → 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>

+ 0 - 0
app/src/main/java/com/alvin/Application.java → springboot-main/src/main/java/com/alvin/Application.java


+ 0 - 0
app/src/main/java/com/alvin/aspect/LogAspect.java → springboot-main/src/main/java/com/alvin/aspect/LogAspect.java


+ 0 - 0
app/src/main/java/com/alvin/config/LongToStringJsonConfig.java → springboot-main/src/main/java/com/alvin/config/LongToStringJsonConfig.java


+ 0 - 0
app/src/main/java/com/alvin/controller/AppController.java → springboot-main/src/main/java/com/alvin/controller/AppController.java


+ 0 - 0
app/src/main/java/com/alvin/entity/User.java → springboot-main/src/main/java/com/alvin/entity/User.java


+ 0 - 0
app/src/main/java/com/alvin/handle/ExceptionHandle.java → springboot-main/src/main/java/com/alvin/handle/ExceptionHandle.java


+ 0 - 0
app/src/main/resources/application-dev.yml → springboot-main/src/main/resources/application-dev.yml


+ 0 - 0
app/src/main/resources/application-docker.yml → springboot-main/src/main/resources/application-docker.yml


+ 0 - 0
app/src/main/resources/application-prod.yml → springboot-main/src/main/resources/application-prod.yml


+ 0 - 0
app/src/main/resources/application.yml → springboot-main/src/main/resources/application.yml


+ 0 - 0
app/src/main/resources/log4j2.xml → springboot-main/src/main/resources/log4j2.xml


+ 0 - 0
app/src/test/java/com/alvin/controller/AppControllerTest.java → springboot-main/src/test/java/com/alvin/controller/AppControllerTest.java


+ 0 - 0
app/src/test/java/com/alvin/controller/TestBase.java → springboot-main/src/test/java/com/alvin/controller/TestBase.java