Ver código fonte

Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS

txf 3 anos atrás
pai
commit
de06124a1f

+ 1 - 1
src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderServiceImpl.java

@@ -1619,7 +1619,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 break;
             case 12:
                 mesMap =omstruckOrderMapper.getSporadicOrder(orderId);
-                break;
+
         }
         mesMap.put("materialMesList", omstruckOrderMapper.getMaterialMes(orderId));
         return mesMap;

+ 15 - 5
src/main/resources/bootstrap.yml

@@ -42,6 +42,10 @@ redis:
 
 #feign设置
 openfeign:
+
+  #正式环境
+
+
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
@@ -51,14 +55,20 @@ openfeign:
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
     #测试环境
+
 #  ColumnDataFeign:
-#    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8001}
+#    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
 #  TmsTruckFeign:
-#    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8008}
+#    url: ${TMSTRUCKFEIGN_URL:192.168.1.104:8088}
 #  AmsFeign:
-#    url: ${AMSFEIGN_URL:172.16.33.166:8015}
+#    url: ${AMSFEIGN_URL:192.168.1.104:8079}
 #  ImFeign:
-#    url: ${IMFEIGN_URL:172.16.33.166:8018}
+#    url: ${IMFEIGN_URL:172.16.33.166:8055}
+
+
+
+
+
 
 
 mybatis:
@@ -71,6 +81,6 @@ mybatis:
 
 server:
   #正式
-  port: 8095
+   port: 8095
   #测试
 #  port: 8016