|
|
@@ -2,10 +2,9 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="a191bf23-5de1-438a-810e-95cec23d6b25" name="Default" comment="change fastjson dependenciy">
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/dingding_java110.jpg" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/OrderService/src/main/java/com/java110/order/smo/IOrderServiceSMO.java" afterPath="$PROJECT_DIR$/OrderService/src/main/java/com/java110/order/smo/IOrderServiceSMO.java" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/OrderService/src/main/java/com/java110/order/smo/impl/OrderServiceSMOImpl.java" afterPath="$PROJECT_DIR$/OrderService/src/main/java/com/java110/order/smo/impl/OrderServiceSMOImpl.java" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/order/BusiOrder.java" afterPath="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/order/BusiOrder.java" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Readme.md" afterPath="$PROJECT_DIR$/Readme.md" />
|
|
|
</list>
|
|
|
<ignored path="$PROJECT_DIR$/out/" />
|
|
|
<ignored path="$PROJECT_DIR$/target/" />
|
|
|
@@ -70,16 +69,29 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="OrderServiceSMOImpl.java" pinned="false" current-in-tab="true">
|
|
|
+ <file leaf-file-name="OrderServiceSMOImpl.java" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/OrderService/src/main/java/com/java110/order/smo/impl/OrderServiceSMOImpl.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="199">
|
|
|
- <caret line="594" column="49" lean-forward="false" selection-start-line="594" selection-start-column="39" selection-end-line="594" selection-end-column="49" />
|
|
|
+ <state relative-caret-position="-228">
|
|
|
+ <caret line="302" column="0" lean-forward="true" selection-start-line="302" selection-start-column="0" selection-end-line="302" selection-end-column="0" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
+ <file leaf-file-name="Readme.md" pinned="false" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Readme.md">
|
|
|
+ <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
|
|
|
+ <state split_layout="SPLIT">
|
|
|
+ <first_editor relative-caret-position="368">
|
|
|
+ <caret line="138" column="77" lean-forward="false" selection-start-line="138" selection-start-column="77" selection-end-line="138" selection-end-column="77" />
|
|
|
+ <folding />
|
|
|
+ </first_editor>
|
|
|
+ <second_editor />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
<file leaf-file-name="BusiOrder.java" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/bean/src/main/java/com/java110/entity/order/BusiOrder.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
@@ -129,18 +141,6 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="IMerchantMemberServiceSMO.java" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/MerchantService/src/main/java/com/java110/merchant/smo/IMerchantMemberServiceSMO.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="1207">
|
|
|
- <caret line="86" column="18" lean-forward="false" selection-start-line="86" selection-start-column="18" selection-end-line="86" selection-end-column="18" />
|
|
|
- <folding>
|
|
|
- <element signature="imports" expanded="false" />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
<file leaf-file-name="MerchantMemberServiceSMOImpl.java" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/MerchantService/src/main/java/com/java110/merchant/smo/impl/MerchantMemberServiceSMOImpl.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
@@ -243,7 +243,6 @@
|
|
|
<component name="IdeDocumentHistory">
|
|
|
<option name="CHANGED_PATHS">
|
|
|
<list>
|
|
|
- <option value="$PROJECT_DIR$/BaseService/src/main/java/com/java110/base/dao/impl/CommonServiceDaoImpl.java" />
|
|
|
<option value="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/mapping/CodeMapping.java" />
|
|
|
<option value="$PROJECT_DIR$/feign/src/main/java/com/java110/feign/base/ICommonService.java" />
|
|
|
<option value="$PROJECT_DIR$/BaseService/src/main/java/com/java110/base/rest/CommonServiceRest.java" />
|
|
|
@@ -294,6 +293,7 @@
|
|
|
<option value="$PROJECT_DIR$/bean/src/main/java/com/java110/entity/order/BusiOrder.java" />
|
|
|
<option value="$PROJECT_DIR$/OrderService/src/main/java/com/java110/order/smo/IOrderServiceSMO.java" />
|
|
|
<option value="$PROJECT_DIR$/OrderService/src/main/java/com/java110/order/smo/impl/OrderServiceSMOImpl.java" />
|
|
|
+ <option value="$PROJECT_DIR$/Readme.md" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
|
@@ -409,16 +409,12 @@
|
|
|
<property name="jdk.selected.JAVA_MODULE" value="1.8" />
|
|
|
</component>
|
|
|
<component name="RecentsManager">
|
|
|
+ <key name="MoveFile.RECENT_KEYS">
|
|
|
+ <recent name="E:\project\MicroCommunity\config\src\main\resources\cache" />
|
|
|
+ </key>
|
|
|
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
|
|
|
<recent name="com.java110.merchant" />
|
|
|
</key>
|
|
|
- <key name="CopyFile.RECENT_KEYS">
|
|
|
- <recent name="E:\project\MicroCommunity\config\src\main\resources\mapper\merchant" />
|
|
|
- <recent name="E:\project\MicroCommunity\common\src\main\java\com\java110\common\util" />
|
|
|
- <recent name="E:\project\MicroCommunity\bean\src\main\java\com\java110\entity\listener" />
|
|
|
- <recent name="E:\project\MicroCommunity\SimpleListener\src\main\java\com\java110\listener\task" />
|
|
|
- <recent name="E:\project\MicroCommunity\config\src\main\resources\mapper\listener" />
|
|
|
- </key>
|
|
|
<key name="CopyClassDialog.RECENTS_KEY">
|
|
|
<recent name="com.java110.feign.merchant" />
|
|
|
<recent name="com.java110.listener" />
|
|
|
@@ -426,8 +422,12 @@
|
|
|
<recent name="com.java110.merchant.smo" />
|
|
|
<recent name="com.java110.merchant.smo.impl" />
|
|
|
</key>
|
|
|
- <key name="MoveFile.RECENT_KEYS">
|
|
|
- <recent name="E:\project\MicroCommunity\config\src\main\resources\cache" />
|
|
|
+ <key name="CopyFile.RECENT_KEYS">
|
|
|
+ <recent name="E:\project\MicroCommunity" />
|
|
|
+ <recent name="E:\project\MicroCommunity\config\src\main\resources\mapper\merchant" />
|
|
|
+ <recent name="E:\project\MicroCommunity\common\src\main\java\com\java110\common\util" />
|
|
|
+ <recent name="E:\project\MicroCommunity\bean\src\main\java\com\java110\entity\listener" />
|
|
|
+ <recent name="E:\project\MicroCommunity\SimpleListener\src\main\java\com\java110\listener\task" />
|
|
|
</key>
|
|
|
</component>
|
|
|
<component name="RunDashboard">
|
|
|
@@ -913,7 +913,7 @@
|
|
|
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3294509" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.38602328" sideWeight="0.4969651" order="10" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.17602427" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
|
|
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21927163" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
|
|
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24962178" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.37213114" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
|
@@ -1016,13 +1016,6 @@
|
|
|
<option name="FILTER_TARGETS" value="false" />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
- <entry file="file://$PROJECT_DIR$/SimpleListener/src/main/java/com/java110/listener/task/FTPClientTemplate.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="184">
|
|
|
- <caret line="509" column="70" lean-forward="false" selection-start-line="509" selection-start-column="53" selection-end-line="509" selection-end-column="70" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/SimpleListener/src/main/java/com/java110/listener/task/DownloadFileFromFtpToTable.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="547">
|
|
|
@@ -1397,12 +1390,23 @@
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/OrderService/src/main/java/com/java110/order/smo/impl/OrderServiceSMOImpl.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="199">
|
|
|
- <caret line="594" column="49" lean-forward="false" selection-start-line="594" selection-start-column="39" selection-end-line="594" selection-end-column="49" />
|
|
|
+ <state relative-caret-position="-228">
|
|
|
+ <caret line="302" column="0" lean-forward="true" selection-start-line="302" selection-start-column="0" selection-end-line="302" selection-end-column="0" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/Readme.md">
|
|
|
+ <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
|
|
|
+ <state split_layout="SPLIT">
|
|
|
+ <first_editor relative-caret-position="368">
|
|
|
+ <caret line="138" column="77" lean-forward="false" selection-start-line="138" selection-start-column="77" selection-end-line="138" selection-end-column="77" />
|
|
|
+ <folding />
|
|
|
+ </first_editor>
|
|
|
+ <second_editor />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
</component>
|
|
|
<component name="masterDetails">
|
|
|
<states>
|