Commit c2d87b43 by chenjunxiong

build:

parent e8ebde53
package org.jeecg.config; package org.jeecg.config;
import java.io.IOException; import com.alibaba.fastjson.JSON;
import java.util.ArrayList; import com.alibaba.fastjson.serializer.SerializerFeature;
import java.util.Arrays; import com.alibaba.fastjson.support.config.FastJsonConfig;
import java.util.List; import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
import java.util.SortedMap; import com.alibaba.fastjson.support.springfox.SwaggerJsonSerializer;
import feign.Feign;
import javax.servlet.http.HttpServletRequest; import feign.Logger;
import feign.RequestInterceptor;
import feign.codec.Decoder;
import feign.codec.Encoder;
import feign.form.spring.SpringFormEncoder;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.config.mqtoken.UserTokenContext; import org.jeecg.common.config.mqtoken.UserTokenContext;
import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.DateUtils;
...@@ -30,19 +34,12 @@ import org.springframework.http.MediaType; ...@@ -30,19 +34,12 @@ import org.springframework.http.MediaType;
import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.context.request.ServletRequestAttributes;
import com.alibaba.fastjson.JSON; import javax.servlet.http.HttpServletRequest;
import com.alibaba.fastjson.serializer.SerializerFeature; import java.io.IOException;
import com.alibaba.fastjson.support.config.FastJsonConfig; import java.util.ArrayList;
import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter; import java.util.Arrays;
import com.alibaba.fastjson.support.springfox.SwaggerJsonSerializer; import java.util.List;
import java.util.SortedMap;
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;
@ConditionalOnClass(Feign.class) @ConditionalOnClass(Feign.class)
@AutoConfigureBefore(FeignAutoConfiguration.class) @AutoConfigureBefore(FeignAutoConfiguration.class)
...@@ -59,29 +56,29 @@ public class FeignConfig { ...@@ -59,29 +56,29 @@ public class FeignConfig {
log.debug("Feign request: {}", request.getRequestURI()); log.debug("Feign request: {}", request.getRequestURI());
// 将token信息放入header中 // 将token信息放入header中
String token = request.getHeader(CommonConstant.X_ACCESS_TOKEN); String token = request.getHeader(CommonConstant.X_ACCESS_TOKEN);
if(token==null || "".equals(token)){ if (token == null || "".equals(token)) {
token = request.getParameter("token"); token = request.getParameter("token");
} }
log.debug("Feign request token: {}", token); log.debug("Feign request token: {}", token);
requestTemplate.header(CommonConstant.X_ACCESS_TOKEN, token); requestTemplate.header(CommonConstant.X_ACCESS_TOKEN, token);
//根据URL地址过滤请求 【字典表参数签名验证】 //根据URL地址过滤请求 【字典表参数签名验证】
if (PathMatcherUtil.matches(Arrays.asList(SignAuthConfiguration.urlList),requestTemplate.path())) { if (PathMatcherUtil.matches(Arrays.asList(SignAuthConfiguration.urlList), requestTemplate.path())) {
try { try {
log.info("============================ [begin] fegin api url ============================"); log.info("============================ [begin] fegin api url ============================");
log.info(requestTemplate.path()); log.info(requestTemplate.path());
log.info(requestTemplate.method()); log.info(requestTemplate.method());
String queryLine = requestTemplate.queryLine(); String queryLine = requestTemplate.queryLine();
if(queryLine!=null && queryLine.startsWith("?")){ if (queryLine.startsWith("?")) {
queryLine = queryLine.substring(1); queryLine = queryLine.substring(1);
} }
log.info(queryLine); log.info(queryLine);
if(requestTemplate.body()!=null){ if (requestTemplate.body() != null) {
log.info(new String(requestTemplate.body())); log.info(new String(requestTemplate.body()));
} }
SortedMap<String, String> allParams = HttpUtils.getAllParams(requestTemplate.path(),queryLine,requestTemplate.body(),requestTemplate.method()); SortedMap<String, String> allParams = HttpUtils.getAllParams(requestTemplate.path(), queryLine, requestTemplate.body(), requestTemplate.method());
String sign = SignUtil.getParamsSign(allParams); String sign = SignUtil.getParamsSign(allParams);
log.info(" Feign request params sign: {}",sign); log.info(" Feign request params sign: {}", sign);
log.info("============================ [end] fegin api url ============================"); log.info("============================ [end] fegin api url ============================");
requestTemplate.header(CommonConstant.X_SIGN, sign); requestTemplate.header(CommonConstant.X_SIGN, sign);
requestTemplate.header(CommonConstant.X_TIMESTAMP, DateUtils.getCurrentTimestamp().toString()); requestTemplate.header(CommonConstant.X_TIMESTAMP, DateUtils.getCurrentTimestamp().toString());
...@@ -89,8 +86,8 @@ public class FeignConfig { ...@@ -89,8 +86,8 @@ public class FeignConfig {
e.printStackTrace(); e.printStackTrace();
} }
} }
}else{ } else {
String token = UserTokenContext.getToken(); String token = UserTokenContext.getToken();
log.debug("Feign request token: {}", token); log.debug("Feign request token: {}", token);
requestTemplate.header(CommonConstant.X_ACCESS_TOKEN, token); requestTemplate.header(CommonConstant.X_ACCESS_TOKEN, token);
} }
...@@ -98,7 +95,6 @@ public class FeignConfig { ...@@ -98,7 +95,6 @@ public class FeignConfig {
} }
/** /**
* Feign 客户端的日志记录,默认级别为NONE * Feign 客户端的日志记录,默认级别为NONE
* Logger.Level 的具体级别如下: * Logger.Level 的具体级别如下:
...@@ -114,6 +110,7 @@ public class FeignConfig { ...@@ -114,6 +110,7 @@ public class FeignConfig {
/** /**
* Feign支持文件上传 * Feign支持文件上传
*
* @param messageConverters * @param messageConverters
* @return * @return
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment