合并分支

.idea/workspace.xml

@@ -20,26 +20,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="abe40335-1998-468a-9c83-8ed884d8e030" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/mapper/RmsBidAreaMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/model/RmsBidArea.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsBidAreaService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl/RmsBidAreaServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/com/steerinfo/dil/mapper/RmsBidAreaMapper.xml" afterDir="false" />
-      <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$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" 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/service/IRmsCarrierService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/IRmsCarrierService.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$/dil-api.iml" beforeDir="false" afterPath="$PROJECT_DIR$/dil-api.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/bootstrap.yml" 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/service/IRmsCarrierService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/steerinfo/dil/service/IRmsCarrierService.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$/src/main/java/com/steerinfo/dil/controller/RmsOilPriceController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/controller/RmsOilPriceController.java" afterDir="false" />
-
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -72,11 +55,7 @@
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/java/com/steerinfo/dil/service/impl" />
-
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../DAL-DAZHOU-API" />
-
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.path.for.package.eslint" value="project" />
@@ -121,6 +100,8 @@
       <workItem from="1639963691127" duration="15865000" />
       <workItem from="1639799866763" duration="19781000" />
       <workItem from="1639960339544" duration="3726000" />
+      <workItem from="1639995237548" duration="323000" />
+      <workItem from="1639995569503" duration="6000" />
     </task>
     <servers />
   </component>
@@ -137,6 +118,7 @@
         </entry>
       </map>
     </option>
+    <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="WindowStateProjectService">
     <state x="446" y="46" key="#com.intellij.ide.util.MemberChooser" timestamp="1639985896075">
@@ -147,83 +129,75 @@
       <screen x="0" y="0" width="1536" height="824" />
     </state>
     <state width="444" height="466" key="DebuggerActiveHint/0.0.1536.824@0.0.1536.824" timestamp="1639818003519" />
-
-    <state x="458" y="137" key="FileChooserDialogImpl" timestamp="1639965013078">
+    <state x="458" y="137" key="FileChooserDialogImpl" timestamp="1639995555735">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state x="458" y="137" key="FileChooserDialogImpl/0.0.1280.680@0.0.1280.680" timestamp="1639965013078" />
-    <state x="549" y="166" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1639799913289" />
-    <state width="1237" height="305" key="GridCell.Tab.0.bottom" timestamp="1639989735386">
-      <screen x="0" y="0" width="1280" height="680" />
-    </state>
-    <state x="549" y="166" key="FileChooserDialogImpl" timestamp="1639961493966">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
+    <state x="458" y="137" key="FileChooserDialogImpl/0.0.1280.680@0.0.1280.680" timestamp="1639995555735" />
     <state x="549" y="166" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1639961493966" />
-    <state width="1493" height="462" key="GridCell.Tab.0.bottom" timestamp="1639822112420">
-      <screen x="0" y="0" width="1536" height="824" />
+    <state width="1237" height="119" key="GridCell.Tab.0.bottom" timestamp="1639995560177">
+      <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="305" key="GridCell.Tab.0.bottom/0.0.1280.680@0.0.1280.680" timestamp="1639989735386" />
+    <state width="1237" height="119" key="GridCell.Tab.0.bottom/0.0.1280.680@0.0.1280.680" timestamp="1639995560177" />
     <state width="1493" height="462" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1639822112420" />
-    <state width="1237" height="305" key="GridCell.Tab.0.center" timestamp="1639989735386">
+    <state width="1237" height="119" key="GridCell.Tab.0.center" timestamp="1639995560177">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="305" key="GridCell.Tab.0.center/0.0.1280.680@0.0.1280.680" timestamp="1639989735386" />
+    <state width="1237" height="119" key="GridCell.Tab.0.center/0.0.1280.680@0.0.1280.680" timestamp="1639995560177" />
     <state width="1493" height="462" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1639822112420" />
-    <state width="1237" height="305" key="GridCell.Tab.0.left" timestamp="1639989735385">
+    <state width="1237" height="119" key="GridCell.Tab.0.left" timestamp="1639995560177">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="305" key="GridCell.Tab.0.left/0.0.1280.680@0.0.1280.680" timestamp="1639989735385" />
+    <state width="1237" height="119" key="GridCell.Tab.0.left/0.0.1280.680@0.0.1280.680" timestamp="1639995560177" />
     <state width="1493" height="462" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1639822112418" />
-    <state width="1237" height="305" key="GridCell.Tab.0.right" timestamp="1639989735386">
+    <state width="1237" height="119" key="GridCell.Tab.0.right" timestamp="1639995560177">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="305" key="GridCell.Tab.0.right/0.0.1280.680@0.0.1280.680" timestamp="1639989735386" />
+    <state width="1237" height="119" key="GridCell.Tab.0.right/0.0.1280.680@0.0.1280.680" timestamp="1639995560177" />
     <state width="1493" height="462" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1639822112420" />
-    <state width="1237" height="305" key="GridCell.Tab.1.bottom" timestamp="1639989735900">
+    <state width="1237" height="119" key="GridCell.Tab.1.bottom" timestamp="1639995560182">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="305" key="GridCell.Tab.1.bottom/0.0.1280.680@0.0.1280.680" timestamp="1639989735900" />
+    <state width="1237" height="119" key="GridCell.Tab.1.bottom/0.0.1280.680@0.0.1280.680" timestamp="1639995560182" />
     <state width="1493" height="462" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1639822112421" />
