Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

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

@@ -1,28 +0,0 @@
-package com.steerinfo.dil.controller;
-
-
-import com.steerinfo.dil.feign.BmsFeign;
-import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.framework.controller.RESTfulResult;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartRequest;
-
-import java.math.BigDecimal;
-import java.util.*;
-
-/**
- * @author hujianguo
- * @create 2021-09-22 17:10
- */
-@RestController
-@RequestMapping("${api.version}/bms")
-public class BMSController extends BaseRESTfulController {
-
-
-}

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

@@ -1,22 +0,0 @@
-package com.steerinfo.dil.controller;
-
-import com.steerinfo.dil.feign.OmsFeign;
-import io.swagger.annotations.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author luobang
- * @create 2021-09-17 14:10
- */
-@RestController
-@RequestMapping("${api.version}/oms")
-public class OMSController {
- 
-
-}

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

@@ -1,22 +0,0 @@
-package com.steerinfo.dil.feign;
-
-import com.steerinfo.framework.controller.RESTfulResult;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description:
- * @Author:HuJianGuo
- * @GreateTime:2021/9/23 8:46
- * @Version:V2.0
- */
-@FeignClient(value = "ANTAI-BMS-API", url = "${openfeign.BmsFeign.url}")
-public interface BmsFeign {
-
-}

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

@@ -1,20 +0,0 @@
-package com.steerinfo.dil.feign;
-
-import io.swagger.annotations.ApiOperation;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ author    :TXF
- * @ time      :2021/10/28 13:28
- */
-
-@FeignClient(value = "ANTAI-OMS-API", url = "${openfeign.OMSFeign.url}")
-public interface OmsFeign {
-
-}
-

src/main/resources/application-dev.yml

@@ -27,20 +27,12 @@ openfeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.90.214:8083}
   AmsFeign:
     url: ${AMSFEIGN_URL:172.16.90.214:8079}
-  BmsFeign:
-    url: ${BMSFEIGN_URL:172.16.90.214:8078}
   TmsFeign:
     url: ${TMSFEIGN_URL:172.16.90.214:8086}
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.90.214:8093}
-  OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.90.214:8095}
   RmsFeign:
     url: ${RMSFEIGN_URL:172.16.90.214:8060}
-  IntegrationFeign:
-    url: ${INTEGRATIONFEIGN_URL:172.16.90.214:8066}
-  OTMSFeign:
-    url: ${OTMSFEIGN_URL:172.16.90.214:8038}
   EmsFeign:
     url: ${TMSFEIGN_URL:172.16.90.214:8096}
   SSOFeign:

src/main/resources/application-prod.yml

@@ -27,20 +27,12 @@ openfeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.90.202:8083}
   AmsFeign:
     url: ${AMSFEIGN_URL:172.16.90.202:8079}
-  BmsFeign:
-    url: ${BMSFEIGN_URL:172.16.90.202:8078}
   TmsFeign:
     url: ${TMSFEIGN_URL:172.16.90.202:8086}
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.90.202:8093}
-  OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.90.202:8095}
   RmsFeign:
     url: ${RMSFEIGN_URL:172.16.90.202:8060}
-  IntegrationFeign:
-    url: ${INTEGRATIONFEIGN_URL:172.16.90.202:8066}
-  OTMSFeign:
-    url: ${OTMSFEIGN_URL:172.16.90.202:8038}
   EmsFeign:
     url: ${TMSFEIGN_URL:172.16.90.202:8096}
   SSOFeign: