Merge remote-tracking branch 'origin/master'

assembly-upgrade.xml

@@ -1,20 +0,0 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
-    <id>upgrade</id>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <fileSets>
-        <fileSet>
-            <directory>target${file.separator}classes</directory>
-            <outputDirectory>${file.separator}</outputDirectory>
-            <includes>
-                <include>**/upgrade/**</include>
-            </includes>
-            <excludes>
-                <exclude>**/upgrade/*.java</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-</assembly>

pom-bin.xml

@@ -26,7 +26,7 @@
         <dependency>
             <groupId>net.mingsoft</groupId>
             <artifactId>store-client</artifactId>
-            <version>3.0</version>
+            <version>5.1</version> 
         </dependency>
     </dependencies>
     <build>
@@ -53,7 +53,6 @@
                 </executions>
                 <!--打包生产-->
                 <configuration>
-                    <layout>ZIP</layout>
                     <fork>true</fork>
                 </configuration>
             </plugin>

pom-war.xml

@@ -27,7 +27,7 @@
         <dependency>
             <groupId>net.mingsoft</groupId>
             <artifactId>store-client</artifactId>
-            <version>5.0</version>
+            <version>5.1</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

pom.xml

@@ -82,7 +82,7 @@
         <dependency>
             <groupId>net.mingsoft</groupId>
             <artifactId>store-client</artifactId>
-            <version>5.0</version>
+            <version>5.1</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>