From 928873dbc5830096415dc88c89745f544c6a6c5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <wangiegie@gmail.com>
Date: Fri, 23 Aug 2019 19:45:25 +0800
Subject: [PATCH] =?UTF-8?q?:bookmark:=20:bookmark:=20:bookmark:=20Releasin?=
 =?UTF-8?q?g=20/=20Version=20tags.=20=202.4.0=20=E8=B0=83=E6=95=B4pig-ui?=
 =?UTF-8?q?=20=E5=89=8D=E7=AB=AF=E5=BA=95=E5=B1=82=E4=BE=9D=E8=B5=96=20=20?=
 =?UTF-8?q?element=20=20=E3=80=81avue=20=E7=89=88=E6=9C=AC=20=E5=A4=A7?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                              | 13 ++++++++-----
 pig-auth/pom.xml                       |  6 +++---
 pig-common/pig-common-core/pom.xml     |  2 +-
 pig-common/pig-common-log/pom.xml      |  6 +++---
 pig-common/pig-common-security/pom.xml |  6 +++---
 pig-common/pom.xml                     |  2 +-
 pig-config/pom.xml                     |  2 +-
 pig-eureka/pom.xml                     |  2 +-
 pig-gateway/pom.xml                    |  4 ++--
 pig-upms/pig-upms-api/pom.xml          |  4 ++--
 pig-upms/pig-upms-biz/pom.xml          |  8 ++++----
 pig-upms/pom.xml                       |  2 +-
 pig-visual/pig-codegen/pom.xml         |  6 +++---
 pig-visual/pig-monitor/pom.xml         |  2 +-
 pig-visual/pig-zipkin/pom.xml          |  2 +-
 pig-visual/pom.xml                     |  2 +-
 pom.xml                                |  4 ++--
 17 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/README.md b/README.md
index 9654f585..1c8f888c 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
  <p align="center">
-  <img src="https://img.shields.io/badge/Avue-1.6.0-green.svg" alt="Build Status">
+  <img src="https://img.shields.io/badge/Avue-2.6.0-green.svg" alt="Build Status">
    <img src="https://img.shields.io/badge/Spring%20Cloud-Greenwich.SR2-blue.svg" alt="Coverage Status">
    <img src="https://img.shields.io/badge/Spring%20Boot-2.1.7.RELEASE-blue.svg" alt="Downloads">
  </p>  
@@ -14,10 +14,12 @@
 
 <a href="http://pig4cloud.com/#/doc/pig" target="_blank">部署文档</a> | <a target="_blank" href="http://avue.top"> 前端解决方案</a> | <a target="_blank" href="https://gitee.com/log4j/pig/releases/v1.3.2"> 1.0  版本</a> | <a target="_blank" href="http://pigx.pig4cloud.com"> PigX在线体验</a>
     
