优化代码 调整 目录

eureka/docker/bin/start_eureka.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-#### normal dev model
-nohup java -jar target/eureka.jar > eureka.log 2>&1 &
-
-tail -100f eureka.log

java110-code-generator/src/main/java/com/java110/code/back/GeneratorAbstractBussiness.java

@@ -43,7 +43,7 @@ public class GeneratorAbstractBussiness extends BaseGenerator {
                 fileContext);
 //        System.out.println("看这里"+toUpperCaseFirstOne(data.getShareName()).toString());
         if (data.isAutoMove()) {
-            FileUtilBase.copyfile(writePath, toUpperCaseFirstOne(data.getShareName()).toString() + "Service\\src\\main\\java\\com\\java110\\"+data.getShareName()+"\\listener\\" + data.getName() + "/Abstract" + toUpperCaseFirstOne(data.getName()) + "BusinessServiceDataFlowListener.java");
+            FileUtilBase.copyfile(writePath, "service-" + data.getShareName() + "\\src\\main\\java\\com\\java110\\"+data.getShareName()+"\\listener\\" + data.getName() + "/Abstract" + toUpperCaseFirstOne(data.getName()) + "BusinessServiceDataFlowListener.java");
         }
     }
 }

java110-code-generator/src/main/java/com/java110/code/back/GeneratorApiListener.java

@@ -44,7 +44,7 @@ public class GeneratorApiListener extends BaseGenerator {
                 fileContext);
         //复制生成的文件到对应分区目录下
         if (data.isAutoMove()) {
-            FileUtilBase.copyfile(writePath, "Api\\src\\main\\java\\com\\java110\\api\\listener\\" + data.getName() + "/List" + toUpperCaseFirstOne(data.getName()) + "sListener.java");
+            FileUtilBase.copyfile(writePath, "service-api\\src\\main\\java\\com\\java110\\api\\listener\\" + data.getName() + "/List" + toUpperCaseFirstOne(data.getName()) + "sListener.java");
         }
     }
 
@@ -165,7 +165,7 @@ public class GeneratorApiListener extends BaseGenerator {
                 fileContext);
         //复制生成的文件到对应分区目录下
         if (data.isAutoMove()) {
-            FileUtilBase.copyfile(writePath, "Api\\src\\main\\java\\com\\java110\\api\\bmo\\" + data.getName() + "/I" + toUpperCaseFirstOne(data.getName()) + "BMO.java");
+            FileUtilBase.copyfile(writePath, "service-api\\src\\main\\java\\com\\java110\\api\\bmo\\" + data.getName() + "/I" + toUpperCaseFirstOne(data.getName()) + "BMO.java");
         }
     }
 
@@ -189,7 +189,7 @@ public class GeneratorApiListener extends BaseGenerator {
                 fileContext);
         //复制生成的文件到对应分区目录下
         if (data.isAutoMove()) {
-            FileUtilBase.copyfile(writePath, "Api\\src\\main\\java\\com\\java110\\api\\bmo\\" + data.getName() + "/impl/" + toUpperCaseFirstOne(data.getName()) + "BMOImpl.java");
+            FileUtilBase.copyfile(writePath, "service-api\\src\\main\\java\\com\\java110\\api\\bmo\\" + data.getName() + "/impl/" + toUpperCaseFirstOne(data.getName()) + "BMOImpl.java");
         }
     }
 
@@ -224,7 +224,7 @@ public class GeneratorApiListener extends BaseGenerator {
                 fileContext);
         //复制生成的文件到对应分区目录下
         if (data.isAutoMove()) {
-            FileUtilBase.copyfile(writePath, "Api\\src\\main\\java\\com\\java110\\api\\listener\\" + data.getName() + "/Save" + toUpperCaseFirstOne(data.getName()) + "Listener.java");
+            FileUtilBase.copyfile(writePath, "service-api\\src\\main\\java\\com\\java110\\api\\listener\\" + data.getName() + "/Save" + toUpperCaseFirstOne(data.getName()) + "Listener.java");
         }
     }
 
@@ -258,7 +258,7 @@ public class GeneratorApiListener extends BaseGenerator {
                 fileContext);
         //复制生成的文件到对应分区目录下
         if (data.isAutoMove()) {
-            FileUtilBase.copyfile(writePath, "Api\\src\\main\\java\\com\\java110\\api\\listener\\" + data.getName() + "/Update" + toUpperCaseFirstOne(data.getName()) + "Listener.java");
+            FileUtilBase.copyfile(writePath, "service-api\\src\\main\\java\\com\\java110\\api\\listener\\" + data.getName() + "/Update" + toUpperCaseFirstOne(data.getName()) + "Listener.java");
         }
     }
 
