10.12提交

src/main/java/com/steerinfo/dil/controller/WmshInboundResultController.java

@@ -73,8 +73,8 @@ public class WmshInboundResultController extends BaseRESTfulController {
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
-    @PostMapping("/getAllResult")
-    public RESTfulResult getAllResult(@RequestBody(required=false) Map<String,Object> mapValue,
+    @PostMapping("/getInBoundResult")
+    public RESTfulResult getInBoundResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                       Integer apiId,
                                       Integer pageNum,
                                       Integer pageSize

src/main/java/com/steerinfo/dil/controller/WmshOutboundResultController.java

@@ -54,8 +54,8 @@ public class WmshOutboundResultController extends BaseRESTfulController {
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
-    @PostMapping("/getAllResult")
-    public RESTfulResult getAllResult(@RequestBody(required=false) Map<String,Object> mapValue,
+    @PostMapping("/getOutBoundResult")
+    public RESTfulResult getOutBoundResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                       Integer apiId,
                                       Integer pageNum,
                                       Integer pageSize

src/main/java/com/steerinfo/dil/feign/ColumnDataFeign.java

@@ -12,7 +12,7 @@ import java.util.Map;
  * @Date 2021/6/23 9:58
  * @Version 1.0
  */
-@FeignClient(value = "DIL-COLUMN-DATA-DEV",url = "192.168.0.102:8083")
+@FeignClient(value = "DIL-COLUMN-DATA-DEV",url = "${openfeign.ColumnDataFeign.url}")
 public interface ColumnDataFeign {
     @RequestMapping("getColumnData")
     List<Map<String,Object>> getColumnData(@RequestParam("apiId") Integer apiId);

src/main/resources/bootstrap.yml

@@ -12,6 +12,12 @@ spring:
   mvc:
     static-path-pattern:
 
+openfeign:
+  ESFeign:
+    url: ${ESFEIGN_URL:localhost:8099}
+  ColumnDataFeign:
+    url: ${COLUMNDATAFEIGN_URL:localhost:8083}
+
 #eureka设置
 eureka:
   client: