master服务编排

.idea/workspace.xml

@@ -2,59 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="abe40335-1998-468a-9c83-8ed884d8e030" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsCapacityController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsCapacityController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsCarDriverController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsCarDriverController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsCarrierController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsCarrierController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsGatepostController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsGatepostController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsMaterialController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsMaterialController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsPersonnelController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsPersonnelController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsShipperController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsShipperController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsSupplierController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsSupplierController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsWarehouseController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsWarehouseController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/model/RmsCapacity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/model/RmsCapacity.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/model/RmsMaterial.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/model/RmsMaterial.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsSupplierService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsSupplierService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsCapacityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsCapacityServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsCarDriverServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsCarDriverServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsCarrierServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsCarrierServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsGatepostServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsGatepostServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsMaterialServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsMaterialServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsPersonnelServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsPersonnelServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsPortServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsPortServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsShipperServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsShipperServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsSupplierServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsSupplierServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsTruckCalculateServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsTruckCalculateServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsWarehouseServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsWarehouseServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsCapacityMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsCapacityMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsMaterialMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsMaterialMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsPersonnelMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsPersonnelMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsCapacityController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsCapacityController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsCarDriverController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsCarDriverController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsCarrierController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsCarrierController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsGatepostController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsGatepostController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsMaterialController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsMaterialController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsPersonnelController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsPersonnelController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsShipperController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsShipperController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsSupplierController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsSupplierController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsWarehouseController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/controller/RmsWarehouseController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsCapacityMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsCapacityMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsMaterialMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsMaterialMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsPersonnelMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/mapper/RmsPersonnelMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsCapacity.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsCapacity.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsMaterial.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/model/RmsMaterial.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsCapacityServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsCapacityServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsCarDriverServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsCarDriverServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsCarrierServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsCarrierServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsGatepostServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsGatepostServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsMaterialServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsMaterialServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsPersonnelServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsPersonnelServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsShipperServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsShipperServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsSupplierServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsSupplierServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsTruckCalculateServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsTruckCalculateServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsWarehouseServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/impl/RmsWarehouseServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bootstrap.yml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -94,6 +43,7 @@
     <property name="node.js.path.for.package.tslint" value="project" />
     <property name="node.js.selected.package.eslint" value="(autodetect)" />
     <property name="node.js.selected.package.tslint" value="(autodetect)" />
+    <property name="nodejs_package_manager_path" value="npm" />
     <property name="settings.editor.selected.configurable" value="MavenSettings" />
   </component>
   <component name="RecentsManager">
@@ -123,7 +73,7 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1639799862423</updated>
-      <workItem from="1639799866763" duration="17113000" />
+      <workItem from="1639799866763" duration="17817000" />
     </task>
     <servers />
   </component>
@@ -139,54 +89,54 @@
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state x="549" y="166" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1639799913289" />
-    <state width="1493" height="40" key="GridCell.Tab.0.bottom" timestamp="1639820263752">
+    <state width="1493" height="462" key="GridCell.Tab.0.bottom" timestamp="1639822112420">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="40" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1639820263752" />
-    <state width="1493" height="40" key="GridCell.Tab.0.center" timestamp="1639820263751">
+    <state width="1493" height="462" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1639822112420" />
+    <state width="1493" height="462" key="GridCell.Tab.0.center" timestamp="1639822112420">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="40" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1639820263751" />
-    <state width="1493" height="40" key="GridCell.Tab.0.left" timestamp="1639820263751">
+    <state width="1493" height="462" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1639822112420" />
+    <state width="1493" height="462" key="GridCell.Tab.0.left" timestamp="1639822112418">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="40" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1639820263751" />
-    <state width="1493" height="40" key="GridCell.Tab.0.right" timestamp="1639820263752">
+    <state width="1493" height="462" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1639822112418" />
+    <state width="1493" height="462" key="GridCell.Tab.0.right" timestamp="1639822112420">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="40" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1639820263752" />
-    <state width="1493" height="40" key="GridCell.Tab.1.bottom" timestamp="1639820263609">
+    <state width="1493" height="462" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1639822112420" />
+    <state width="1493" height="462" key="GridCell.Tab.1.bottom" timestamp="1639822112421">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="40" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1639820263609" />
-    <state width="1493" height="40" key="GridCell.Tab.1.center" timestamp="1639820263608">
+    <state width="1493" height="462" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1639822112421" />
+    <state width="1493" height="462" key="GridCell.Tab.1.center" timestamp="1639822112420">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="40" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1639820263608" />
-    <state width="1493" height="40" key="GridCell.Tab.1.left" timestamp="1639820263608">
+    <state width="1493" height="462" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1639822112420" />
+    <state width="1493" height="462" key="GridCell.Tab.1.left" timestamp="1639822112420">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="40" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1639820263608" />
-    <state width="1493" height="40" key="GridCell.Tab.1.right" timestamp="1639820263609">
+    <state width="1493" height="462" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1639822112420" />
+    <state width="1493" height="462" key="GridCell.Tab.1.right" timestamp="1639822112420">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="40" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1639820263609" />
-    <state width="1493" height="40" key="GridCell.Tab.2.bottom" timestamp="1639820263610">
+    <state width="1493" height="462" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1639822112420" />
+    <state width="1493" height="462" key="GridCell.Tab.2.bottom" timestamp="1639822112421">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="40" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1639820263610" />
-    <state width="1493" height="40" key="GridCell.Tab.2.center" timestamp="1639820263609">
+    <state width="1493" height="462" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1639822112421" />
+    <state width="1493" height="462" key="GridCell.Tab.2.center" timestamp="1639822112421">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="40" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1639820263609" />
-    <state width="1493" height="40" key="GridCell.Tab.2.left" timestamp="1639820263609">
+    <state width="1493" height="462" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1639822112421" />
+    <state width="1493" height="462" key="GridCell.Tab.2.left" timestamp="1639822112421">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="40" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1639820263609" />
-    <state width="1493" height="40" key="GridCell.Tab.2.right" timestamp="1639820263610">
+    <state width="1493" height="462" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1639822112421" />
+    <state width="1493" height="462" key="GridCell.Tab.2.right" timestamp="1639822112421">
       <screen x="0" y="0" width="1536" height="824" />
     </state>
-    <state width="1493" height="40" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1639820263610" />
+    <state width="1493" height="462" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1639822112421" />
     <state x="270" y="56" key="SettingsEditor" timestamp="1639799919381">
       <screen x="0" y="0" width="1536" height="824" />
     </state>

src/main/resources/bootstrap.yml

@@ -46,11 +46,11 @@ redis:
 
 openFeign:
   ESFeign:
-    url: ${ESFEIGN_URL:172.16.33.162:8011}
+    url: ${ESFEIGN_URL:172.16.33.166:8089}
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.162:8015}
+    url: ${AMSFEIGN_URL:172.16.33.166:8079}
 
 mybatis:
   type-aliases-package: com.steerinfo.dil.model
@@ -61,4 +61,4 @@ mybatis:
     call-setters-on-nulls: true
 
 server:
-  port: 8014
+  port: 8060