From f77e5779550c44087e076eddae5780e02b64e6d7 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 14 May 2019 00:02:29 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E5=90=8E=E7=AB=AF=EF=BC=9A=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=20promotion=20=E9=A1=B9=E7=9B=AE=EF=BC=8C=E6=9C=AC?=
 =?UTF-8?q?=E5=9C=B0=E5=BC=80=E5=8F=91=E4=B8=8D=E5=BC=80=E5=90=AF=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=20-=20=E5=90=8E=E7=AB=AF=EF=BC=9Apromotion=20?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=EF=BC=8C=E5=BC=95=E5=85=A5=20seata=20?=
 =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E4=BA=8B=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 promotion/promotion-application/pom.xml       | 15 ++-
 .../src/main/resources/application-test.yaml  |  6 ++
 .../src/main/resources/application.yaml       |  5 +-
 promotion/promotion-service-api/pom.xml       |  8 +-
 promotion/promotion-service-impl/pom.xml      | 97 ++++++++-----------
 5 files changed, 58 insertions(+), 73 deletions(-)
 create mode 100644 promotion/promotion-application/src/main/resources/application-test.yaml

diff --git a/promotion/promotion-application/pom.xml b/promotion/promotion-application/pom.xml
index a83040df4..f00b8e4be 100644
--- a/promotion/promotion-application/pom.xml
+++ b/promotion/promotion-application/pom.xml
@@ -12,6 +12,7 @@
     <artifactId>promotion-application</artifactId>
 
     <dependencies>
+        <!-- Mall 相关 -->
         <dependency>
             <groupId>cn.iocoder.mall</groupId>
             <artifactId>common-framework</artifactId>
@@ -53,15 +54,12 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
+        <!-- Web 相关 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
+
 
         <dependency>
             <groupId>io.springfox</groupId>
@@ -72,6 +70,13 @@
             <artifactId>swagger-bootstrap-ui</artifactId>
         </dependency>
 
+        <!-- 测试相关 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
diff --git a/promotion/promotion-application/src/main/resources/application-test.yaml b/promotion/promotion-application/src/main/resources/application-test.yaml
new file mode 100644
index 000000000..96b1b5566
--- /dev/null
+++ b/promotion/promotion-application/src/main/resources/application-test.yaml
@@ -0,0 +1,6 @@
+swagger:
+  enable: false
+  title: 营销子系统
+  description: 营销子系统
+  version: 1.0.0
+  base-package: cn.iocoder.mall.promotion.application.controller
diff --git a/promotion/promotion-application/src/main/resources/application.yaml b/promotion/promotion-application/src/main/resources/application.yaml
index e6d66102e..9d226a880 100644
--- a/promotion/promotion-application/src/main/resources/application.yaml
+++ b/promotion/promotion-application/src/main/resources/application.yaml
@@ -9,7 +9,4 @@ server:
     context-path: /promotion-api/
 
 swagger:
-  title: 营销子系统
-  description: 营销子系统
-  version: 1.0.0
-  base-package: cn.iocoder.mall.promotion.application.controller
+  enable: false
diff --git a/promotion/promotion-service-api/pom.xml b/promotion/promotion-service-api/pom.xml
index cfbce1019..e7f74dd1f 100644
--- a/promotion/promotion-service-api/pom.xml
+++ b/promotion/promotion-service-api/pom.xml
@@ -12,17 +12,14 @@
     <artifactId>promotion-service-api</artifactId>
 
     <dependencies>
+        <!-- Mall 相关 -->
         <dependency>
             <groupId>cn.iocoder.mall</groupId>
             <artifactId>common-framework</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-        </dependency>
-
+        <!-- 工具类相关 -->
         <dependency>
             <groupId>org.mapstruct</groupId>
             <artifactId>mapstruct</artifactId> <!-- use mapstruct-jdk8 for Java 8 or higher -->
@@ -31,6 +28,7 @@
             <groupId>org.mapstruct</groupId>
             <artifactId>mapstruct-jdk8</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
diff --git a/promotion/promotion-service-impl/pom.xml b/promotion/promotion-service-impl/pom.xml
index 9b6a5704b..1ce26638e 100644
--- a/promotion/promotion-service-impl/pom.xml
+++ b/promotion/promotion-service-impl/pom.xml
@@ -12,6 +12,7 @@
     <artifactId>promotion-service-impl</artifactId>
 
     <dependencies>
+        <!-- Mall 相关 -->
         <dependency>
             <groupId>cn.iocoder.mall</groupId>
             <artifactId>promotion-service-api</artifactId>
@@ -28,106 +29,84 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
+        <!-- DB 相关 -->
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
         </dependency>
+
         <dependency>
-            <groupId>com.xuxueli</groupId>
-            <artifactId>xxl-job-core</artifactId>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
         </dependency>
-
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
         </dependency>
+
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid-spring-boot-starter</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-jdbc</artifactId>-->
-<!--            <exclusions>-->
-<!--                <exclusion>-->
-<!--                    <artifactId>logback-classic</artifactId>-->
-<!--                    <groupId>ch.qos.logback</groupId>-->
-<!--                </exclusion>-->
-<!--                <exclusion>-->
-<!--                    <artifactId>spring-boot-starter-logging</artifactId>-->
-<!--                    <groupId>org.springframework.boot</groupId>-->
-<!--                </exclusion>-->
-<!--            </exclusions>-->
-<!--        </dependency>-->
 
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
 
         <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo</artifactId>
+            <groupId>io.seata</groupId>
+            <artifactId>seata-spring</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.curator</groupId>
-            <artifactId>curator-framework</artifactId>
+            <groupId>io.seata</groupId>
+            <artifactId>seata-dubbo</artifactId>
         </dependency>
+
+        <!-- RPC 相关 -->
         <dependency>
-            <groupId>org.apache.curator</groupId>
-            <artifactId>curator-recipes</artifactId>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-spring-boot-starter</artifactId>
         </dependency>
 
+        <!-- Registry 和 Config 相关 -->
         <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-jdbc</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-framework</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-recipes</artifactId>
         </dependency>
 
+        <!-- MQ 相关 -->
         <dependency>
             <groupId>org.apache.rocketmq</groupId>
             <artifactId>rocketmq-spring-boot-starter</artifactId>
         </dependency>
 
+        <!-- Job 相关 -->
         <dependency>
-            <groupId>io.seata</groupId>
-            <artifactId>seata-spring</artifactId>
-        </dependency>
-        <!--dependency for Apache Dubbo-->
-        <dependency>
-            <groupId>io.seata</groupId>
-            <artifactId>seata-dubbo</artifactId>
+            <groupId>com.xuxueli</groupId>
+            <artifactId>xxl-job-core</artifactId>
         </dependency>
+
+        <!-- 工具类相关 -->
         <dependency>
-            <groupId>io.seata</groupId>
-            <artifactId>seata-discovery-zk</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
-        <!--  test  -->
+        <!-- 测试相关  -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-tx</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-jdbc</artifactId>
-        </dependency>
-        <!--        <dependency>-->
-<!--            <groupId>org.springframework</groupId>-->
-<!--            <artifactId>spring-tx</artifactId>-->
-<!--            <version>5.0.12.RELEASE</version>-->
-<!--            <scope>compile</scope>-->
-<!--        </dependency>-->
 
     </dependencies>