更换版本，整理模块，构建新分支zmrq

common-annotation/pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <artifactId>tofly-parent</artifactId>
         <groupId>com.tofly</groupId>
-        <version>1.0.3</version>
+        <version>1.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>common-annotation</artifactId>
 
     <packaging>jar</packaging>
-    <version>1.0.0</version>
+    <version>1.0.4</version>
 </project>

common-baseapi/pom.xml

@@ -5,18 +5,18 @@
     <parent>
         <artifactId>tofly-parent</artifactId>
         <groupId>com.tofly</groupId>
-        <version>1.0.3</version>
+        <version>1.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>common-baseapi</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
     <dependencies>
         <dependency>
             <groupId>com.tofly</groupId>
             <artifactId>common-orm-mybatisplus</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.4</version>
         </dependency>
 
         <dependency>

common-cache-redis/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>tofly-parent</artifactId>
         <groupId>com.tofly</groupId>
-        <version>1.0.3</version>
+        <version>1.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>common-redis</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
 
     <dependencies>
         <!--<dependency>-->

common-core/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>tofly-parent</artifactId>
         <groupId>com.tofly</groupId>
-        <version>1.0.3</version>
+        <version>1.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>common-core</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
 
     <properties>
         <poi.version>4.0.0</poi.version>

common-data-es/pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <artifactId>tofly-parent</artifactId>
         <groupId>com.tofly</groupId>
-        <version>1.0.3</version>
+        <version>1.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>common-es</artifactId>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
     <packaging>jar</packaging>
 
     <dependencies>

common-entity/pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <artifactId>tofly-parent</artifactId>
         <groupId>com.tofly</groupId>
-        <version>1.0.3</version>
+        <version>1.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>common-entity</artifactId>
     <groupId>com.tofly</groupId>
     <packaging>jar</packaging>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
 </project>

common-file-ftp/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>tofly-parent</artifactId>
         <groupId>com.tofly</groupId>
-        <version>1.0.3</version>
+        <version>1.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>common-ftp</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
 
     <properties>
         <thumbnailator.version>0.4.2</thumbnailator.version>

common-log/pom.xml

@@ -5,31 +5,31 @@
     <parent>
         <artifactId>tofly-parent</artifactId>
         <groupId>com.tofly</groupId>
-        <version>1.0.3</version>
+        <version>1.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>common-log</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
 
     <dependencies>
 
         <dependency>
             <groupId>com.tofly</groupId>
             <artifactId>common-oauth</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.4</version>
         </dependency>
 
         <dependency>
             <groupId>com.tofly</groupId>
             <artifactId>common-entity</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.4</version>
         </dependency>
         <dependency>
             <groupId>com.tofly</groupId>
             <artifactId>common-web</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.4</version>
         </dependency>
 
     </dependencies>

common-mq-active/pom.xml

@@ -12,7 +12,7 @@
 
     <artifactId>common-mq-active</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.0</version>
+    <version>1.0.4</version>
 
     <dependencies>
         <dependency>

common-oauth/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>tofly-parent</artifactId>
         <groupId>com.tofly</groupId>
-        <version>1.0.3</version>
+        <version>1.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>common-oauth</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
 
 
 

common-orm-mybatisplus/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>tofly-parent</artifactId>
         <groupId>com.tofly</groupId>
-        <version>1.0.3</version>
+        <version>1.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>common-orm-mybatisplus</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
     <properties>
         <mybatis-plus.version>3.3.2</mybatis-plus.version>
         <oracle.version>11.2.0.4.0-atlassian-hosted</oracle.version>
@@ -24,13 +24,13 @@
         <dependency>
             <groupId>com.tofly</groupId>
             <artifactId>common-core</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.4</version>
         </dependency>
 
         <dependency>
             <groupId>com.tofly</groupId>
             <artifactId>common-oauth</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.4</version>
         </dependency>
 
         <dependency>

common-web/pom.xml

@@ -5,18 +5,18 @@
     <parent>
         <artifactId>tofly-parent</artifactId>
         <groupId>com.tofly</groupId>
-        <version>1.0.3</version>
+        <version>1.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>common-web</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
     <dependencies>
         <dependency>
             <groupId>com.tofly</groupId>
             <artifactId>common-core</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.4</version>
         </dependency>
 
         <dependency>

common-websocket/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>tofly-parent</artifactId>
         <groupId>com.tofly</groupId>
-        <version>1.0.3</version>
+        <version>1.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>common-websocket</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
 
     <dependencies>
         <dependency>

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>com.tofly</groupId>
     <artifactId>tofly-parent</artifactId>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
     <name>parent</name>
     <packaging>pom</packaging>
     <description>基础架构父类</description>

swagger-bootstrap-ui/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>tofly-parent</artifactId>
         <groupId>com.tofly</groupId>
-        <version>1.0.3</version>
+        <version>1.0.4</version>
     </parent>
 
     <artifactId>swagger-bootstrap-ui</artifactId>

tofly-webParent/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>tofly-parent</artifactId>
         <groupId>com.tofly</groupId>
-        <version>1.0.3</version>
+        <version>1.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>tofly-webParent</artifactId>
     <groupId>com.tofly</groupId>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
     <name>web-parent</name>
     <packaging>pom</packaging>
     <description>web基础架构父类</description>
@@ -20,25 +20,25 @@
         <dependency>
             <groupId>com.tofly</groupId>
             <artifactId>common-oauth</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.4</version>
         </dependency>
 
         <dependency>
             <groupId>com.tofly</groupId>
             <artifactId>common-log</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.4</version>
         </dependency>
 
         <dependency>
             <groupId>com.tofly</groupId>
             <artifactId>common-orm-mybatisplus</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.4</version>
         </dependency>
 
         <dependency>
             <groupId>com.tofly</groupId>
             <artifactId>common-baseapi</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.4</version>
         </dependency>