From dc91b8439c4d71d69fb2244c2283cebc32c1acdc Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Wed, 17 Feb 2021 21:54:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=99=E7=A8=8B=E9=87=8C=E5=85=B3=E4=BA=8Efe?= =?UTF-8?q?ign=E8=B0=83=E7=94=A8=E6=8B=BF=E4=B8=8D=E5=88=B0token=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20#2244=20=E9=9B=86=E6=88=90xxl-job-2.2.0?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=EF=BC=8C=E6=B3=A8=E8=A7=A3=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=88=A0=E6=8E=89=EF=BC=8C=E5=AF=BC=E8=87=B4=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E6=8A=A5=E7=AB=AF=E5=8F=A3=E5=86=B2=E7=AA=81=20#2228?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vue/${entityName}List.vuei | 3 + .../java/org/jeecg/config/FeignConfig.java | 76 +++++++++++++++++++ .../cloud/config/FeignClientConfig.java | 76 ------------------- .../job/config/XxlJobConfiguration.java | 3 +- 4 files changed, 81 insertions(+), 77 deletions(-) create mode 100644 jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-cloud/src/main/java/org/jeecg/config/FeignConfig.java delete mode 100644 jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-cloud/src/main/java/org/jeecg/starter/cloud/config/FeignClientConfig.java diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei index 34c1191a..129d91dd 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei +++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei @@ -95,6 +95,9 @@ <#if po.classType=='pca'> <#assign list_need_pca=true> +<#if po.classType=='switch'> +<#assign list_need_switch=true> + <#-- 结束循环 --> <#t> diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-cloud/src/main/java/org/jeecg/config/FeignConfig.java b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-cloud/src/main/java/org/jeecg/config/FeignConfig.java new file mode 100644 index 00000000..29160cf1 --- /dev/null +++ b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-cloud/src/main/java/org/jeecg/config/FeignConfig.java @@ -0,0 +1,76 @@ +package org.jeecg.config; + +import feign.Feign; +import feign.Logger; +import feign.RequestInterceptor; +import feign.codec.Encoder; +import feign.form.spring.SpringFormEncoder; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.constant.CommonConstant; +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.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.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; + + +@ConditionalOnClass(Feign.class) +@AutoConfigureBefore(FeignAutoConfiguration.class) +@Slf4j +@Configuration +public class FeignConfig { + + @Bean + public RequestInterceptor requestInterceptor() { + return requestTemplate -> { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (null != attributes) { + HttpServletRequest request = attributes.getRequest(); + log.info("Feign request: {}", request.getRequestURI()); + // 将token信息放入header中 + String token = request.getHeader(CommonConstant.X_ACCESS_TOKEN); + if(token==null){ + token = request.getParameter("token"); + } + log.info("Feign request token: {}", token); + requestTemplate.header(CommonConstant.X_ACCESS_TOKEN, token); + } + }; + } + + + + /** + * 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 messageConverters) { + return new SpringFormEncoder(new SpringEncoder(messageConverters)); + } +} diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-cloud/src/main/java/org/jeecg/starter/cloud/config/FeignClientConfig.java b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-cloud/src/main/java/org/jeecg/starter/cloud/config/FeignClientConfig.java deleted file mode 100644 index 612da73a..00000000 --- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-cloud/src/main/java/org/jeecg/starter/cloud/config/FeignClientConfig.java +++ /dev/null @@ -1,76 +0,0 @@ -//package org.jeecg.starter.cloud.config; -// -//import feign.Feign; -//import feign.Logger; -//import feign.RequestInterceptor; -//import feign.codec.Encoder; -//import feign.form.spring.SpringFormEncoder; -//import lombok.extern.slf4j.Slf4j; -//import org.jeecg.common.constant.CommonConstant; -//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.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.web.context.request.RequestContextHolder; -//import org.springframework.web.context.request.ServletRequestAttributes; -// -//import javax.servlet.http.HttpServletRequest; -// -// -//@ConditionalOnClass(Feign.class) -//@AutoConfigureBefore(FeignAutoConfiguration.class) -//@Slf4j -//@Configuration -//public class FeignClientConfig { -// -// @Bean -// public RequestInterceptor requestInterceptor() { -// return requestTemplate -> { -// ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); -// if (null != attributes) { -// HttpServletRequest request = attributes.getRequest(); -// log.info("Feign request: {}", request.getRequestURI()); -// // 将token信息放入header中 -// String token = request.getHeader(CommonConstant.X_ACCESS_TOKEN); -// if(token==null){ -// token = request.getParameter("token"); -// } -// log.info("Feign request token: {}", token); -// requestTemplate.header(CommonConstant.X_ACCESS_TOKEN, token); -// } -// }; -// } -// -// -// -// /** -// * 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 messageConverters) { -// return new SpringFormEncoder(new SpringEncoder(messageConverters)); -// } -//} diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-job/src/main/java/org/jeecg/boot/starter/job/config/XxlJobConfiguration.java b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-job/src/main/java/org/jeecg/boot/starter/job/config/XxlJobConfiguration.java index 28d06b23..21d83318 100644 --- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-job/src/main/java/org/jeecg/boot/starter/job/config/XxlJobConfiguration.java +++ b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-job/src/main/java/org/jeecg/boot/starter/job/config/XxlJobConfiguration.java @@ -25,7 +25,8 @@ public class XxlJobConfiguration { @Autowired private XxlJobProperties xxlJobProperties; - @Bean(initMethod = "start", destroyMethod = "destroy") + //@Bean(initMethod = "start", destroyMethod = "destroy") + @Bean @ConditionalOnClass() public XxlJobSpringExecutor xxlJobExecutor() { log.info(">>>>>>>>>>> xxl-job config init.");