🔖 2.6.0 spring cloud hoxton

pig-mesh · Nov 28, 2019 · e962abf · e962abf
1 parent 6515f86
commit e962abf
Show file tree

Hide file tree

Showing 26 changed files with 51 additions and 51 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -17,6 +17,6 @@ indent_size = 4
 indent_style = space
 indent_size = 2
 
-# 对后缀名为 md 的文件生效
+# 对后缀名为 .md 的文件生效
 [*.md]
 trim_trailing_whitespace = false
diff --git a/.gitee/ISSUE_TEMPLATE.zh-CN.md b/.gitee/ISSUE_TEMPLATE.zh-CN.md
@@ -5,11 +5,12 @@
 
 ### 报错信息 （注意格式化）
 
+
 ```angular2
 这里粘贴代码或者、日志  
 
 ```
 
 ###问题描述（包括回显步骤、截图 ）
 
-此项没有直接关闭、不予解决
+此项没有直接关闭、感谢理解
diff --git a/README.md b/README.md
@@ -5,8 +5,8 @@
 
 <p align="center">
  <img src="https://img.shields.io/badge/Avue-2.2.1-green.svg" alt="Build Status">
- <img src="https://img.shields.io/badge/Spring%20Cloud-Hoxton.RC1-blue.svg" alt="Coverage Status">
- <img src="https://img.shields.io/badge/Spring%20Boot-2.2.0.RELEASE-blue.svg" alt="Downloads">
+ <img src="https://img.shields.io/badge/Spring%20Cloud-Hoxton-blue.svg" alt="Coverage Status">
+ <img src="https://img.shields.io/badge/Spring%20Boot-2.2.RELEASE-blue.svg" alt="Downloads">
 </p>
 
 - 基于 Spring Cloud Hoxton 、Spring Boot 2.2、 OAuth2 的RBAC权限管理系统  
@@ -18,8 +18,6 @@
 <a href="http://pig4cloud.com/doc/pig" target="_blank">部署文档</a> | <a target="_blank" href="https://avuejs.com"> 前端解决方案</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> | <a target="_blank" href="https://pig4cloud.com/images/20190918.pdf"> PigX白皮书</a>
 
 
