Merge remote-tracking branch 'origin/dev' into dev

ace-common/pom.xml

@@ -209,6 +209,24 @@
             <artifactId>spring-boot</artifactId>
             <version>2.1.3.RELEASE</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-openfeign-core</artifactId>
+            <version>2.1.0.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-openfeign-core</artifactId>
+            <version>2.1.0.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-core</artifactId>
+            <version>10.1.0</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

ace-common/src/main/java/com/github/wxiaoqi/security/common/config/feign/FeignConfig.java

+package com.github.wxiaoqi.security.common.config.feign;
+
+import feign.Logger;
+import feign.codec.Decoder;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+import org.springframework.cloud.openfeign.support.ResponseEntityDecoder;
+import org.springframework.cloud.openfeign.support.SpringDecoder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+//@Configuration
+public class FeignConfig {
+
+    @Bean
+    Logger.Level feignLoggerLevel() {
+        return Logger.Level.FULL;
+    }
+
+    @Bean
+    public Decoder feignDecoder() {
+        return new ResponseEntityDecoder(new SpringDecoder(feignHttpMessageConverter()));
+    }
+
+    public ObjectFactory<HttpMessageConverters> feignHttpMessageConverter() {
+        final HttpMessageConverters httpMessageConverters = new HttpMessageConverters(new XXMappingJackson2HttpMessageConverter());
+        return new ObjectFactory<HttpMessageConverters>() {
+            @Override
+            public HttpMessageConverters getObject() throws BeansException {
+                return httpMessageConverters;
+            }
+        };
+    }
+
+    public class XXMappingJackson2HttpMessageConverter extends MappingJackson2HttpMessageConverter {
+        XXMappingJackson2HttpMessageConverter(){
+            List<MediaType> mediaTypes = new ArrayList<>();
+            mediaTypes.add(MediaType.valueOf(MediaType.TEXT_HTML_VALUE + ";charset=UTF-8nnn")); //关键
+            setSupportedMediaTypes(mediaTypes);
+        }
+    }
+
+}
\ No newline at end of file

ace-common/src/main/java/com/github/wxiaoqi/security/common/config/RabbitCommonConfig.java → ace-common/src/main/java/com/github/wxiaoqi/security/common/config/rabbit/RabbitCommonConfig.java

-package com.github.wxiaoqi.security.common.config;
+package com.github.wxiaoqi.security.common.config.rabbit;
 
 import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.common.config.rabbit.BindDTO;

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/config/RabbitAdminConfig.java

 package com.github.wxiaoqi.security.admin.config;
 
-import com.github.wxiaoqi.security.common.config.RabbitCommonConfig;
+import com.github.wxiaoqi.security.common.config.rabbit.RabbitCommonConfig;
 import com.github.wxiaoqi.security.common.config.rabbit.BindDTO;
-import com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant;
 import org.springframework.context.annotation.Configuration;
 
 import java.util.ArrayList;

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/config/RabbitActivityConfig.java

 package com.xxfc.platform.activity.config;
 
-import com.github.wxiaoqi.security.common.config.RabbitCommonConfig;
+import com.github.wxiaoqi.security.common.config.rabbit.RabbitCommonConfig;
 import com.github.wxiaoqi.security.common.config.rabbit.BindDTO;
-import com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant;
 import org.springframework.context.annotation.Configuration;
 
 import java.util.ArrayList;

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/config/RabbitOrderConfig.java

 package com.xxfc.platform.order.config;
 
-import com.github.wxiaoqi.security.common.config.RabbitCommonConfig;
+import com.github.wxiaoqi.security.common.config.rabbit.RabbitCommonConfig;
 import com.github.wxiaoqi.security.common.config.rabbit.BindDTO;
 import org.springframework.context.annotation.Configuration;