zhouzh 3 anos atrás
pai
commit
29076b5375

+ 2 - 2
src/main/java/com/steerinfo/dil/controller/RMScontroller.java

@@ -902,14 +902,14 @@ public class RMScontroller {
         return rmsFeign.getConsigneeList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
     }
 
-    @ApiOperation(value="新增运力信息", notes="根据rmsConsignee对象创建")
+    @ApiOperation(value="新增收货客户信息", notes="根据rmsConsignee对象创建")
     @ApiImplicitParam(name = "rmsConsignee", value = "详细实体rmsConsignee", required = true, dataType = "rmsConsignee")
     @PostMapping(value = "/insertConsignee")
     public Map<String, Object> insertConsignee(@RequestBody(required = false) Map<String, Object> map){
         return rmsFeign.insertConsignee(map);
     }
     @ApiOperation(value="删除", notes="根据rmsConsignee对象创建")
-    @ApiImplicitParam(name = "运力信息id", value = "id", required = true, dataType = "int")
+    @ApiImplicitParam(name = "收货客户信息id", value = "id", required = true, dataType = "int")
     @PostMapping(value = "/deleteConsignee/{id}")
     public Map<String, Object> deleteConsignee(@PathVariable("id")BigDecimal id){
         return rmsFeign.deleteConsignee(id);

+ 2 - 2
src/main/resources/application-dev.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: Dil123789
-    username: dil
+    password: root123
+    username: dagang
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-api

+ 2 - 2
src/main/resources/application-prod.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: Dil123789
-    username: dil
+    password: root123
+    username: dagang
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-api

+ 27 - 53
src/main/resources/bootstrap.yml

@@ -26,60 +26,34 @@ eureka:
 openfeign:
 #  正式环境
 
-    ColumnDataFeign:
-      url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
-    AmsFeign:
-      url: ${AMSFEIGN_URL:172.16.33.166:8079}
-    BmsshipFeign:
-      url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
-    BmstrainFeign:
-      url: ${BMSTRAINFEIGN_URL:172.16.33.166:8077}
-    BmstruckFeign:
-      url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
-    QmsTruckFeign:
-      url: ${QMSTRUCKFEIGN_URL:172.16.33.166:8047}
-    TmsTrainFeign:
-      url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
-    TmsTruckFeign:
-      url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
-    TmsshipFeign:
-      url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
-    WMSHFeign:
-      url: ${WMSHFEIGN_URL:172.16.33.166:8070}
-    WMSFeign:
-      url: ${WMSFEIGN_URL:172.16.33.166:8093}
-    OMSFeign:
-      url: ${OMSFEIGN_URL:172.16.33.166:8095}
-    RmsFeign:
-      url: ${RMSFEIGN_HRL:localhost:8060}
+#    ColumnDataFeign:
+#      url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+#    AmsFeign:
+#      url: ${AMSFEIGN_URL:172.16.33.166:8079}
+#    BmsshipFeign:
+#      url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
+#    BmstrainFeign:
+#      url: ${BMSTRAINFEIGN_URL:172.16.33.166:8077}
+#    BmstruckFeign:
+#      url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
+#    QmsTruckFeign:
+#      url: ${QMSTRUCKFEIGN_URL:172.16.33.166:8047}
+#    TmsTrainFeign:
+#      url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
+#    TmsTruckFeign:
+#      url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
+#    TmsshipFeign:
+#      url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
+#    WMSHFeign:
+#      url: ${WMSHFEIGN_URL:172.16.33.166:8070}
+#    WMSFeign:
+#      url: ${WMSFEIGN_URL:172.16.33.166:8093}
+#    OMSFeign:
+#      url: ${OMSFEIGN_URL:172.16.33.166:8095}
+#    RmsFeign:
+#      url: ${RMSFEIGN_HRL:localhost:8060}
 
 # 测试环境
-#  ColumnDataFeign:
-#    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
-#  AmsFeign:
-#    url: ${AMSFEIGN_URL:172.16.33.162:8015}
-#  BmsshipFeign:
-#    url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
-#  BmstrainFeign:
-#    url: ${BMSTRAINFEIGN_URL:172.16.33.162:8005}
-#  BmstruckFeign:
-#    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
-#  QmsTruckFeign:
-#    url: ${QMSTRUCKFEIGN_URL:172.16.33.162:8017}
-#  TmsTrainFeign:
-#    url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
-#  TmsTruckFeign:
-#    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
-#  TmsshipFeign:
-#    url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
-#  WMSHFeign:
-#    url: ${WMSHFEIGN_URL:172.16.33.162:8013}
-#  WMSFeign:
-#    url: ${WMSFEIGN_URL:172.16.33.162:8012}
-#  OMSFeign:
-#    url: ${OMSFEIGN_URL:172.16.33.162:8016}
-#  RmsFeign:
-#    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
 
 
 genxml:
@@ -111,4 +85,4 @@ mybatis:
     mapUnderscoreToCamelCase: true
     call-setters-on-nulls: true
 server:
-  port: 8080
+  port: 8019