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

liquidnet-bus-config/liquidnet-config/application-dev.yml

@@ -53,6 +53,8 @@ liquidnet:
         localUrl: http://devorder.zhengzai.tv/order/order/syncOrder
       url-service:
         url: http://testservice.zhengzai.tv/
+    platform:
+        url: http://devplatform.zhengzai.tv
     executor-main:
       xxl:
         admin:
@@ -72,4 +74,4 @@ liquidnet:
         sk: 21e9a70f677a2bf29dfa2b3bead4f018
         appid: 557104628450889728
         custid: 7551234567
-#application-dev-end
+#application-dev-end
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -50,6 +50,8 @@ liquidnet:
         localUrl: http://testkylin.zhengzai.tv/kylin/order/syncOrder
       url-service:
         url: http://testservice.zhengzai.tv/
+    platform:
+      url: http://testplatform.zhengzai.tv
     executor-main:
       xxl:
         admin:
@@ -68,4 +70,4 @@ liquidnet:
         url: "https://butler-dev-ms.sf-express.com"
         sk: 21e9a70f677a2bf29dfa2b3bead4f018
         appid: 557104628450889728
-        custid: 7551234567
+        custid: 7551234567
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-service-executor-main-dev.yml

@@ -21,3 +21,5 @@ liquidnet:
       appname: liquidnet-service-executor
       # Job执行器运行日志，注意目录读写权限
       logpath: /data/logs/job
+  url:
+    paltform: ${liquidnet.service.platform.url}

liquidnet-bus-config/liquidnet-config/liquidnet-service-executor-main-test.yml

@@ -21,3 +21,5 @@ liquidnet:
       appname: liquidnet-service-executor
       # Job执行器运行日志，注意目录读写权限
       logpath: /data/logs/job
+  url:
+    paltform: ${liquidnet.service.platform.url}

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

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 @Component
 @FeignClient(name = "liquidnet-service-platform",
         contextId = "FeignPlatformTaskClient", path = "",
+        url = "${liquidnet.url.platform}",
         fallback = FallbackFactory.Default.class)
 public interface FeignPlatformTaskClient {
 

liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/java/com/liquidnet/service/executor/main/handler/KylinTaskHandler.java

 package com.liquidnet.service.executor.main.handler;
 
+import com.liquidnet.commons.lang.util.HttpUtil;
 import com.liquidnet.service.feign.kylin.task.FeignPlatformTaskClient;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;