微服调用token修复

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/AuthBootstrap.java

 package com.github.wxiaoqi.security.auth;
 
 
+import com.github.wxiaoqi.security.api.vo.config.HeaderConfig;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@@ -12,7 +13,7 @@ import tk.mybatis.spring.annotation.MapperScan;
  */
 @SpringBootApplication
 @EnableDiscoveryClient
-@EnableFeignClients
+@EnableFeignClients(defaultConfiguration = HeaderConfig.class)
 @MapperScan("com.github.wxiaoqi.security.auth.mapper")
 //@EnableAutoConfiguration
 public class AuthBootstrap {

ace-gate/src/main/java/com/github/wxiaoqi/security/gate/GatewayServerBootstrap.java

 package com.github.wxiaoqi.security.gate;
 
+import com.github.wxiaoqi.security.api.vo.config.HeaderConfig;
 import com.github.wxiaoqi.security.auth.client.EnableAceAuthClient;
 import com.github.wxiaoqi.security.gate.utils.DBLog;
 import org.springframework.boot.SpringApplication;
@@ -16,7 +17,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @SpringCloudApplication
 @EnableDiscoveryClient
 @EnableAceAuthClient
-@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign","com.github.wxiaoqi.security.gate.feign"})
+@EnableFeignClients(value = {"com.github.wxiaoqi.security.auth.client.feign","com.github.wxiaoqi.security.gate.feign"},defaultConfiguration = HeaderConfig.class)
 public class GatewayServerBootstrap {
     public static void main(String[] args) {
         DBLog.getInstance().start();

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

 package com.github.wxiaoqi.security.admin;
 
 import com.ace.cache.EnableAceCache;
+import com.github.wxiaoqi.security.api.vo.config.HeaderConfig;
 import com.github.wxiaoqi.security.auth.client.EnableAceAuthClient;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -22,8 +23,7 @@ import tk.mybatis.spring.annotation.MapperScan;
 @EnableCircuitBreaker
 @SpringBootApplication
 
-//@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign","com.xxfc.platform","com.github.wxiaoqi.security.admin.feign"})
-@EnableFeignClients({"com.github.wxiaoqi.security","com.xxfc.platform"})
+@EnableFeignClients(value = {"com.github.wxiaoqi.security","com.xxfc.platform"},defaultConfiguration = HeaderConfig.class)
 @EnableScheduling
 @EnableAceAuthClient
 @EnableAceCache

ace-modules/ace-interface/pom.xml

@@ -16,5 +16,13 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>4.0.1</version>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
 </project>
\ No newline at end of file

ace-modules/ace-interface/src/main/java/com/github/wxiaoqi/security/api/vo/config/HeaderConfig.java

+package com.github.wxiaoqi.security.api.vo.config;
+
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.annotation.PostConstruct;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Enumeration;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description 设置请求头部信息，防止微服务之间调用请求头部信息丢失
+ * @data 2019/6/25 16:22
+ */
+@Configuration
+public class HeaderConfig implements RequestInterceptor {
+
+    @Override
+    public void apply(RequestTemplate template) {
+        RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
+        if (requestAttributes instanceof ServletRequestAttributes){
+             ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) requestAttributes;
+            HttpServletRequest request = servletRequestAttributes.getRequest();
+            //请求头设置
+            Enumeration<String> headerNames = request.getHeaderNames();
+            if (headerNames!=null){
+                while (headerNames.hasMoreElements()){
+                    String headerName = headerNames.nextElement();
+                    String headerValue = request.getHeader(headerName);
+                    template.header(headerName,headerValue);
+                }
+            }
+        }
+    }
+}

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/VehicleApplication.java

 package com.xinxincaravan.caravan.vehicle;
 
 import com.ace.cache.EnableAceCache;
+import com.github.wxiaoqi.security.api.vo.config.HeaderConfig;
 import com.github.wxiaoqi.security.auth.client.EnableAceAuthClient;
 import com.spring4all.swagger.EnableSwagger2Doc;
 import org.mybatis.spring.annotation.MapperScan;
@@ -15,7 +16,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableDiscoveryClient
 @EnableScheduling
 @EnableAceAuthClient
-@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign", "com.xinxincaravan.caravan.vehicle.feign"})
+@EnableFeignClients(value = {"com.github.wxiaoqi.security.auth.client.feign", "com.xinxincaravan.caravan.vehicle.feign"},defaultConfiguration = HeaderConfig.class)
 @EnableAceCache
 @MapperScan("com.xinxincaravan.caravan.vehicle.mapper")
 public class VehicleApplication {

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

 package com.xxfc.platform.activity;
 
 import com.ace.cache.EnableAceCache;
+import com.github.wxiaoqi.security.api.vo.config.HeaderConfig;
 import com.github.wxiaoqi.security.auth.client.EnableAceAuthClient;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -23,7 +24,7 @@ import tk.mybatis.spring.annotation.MapperScan;
 @EnableDiscoveryClient
 @EnableScheduling
 @EnableAceAuthClient
-@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign", "com.github.wxiaoqi.security.admin.feign","com.xxfc.platform"})
+@EnableFeignClients(value = {"com.github.wxiaoqi.security.auth.client.feign", "com.github.wxiaoqi.security.admin.feign","com.xxfc.platform"},defaultConfiguration = HeaderConfig.class)
 @EnableAceCache
 @EnableCaching
 @MapperScan(basePackages = "com.xxfc.platform.activity.mapper")

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/AppApplication.java

 package com.xxfc.platform.app;
 
 import com.ace.cache.EnableAceCache;
+import com.github.wxiaoqi.security.api.vo.config.HeaderConfig;
 import com.github.wxiaoqi.security.auth.client.EnableAceAuthClient;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -15,7 +16,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableDiscoveryClient
 @EnableScheduling
 @EnableAceAuthClient
-@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign", "com.xxfc.platform.app.feign"})
+@EnableFeignClients(value = {"com.github.wxiaoqi.security.auth.client.feign", "com.xxfc.platform.app.feign"},defaultConfiguration = HeaderConfig.class)
 @EnableAceCache
 @tk.mybatis.spring.annotation.MapperScan(basePackages = "com.xxfc.platform.app.mapper")
 public class AppApplication {

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/CampSiteApplication.java

 package com.xxfc.platform.campsite;
 
 import com.ace.cache.EnableAceCache;
+import com.github.wxiaoqi.security.api.vo.config.HeaderConfig;
 import com.github.wxiaoqi.security.auth.client.EnableAceAuthClient;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -23,7 +24,7 @@ import tk.mybatis.spring.annotation.MapperScan;
 @EnableDiscoveryClient
 @EnableAceAuthClient
 @EnableScheduling
-@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign", "com.github.wxiaoqi.security.admin.feign","com.xxfc.platform"})
+@EnableFeignClients(value = {"com.github.wxiaoqi.security.auth.client.feign", "com.github.wxiaoqi.security.admin.feign","com.xxfc.platform"},defaultConfiguration = HeaderConfig.class)
 @EnableAceCache
 @EnableCaching
 @MapperScan(basePackages = "com.xxfc.platform.campsite.mapper")

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/config/SwaggerConfig.java

 package com.xxfc.platform.campsite.config;
 
+import io.swagger.annotations.Api;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import springfox.documentation.builders.ApiInfoBuilder;
@@ -16,41 +17,43 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
-* @Description : swagger配置配置
-* @Author : Mars
-* @Date : 2017年9月6日
-*/
+ * @Description : swagger配置配置
+ * @Author : Mars
+ * @Date : 2017年9月6日
+ */
 @Configuration
 @EnableSwagger2
 public class SwaggerConfig {
-	
+
     /**
      * Every Docket bean is picked up by the swagger-mvc framework - allowing for multiple
      * swagger groups i.e. same code base multiple swagger resource listings.
      */
     @Bean
-    public Docket customDocket(){
-    	ParameterBuilder ticketPar = new ParameterBuilder();
+    public Docket customDocket() {
+        ParameterBuilder ticketPar = new ParameterBuilder();
         List<Parameter> pars = new ArrayList<Parameter>();
-    	ticketPar.name("Authorization").description("user Authorization")
-    	.modelRef(new ModelRef("string")).parameterType("header")
-    	.required(false).build(); //header中的ticket参数非必填，传空也可以
-    	pars.add(ticketPar.build());    //根据每个方法名也知道当前方法在设置什么参数
- 
+        ticketPar.name("Authorization").description("user Authorization")
+                .modelRef(new ModelRef("string")).parameterType("header")
+                //header中的ticket参数非必填，传空也可以
+                .required(false).build();
+        //根据每个方法名也知道当前方法在设置什么参数
+        pars.add(ticketPar.build());
+
         return new Docket(DocumentationType.SWAGGER_2)
-        		.select()
-                .apis(RequestHandlerSelectors.basePackage("com.xxfc.platform.campsite"))
-        		//.apis(RequestHandlerSelectors.any())
-                .build()  
-                .globalOperationParameters(pars)  
+                .select()
+                .apis(RequestHandlerSelectors.withClassAnnotation(Api.class))
+                //.apis(RequestHandlerSelectors.any())
+                .build()
+                .globalOperationParameters(pars)
                 .apiInfo(apiInfo());
     }
-    
+
     ApiInfo apiInfo() {
-    	return new ApiInfoBuilder()
-            .title("api swagger document")  
-            .description("前后端联调swagger api 文档")  
-            .version("2.1.5.5")  
-            .build();
-    }  
+        return new ApiInfoBuilder()
+                .title("api swagger document")
+                .description("前后端联调swagger api 文档")
+                .version("2.1.5.5")
+                .build();
+    }
 }
\ No newline at end of file

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/ImApplication.java

 package com.xxfc.platform.im;
 
 import com.ace.cache.EnableAceCache;
+import com.github.wxiaoqi.security.api.vo.config.HeaderConfig;
 import com.github.wxiaoqi.security.auth.client.EnableAceAuthClient;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -17,7 +18,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableDiscoveryClient
 @EnableScheduling
 @EnableAceAuthClient
-@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign", "com.xxfc.platform"})
+@EnableFeignClients(value = {"com.github.wxiaoqi.security.auth.client.feign", "com.xxfc.platform"},defaultConfiguration = HeaderConfig.class)
 @EnableAceCache
 @EnableCaching
 public class ImApplication {

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

 package com.xxfc.platform.order;
 
 import com.ace.cache.EnableAceCache;
+import com.github.wxiaoqi.security.api.vo.config.HeaderConfig;
 import com.github.wxiaoqi.security.auth.client.EnableAceAuthClient;
 import com.spring4all.swagger.EnableSwagger2Doc;
 import org.mybatis.spring.annotation.MapperScan;
@@ -17,7 +18,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableDiscoveryClient
 @EnableScheduling
 @EnableAceAuthClient
-@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign", "com.github.wxiaoqi.security.admin.feign", "com.xxfc.platform"})
+@EnableFeignClients(value = {"com.github.wxiaoqi.security.auth.client.feign", "com.github.wxiaoqi.security.admin.feign", "com.xxfc.platform"},defaultConfiguration = HeaderConfig.class)
 @EnableAceCache
 @tk.mybatis.spring.annotation.MapperScan(basePackages = "com.xxfc.platform.order.mapper")
 public class OrderApplication {

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/TourApplication.java

 package com.xxfc.platform.tour;
 
 import com.ace.cache.EnableAceCache;
+import com.github.wxiaoqi.security.api.vo.config.HeaderConfig;
 import com.github.wxiaoqi.security.auth.client.EnableAceAuthClient;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -23,7 +24,7 @@ import tk.mybatis.spring.annotation.MapperScan;
 @EnableDiscoveryClient
 @EnableScheduling
 @EnableAceAuthClient
-@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign", "com.github.wxiaoqi.security.admin.feign","com.xxfc.platform"})
+@EnableFeignClients(value = {"com.github.wxiaoqi.security.auth.client.feign", "com.github.wxiaoqi.security.admin.feign","com.xxfc.platform"},defaultConfiguration = HeaderConfig.class)
 @EnableAceCache
 @EnableCaching
 @MapperScan(basePackages = "com.xxfc.platform.tour.mapper")

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/mapper/TourUserScoreMapper.java

@@ -24,7 +24,6 @@ public interface TourUserScoreMapper extends Mapper<TourUserScore> {
      * @param status
      * @return
      */
-    @Select("select `user_id` as `userId`,`comment` as `comment`,`ave_score` as `aveScore`,`is_anony` as `isAnony`,`imgs` as `imgs`,`crt_time` as `crtTime` from `tour_user_score` where `model_id`=#{goodId}")
     List<TourUserScoreListDTO> findyByGoodIdAndApproved(@Param("goodId") Integer goodId, @Param("status") Integer status);
 
     /**

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourUserScoreController.java

@@ -9,17 +9,15 @@ import com.xxfc.platform.tour.biz.TourUserScoreBiz;
 import com.xxfc.platform.tour.dto.TourUserScoreDTO;
 import com.xxfc.platform.tour.entity.TourUserScore;
 import com.xxfc.platform.tour.vo.TourUserScoreVo;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("tourUserScore")
 public class TourUserScoreController extends BaseController<TourUserScoreBiz,TourUserScore> {
-    /**
-     * 保存评论
-     * @param tourUserScoreDTO
-     * @param appUserDTO
-     * @return
-     */
+
+
+    @ApiOperation("保存评论")
     @PostMapping("/score")
     public ObjectRestResponse<Void> saveTourUserScore(@RequestBody @BeanValid TourUserScoreDTO tourUserScoreDTO, AppUserDTO appUserDTO){
         int effectRows = getBaseBiz().saveTourUserScore(tourUserScoreDTO,appUserDTO);
@@ -28,14 +26,9 @@ public class TourUserScoreController extends BaseController<TourUserScoreBiz,Tou
         }
         return ObjectRestResponse.createDefaultFail();
     }
-    /**
-     * 根据车型查询评论列表  根据评分时间排序
-     *
-     * @param modelId
-     * @param pageNo
-     * @param pageSize
-     * @return
-     */
+
+
+    @ApiOperation("根据车型查询评论列表  根据评分时间排序")
     @GetMapping("/app/unauth/scores")
     public ObjectRestResponse<PageDataVO<TourUserScoreVo>> findVehicleUserScorePageByModelId(@RequestParam("modelId") Integer modelId,
                                                                                              @RequestParam(value = "pageNo",required = false,defaultValue = "1")Integer pageNo,
@@ -44,11 +37,8 @@ public class TourUserScoreController extends BaseController<TourUserScoreBiz,Tou
         return ObjectRestResponse.succ(pageDataVO);
     }
 
-    /**
-     * 根据订单id查询评价详情
-     * @param orderId
-     * @return
-     */
+
+    @ApiOperation("根据订单id查询评价详情")
     @GetMapping("/score/order/{orderId}")
     public ObjectRestResponse findVehicleUserScoreDetailByOrderId(@PathVariable("orderId") Integer orderId){
         TourUserScoreVo vehicleUserScoreVo = getBaseBiz().findTourUserScoreDetailByOrderId(orderId);

xx-tour/xx-tour-server/src/main/resources/mapper/TourUserScoreMapper.xml

@@ -20,6 +20,13 @@
         <result property="updTime" column="upd_time"/>
         <result property="isDel" column="is_del"/>
     </resultMap>
+
+    <!--查询评价-->
+     <select id="findyByGoodIdAndApproved">
+         select `user_id` as `userId`,`comment` as `comment`,`ave_score` as `aveScore`,`is_anony` as `isAnony`,`imgs` as `imgs`,`crt_time` as `crtTime` from `tour_user_score` where `model_id`=#{goodId}
+     </select>
+
+    <!--根据订单id查询-->
     <select id="findTourUserScoreDetailByOrderId"
             resultType="com.xxfc.platform.tour.dto.TourUserScoreDetailDTO">
 SELECT tus.user_id as `userId`,tus.ave_score as `aveScore`,tus.comment as `comment`, tus.imgs as `imgs`,tus.crt_time as `crtTime`,tus.scores as `scores`,tg.name as `name`,tg.describes as `describes`,tg.cover as `cover`

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/UniversalApplication.java

 package com.xxfc.platform.universal;
 
 import com.ace.cache.EnableAceCache;
+import com.github.wxiaoqi.security.api.vo.config.HeaderConfig;
 import com.github.wxiaoqi.security.auth.client.EnableAceAuthClient;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
@@ -18,7 +19,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableAceCache
 @EnableTransactionManagement
 @tk.mybatis.spring.annotation.MapperScan(basePackages = "com.xxfc.platform.universal.mapper")
-@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign", "com.xxfc.platform","com.github.wxiaoqi.security.admin.feign"})
+@EnableFeignClients(value = {"com.github.wxiaoqi.security.auth.client.feign", "com.xxfc.platform","com.github.wxiaoqi.security.admin.feign"},defaultConfiguration = HeaderConfig.class)
 public class UniversalApplication {
 
     public static void main(String[] args) {

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/VehicleApplication.java

 package com.xxfc.platform.vehicle;
 
 import com.ace.cache.EnableAceCache;
+import com.github.wxiaoqi.security.api.vo.config.HeaderConfig;
 import com.github.wxiaoqi.security.auth.client.EnableAceAuthClient;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -15,7 +16,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableDiscoveryClient
 @EnableScheduling
 @EnableAceAuthClient
-@EnableFeignClients({"com.github.wxiaoqi.security","com.xxfc.platform.vehicle.feign"})
+@EnableFeignClients(value = {"com.github.wxiaoqi.security","com.xxfc.platform.vehicle.feign"},defaultConfiguration = HeaderConfig.class)
 @EnableAceCache
 @tk.mybatis.spring.annotation.MapperScan(basePackages = "com.xxfc.platform.vehicle.mapper")
 public class VehicleApplication {