Merge branch 'develop' of

https://zhangguoping@gitlab.dituhui.com/bsh/project/project.git into
develop

project-order/src/main/java/com/dituhui/pea/order/feign/SaaSRemoteService.java → project-order/src/main/java/com/dituhui/pea/order/feign/ISaaSRemoteService.java

@@ -4,19 +4,19 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestParam;
 
 
-import com.dituhui.pea.common.Result;
-
-@FeignClient(url = "https://pea-test.bshg.com.cn", name = "saasService")
-public interface SaaSRemoteService {
+@FeignClient(url = "${SaaS.url}", name = "saasService")
+public interface ISaaSRemoteService {
 
 
 	@PostMapping("/v1/area/add")
 	@PostMapping("/v1/area/add")
-	public String addArea(@RequestParam String ak, @RequestParam String sign, @RequestParam String name, @RequestParam String layer_code, @RequestParam String region, @RequestParam String coord_type);
+	public String addArea(@RequestParam String ak, @RequestParam String sign, @RequestParam String name,
+			@RequestParam String layer_code, @RequestParam String region, @RequestParam String coord_type);
 
 
 	@PostMapping("/v1/area/delById")
 	@PostMapping("/v1/area/delById")
 	public String deleteArea(@RequestParam String ak, @RequestParam String layerCode, @RequestParam String id);
 	public String deleteArea(@RequestParam String ak, @RequestParam String layerCode, @RequestParam String id);
 
 
 	@PostMapping("/v1/layer/save")
 	@PostMapping("/v1/layer/save")
-	public String addLayer(@RequestParam String ak, @RequestParam String layerName, @RequestParam Integer layerType, @RequestParam Integer clipType);
+	public String addLayer(@RequestParam String ak, @RequestParam String layerName, @RequestParam Integer layerType,
+			@RequestParam Integer clipType);
 
 
 	@PostMapping("/v1/layer/delete")
 	@PostMapping("/v1/layer/delete")
 	public String deleteLayer(@RequestParam String ak, @RequestParam String layerId);
 	public String deleteLayer(@RequestParam String ak, @RequestParam String layerId);

project-order/src/main/resources/application.yaml

@@ -55,3 +55,7 @@ sentry:
   # We recommend adjusting this value in production.
   # We recommend adjusting this value in production.
   tracesSampleRate: 1.0
   tracesSampleRate: 1.0
   exception-resolver-order: -2147483647
   exception-resolver-order: -2147483647
+
+SaaS:
+  url: https://pea-test.bshg.com.cn
+