Merge branch 'master' into 'hotfix-2.1.1'

# Conflicts: # choerodon-gitlab4j-api/pom.xml # choerodon-starter-asgard/pom.xml # choerodon-starter-core/pom.xml # choerodon-starter-fragment/pom.xml # choerodon-starter-limit/pom.xml # choerodon-starter-nacos-client/pom.xml # choerodon-starter-only-office/pom.xml # choerodon-tool-liquibase/pom.xml # pom.xml
open-hand · Jul 29, 2022 · ab3f718 · ab3f718
2 parents d022856 + b54e41d
commit ab3f718
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 11 deletions.
diff --git a/choerodon-gitlab4j-api/pom.xml b/choerodon-gitlab4j-api/pom.xml
@@ -4,7 +4,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>choerodon-gitlab4j-api</artifactId>
-    <version>2.1.1.RELEASE</version>
+    <version>2.2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>choerodon-gitlab4j-api</name>
     <description>GitLab API Java Client</description>
@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.choerodon</groupId>
         <artifactId>choerodon-starter-parent</artifactId>
-        <version>2.1.1.RELEASE</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
     <build>
         <defaultGoal>package</defaultGoal>

diff --git a/choerodon-starter-asgard/pom.xml b/choerodon-starter-asgard/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>choerodon-starter-parent</artifactId>
         <groupId>io.choerodon</groupId>
-        <version>2.1.1.RELEASE</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/choerodon-starter-core/pom.xml b/choerodon-starter-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>choerodon-starter-parent</artifactId>
         <groupId>io.choerodon</groupId>
-        <version>2.1.1.RELEASE</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/choerodon-starter-core/src/main/java/io/choerodon/core/utils/FeignFallbackUtil.java b/choerodon-starter-core/src/main/java/io/choerodon/core/utils/FeignFallbackUtil.java
@@ -0,0 +1,39 @@
+package io.choerodon.core.utils;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Proxy;
+import java.util.Arrays;
+
+import com.alibaba.fastjson.JSON;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.util.Assert;
+
+/**
+ * Copyright (c) 2022. Hand Enterprise Solution Company. All right reserved.
+ *
+ * @author [email protected]
+ * @since 2022/7/13
+ */
+public class FeignFallbackUtil {
+
+    private FeignFallbackUtil() {
+    }
+
+    public static <T> T get(Throwable cause, Class<T> targetClass) {
+        Assert.notNull(targetClass, "feign target class could not be null!");
+        Logger logger = LoggerFactory.getLogger(targetClass);
+        InvocationHandler invocationHandler = (proxy, method, args) -> {
+            logger.error("error when call {}.{} by params{}", method.getDeclaringClass().getSimpleName(),
+                    method.getName(), JSON.toJSONString(args));
+            if (cause != null) {
+                logger.error(cause.getMessage(), cause);
+            }
+            return ResponseEntity.badRequest().contentType(MediaType.APPLICATION_JSON).body("请联系运维人员");
+        };
+        return (T) Proxy.newProxyInstance(targetClass.getClassLoader(), new Class[]{targetClass}, invocationHandler);
+    }
+
+}
diff --git a/choerodon-starter-fragment/pom.xml b/choerodon-starter-fragment/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>choerodon-starter-parent</artifactId>
         <groupId>io.choerodon</groupId>
-        <version>2.1.1.RELEASE</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/choerodon-starter-limit/pom.xml b/choerodon-starter-limit/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>choerodon-starter-parent</artifactId>
         <groupId>io.choerodon</groupId>
-        <version>2.1.1.RELEASE</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/choerodon-starter-nacos-client/pom.xml b/choerodon-starter-nacos-client/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>choerodon-starter-parent</artifactId>
         <groupId>io.choerodon</groupId>
-        <version>2.1.1.RELEASE</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/choerodon-starter-only-office/pom.xml b/choerodon-starter-only-office/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>choerodon-starter-parent</artifactId>
         <groupId>io.choerodon</groupId>
-        <version>2.1.1.RELEASE</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>choerodon-starter-only-office</artifactId>
-    <version>2.1.1.RELEASE</version>
+    <version>2.2.0-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

diff --git a/choerodon-tool-liquibase/pom.xml b/choerodon-tool-liquibase/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.choerodon</groupId>
         <artifactId>choerodon-starter-parent</artifactId>
-        <version>2.1.1.RELEASE</version>
+        <version>2.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>choerodon-tool-liquibase</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.choerodon</groupId>
     <artifactId>choerodon-starter-parent</artifactId>
-    <version>2.1.1.RELEASE</version>
+    <version>2.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <parent>