diff --git a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/config/FeignConfig.java b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/config/FeignConfig.java
index 2ae28e1..c628b65 100644
--- a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/config/FeignConfig.java
+++ b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/config/FeignConfig.java
@@ -1,180 +1,180 @@
-package org.jeecg.config;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.SortedMap;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.jeecg.common.config.mqtoken.UserTokenContext;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.util.DateUtils;
-import org.jeecg.common.util.PathMatcherUtil;
-import org.jeecg.config.sign.interceptor.SignAuthConfiguration;
-import org.jeecg.config.sign.util.HttpUtils;
-import org.jeecg.config.sign.util.SignUtil;
-import org.springframework.beans.factory.ObjectFactory;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
-import org.springframework.cloud.openfeign.FeignAutoConfiguration;
-import org.springframework.cloud.openfeign.support.SpringDecoder;
-import org.springframework.cloud.openfeign.support.SpringEncoder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.context.annotation.Scope;
-import org.springframework.http.MediaType;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.alibaba.fastjson.support.config.FastJsonConfig;
-import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
-import com.alibaba.fastjson.support.springfox.SwaggerJsonSerializer;
-
-import feign.Feign;
-import feign.Logger;
-import feign.RequestInterceptor;
-import feign.codec.Decoder;
-import feign.codec.Encoder;
-import feign.form.spring.SpringFormEncoder;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * @Description: FeignConfig
- * @author: JeecgBoot
- */
-@ConditionalOnClass(Feign.class)
-@AutoConfigureBefore(FeignAutoConfiguration.class)
-@Slf4j
-@Configuration
-public class FeignConfig {
-
- /**
- * 设置feign header参数
- * 【X_ACCESS_TOKEN】【X_SIGN】【X_TIMESTAMP】
- * @return
- */
- @Bean
- public RequestInterceptor requestInterceptor() {
- return requestTemplate -> {
- ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
- if (null != attributes) {
- HttpServletRequest request = attributes.getRequest();
- log.debug("Feign request: {}", request.getRequestURI());
- // 将token信息放入header中
- String token = request.getHeader(CommonConstant.X_ACCESS_TOKEN);
- if(token==null || "".equals(token)){
- token = request.getParameter("token");
- }
- log.info("Feign Login Request token: {}", token);
- requestTemplate.header(CommonConstant.X_ACCESS_TOKEN, token);
- }else{
- //解决后台任务、MQ中调用feign接口，无会话token的问题
- String token = UserTokenContext.getToken();
- log.info("Feign No Login token: {}", token);
- requestTemplate.header(CommonConstant.X_ACCESS_TOKEN, token);
- }
-
- //================================================================================================================
- //针对特殊接口，进行加签验证 ——根据URL地址过滤请求 【字典表参数签名验证】
- if (PathMatcherUtil.matches(Arrays.asList(SignAuthConfiguration.SIGN_URL_LIST),requestTemplate.path())) {
- try {
- log.info("============================ [begin] fegin api url ============================");
- log.info(requestTemplate.path());
- log.info(requestTemplate.method());
- String queryLine = requestTemplate.queryLine();
- String questionMark="?";
- if(queryLine!=null && queryLine.startsWith(questionMark)){
- queryLine = queryLine.substring(1);
- }
- log.info(queryLine);
- if(requestTemplate.body()!=null){
- log.info(new String(requestTemplate.body()));
- }
- SortedMap<String, String> allParams = HttpUtils.getAllParams(requestTemplate.path(),queryLine,requestTemplate.body(),requestTemplate.method());
- String sign = SignUtil.getParamsSign(allParams);
- log.info(" Feign request params sign: {}",sign);
- log.info("============================ [end] fegin api url ============================");
- requestTemplate.header(CommonConstant.X_SIGN, sign);
- requestTemplate.header(CommonConstant.X_TIMESTAMP, DateUtils.getCurrentTimestamp().toString());
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- //================================================================================================================
- };
- }
-
-
-
- /**
- * Feign 客户端的日志记录，默认级别为NONE
- * Logger.Level 的具体级别如下：
- * NONE：不记录任何信息
- * BASIC：仅记录请求方法、URL以及响应状态码和执行时间
- * HEADERS：除了记录 BASIC级别的信息外，还会记录请求和响应的头信息
- * FULL：记录所有请求与响应的明细，包括头信息、请求体、元数据
- */
- @Bean
- Logger.Level feignLoggerLevel() {
- return Logger.Level.FULL;
- }
-
- /**
- * Feign支持文件上传
- * @param messageConverters
- * @return
- */
- @Bean
- @Primary
- @Scope("prototype")
- public Encoder multipartFormEncoder(ObjectFactory<HttpMessageConverters> messageConverters) {
- return new SpringFormEncoder(new SpringEncoder(messageConverters));
- }
-
- // update-begin--Author:sunjianlei Date:20210604 for： 给 Feign 添加 FastJson 的解析支持 ----------
- /**
- * 给 Feign 添加 FastJson 的解析支持
- */
- @Bean
- public Encoder feignEncoder() {
- return new SpringEncoder(feignHttpMessageConverter());
- }
-
- @Bean
- public Decoder feignDecoder() {
- return new SpringDecoder(feignHttpMessageConverter());
- }
-
- /**
- * 设置解码器为fastjson
- *
- * @return
- */
- private ObjectFactory<HttpMessageConverters> feignHttpMessageConverter() {
- final HttpMessageConverters httpMessageConverters = new HttpMessageConverters(this.getFastJsonConverter());
- return () -> httpMessageConverters;
- }
-
- private FastJsonHttpMessageConverter getFastJsonConverter() {
- FastJsonHttpMessageConverter converter = new FastJsonHttpMessageConverter();
-
- List<MediaType> supportedMediaTypes = new ArrayList<>();
- MediaType mediaTypeJson = MediaType.valueOf(MediaType.APPLICATION_JSON_VALUE);
- supportedMediaTypes.add(mediaTypeJson);
- converter.setSupportedMediaTypes(supportedMediaTypes);
- FastJsonConfig config = new FastJsonConfig();
- config.getSerializeConfig().put(JSON.class, new SwaggerJsonSerializer());
- config.setSerializerFeatures(SerializerFeature.DisableCircularReferenceDetect);
- converter.setFastJsonConfig(config);
-
- return converter;
- }
- // update-end--Author:sunjianlei Date:20210604 for： 给 Feign 添加 FastJson 的解析支持 ----------
-
-}
+//package org.jeecg.config;
+//
+//import java.io.IOException;
+//import java.util.ArrayList;
+//import java.util.Arrays;
+//import java.util.List;
+//import java.util.SortedMap;
+//
+//import javax.servlet.http.HttpServletRequest;
+//
+//import org.jeecg.common.config.mqtoken.UserTokenContext;
+//import org.jeecg.common.constant.CommonConstant;
+//import org.jeecg.common.util.DateUtils;
+//import org.jeecg.common.util.PathMatcherUtil;
+//import org.jeecg.config.sign.interceptor.SignAuthConfiguration;
+//import org.jeecg.config.sign.util.HttpUtils;
+//import org.jeecg.config.sign.util.SignUtil;
+//import org.springframework.beans.factory.ObjectFactory;
+//import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+//import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+//import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
+//import org.springframework.cloud.openfeign.FeignAutoConfiguration;
+//import org.springframework.cloud.openfeign.support.SpringDecoder;
+//import org.springframework.cloud.openfeign.support.SpringEncoder;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.context.annotation.Primary;
+//import org.springframework.context.annotation.Scope;
+//import org.springframework.http.MediaType;
+//import org.springframework.web.context.request.RequestContextHolder;
+//import org.springframework.web.context.request.ServletRequestAttributes;
+//
+//import com.alibaba.fastjson.JSON;
+//import com.alibaba.fastjson.serializer.SerializerFeature;
+//import com.alibaba.fastjson.support.config.FastJsonConfig;
+//import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
+//import com.alibaba.fastjson.support.springfox.SwaggerJsonSerializer;
+//
+//import feign.Feign;
+//import feign.Logger;
+//import feign.RequestInterceptor;
+//import feign.codec.Decoder;
+//import feign.codec.Encoder;
+//import feign.form.spring.SpringFormEncoder;
+//import lombok.extern.slf4j.Slf4j;
+//
+///**
+// * @Description: FeignConfig
+// * @author: JeecgBoot
+// */
+//@ConditionalOnClass(Feign.class)
+//@AutoConfigureBefore(FeignAutoConfiguration.class)
+//@Slf4j
+//@Configuration
+//public class FeignConfig {
+//
+// /**
+// * 设置feign header参数
+// * 【X_ACCESS_TOKEN】【X_SIGN】【X_TIMESTAMP】
+// * @return
+// */
+// @Bean
+// public RequestInterceptor requestInterceptor() {
+// return requestTemplate -> {
+// ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+// if (null != attributes) {
+// HttpServletRequest request = attributes.getRequest();
+// log.debug("Feign request: {}", request.getRequestURI());
+// // 将token信息放入header中
+// String token = request.getHeader(CommonConstant.X_ACCESS_TOKEN);
+// if(token==null || "".equals(token)){
+// token = request.getParameter("token");
+// }
+// log.info("Feign Login Request token: {}", token);
+// requestTemplate.header(CommonConstant.X_ACCESS_TOKEN, token);
+// }else{
+// //解决后台任务、MQ中调用feign接口，无会话token的问题
+// String token = UserTokenContext.getToken();
+// log.info("Feign No Login token: {}", token);
+// requestTemplate.header(CommonConstant.X_ACCESS_TOKEN, token);
+// }
+//
+// //================================================================================================================
+// //针对特殊接口，进行加签验证 ——根据URL地址过滤请求 【字典表参数签名验证】
+// if (PathMatcherUtil.matches(Arrays.asList(SignAuthConfiguration.SIGN_URL_LIST),requestTemplate.path())) {
+// try {
+// log.info("============================ [begin] fegin api url ============================");
+// log.info(requestTemplate.path());
+// log.info(requestTemplate.method());
+// String queryLine = requestTemplate.queryLine();
+// String questionMark="?";
+// if(queryLine!=null && queryLine.startsWith(questionMark)){
+// queryLine = queryLine.substring(1);
+// }
+// log.info(queryLine);
+// if(requestTemplate.body()!=null){
+// log.info(new String(requestTemplate.body()));
+// }
+// SortedMap<String, String> allParams = HttpUtils.getAllParams(requestTemplate.path(),queryLine,requestTemplate.body(),requestTemplate.method());
+// String sign = SignUtil.getParamsSign(allParams);
+// log.info(" Feign request params sign: {}",sign);
+// log.info("============================ [end] fegin api url ============================");
+// requestTemplate.header(CommonConstant.X_SIGN, sign);
+// requestTemplate.header(CommonConstant.X_TIMESTAMP, DateUtils.getCurrentTimestamp().toString());
+// } catch (IOException e) {
+// e.printStackTrace();
+// }
+// }
+// //================================================================================================================
+// };
+// }
+//
+//
+//
+// /**
+// * Feign 客户端的日志记录，默认级别为NONE
+// * Logger.Level 的具体级别如下：
+// * NONE：不记录任何信息
+// * BASIC：仅记录请求方法、URL以及响应状态码和执行时间
+// * HEADERS：除了记录 BASIC级别的信息外，还会记录请求和响应的头信息
+// * FULL：记录所有请求与响应的明细，包括头信息、请求体、元数据
+// */
+// @Bean
+// Logger.Level feignLoggerLevel() {
+// return Logger.Level.FULL;
+// }
+//
+// /**
+// * Feign支持文件上传
+// * @param messageConverters
+// * @return
+// */
+// @Bean
+// @Primary
+// @Scope("prototype")
+// public Encoder multipartFormEncoder(ObjectFactory<HttpMessageConverters> messageConverters) {
+// return new SpringFormEncoder(new SpringEncoder(messageConverters));
+// }
+//
+// // update-begin--Author:sunjianlei Date:20210604 for： 给 Feign 添加 FastJson 的解析支持 ----------
+// /**
+// * 给 Feign 添加 FastJson 的解析支持
+// */
+// @Bean
+// public Encoder feignEncoder() {
+// return new SpringEncoder(feignHttpMessageConverter());
+// }
+//
+// @Bean
+// public Decoder feignDecoder() {
+// return new SpringDecoder(feignHttpMessageConverter());
+// }
+//
+// /**
+// * 设置解码器为fastjson
+// *
+// * @return
+// */
+// private ObjectFactory<HttpMessageConverters> feignHttpMessageConverter() {
+// final HttpMessageConverters httpMessageConverters = new HttpMessageConverters(this.getFastJsonConverter());
+// return () -> httpMessageConverters;
+// }
+//
+// private FastJsonHttpMessageConverter getFastJsonConverter() {
+// FastJsonHttpMessageConverter converter = new FastJsonHttpMessageConverter();
+//
+// List<MediaType> supportedMediaTypes = new ArrayList<>();
+// MediaType mediaTypeJson = MediaType.valueOf(MediaType.APPLICATION_JSON_VALUE);
+// supportedMediaTypes.add(mediaTypeJson);
+// converter.setSupportedMediaTypes(supportedMediaTypes);
+// FastJsonConfig config = new FastJsonConfig();
+// config.getSerializeConfig().put(JSON.class, new SwaggerJsonSerializer());
+// config.setSerializerFeatures(SerializerFeature.DisableCircularReferenceDetect);
+// converter.setFastJsonConfig(config);
+//
+// return converter;
+// }
+// // update-end--Author:sunjianlei Date:20210604 for： 给 Feign 添加 FastJson 的解析支持 ----------
+//
+//}