@@ -287,7 +287,7 @@ public class GeneratorApiListener extends BaseGenerator {
                 fileContext);
         //复制生成的文件到对应分区目录下
         if (data.isAutoMove()) {
-            FileUtilBase.copyfile(writePath, "Api\\src\\main\\java\\com\\java110\\api\\listener\\" + data.getName() + "/Delete" + toUpperCaseFirstOne(data.getName()) + "Listener.java");
+            FileUtilBase.copyfile(writePath, "service-api\\src\\main\\java\\com\\java110\\api\\listener\\" + data.getName() + "/Delete" + toUpperCaseFirstOne(data.getName()) + "Listener.java");
         }
     }
 

java110-code-generator/src/main/java/com/java110/code/back/GeneratorDeleteInfoListener.java

@@ -32,7 +32,7 @@ public class GeneratorDeleteInfoListener extends BaseGenerator {
                 fileContext);
         //复制生成的文件到对应分区目录下
         if (data.isAutoMove()) {
-            FileUtilBase.copyfile(writePath, toUpperCaseFirstOne(data.getShareName()).toString() + "Service\\src\\main\\java\\com\\java110\\"+data.getShareName()+"\\listener\\" + data.getName() + "/Delete" + toUpperCaseFirstOne(data.getName()) + "InfoListener.java");
+            FileUtilBase.copyfile(writePath, "service-" + data.getShareName()+ "\\src\\main\\java\\com\\java110\\"+data.getShareName()+"\\listener\\" + data.getName() + "/Delete" + toUpperCaseFirstOne(data.getName()) + "InfoListener.java");
 
         }//生成协议
 

java110-code-generator/src/main/java/com/java110/code/back/GeneratorInnerServiceSMOImpl.java

@@ -26,7 +26,7 @@ public class GeneratorInnerServiceSMOImpl extends BaseGenerator {
                 fileContext);
         //复制生成的文件到对应分区目录下
         if (data.isAutoMove()) {
-            FileUtilBase.copyfile(writePath, toUpperCaseFirstOne(data.getShareName().toString()) + "Service\\src\\main\\java\\com\\java110\\"+data.getShareName()+"\\smo\\impl\\" + toUpperCaseFirstOne(data.getName()) + "InnerServiceSMOImpl.java");
+            FileUtilBase.copyfile(writePath,"service-" + data.getShareName() + "\\src\\main\\java\\com\\java110\\"+data.getShareName()+"\\smo\\impl\\" + toUpperCaseFirstOne(data.getName()) + "InnerServiceSMOImpl.java");
         }
     }
 }

java110-code-generator/src/main/java/com/java110/code/back/GeneratorSaveInfoListener.java

@@ -40,7 +40,7 @@ public class GeneratorSaveInfoListener extends BaseGenerator {
                 fileContext);
         //复制生成的文件到对应分区目录下
         if (data.isAutoMove()) {
-            FileUtilBase.copyfile(writePath, toUpperCaseFirstOne(data.getShareName()).toString() + "Service\\src\\main\\java\\com\\java110\\"+data.getShareName()+"\\listener\\" + data.getName() + "/Save" + toUpperCaseFirstOne(data.getName()) + "InfoListener.java");
+            FileUtilBase.copyfile(writePath, "service-" + data.getShareName() + "\\src\\main\\java\\com\\java110\\" + data.getShareName() + "\\listener\\" + data.getName() + "/Save" + toUpperCaseFirstOne(data.getName()) + "InfoListener.java");
         }
         //生成协议
 

java110-code-generator/src/main/java/com/java110/code/back/GeneratorServiceDaoImplListener.java

@@ -23,7 +23,7 @@ public class GeneratorServiceDaoImplListener extends BaseGenerator {
                 fileContext);
         //复制生成的文件到对应分区目录下
         if (data.isAutoMove()) {
-            FileUtilBase.copyfile(writePath, toUpperCaseFirstOne(data.getShareName().toString()) + "Service\\src\\main\\java\\com\\java110\\"+data.getShareName()+"\\dao\\impl\\" + toUpperCaseFirstOne(data.getName()) + "ServiceDaoImpl.java");
+            FileUtilBase.copyfile(writePath, "service-" + data.getShareName() + "\\src\\main\\java\\com\\java110\\"+data.getShareName()+"\\dao\\impl\\" + toUpperCaseFirstOne(data.getName()) + "ServiceDaoImpl.java");
         }
     }
 }

