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

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-dev.yml

@@ -4,7 +4,7 @@ liquidnet:
       switch: false
   info:
     port: 9001
-    context:
+    context: /adam
     name: liquidnet-service-adam
   logfile:
     path: ./logs

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin-dev.yml

@@ -4,7 +4,7 @@ liquidnet:
       switch: false
   info:
     port: 9002
-    context:
+    context: /kylin
     name: liquidnet-service-kylin
   logfile:
     path: ./logs

liquidnet-bus-feign/liquidnet-api-feign-adam/src/main/java/com/liquidnet/service/feign/adam/api/FeignAdamBaseClient.java

@@ -15,11 +15,11 @@ import org.springframework.web.bind.annotation.RequestParam;
         fallback = FallbackFactory.Default.class)
 public interface FeignAdamBaseClient {
 
-    @GetMapping("enters/query/depth")
+    @GetMapping("adam/enters/query/depth")
     ResponseDto<AdamEntersVo> queryEnters(@RequestParam("entersId") String entersId,
                                                   @RequestParam("uid") String uid);
 
-    @GetMapping("addr/query/depth")
+    @GetMapping("adam/addr/query/depth")
     ResponseDto<AdamAddressesVo> queryAddresses(@RequestParam(value = "addrId") String addrId,
                                                         @RequestParam(value = "uid") String uid);
 
@@ -29,6 +29,6 @@ public interface FeignAdamBaseClient {
      * @param uid 用户ID
      * @return 是否会员：true-是
      */
-    @GetMapping("member/check/depth")
+    @GetMapping("adam/member/check/depth")
     ResponseDto<Boolean> isMember(@RequestParam("uid") String uid);
 }

liquidnet-bus-feign/liquidnet-api-feign-kylin/src/main/java/com/liquidnet/service/feign/kylin/api/FeignKylinPerformanceClient.java

@@ -17,6 +17,6 @@ import java.util.List;
 public interface FeignKylinPerformanceClient {
 
     // 演出列表
-    @GetMapping(value =  "performance/list")
+    @GetMapping(value =  "kylin/performance/list")
     ResponseDto<List<KylinPerformanceVo>> performanceList(@RequestParam("performancesIds") String... performancesIds);
 }

liquidnet-bus-feign/liquidnet-api-feign-kylin/src/main/java/com/liquidnet/service/feign/kylin/task/FeignKylinTaskClient.java

@@ -12,9 +12,9 @@ import org.springframework.web.bind.annotation.PostMapping;
         fallback = FallbackFactory.Default.class)
 public interface FeignKylinTaskClient {
 
-    @PostMapping("order/checkOrderTime")
+    @PostMapping("kylin/order/checkOrderTime")
     ResponseDto<Boolean> checkOrderTime();
 
-    @PostMapping("performance/checkPerformanceTime")
+    @PostMapping("kylin/performance/checkPerformanceTime")
     ResponseDto<String> checkPerformanceTime();
 }