+![](https://images.gitee.com/uploads/images/2019/0330/065147_85756aea_410595.png)
 
+#### 快速构架微服务应用  
 
+<img src="https://images.gitee.com/uploads/images/2019/0823/120112_98bb9619_410595.gif"/>  
    
-![](https://images.gitee.com/uploads/images/2019/0330/065147_85756aea_410595.png)   
 #### 核心依赖 
 
 
@@ -27,15 +29,16 @@ Spring Boot |  2.1.7.RELEASE
 Spring Cloud | Greenwich.SR2   
 Spring Security OAuth2 | 2.3.5
 Mybatis Plus | 3.1.2
-hutool | 4.6.1
-Avue | 1.6.0
+hutool | 4.6.3
+Avue | 2.0.6
    
 
 
 #### 模块说明
 ```lua
+pig-ui  -- https://gitee.com/log4j/pig-ui
+
 pig
-├── pig-ui -- 前端工程[8080]
 ├── pig-auth -- 授权服务提供[3000]
 └── pig-common -- 系统公共模块 
      ├── pig-common-core -- 公共工具类核心包
diff --git a/pig-auth/pom.xml b/pig-auth/pom.xml
index 2930e421..46334515 100755
--- a/pig-auth/pom.xml
+++ b/pig-auth/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>2.3.2</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>pig-auth</artifactId>
@@ -39,13 +39,13 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-upms-api</artifactId>
-			<version>2.3.2</version>
+			<version>2.4.0</version>
 		</dependency>
 		<!--security-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-security</artifactId>
-			<version>2.3.2</version>
+			<version>2.4.0</version>
 		</dependency>
 		<!--JDBC相关-->
 		<dependency>
diff --git a/pig-common/pig-common-core/pom.xml b/pig-common/pig-common-core/pom.xml
index cdb1c6b1..7d640701 100755
--- a/pig-common/pig-common-core/pom.xml
+++ b/pig-common/pig-common-core/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-common</artifactId>
-		<version>2.3.2</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>pig-common-core</artifactId>
diff --git a/pig-common/pig-common-log/pom.xml b/pig-common/pig-common-log/pom.xml
index 6a178438..f47ecf2b 100755
--- a/pig-common/pig-common-log/pom.xml
+++ b/pig-common/pig-common-log/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-common</artifactId>
-		<version>2.3.2</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>pig-common-log</artifactId>
@@ -35,13 +35,13 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-core</artifactId>
-			<version>2.3.2</version>
+			<version>2.4.0</version>
 		</dependency>
 		<!--UPMS接口模块-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-upms-api</artifactId>
-			<version>2.3.2</version>
+			<version>2.4.0</version>
 		</dependency>
 		<!--安全依赖获取上下文信息-->
 		<dependency>
diff --git a/pig-common/pig-common-security/pom.xml b/pig-common/pig-common-security/pom.xml
index e001da0f..e486382a 100755
--- a/pig-common/pig-common-security/pom.xml
+++ b/pig-common/pig-common-security/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-common</artifactId>
-		<version>2.3.2</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>pig-common-security</artifactId>
@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-core</artifactId>
-			<version>2.3.2</version>
+			<version>2.4.0</version>
 		</dependency>
 		<!--安全模块-->
 		<dependency>
@@ -50,7 +50,7 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-upms-api</artifactId>
-			<version>2.3.2</version>
+			<version>2.4.0</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/pig-common/pom.xml b/pig-common/pom.xml
index 2d04ada7..a2cb9d34 100755
--- a/pig-common/pom.xml
+++ b/pig-common/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>2.3.2</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>pig-common</artifactId>
diff --git a/pig-config/pom.xml b/pig-config/pom.xml
index 5d800189..9de63cb7 100755
--- a/pig-config/pom.xml
+++ b/pig-config/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>2.3.2</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>pig-config</artifactId>
diff --git a/pig-eureka/pom.xml b/pig-eureka/pom.xml
index 81e42425..0a590e15 100755
--- a/pig-eureka/pom.xml
+++ b/pig-eureka/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>2.3.2</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>pig-eureka</artifactId>
diff --git a/pig-gateway/pom.xml b/pig-gateway/pom.xml
index c77e89ef..0f471a4b 100755
--- a/pig-gateway/pom.xml
+++ b/pig-gateway/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>2.3.2</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>pig-gateway</artifactId>
@@ -54,7 +54,7 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-core</artifactId>
-			<version>2.3.2</version>
+			<version>2.4.0</version>
 		</dependency>
 	</dependencies>
 
diff --git a/pig-upms/pig-upms-api/pom.xml b/pig-upms/pig-upms-api/pom.xml
index 2aea8ad4..0c4fe5aa 100755
--- a/pig-upms/pig-upms-api/pom.xml
+++ b/pig-upms/pig-upms-api/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-upms</artifactId>
-		<version>2.3.2</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>pig-upms-api</artifactId>
@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-core</artifactId>
-			<version>2.3.2</version>
+			<version>2.4.0</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/pig-upms/pig-upms-biz/pom.xml b/pig-upms/pig-upms-biz/pom.xml
index 851cbc82..31fe3be5 100644
--- a/pig-upms/pig-upms-biz/pom.xml
+++ b/pig-upms/pig-upms-biz/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-upms</artifactId>
-		<version>2.3.2</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>pig-upms-biz</artifactId>
@@ -34,19 +34,19 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-upms-api</artifactId>
-			<version>2.3.2</version>
+			<version>2.4.0</version>
 		</dependency>
 		<!--安全模块-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-security</artifactId>
-			<version>2.3.2</version>
+			<version>2.4.0</version>
 		</dependency>
 		<!--日志处理-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-log</artifactId>
-			<version>2.3.2</version>
+			<version>2.4.0</version>
 		</dependency>
 		<!--配置中心客户端-->
 		<dependency>
diff --git a/pig-upms/pom.xml b/pig-upms/pom.xml
index 419b39ab..f15069dc 100755
--- a/pig-upms/pom.xml
+++ b/pig-upms/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>2.3.2</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>pig-upms</artifactId>
diff --git a/pig-visual/pig-codegen/pom.xml b/pig-visual/pig-codegen/pom.xml
index 6bceb9ff..fec884c6 100755
--- a/pig-visual/pig-codegen/pom.xml
+++ b/pig-visual/pig-codegen/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-visual</artifactId>
-		<version>2.3.2</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>pig-codegen</artifactId>
@@ -50,13 +50,13 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-core</artifactId>
-			<version>2.3.2</version>
+			<version>2.4.0</version>
 		</dependency>
 		<!--安全模块-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-security</artifactId>
-			<version>2.3.2</version>
+			<version>2.4.0</version>
 		</dependency>
 		<!--代码生成模板引擎-->
 		<dependency>
diff --git a/pig-visual/pig-monitor/pom.xml b/pig-visual/pig-monitor/pom.xml
index 428aa911..2ee221f5 100755
--- a/pig-visual/pig-monitor/pom.xml
+++ b/pig-visual/pig-monitor/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-visual</artifactId>
-		<version>2.3.2</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>pig-monitor</artifactId>
diff --git a/pig-visual/pig-zipkin/pom.xml b/pig-visual/pig-zipkin/pom.xml
index 67ffccbc..03500181 100644
--- a/pig-visual/pig-zipkin/pom.xml
+++ b/pig-visual/pig-zipkin/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>pig-visual</artifactId>
 		<groupId>com.pig4cloud</groupId>
-		<version>2.3.2</version>
+		<version>2.4.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/pig-visual/pom.xml b/pig-visual/pom.xml
index 61f3ee2c..0172d8f9 100755
--- a/pig-visual/pom.xml
+++ b/pig-visual/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>2.3.2</version>
+		<version>2.4.0</version>
 	</parent>
 
 	<artifactId>pig-visual</artifactId>
diff --git a/pom.xml b/pom.xml
index 7c9c70db..4fc2e7cf 100755
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
 
 	<groupId>com.pig4cloud</groupId>
 	<artifactId>pig</artifactId>
-	<version>2.3.2</version>
+	<version>2.4.0</version>
 	<name>${project.artifactId}</name>
 	<packaging>pom</packaging>
 	<url>https://www.pig4cloud.com</url>
@@ -34,7 +34,7 @@
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<spring-boot-admin.version>2.1.6</spring-boot-admin.version>
-		<hutool.version>4.6.1</hutool.version>
+		<hutool.version>4.6.3</hutool.version>
 		<mybatis-plus.version>3.1.2</mybatis-plus.version>
 		<kaptcha.version>0.0.9</kaptcha.version>
 		<velocity.version>1.7</velocity.version>