From a54a28a5a26e86d6b32990bfbb174c350b917b47 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 18 七月 2019 15:03:51 +0800
Subject: [PATCH] 加入服务下一步限制功能

---
 pom.xml |  161 ++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 121 insertions(+), 40 deletions(-)

diff --git a/pom.xml b/pom.xml
index 95298f6..0b76665 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,50 +13,55 @@
         <module>java110-config</module>
         <module>java110-common</module>
         <module>UserService</module>
-        <module>OrderService</module>
-        <module>PayService</module>
+        <module>LogService</module>
+        <module>FeeService</module>
         <module>eureka</module>
-        <module>WechatService</module>
-        <module>java110-feign</module>
         <module>java110-core</module>
         <module>java110-service</module>
         <module>CodeService</module>
-        <module>MerchantService</module>
+        <module>StoreService</module>
         <module>RuleService</module>
-        <module>SimpleListenerService</module>
         <module>java110-event</module>
-        <module>CenterService</module>
+        <module>OrderService</module>
         <module>java110-cacheAgent</module>
-        <module>ConsoleService</module>
+        <module>WebService</module>
+        <module>java110-logAgent</module>
+        <module>zipkin</module>
+        <module>ShopService</module>
+        <module>CommentService</module>
+        <module>Api</module>
+        <module>CommunityService</module>
+        <module>java110-code-generator</module>
+        <module>java110-db</module>
     </modules>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.4.0.RELEASE</version>
+        <version>2.0.4.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
     <properties>
         <maven.compile.target>1.8</maven.compile.target>
         <sourceEncoding>UTF-8</sourceEncoding>
-        <spring-boot>1.3.2.RELEASE</spring-boot>
+        <spring-boot>2.0.4.RELEASE</spring-boot>
         <shiro.version>1.2.4</shiro.version>
         <mybatis.version>3.3.0</mybatis.version>
         <microcommunity.version>1.0-SNAPSHOT</microcommunity.version>
         <dubbo.version>2.5.4-SNAPSHOT</dubbo.version>
-        <logback.vaersion>1.1.3</logback.vaersion>
+        <logback.vaersion>1.2.3</logback.vaersion>
 
         <apache.common.lang3.version>3.4</apache.common.lang3.version>
         <mybatis.version>3.4.1</mybatis.version>
         <log4j.version>1.2.17</log4j.version>
         <tomcat.servlet.version>6.0.37</tomcat.servlet.version>
-        <druid.version>1.0.18</druid.version>
+        <druid.version>1.1.10</druid.version>
         <mybatis-spring.version>1.3.1</mybatis-spring.version>
         <mysql.version>5.1.39</mysql.version>
         <commons-pool2.version>2.2</commons-pool2.version>
         <commons-collections.version>3.2.1</commons-collections.version>
-        <commons-fileupload.version>1.3.1</commons-fileupload.version>
+        <commons-fileupload.version>1.3.3</commons-fileupload.version>
         <commons-codec.version>1.6</commons-codec.version>
         <commons-logging.version>1.1.1</commons-logging.version>
         <commons-lang.version>2.5</commons-lang.version>
@@ -67,8 +72,9 @@
         <xbean.version>3.18</xbean.version>
         <axis.version>1.4</axis.version>
         <httpclient.verion>3.1</httpclient.verion>
-        <spring.version>4.3.2.RELEASE</spring.version>
-        <zookeeper.version>3.3.6</zookeeper.version>
+        <spring.version>5.0.8.RELEASE</spring.version>
+        <zookeeper.version>3.4.14</zookeeper.version>
+        <swagger.version>2.5.0</swagger.version>
     </properties>
 
     <dependencyManagement>
@@ -76,21 +82,18 @@
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-dependencies</artifactId>
-                <version>Brixton.SR5</version>
+                <version>Finchley.SR3</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
 