java110-code-generator/src/main/java/com/java110/code/back/GeneratorUpdateInfoListener.java

@@ -34,7 +34,7 @@ public class GeneratorUpdateInfoListener extends BaseGenerator {
 
         //复制生成的文件到对应分区目录下
         if (data.isAutoMove()) {
-            FileUtilBase.copyfile(writePath, toUpperCaseFirstOne(data.getShareName()).toString() + "Service\\src\\main\\java\\com\\java110\\"+data.getShareName()+"\\listener\\" + data.getName() + "/Update" + toUpperCaseFirstOne(data.getName()) + "InfoListener.java");
+            FileUtilBase.copyfile(writePath,"service-" + data.getShareName() + "\\src\\main\\java\\com\\java110\\"+data.getShareName()+"\\listener\\" + data.getName() + "/Update" + toUpperCaseFirstOne(data.getName()) + "InfoListener.java");
             //生成协议
         }
         /**

pom.xml

@@ -12,25 +12,25 @@
         <module>java110-bean</module>
         <module>java110-config</module>
         <module>java110-utils</module>
-        <module>UserService</module>
-        <module>LogService</module>
-        <module>FeeService</module>
-        <module>eureka</module>
         <module>java110-core</module>
         <module>java110-service</module>
-        <module>CodeService</module>
-        <module>StoreService</module>
-        <module>RuleService</module>
-        <module>OrderService</module>
-        <module>CommentService</module>
-        <module>Api</module>
-        <module>CommunityService</module>
-        <module>java110-code-generator</module>
         <module>java110-db</module>
-        <module>JobService</module>
-        <module>CommonService</module>
-        <module>ReportService</module>
-        <module>FrontService</module>
+        <module>java110-code-generator</module>
+        <module>service-user</module>
+        <module>service-log</module>
+        <module>service-fee</module>
+        <module>service-eureka</module>
+        <module>service-sequence</module>
+        <module>service-store</module>
+        <module>service-rule</module>
+        <module>service-order</module>
+        <module>service-comment</module>
+        <module>service-api</module>
+        <module>service-community</module>
+        <module>service-job</module>
+        <module>service-common</module>
+        <module>service-report</module>
+        <module>service-front</module>
     </modules>
 
     <parent>
@@ -168,11 +168,6 @@
                 <artifactId>java110-front</artifactId>
                 <version>${microcommunity.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.java110</groupId>
-                <artifactId>ReportComponent</artifactId>
-                <version>${microcommunity.version}</version>
-            </dependency>
             <!-- logback 日志组件支持  -->
 
             <dependency>
@@ -196,12 +191,6 @@
                 <version>${logback.vaersion}</version>
             </dependency>
 
-            <!--            <dependency>-->
-            <!--                <groupId>log4j</groupId>-->
-            <!--                <artifactId>log4j</artifactId>-->
-            <!--                <version>1.2.17</version>-->
-            <!--            </dependency>-->
-
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-core</artifactId>

Api/docker/bin/start_api.sh

@@ -10,6 +10,6 @@
 
 #### normal dev model
 #nohup java -jar -Dspring.profiles.active=dev $1 target/Api.jar > order.log $1 2>&1 &
-nohup java -jar -Dspring.profiles.active=$1 $2 target/Api.jar > center.log $2 2>&1 &
+nohup java -jar -Dspring.profiles.active=$1 $2 target/service-api.jar > api.log $2 2>&1 &
 
-tail -100f center.log
+tail -100f api.log

Api/docker/docker-compose.yml

@@ -9,7 +9,7 @@ services:
        ports:
        - "8008:8008"
        volumes:
-       - ../target/Api.jar:/root/target/Api.jar
+       - ../target/service-api.jar:/root/target/service-api.jar
        networks:
        - java110-net
 #       mem_limit: 1024m

Api/pom.xml

@@ -9,9 +9,9 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>Api</artifactId>
+    <artifactId>service-api</artifactId>
 
-    <name>Api</name>
+    <name>service-api</name>
     <!-- FIXME change it to the project's website -->
     <url>http://www.example.com</url>
 
@@ -58,7 +58,7 @@
     </dependencies>
 
     <build>
-        <finalName>Api</finalName>
+        <finalName>service-api</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>