适应 1.0.5

labidc · Jan 4, 2019 · 281cb22 · 281cb22
1 parent a2eacec
commit 281cb22
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 67 deletions.
diff --git a/base-service/base-demo1-service/base-demo1-base/pom.xml b/base-service/base-demo1-service/base-demo1-base/pom.xml
@@ -87,13 +87,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <!-- <configuration>
-                     <fork>true</fork>
-                 </configuration>-->
-            </plugin>
             <plugin>
                 <groupId>pl.project13.maven</groupId>
                 <artifactId>git-commit-id-plugin</artifactId>

diff --git a/base-service/base-demo4-service/base-demo4-base/pom.xml b/base-service/base-demo4-service/base-demo4-base/pom.xml
@@ -86,13 +86,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <!-- <configuration>
-                     <fork>true</fork>
-                 </configuration>-->
-            </plugin>
             <plugin>
                 <groupId>pl.project13.maven</groupId>
                 <artifactId>git-commit-id-plugin</artifactId>

diff --git a/base-service/pom.xml b/base-service/pom.xml
@@ -1,10 +1,17 @@
 <?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">
+
+    <parent>
+        <groupId>com.labidc.demo</groupId>
+        <artifactId>servicedemo</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>base-service</artifactId>
     <packaging>pom</packaging>
-    <name>base-service</name>
     <description>基础层</description>
 
     <modules>
@@ -14,18 +21,5 @@
         <module>base-demo4-service</module>
     </modules>
 
-    <parent>
-        <groupId>com.labidc.demo</groupId>
-        <artifactId>servicedemo</artifactId>
-        <version>1.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <dependencies>
-        <!--小辣椒工具-->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
+
 </project>
diff --git a/business-service/business-demo-service/business-demo-base/pom.xml b/business-service/business-demo-service/business-demo-base/pom.xml
@@ -18,6 +18,14 @@
             <groupId>com.labidc.demo</groupId>
             <artifactId>business-demo-contract</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.labidc.demo</groupId>
+            <artifactId>base-demo1-contract</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.labidc.demo</groupId>
+            <artifactId>base-demo4-contract</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -81,13 +89,6 @@
 
      <build>
          <plugins>
-             <plugin>
-                 <groupId>org.springframework.boot</groupId>
-                 <artifactId>spring-boot-maven-plugin</artifactId>
-                 <configuration>
-                     <fork>true</fork>
-                 </configuration>
-             </plugin>
              <plugin>
                  <groupId>pl.project13.maven</groupId>
                  <artifactId>git-commit-id-plugin</artifactId>

diff --git a/business-service/pom.xml b/business-service/pom.xml
@@ -1,29 +1,22 @@
 <?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">
+    <parent>
+        <groupId>com.labidc.demo</groupId>
+        <artifactId>servicedemo</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>business-service</artifactId>
     <packaging>pom</packaging>
-    <name>business-service</name>
     <description>业务逻辑层</description>
 
     <modules>
         <module>business-demo-contract</module>
         <module>business-demo-service</module>
     </modules>
 
-    <parent>
-        <groupId>com.labidc.demo</groupId>
-        <artifactId>servicedemo</artifactId>
-        <version>1.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <dependencies>
-        <!--小辣椒工具-->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
+
 </project>
diff --git a/pom.xml b/pom.xml
@@ -239,6 +239,13 @@
 
         </dependencies>
     </dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
 
     <repositories>
         <repository>

diff --git a/product-service/pom.xml b/product-service/pom.xml
@@ -18,12 +18,4 @@
 
 
 
-    <dependencies>
-        <!--小辣椒工具-->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
 </project>
diff --git a/product-service/product-demo/product-demo-base/pom.xml b/product-service/product-demo/product-demo-base/pom.xml
@@ -65,13 +65,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <fork>true</fork>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>pl.project13.maven</groupId>
                 <artifactId>git-commit-id-plugin</artifactId>

diff --git a/.../gateway-service/src/main/java/com/example/gateway/service/GatewayServiceApplication.java b/.../gateway-service/src/main/java/com/example/gateway/service/GatewayServiceApplication.java
@@ -8,7 +8,6 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import reactor.core.publisher.Mono;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/spring-server/pom.xml b/spring-server/pom.xml
@@ -10,6 +10,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>spring-server</artifactId>
+    <packaging>pom</packaging>
 
+    <modules>
+        <module>eureka-server</module>
+        <module>gateway-service</module>
+        <module>zuul2-server</module>
+    </modules>
 
 </project>
diff --git a/spring-server/zuul2-server/pom.xml b/spring-server/zuul2-server/pom.xml
@@ -25,6 +25,7 @@
             <scope>test</scope>
         </dependency>
 
+        <!--eureka 灰度发布包-->
         <dependency>
              <groupId>com.labidc</groupId>
              <artifactId>labidc-gray-deploy-eureka</artifactId>