合并master分支

src/main/resources/bootstrap.yml

@@ -17,45 +17,45 @@ spring:
 openfeign:
 
 #    正式环境
-  ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
-  BmsShipFeign:
-    url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
-  BmsTruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
-  WmshBoundFeign:
-    url: ${WMSHBOUNDFEIGN_URL:172.16.33.166:8070}
-  WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.166:8093}
-  OmsFeign:
-    url: ${OMSFEIGN_URL:172.16.33.166:8095}
-  JoinFeign:
-    url: ${JOINFEIGN_URL:172.16.33.166:8066}
-  QmsFeign:
-    url: ${QMSFEIGN_URL:172.16.33.166:8047}
-  ImFeign:
-    url: ${IMFEIGN_URL:172.16.33.161:8055}
-
-
-##    测试环境
 #  ColumnDataFeign:
-#    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
+#    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
 #  BmsShipFeign:
-#    url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
+#    url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
 #  BmsTruckFeign:
-#    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
+#    url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
 #  WmshBoundFeign:
-#    url: ${WMSHBOUNDFEIGN_URL:172.16.33.162:8013}
+#    url: ${WMSHBOUNDFEIGN_URL:172.16.33.166:8070}
 #  WMSFeign:
-#    url: ${WMSFEIGN_URL:172.16.33.162:8012}
+#    url: ${WMSFEIGN_URL:172.16.33.166:8093}
 #  OmsFeign:
-#    url: ${OMSFEIGN_URL:172.16.33.162:8016}
+#    url: ${OMSFEIGN_URL:172.16.33.166:8095}
 #  JoinFeign:
-#    url: ${JOINFEIGN_URL:172.16.33.162:8006}
+#    url: ${JOINFEIGN_URL:172.16.33.166:8066}
 #  QmsFeign:
-#    url: ${QMSFEIGN_URL:172.16.33.162:8017}
+#    url: ${QMSFEIGN_URL:172.16.33.166:8047}
 #  ImFeign:
-#    url: ${IMFEIGN_URL:172.16.33.162:8018}
+#    url: ${IMFEIGN_URL:172.16.33.161:8055}
+
+
+##    测试环境
+  ColumnDataFeign:
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
+  BmsShipFeign:
+    url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
+  BmsTruckFeign:
+    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
+  WmshBoundFeign:
+    url: ${WMSHBOUNDFEIGN_URL:172.16.33.162:8013}
+  WMSFeign:
+    url: ${WMSFEIGN_URL:172.16.33.162:8012}
+  OmsFeign:
+    url: ${OMSFEIGN_URL:172.16.33.162:8016}
+  JoinFeign:
+    url: ${JOINFEIGN_URL:172.16.33.162:8006}
+  QmsFeign:
+    url: ${QMSFEIGN_URL:172.16.33.162:8017}
+  ImFeign:
+    url: ${IMFEIGN_URL:172.16.33.162:8018}
 
 #eureka设置
 eureka:
@@ -125,9 +125,9 @@ mybatis:
 
 server:
   #正式环境
-  port: 8088
+#  port: 8088
   #测试环境
-#  port: 8008
+  port: 8008