-    <state width="1237" height="305" key="GridCell.Tab.1.center" timestamp="1639989735900">
+    <state width="1237" height="119" key="GridCell.Tab.1.center" timestamp="1639995560181">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="305" key="GridCell.Tab.1.center/0.0.1280.680@0.0.1280.680" timestamp="1639989735900" />
+    <state width="1237" height="119" key="GridCell.Tab.1.center/0.0.1280.680@0.0.1280.680" timestamp="1639995560181" />
     <state width="1493" height="462" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1639822112420" />
-    <state width="1237" height="305" key="GridCell.Tab.1.left" timestamp="1639989735900">
+    <state width="1237" height="119" key="GridCell.Tab.1.left" timestamp="1639995560181">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="305" key="GridCell.Tab.1.left/0.0.1280.680@0.0.1280.680" timestamp="1639989735900" />
+    <state width="1237" height="119" key="GridCell.Tab.1.left/0.0.1280.680@0.0.1280.680" timestamp="1639995560181" />
     <state width="1493" height="462" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1639822112420" />
-    <state width="1237" height="305" key="GridCell.Tab.1.right" timestamp="1639989735900">
+    <state width="1237" height="119" key="GridCell.Tab.1.right" timestamp="1639995560182">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="305" key="GridCell.Tab.1.right/0.0.1280.680@0.0.1280.680" timestamp="1639989735900" />
+    <state width="1237" height="119" key="GridCell.Tab.1.right/0.0.1280.680@0.0.1280.680" timestamp="1639995560182" />
     <state width="1493" height="462" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1639822112420" />
-    <state width="1237" height="242" key="GridCell.Tab.2.bottom" timestamp="1639989772908">
+    <state width="1237" height="119" key="GridCell.Tab.2.bottom" timestamp="1639995560179">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="242" key="GridCell.Tab.2.bottom/0.0.1280.680@0.0.1280.680" timestamp="1639989772908" />
+    <state width="1237" height="119" key="GridCell.Tab.2.bottom/0.0.1280.680@0.0.1280.680" timestamp="1639995560179" />
     <state width="1493" height="462" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1639822112421" />
-    <state width="1237" height="242" key="GridCell.Tab.2.center" timestamp="1639989772908">
+    <state width="1237" height="119" key="GridCell.Tab.2.center" timestamp="1639995560178">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="242" key="GridCell.Tab.2.center/0.0.1280.680@0.0.1280.680" timestamp="1639989772908" />
+    <state width="1237" height="119" key="GridCell.Tab.2.center/0.0.1280.680@0.0.1280.680" timestamp="1639995560178" />
     <state width="1493" height="462" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1639822112421" />
-    <state width="1237" height="242" key="GridCell.Tab.2.left" timestamp="1639989772908">
+    <state width="1237" height="119" key="GridCell.Tab.2.left" timestamp="1639995560177">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="242" key="GridCell.Tab.2.left/0.0.1280.680@0.0.1280.680" timestamp="1639989772908" />
+    <state width="1237" height="119" key="GridCell.Tab.2.left/0.0.1280.680@0.0.1280.680" timestamp="1639995560177" />
     <state width="1493" height="462" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1639822112421" />
-    <state width="1237" height="242" key="GridCell.Tab.2.right" timestamp="1639989772908">
+    <state width="1237" height="119" key="GridCell.Tab.2.right" timestamp="1639995560178">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state width="1237" height="242" key="GridCell.Tab.2.right/0.0.1280.680@0.0.1280.680" timestamp="1639989772908" />
+    <state width="1237" height="119" key="GridCell.Tab.2.right/0.0.1280.680@0.0.1280.680" timestamp="1639995560178" />
     <state width="1493" height="462" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1639822112421" />
-    <state x="225" y="0" key="SettingsEditor" timestamp="1639963719060">
+    <state x="225" y="0" key="SettingsEditor" timestamp="1639995255049">
       <screen x="0" y="0" width="1280" height="680" />
     </state>
-    <state x="225" y="0" key="SettingsEditor/0.0.1280.680@0.0.1280.680" timestamp="1639963719060" />
+    <state x="225" y="0" key="SettingsEditor/0.0.1280.680@0.0.1280.680" timestamp="1639995255049" />
     <state x="270" y="56" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1639799919381" />
     <state x="235" y="0" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1639818889347">
       <screen x="0" y="0" width="1536" height="824" />

dil-api.iml

@@ -7,6 +7,10 @@
     <facet type="web" name="Web">
       <configuration>
         <webroots />
+        <sourceRoots>
+          <root url="file://$MODULE_DIR$/src/main/java" />
+          <root url="file://$MODULE_DIR$/src/main/resources" />
+        </sourceRoots>
       </configuration>
     </facet>
   </component>
@@ -16,6 +20,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />

target/classes/bootstrap.yml

@@ -61,4 +61,4 @@ mybatis:
     call-setters-on-nulls: true
 
 server:
-  port: 8090
+  port: 8061