修改eureka 注册名

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -22,6 +22,7 @@ import cn.freemud.service.EncircleOrderService;
 import cn.freemud.service.OrderAdapterService;
 import cn.freemud.service.Orderservice;
 import cn.freemud.service.impl.MallOrderServiceImpl;
+import cn.freemud.service.thirdparty.LocalTest;
 import cn.freemud.utils.ResponseUtil;
 import com.freemud.application.sdk.api.log.ApiAnnotation;
 import com.freemud.application.sdk.api.log.LogParams;
@@ -29,10 +30,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 
@@ -51,6 +49,9 @@ public class OrderController {
     @Autowired
     private MallOrderServiceImpl mallOrderService;
 
+    @Autowired
+    private LocalTest lt;
+
     /**
      * 创建订单之前校验前面排队的订单数
      */
@@ -220,4 +221,22 @@ public class OrderController {
         return mallOrderService.orderAffirm(request);
     }
 
+    /**
+     * 订单确认完成
+     */
+    @ApiAnnotation(logMessage = "affirm")
+    @GetMapping("/orderTimeout")
+    public BaseResponse orderTimeout() {
+        return lt.test();
+    }
+
+    /**
+     * 订单确认完成
+     */
+    @ApiAnnotation(logMessage = "affirm")
+    @GetMapping("/orderTimeout1")
+    public BaseResponse orderTimeout1() {
+        return lt.test2();
+    }
+
 }

order-application-service/src/main/resources/application.properties

@@ -10,8 +10,8 @@ spring.redis.pool.max-active = 100
 jasypt.encryptor.bean = jasyptStringEncryptorFreemud
 #####  eureka
 ###eureka.instance.preferIpAddress = true
-eureka.client.register-with-eureka=false
-eureka.client.fetch-registry=false
+eureka.client.register-with-eureka=true
+eureka.client.fetch-registry=true
 eureka.client.serviceUrl.defaultZone = http://localhost:8080/eureka/
 eureka.instance.prefer-ip-address = true
 eureka.instance.instance-id = ${spring.cloud.client.ipAddress}:${server.port}
@@ -52,8 +52,8 @@ mybatis.configuration.log-impl = org.apache.ibatis.logging.stdout.StdOutImpl
 mybatis.mapper-locations = classpath*:mapper/*.xml,classpath*:mapper/*/*.xml,classpath*:com.freemud.sdk.api.assortment.orderdistributor.mapper/*.xml
 mybatis.type-aliases-package = cn.freemud.entities.db,com.freemud.api.assortment.datamanager.entity.db
 ##### Fegin
-ribbon.ReadTimeout = 10000
-ribbon.ConnectTimeout = 10000
+ribbon.ReadTimeout = 100000
+ribbon.ConnectTimeout = 100000
 feign.hystirx.enable = false
 logging.level.org.springframework.security = DEBUG
 feign.compression.request.enabled = true
@@ -282,3 +282,7 @@ management.health.rabbit.enabled = false
 
 eureka.instance.preferIpAddress = true
 
+ribbon.MaxTotalConnections=200
+ribbon.MaxConnectionsPerHost=100
+#feign.httpclient.enabled=false
+

order-management/order-management.iml

@@ -22,6 +22,8 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: cn.freemud:assortment-ordercenter-sdk:1.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.freemud.application.service.sdk:takeawaycenter-sdk:1.2.3-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: cn.freemud:assortment-ordercenter-sdk:1.3.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.freemud.application.service.sdk:takeawaycenter-sdk:1.2.3-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: cn.freemud:assortment-ordercenter-sdk:1.3.0-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.5.3.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:1.5.3.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:1.5.3.RELEASE" level="project" />