Merge branch 'master' into 'develop'

Master

See merge request !2

config-init/config/project-gateway.yaml

@@ -2,40 +2,20 @@ spring:
   cloud:
   cloud:
     gateway:
     gateway:
       routes:
       routes:
-        - id: placeOrder
-          uri: lb://project-order
-          predicates:
-            - Path=/order/create
-        - id: queryStorage
-          uri: lb://project-storage
-          predicates:
-            - Path=/storage/
-        - id: queryAccount
-          uri: lb://project-account
-          predicates:
-            - Path=/account/
-        - id: praiseItemRocketMQ
-          uri: lb://project-provider
-          predicates:
-            - Path=/praise/rocketmq
-        - id: praiseItemSentinel
-          uri: lb://project-provider
-          predicates:
-            - Path=/praise/sentinel
-        - id: queryPraise
-          uri: lb://project-consumer
-          predicates:
-            - Path=/praise/query
         - id: user
         - id: user
           uri: lb://user
           uri: lb://user
           predicates:
           predicates:
           - Path=/user/**, /v1/team/**, /v1/user/**
           - Path=/user/**, /v1/team/**, /v1/user/**
+        - id: order
+          uri: lb://project-order
+          predicates:
+            - Path=/order/**
         - id: gis
         - id: gis
-          uri: lb://gis
+          uri: lb://project-gis
           predicates:
           predicates:
           - Path=/gis/**
           - Path=/gis/**
         - id: district
         - id: district
-          uri: lb://district
+          uri: lb://project-district
           predicates:
           predicates:
             - Path=/district/**
             - Path=/district/**
 
 

project-order/src/main/java/com/alibaba/cloud/integration/order/controller/OrderController.java

@@ -21,6 +21,7 @@ import com.alibaba.cloud.integration.common.Result;
 import com.alibaba.cloud.integration.order.service.OrderService;
 import com.alibaba.cloud.integration.order.service.OrderService;
 
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -38,16 +39,20 @@ public class OrderController {
 
 
 	@PostMapping("/create")
 	@PostMapping("/create")
 	public Result<?> createOrder(@RequestParam("userId") String userId,
 	public Result<?> createOrder(@RequestParam("userId") String userId,
-			@RequestParam("commodityCode") String commodityCode,
-			@RequestParam("count") Integer count) {
+			@RequestParam("commodityCode") String commodityCode, @RequestParam("count") Integer count) {
 		Result<?> res = null;
 		Result<?> res = null;
 		try {
 		try {
 			res = orderService.createOrder(userId, commodityCode, count);
 			res = orderService.createOrder(userId, commodityCode, count);
-		}
-		catch (BusinessException e) {
+		} catch (BusinessException e) {
 			return Result.failed(e.getMessage());
 			return Result.failed(e.getMessage());
 		}
 		}
 		return res;
 		return res;
 	}
 	}
 
 
+	@GetMapping("/test")
+	public Result<?> test(@RequestParam(value = "param", required = false) String param) {
+		System.out.println("test ok");
+		return Result.success("test ok");
+	}
+
 }
 }