Merge branch 'dev' into test

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;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/pom.xml

@@ -35,8 +35,6 @@
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
-
-        <!-- other -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-mongodb</artifactId>
@@ -46,8 +44,9 @@
             <groupId>com.liquidnet</groupId>
             <artifactId>liquidnet-api-feign-adam</artifactId>
             <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
         </dependency>
+
+        <!-- other -->
         <dependency>
             <groupId>taobao-sdk-impl</groupId>
             <artifactId>taobao-sdk-impl</artifactId>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/ServiceKylinApplication.java

 package com.liquidnet.service;
 
 import lombok.extern.slf4j.Slf4j;
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.annotation.Bean;
 import org.springframework.core.env.Environment;
-import org.springframework.data.mongodb.MongoDbFactory;
-import org.springframework.data.mongodb.MongoTransactionManager;
 
 import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.util.Arrays;
 
 @Slf4j
@@ -29,20 +23,20 @@ public class ServiceKylinApplication implements CommandLineRunner {
     }
 
     @Override
-    public void run(String... strings) throws Exception {
+    public void run(String... strings) {
         try {
             log.info("\n----------------------------------------------------------\n\t" +
                             "Application '{}' is running! Access URLs:\n\t" +
                             "Local: \t\thttp://127.0.0.1:{}\n\t" +
-                            "External: \thttp://{}:{}\n\t" +
+                            "External: \thttp://{}:{}{}/doc.html\n\t" +
                             "Profile(s): \t{}\n----------------------------------------------------------",
-
                     environment.getProperty("spring.application.name"),
                     environment.getProperty("server.port"),
                     InetAddress.getLocalHost().getHostAddress(),
                     environment.getProperty("server.port"),
+                    environment.getProperty("server.servlet.context-path"),
                     Arrays.toString(environment.getActiveProfiles()));
-        } catch (UnknownHostException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java

@@ -996,14 +996,14 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 }
 
                 List<KylinOrderRefundsOrderCodeVo> orderRefundsVoBaseList = new ArrayList<>();
-                for (KylinOrderRefundsVo item : dataUtils.getOrderRefundVoByOrderId(orderId)) {
+                List<KylinOrderRefundsVo> orderRefundsVoList = dataUtils.getOrderRefundVoByOrderId(orderId);
+                for (KylinOrderRefundsVo item : orderRefundsVoList) {
                     KylinOrderRefundsOrderCodeVo data = new KylinOrderRefundsOrderCodeVo();
                     data.setOrderRefundsId(item.getOrderRefundsId());
                     data.setOrderRefundCode(item.getOrderRefundCode());
                     data.setStatus(item.getStatus());
                 }
 
-                List<KylinOrderRefundsVo> orderRefundsVoList = dataUtils.getOrderRefundVoByOrderId(orderId);
                 List<OrderRefundListVo> orderRefundListVos = new ArrayList<>();
                 for (KylinOrderRefundsVo item : orderRefundsVoList) {
                     OrderRefundListVo data = new OrderRefundListVo();

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>liquidnet-bus-service</artifactId>
+        <artifactId>liquidnet-service-order</artifactId>
         <groupId>com.liquidnet</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
@@ -26,7 +26,10 @@
             <groupId>com.liquidnet</groupId>
             <artifactId>liquidnet-common-cache-redisson</artifactId>
             <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-mongodb</artifactId>
         </dependency>
         <dependency>
             <groupId>com.liquidnet</groupId>
@@ -38,6 +41,8 @@
             <artifactId>liquidnet-service-adam-api</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+
+        <!-- other -->
         <dependency>
             <groupId>taobao-sdk2-impl</groupId>
             <artifactId>taobao-sdk2-impl</artifactId>
@@ -46,12 +51,14 @@
             <scope>system</scope>
             <systemPath>${basedir}/lib/taobao-sdk-java-auto_1600401599540-20210607-impl.jar</systemPath>
         </dependency>
-
-        <!-- other -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-mongodb</artifactId>
-        </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 </project>

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/ServiceKylinApplication.java → liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/ServiceOrderApplication.java

@@ -5,39 +5,36 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.core.env.Environment;
 
 import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.util.Arrays;
 
 @Slf4j
-@EnableFeignClients
 @SpringBootApplication(scanBasePackages = {"com.liquidnet"})
-public class ServiceKylinApplication implements CommandLineRunner {
+public class ServiceOrderApplication implements CommandLineRunner {
     @Autowired
     private Environment environment;
 
     public static void main(String[] args) {
-        SpringApplication.run(ServiceKylinApplication.class, args);
+        SpringApplication.run(ServiceOrderApplication.class, args);
     }
 
     @Override
-    public void run(String... strings) throws Exception {
+    public void run(String... strings) {
         try {
             log.info("\n----------------------------------------------------------\n\t" +
                             "Application '{}' is running! Access URLs:\n\t" +
                             "Local: \t\thttp://127.0.0.1:{}\n\t" +
-                            "External: \thttp://{}:{}\n\t" +
+                            "External: \thttp://{}:{}{}/doc.html\n\t" +
                             "Profile(s): \t{}\n----------------------------------------------------------",
-
                     environment.getProperty("spring.application.name"),
                     environment.getProperty("server.port"),
                     InetAddress.getLocalHost().getHostAddress(),
                     environment.getProperty("server.port"),
+                    environment.getProperty("server.servlet.context-path"),
                     Arrays.toString(environment.getActiveProfiles()));
-        } catch (UnknownHostException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/config/OrderWebMvcConfig.java

+package com.liquidnet.service.order.config;
+
+import com.liquidnet.common.web.config.WebMvcConfig;
+import com.liquidnet.common.web.filter.GlobalAuthorityInterceptor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+
+@Configuration
+public class OrderWebMvcConfig  extends WebMvcConfig {
+    @Autowired
+    GlobalAuthorityInterceptor globalAuthorityInterceptor;
+
+    @Override
+    protected void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(globalAuthorityInterceptor).addPathPatterns("/**");
+        super.addInterceptors(registry);
+    }
+}