diff --git a/docker-compose.yml b/docker-compose.yml
index 30ce43425..4eaafb588 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-# 使用说明 V2.7.0
+# 使用说明 V2.8.0
# 1. 使用docker-compose 宿主机不需要配置host来发现
# 2. 无需修改源码,根目录 docker-compose up 即可
# 3. 静静等待服务启动
diff --git a/pigx-auth/pom.xml b/pigx-auth/pom.xml
index 9ca4c3f2e..0138ddba4 100644
--- a/pigx-auth/pom.xml
+++ b/pigx-auth/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx
- 2.7.0
+ 2.8.0
pigx-auth
diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java
index fb897a81c..53738f210 100644
--- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java
+++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java
@@ -111,6 +111,9 @@ public class PigxTokenEndpoint {
@Inner
@DeleteMapping("/{token}")
public R delToken(@PathVariable("token") String token) {
+ if (token != null) {
+ throw new RuntimeException("lalalala");
+ }
OAuth2AccessToken oAuth2AccessToken = tokenStore.readAccessToken(token);
tokenStore.removeAccessToken(oAuth2AccessToken);
return new R<>();
diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml
index 67e1b6b51..872624c8c 100644
--- a/pigx-common/pigx-common-bom/pom.xml
+++ b/pigx-common/pigx-common-bom/pom.xml
@@ -16,7 +16,7 @@
pigx 公共版本控制
- 2.7.0
+ 2.8.0
3.1.0
8.0.13
1.5.22
diff --git a/pigx-common/pigx-common-core/pom.xml b/pigx-common/pigx-common-core/pom.xml
index f2f46e6eb..6b4aa513c 100644
--- a/pigx-common/pigx-common-core/pom.xml
+++ b/pigx-common/pigx-common-core/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx-common
- 2.7.0
+ 2.8.0
pigx-common-core
diff --git a/pigx-common/pigx-common-data/pom.xml b/pigx-common/pigx-common-data/pom.xml
index a51afb387..5b69ce245 100644
--- a/pigx-common/pigx-common-data/pom.xml
+++ b/pigx-common/pigx-common-data/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx-common
- 2.7.0
+ 2.8.0
pigx-common-data
diff --git a/pigx-common/pigx-common-gateway/pom.xml b/pigx-common/pigx-common-gateway/pom.xml
index 346f29141..7854a5bce 100644
--- a/pigx-common/pigx-common-gateway/pom.xml
+++ b/pigx-common/pigx-common-gateway/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx-common
- 2.7.0
+ 2.8.0
pigx-common-gateway
diff --git a/pigx-common/pigx-common-job/pom.xml b/pigx-common/pigx-common-job/pom.xml
index 550338fab..f016255db 100644
--- a/pigx-common/pigx-common-job/pom.xml
+++ b/pigx-common/pigx-common-job/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx-common
- 2.7.0
+ 2.8.0
pigx-common-job
diff --git a/pigx-common/pigx-common-log/pom.xml b/pigx-common/pigx-common-log/pom.xml
index 4ec70cafb..afc2b8813 100644
--- a/pigx-common/pigx-common-log/pom.xml
+++ b/pigx-common/pigx-common-log/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx-common
- 2.7.0
+ 2.8.0
pigx-common-log
diff --git a/pigx-common/pigx-common-minio/pom.xml b/pigx-common/pigx-common-minio/pom.xml
index aa859eba8..d86c37e9d 100755
--- a/pigx-common/pigx-common-minio/pom.xml
+++ b/pigx-common/pigx-common-minio/pom.xml
@@ -6,7 +6,7 @@
com.pig4cloud
pigx-common
- 2.7.0
+ 2.8.0
pigx-common-minio
diff --git a/pigx-common/pigx-common-security/pom.xml b/pigx-common/pigx-common-security/pom.xml
index 1f244e842..54fd01845 100644
--- a/pigx-common/pigx-common-security/pom.xml
+++ b/pigx-common/pigx-common-security/pom.xml
@@ -23,7 +23,7 @@
com.pig4cloud
pigx-common
- 2.7.0
+ 2.8.0
pigx-common-security
diff --git a/pigx-common/pigx-common-security/src/main/java/org/springframework/cloud/openfeign/PigxFeignFallback.java b/pigx-common/pigx-common-security/src/main/java/org/springframework/cloud/openfeign/PigxFeignFallback.java
index fb849f19e..21d7c9ff1 100644
--- a/pigx-common/pigx-common-security/src/main/java/org/springframework/cloud/openfeign/PigxFeignFallback.java
+++ b/pigx-common/pigx-common-security/src/main/java/org/springframework/cloud/openfeign/PigxFeignFallback.java
@@ -18,7 +18,7 @@
package org.springframework.cloud.openfeign;
import cn.hutool.core.util.StrUtil;
-import com.pig4cloud.pigx.common.core.constant.CommonConstants;
+import cn.hutool.json.JSONUtil;
import com.pig4cloud.pigx.common.core.util.R;
import feign.FeignException;
import lombok.AllArgsConstructor;
@@ -57,8 +57,7 @@ public class PigxFeignFallback implements MethodInterceptor {
String str = StrUtil.str(content, StandardCharsets.UTF_8);
log.error("PigxFeignFallback:[{}.{}] serviceId:[{}] message:[{}]", targetType.getName(), method.getName(), targetName, str);
- return R.builder().code(CommonConstants.FAIL)
- .msg(str).build();
+ return JSONUtil.toBean(str, R.class);
}
@Override
diff --git a/pigx-common/pigx-common-swagger/pom.xml b/pigx-common/pigx-common-swagger/pom.xml
index de0de37df..6bc15b33d 100644
--- a/pigx-common/pigx-common-swagger/pom.xml
+++ b/pigx-common/pigx-common-swagger/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx-common
- 2.7.0
+ 2.8.0
pigx-common-swagger
diff --git a/pigx-common/pigx-common-transaction/pom.xml b/pigx-common/pigx-common-transaction/pom.xml
index 7a4a68163..e32c6d6a7 100644
--- a/pigx-common/pigx-common-transaction/pom.xml
+++ b/pigx-common/pigx-common-transaction/pom.xml
@@ -5,7 +5,7 @@
com.pig4cloud
pigx-common
- 2.7.0
+ 2.8.0
pigx-common-transaction
diff --git a/pigx-common/pom.xml b/pigx-common/pom.xml
index d4cc03e9d..5d238a181 100644
--- a/pigx-common/pom.xml
+++ b/pigx-common/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx
- 2.7.0
+ 2.8.0
pigx-common
diff --git a/pigx-config/pom.xml b/pigx-config/pom.xml
index 13c3036be..d7481420d 100644
--- a/pigx-config/pom.xml
+++ b/pigx-config/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx
- 2.7.0
+ 2.8.0
pigx-config
diff --git a/pigx-eureka/pom.xml b/pigx-eureka/pom.xml
index 48b061c65..205b64354 100644
--- a/pigx-eureka/pom.xml
+++ b/pigx-eureka/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx
- 2.7.0
+ 2.8.0
pigx-eureka
diff --git a/pigx-gateway/pom.xml b/pigx-gateway/pom.xml
index cf82cd02e..75e7d739e 100644
--- a/pigx-gateway/pom.xml
+++ b/pigx-gateway/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx
- 2.7.0
+ 2.8.0
pigx-gateway
diff --git a/pigx-upms/pigx-upms-api/pom.xml b/pigx-upms/pigx-upms-api/pom.xml
index 164585399..cf377bc86 100644
--- a/pigx-upms/pigx-upms-api/pom.xml
+++ b/pigx-upms/pigx-upms-api/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx-upms
- 2.7.0
+ 2.8.0
pigx-upms-api
diff --git a/pigx-upms/pigx-upms-biz/pom.xml b/pigx-upms/pigx-upms-biz/pom.xml
index e24090894..82ba9cc74 100644
--- a/pigx-upms/pigx-upms-biz/pom.xml
+++ b/pigx-upms/pigx-upms-biz/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx-upms
- 2.7.0
+ 2.8.0
pigx-upms-biz
diff --git a/pigx-upms/pom.xml b/pigx-upms/pom.xml
index ab20d7607..27545bc74 100644
--- a/pigx-upms/pom.xml
+++ b/pigx-upms/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx
- 2.7.0
+ 2.8.0
pigx-upms
diff --git a/pigx-visual/pigx-activiti/pom.xml b/pigx-visual/pigx-activiti/pom.xml
index 45542b234..235acb84f 100644
--- a/pigx-visual/pigx-activiti/pom.xml
+++ b/pigx-visual/pigx-activiti/pom.xml
@@ -23,7 +23,7 @@
com.pig4cloud
pigx-visual
- 2.7.0
+ 2.8.0
pigx-activiti
diff --git a/pigx-visual/pigx-codegen/pom.xml b/pigx-visual/pigx-codegen/pom.xml
index a0bcf4fea..1805d57a7 100755
--- a/pigx-visual/pigx-codegen/pom.xml
+++ b/pigx-visual/pigx-codegen/pom.xml
@@ -6,7 +6,7 @@
com.pig4cloud
pigx-visual
- 2.7.0
+ 2.8.0
pigx-codegen
diff --git a/pigx-visual/pigx-daemon-elastic-job/pom.xml b/pigx-visual/pigx-daemon-elastic-job/pom.xml
index d1111705c..47a291a04 100644
--- a/pigx-visual/pigx-daemon-elastic-job/pom.xml
+++ b/pigx-visual/pigx-daemon-elastic-job/pom.xml
@@ -23,7 +23,7 @@
com.pig4cloud
pigx-visual
- 2.7.0
+ 2.8.0
pigx-daemon-elastic-job
diff --git a/pigx-visual/pigx-daemon-quartz/pom.xml b/pigx-visual/pigx-daemon-quartz/pom.xml
index 36fcd37f5..0f6b1860f 100644
--- a/pigx-visual/pigx-daemon-quartz/pom.xml
+++ b/pigx-visual/pigx-daemon-quartz/pom.xml
@@ -5,7 +5,7 @@
com.pig4cloud
pigx-visual
- 2.7.0
+ 2.8.0
4.0.0
diff --git a/pigx-visual/pigx-monitor/pom.xml b/pigx-visual/pigx-monitor/pom.xml
index dd41f551d..bf2432ce0 100644
--- a/pigx-visual/pigx-monitor/pom.xml
+++ b/pigx-visual/pigx-monitor/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx-visual
- 2.7.0
+ 2.8.0
pigx-monitor
@@ -36,7 +36,7 @@
com.pig4cloud
pigx-common-core
- 2.7.0
+ 2.8.0
org.springframework.boot
diff --git a/pigx-visual/pigx-mp-manager/pom.xml b/pigx-visual/pigx-mp-manager/pom.xml
index cb9b513c3..60be05627 100755
--- a/pigx-visual/pigx-mp-manager/pom.xml
+++ b/pigx-visual/pigx-mp-manager/pom.xml
@@ -6,7 +6,7 @@
com.pig4cloud
pigx-visual
- 2.6.0
+ 2.8.0
pigx-mp-manager
diff --git a/pigx-visual/pigx-sso-client-demo/pom.xml b/pigx-visual/pigx-sso-client-demo/pom.xml
index 4df1a5d21..6fc917786 100644
--- a/pigx-visual/pigx-sso-client-demo/pom.xml
+++ b/pigx-visual/pigx-sso-client-demo/pom.xml
@@ -29,7 +29,7 @@
com.pig4cloud
pigx-visual
- 2.7.0
+ 2.8.0
diff --git a/pigx-visual/pigx-tx-manager/pom.xml b/pigx-visual/pigx-tx-manager/pom.xml
index fe695de20..f94cdc2de 100644
--- a/pigx-visual/pigx-tx-manager/pom.xml
+++ b/pigx-visual/pigx-tx-manager/pom.xml
@@ -5,7 +5,7 @@
com.pig4cloud
pigx-visual
- 2.7.0
+ 2.8.0
pigx-tx-manager
diff --git a/pigx-visual/pigx-zipkin/pom.xml b/pigx-visual/pigx-zipkin/pom.xml
index 9aab28503..a70d40d5a 100644
--- a/pigx-visual/pigx-zipkin/pom.xml
+++ b/pigx-visual/pigx-zipkin/pom.xml
@@ -22,7 +22,7 @@
pigx-visual
com.pig4cloud
- 2.7.0
+ 2.8.0
4.0.0
diff --git a/pigx-visual/pom.xml b/pigx-visual/pom.xml
index 98763b39b..d6b1bbc4a 100644
--- a/pigx-visual/pom.xml
+++ b/pigx-visual/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx
- 2.7.0
+ 2.8.0
pigx-visual
diff --git a/pom.xml b/pom.xml
index 6a61426be..8fbf48b0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
com.pig4cloud
pigx
- 2.7.0
+ 2.8.0
${project.artifactId}
pom