+
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-context-support</artifactId>
-                <version>4.2.7.RELEASE</version>
+                <version>${spring.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.springframework.kafka</groupId>
-                <artifactId>spring-kafka</artifactId>
-                <version>1.1.1.RELEASE</version>
-            </dependency>
+
 
 
             <dependency>
@@ -145,11 +148,6 @@
                 <artifactId>java110-core</artifactId>
                 <version>${microcommunity.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.java110</groupId>
-                <artifactId>java110-feign</artifactId>
-                <version>${microcommunity.version}</version>
-            </dependency>
 
             <dependency>
                 <groupId>com.java110</groupId>
@@ -167,13 +165,22 @@
                 <artifactId>java110-cacheAgent</artifactId>
                 <version>${microcommunity.version}</version>
             </dependency>
-
+            <dependency>
+                <groupId>com.java110</groupId>
+                <artifactId>java110-logAgent</artifactId>
+                <version>${microcommunity.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.java110</groupId>
+                <artifactId>java110-db</artifactId>
+                <version>${microcommunity.version}</version>
+            </dependency>
             <!-- logback 鏃ュ織缁勪欢鏀寔  -->
 
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
-                <version>1.7.7</version>
+                <version>1.7.25</version>
             </dependency>
             <dependency>
                 <groupId>ch.qos.logback</groupId>
@@ -191,14 +198,24 @@
                 <version>${logback.vaersion}</version>
             </dependency>
 
+            <dependency>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+                <version>1.2.17</version>
+            </dependency>
+
             <!-- https://mvnrepository.com/artifact/com.mchange/c3p0 -->
             <dependency>
                 <groupId>com.mchange</groupId>
                 <artifactId>c3p0</artifactId>
-                <version>0.9.5.2</version>
+                <version>0.9.5.4</version>
             </dependency>
 
-
+            <dependency>
+                <groupId>org.thymeleaf</groupId>
+                <artifactId>thymeleaf</artifactId>
+                <version>3.0.9.RELEASE</version>
+            </dependency>
 
 
             <dependency>
@@ -264,6 +281,12 @@
                 <version>1.3.1</version>
             </dependency>
 
+            <dependency>
+                <groupId>commons-beanutils</groupId>
+                <artifactId>commons-beanutils</artifactId>
+                <version>1.9.3</version>
+            </dependency>
+
 
             <dependency>
                 <groupId>org.apache.commons</groupId>
@@ -294,8 +317,26 @@
                 <version>${httpclient.verion}</version>
             </dependency>
 
+            <!--<dependency>
+                <groupId>io.shardingsphere</groupId>
+                <artifactId>sharding-jdbc</artifactId>
+                <version>3.0.0.M3</version>
+            </dependency>-->
 
-            <!-- https://mvnrepository.com/artifact/org.apache.axis2/axis2 -->
+            <!--<dependency>
+                <groupId>io.shardingsphere</groupId>
+                <artifactId>sharding-jdbc-core</artifactId>
+                <version>3.1.0</version>
+            </dependency>-->
+
+            <dependency>
+                <groupId>org.apache.shardingsphere</groupId>
+                <artifactId>sharding-jdbc-core</artifactId>
+                <version>4.0.0-RC1</version>
+            </dependency>
+
+
+            <!-- https://mvnrepository.com/artifact/org.apache.axis2/axis2
             <dependency>
                 <groupId>org.apache.axis</groupId>
                 <artifactId>axis</artifactId>
@@ -317,6 +358,7 @@
                 <artifactId>wsdl4j</artifactId>
                 <version>${axis.version}</version>
             </dependency>
+            -->
 
             <dependency>
                 <groupId>net.sf.ehcache</groupId>
@@ -327,10 +369,8 @@
             <dependency>
                 <groupId>redis.clients</groupId>
                 <artifactId>jedis</artifactId>
-                <version>2.8.2</version>
+                <version>2.9.0</version>
             </dependency>
-
-
 
 
             <dependency>
@@ -343,7 +383,7 @@
             <dependency>
                 <groupId>org.springframework.session</groupId>
                 <artifactId>spring-session-data-redis</artifactId>
-                <version>1.0.1.RELEASE</version>
+                <version>2.0.3.RELEASE</version>
             </dependency>
 
 
@@ -359,6 +399,45 @@
                 <artifactId>zookeeper</artifactId>
                 <version>${zookeeper.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>io.springfox</groupId>
+                <artifactId>springfox-swagger2</artifactId>
+                <version>${swagger.version}</version>
+            </dependency>
+            <!-- swagger-ui -->
+            <dependency>
+                <groupId>io.springfox</groupId>
+                <artifactId>springfox-swagger-ui</artifactId>
+                <version>${swagger.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>net.sourceforge.nekohtml</groupId>
+                <artifactId>nekohtml</artifactId>
+                <version>1.9.22</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.aliyun</groupId>
+                <artifactId>aliyun-java-sdk-core</artifactId>
+                <version>4.0.3</version>
+            </dependency>
+
+            <!--flowable宸ヤ綔娴佷緷璧�-->
+            <dependency>
+                <groupId>org.flowable</groupId>
+                <artifactId>flowable-spring-boot-starter</artifactId>
+                <version>6.4.1</version>
+            </dependency>
+
+            <!-- https://mvnrepository.com/artifact/org.jsoup/jsoup -->
+            <dependency>
+                <groupId>org.jsoup</groupId>
+                <artifactId>jsoup</artifactId>
+                <version>1.11.3</version>
+            </dependency>
+
         </dependencies>
 
     </dependencyManagement>
@@ -390,15 +469,17 @@
             <optional>true</optional>
         </dependency>
 
+
     </dependencies>
-<!--
+
     <build>
         <plugins>
             <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>2.10.4</version>
             </plugin>
         </plugins>
     </build>
--->
+
 </project>

--
Gitblit v1.8.0