修改零星物资

src/main/resources/bootstrap.yml

@@ -14,16 +14,29 @@ spring:
 
 openfeign:
   # 正式环境
+<<<<<<< HEAD
   #ESFeign:
     #url: ${ESFEIGN_URL:172.16.33.166:8089}
   #ColumnDataFeign:
     #url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
 
   # 测试环境
-  ESFeign:
-    url: ${ESFEIGN_URL:172.16.33.162:8011}
-  ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
+#  ESFeign:
+#    url: ${ESFEIGN_URL:172.16.33.162:8011}
+#  ColumnDataFeign:
+#    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
+
+   ESFeign:
+    url: ${ESFEIGN_URL:172.16.33.166:8089}
+   ColumnDataFeign:
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+
+  # 测试环境
+   #ESFeign:
+     #url: ${ESFEIGN_URL:172.16.33.162:8011}
+   #ColumnDataFeign:
+     #url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
+
 
 #eureka设置
 eureka:
@@ -64,6 +77,11 @@ mybatis:
     call-setters-on-nulls: true
 
 server:
+
   #port: 8015
   port: 8079
 
+
+#  port: 8079
+  #port: 8015
+