-
-
 #### 快速构架微服务应用  
 
 ```xml
@@ -39,10 +37,10 @@
 依赖 | 版本
 ---|---
 Spring Boot |  2.2.1.RELEASE  
-Spring Cloud | Hoxton.RC2   
+Spring Cloud | Hoxton.RELEASE   
 Spring Security OAuth2 | 2.3.6
 Mybatis Plus | 3.2.0
-hutool | 5.0.5
+hutool | 5.0.6
 Avue | 2.2.0
 
 
@@ -56,7 +54,8 @@ pig
 └── pig-common -- 系统公共模块 
      ├── pig-common-core -- 公共工具类核心包
      ├── pig-common-log -- 日志服务
-     └── pig-common-security -- 安全工具类
+     ├── pig-common-security -- 安全工具类
+     └── pig-common-swagger -- 接口文档
 ├── pig-config -- 配置中心[8888]
 ├── pig-eureka -- 服务注册与发现[8761]
 ├── pig-gateway -- Spring Cloud Gateway网关[9999]

diff --git a/pig-auth/pom.xml b/pig-auth/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>2.5.2.snapshot</version>
+		<version>2.6.0</version>
 	</parent>
 
 	<artifactId>pig-auth</artifactId>
@@ -39,13 +39,13 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-upms-api</artifactId>
-			<version>2.5.2.snapshot</version>
+			<version>2.6.0</version>
 		</dependency>
 		<!--security-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-security</artifactId>
-			<version>2.5.2.snapshot</version>
+			<version>2.6.0</version>
 		</dependency>
 		<!--JDBC相关-->
 		<dependency>

diff --git a/pig-auth/src/main/resources/bootstrap.yml b/pig-auth/src/main/resources/bootstrap.yml
@@ -24,4 +24,4 @@ eureka:
     prefer-ip-address: true
   client:
     service-url:
-      defaultZone: http://pig:pig@pig-eureka:8761/eureka/
+      defaultZone: http://pig:pig@pig-eureka:8761/eureka
diff --git 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.5.2.snapshot</version>
+		<version>2.6.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
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-common</artifactId>
-		<version>2.5.2.snapshot</version>
+		<version>2.6.0</version>
 	</parent>
 
 	<artifactId>pig-common-log</artifactId>
@@ -35,13 +35,13 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-core</artifactId>
-			<version>2.5.2.snapshot</version>
+			<version>2.6.0</version>
 		</dependency>
 		<!--UPMS接口模块-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-upms-api</artifactId>
-			<version>2.5.2.snapshot</version>
+			<version>2.6.0</version>
 		</dependency>
 		<!--安全依赖获取上下文信息-->
 		<dependency>

diff --git 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.5.2.snapshot</version>
+		<version>2.6.0</version>
 	</parent>
 
 	<artifactId>pig-common-security</artifactId>
@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-core</artifactId>
-			<version>2.5.2.snapshot</version>
+			<version>2.6.0</version>
 		</dependency>
 		<!--安全模块-->
 		<dependency>
@@ -50,7 +50,7 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-upms-api</artifactId>
-			<version>2.5.2.snapshot</version>
+			<version>2.6.0</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/pig-common/pig-common-swagger/pom.xml b/pig-common/pig-common-swagger/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig-common</artifactId>
-		<version>2.5.2.snapshot</version>
+		<version>2.6.0</version>
 	</parent>
 
 	<artifactId>pig-common-swagger</artifactId>

diff --git a/pig-common/pom.xml b/pig-common/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>2.5.2.snapshot</version>
+		<version>2.6.0</version>
 	</parent>
 
 	<artifactId>pig-common</artifactId>

diff --git a/pig-config/pom.xml b/pig-config/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>2.5.2.snapshot</version>
+		<version>2.6.0</version>
 	</parent>
 
 	<artifactId>pig-config</artifactId>

diff --git a/pig-config/src/main/resources/bootstrap.yml b/pig-config/src/main/resources/bootstrap.yml
@@ -19,7 +19,7 @@ eureka:
     prefer-ip-address: true
   client:
     service-url:
-      defaultZone: http://pig:pig@pig-eureka:8761/eureka/
+      defaultZone: http://pig:pig@pig-eureka:8761/eureka
 
 # 暴露监控端点
 management:

diff --git a/pig-eureka/pom.xml b/pig-eureka/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>2.5.2.snapshot</version>
+		<version>2.6.0</version>
 	</parent>
 
 	<artifactId>pig-eureka</artifactId>

diff --git a/pig-eureka/src/main/resources/bootstrap.yml b/pig-eureka/src/main/resources/bootstrap.yml
@@ -22,7 +22,7 @@ eureka:
     register-with-eureka: false
     fetch-registry: false
     service-url:
-      defaultZone: http://pig:pig@${eureka.instance.hostname}:${server.port}/eureka/
+      defaultZone: http://pig:pig@${eureka.instance.hostname}:${server.port}/eureka
   server:
     eviction-interval-timer-in-ms: 4000
     enable-self-preservation: false

diff --git a/pig-gateway/pom.xml b/pig-gateway/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>2.5.2.snapshot</version>
+		<version>2.6.0</version>
 	</parent>
 
 	<artifactId>pig-gateway</artifactId>
@@ -54,7 +54,7 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-core</artifactId>
-			<version>2.5.2.snapshot</version>
+			<version>2.6.0</version>
 		</dependency>
 		<!--接口文档-->
 		<dependency>
@@ -65,7 +65,7 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-swagger</artifactId>
-			<version>2.5.2.snapshot</version>
+			<version>2.6.0</version>
 		</dependency>
 	</dependencies>
 

diff --git a/pig-gateway/src/main/resources/bootstrap.yml b/pig-gateway/src/main/resources/bootstrap.yml
@@ -24,6 +24,6 @@ eureka:
     prefer-ip-address: true
   client:
     service-url:
-      defaultZone: http://pig:pig@pig-eureka:8761/eureka/
+      defaultZone: http://pig:pig@pig-eureka:8761/eureka
 
 
diff --git 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.5.2.snapshot</version>
+		<version>2.6.0</version>
 	</parent>
 
 	<artifactId>pig-upms-api</artifactId>
@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-core</artifactId>
-			<version>2.5.2.snapshot</version>
+			<version>2.6.0</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git 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.5.2.snapshot</version>
+		<version>2.6.0</version>
 	</parent>
 
 	<artifactId>pig-upms-biz</artifactId>
@@ -34,25 +34,25 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-upms-api</artifactId>
-			<version>2.5.2.snapshot</version>
+			<version>2.6.0</version>
 		</dependency>
 		<!--安全模块-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-security</artifactId>
-			<version>2.5.2.snapshot</version>
+			<version>2.6.0</version>
 		</dependency>
 		<!--日志处理-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-log</artifactId>
-			<version>2.5.2.snapshot</version>
+			<version>2.6.0</version>
 		</dependency>
 		<!--接口文档-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-swagger</artifactId>
-			<version>2.5.2.snapshot</version>
+			<version>2.6.0</version>
 		</dependency>
 		<!--配置中心客户端-->
 		<dependency>

diff --git a/pig-upms/pig-upms-biz/src/main/resources/bootstrap.yml b/pig-upms/pig-upms-biz/src/main/resources/bootstrap.yml
@@ -23,4 +23,4 @@ eureka:
     prefer-ip-address: true
   client:
     service-url:
-      defaultZone: http://pig:pig@pig-eureka:8761/eureka/
+      defaultZone: http://pig:pig@pig-eureka:8761/eureka
diff --git a/pig-upms/pom.xml b/pig-upms/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>2.5.2.snapshot</version>
+		<version>2.6.0</version>
 	</parent>
 
 	<artifactId>pig-upms</artifactId>

diff --git 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.5.2.snapshot</version>
+		<version>2.6.0</version>
 	</parent>
 
 	<artifactId>pig-codegen</artifactId>
@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-swagger</artifactId>
-			<version>2.5.2.snapshot</version>
+			<version>2.6.0</version>
 		</dependency>
 		<!--配置中心客户端-->
 		<dependency>
@@ -56,13 +56,13 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-core</artifactId>
-			<version>2.5.2.snapshot</version>
+			<version>2.6.0</version>
 		</dependency>
 		<!--安全模块-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pig-common-security</artifactId>
-			<version>2.5.2.snapshot</version>
+			<version>2.6.0</version>
 		</dependency>
 		<!--代码生成模板引擎-->
 		<dependency>

diff --git a/pig-visual/pig-codegen/src/main/resources/bootstrap.yml b/pig-visual/pig-codegen/src/main/resources/bootstrap.yml
@@ -23,7 +23,7 @@ eureka:
     prefer-ip-address: true
   client:
     service-url:
-      defaultZone: http://pig:pig@pig-eureka:8761/eureka/
+      defaultZone: http://pig:pig@pig-eureka:8761/eureka
 logging:
   level:
     root: info
diff --git 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.5.2.snapshot</version>
+		<version>2.6.0</version>
 	</parent>
 
 	<artifactId>pig-monitor</artifactId>

diff --git a/pig-visual/pig-monitor/src/main/resources/bootstrap.yml b/pig-visual/pig-monitor/src/main/resources/bootstrap.yml
@@ -23,4 +23,4 @@ eureka:
     prefer-ip-address: true
   client:
     service-url:
-      defaultZone: http://pig:pig@pig-eureka:8761/eureka/
+      defaultZone: http://pig:pig@pig-eureka:8761/eureka
diff --git a/pig-visual/pom.xml b/pig-visual/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>com.pig4cloud</groupId>
 		<artifactId>pig</artifactId>
-		<version>2.5.2.snapshot</version>
+		<version>2.6.0</version>
 	</parent>
 
 	<artifactId>pig-visual</artifactId>