|
|
@@ -1,9 +1,93 @@
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" id="a191bf23-5de1-438a-810e-95cec23d6b25" name="Default" comment="" />
|
|
|
+ <list default="true" id="a191bf23-5de1-438a-810e-95cec23d6b25" name="Default" comment="">
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_access_1_1_3.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_3.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_3.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_3_1.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_8_1.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_8_1.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_8_1.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_2_0.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_3_8_1.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_4.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_4.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_4.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_assertj_assertj_core_2_5_0.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_2_4_Final.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_0_Final.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_json_json_20140107.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_2_1.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_3_0.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_21.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_21.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_log4j_over_slf4j_1_7_21.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_1_4_0_RELEASE.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_actuator_1_4_0_RELEASE.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_4_0_RELEASE.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_configuration_processor_1_4_0_RELEASE.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_1_4_0_RELEASE.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_actuator_1_4_0_RELEASE.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_4_0_RELEASE.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_1_4_0_RELEASE.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_1_4_0_RELEASE.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_1_4_0_RELEASE.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_1_4_0_RELEASE.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_1_4_0_RELEASE.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_4_3_2_RELEASE.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_4_3_2_RELEASE.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_4_3_2_RELEASE.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_4_3_2_RELEASE.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_4_3_2_RELEASE.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_4_3_2_RELEASE.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_4_3_2_RELEASE.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_4_3_2_RELEASE.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_17.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/MerchantService/MerchantService.iml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/MerchantService/README.md" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/MerchantService/pom.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/OrderService/OrderService.iml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/OrderService/README.md" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/OrderService/pom.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/PayService/PayService.iml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/PayService/README.md" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/PayService/pom.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Readme.md" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/UserService/README.md" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/UserService/pom.xml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bean/README.md" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bean/bean.iml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bean/src/main/java/com/java110/user/User.java" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/common/README.md" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/common/common.iml" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/common/pom.xml" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/Readme" afterPath="" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/compiler.xml" afterPath="$PROJECT_DIR$/.idea/compiler.xml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/MicroCommunity.iml" afterPath="$PROJECT_DIR$/MicroCommunity.iml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
|
|
|
+ </list>
|
|
|
<ignored path="$PROJECT_DIR$/out/" />
|
|
|
<ignored path="$PROJECT_DIR$/target/" />
|
|
|
+ <ignored path="$PROJECT_DIR$/bean/target/" />
|
|
|
+ <ignored path="$PROJECT_DIR$/common/target/" />
|
|
|
+ <ignored path="$PROJECT_DIR$/UserSevice/target/" />
|
|
|
+ <ignored path="$PROJECT_DIR$/MerchantService/target/" />
|
|
|
+ <ignored path="$PROJECT_DIR$/UserService/target/" />
|
|
|
+ <ignored path="$PROJECT_DIR$/OrderService/target/" />
|
|
|
+ <ignored path="$PROJECT_DIR$/PayService/target/" />
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="TRACKING_ENABLED" value="true" />
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
@@ -17,32 +101,158 @@
|
|
|
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf>
|
|
|
+ <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/common/pom.xml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="442">
|
|
|
+ <caret line="26" column="21" lean-forward="false" selection-start-line="26" selection-start-column="21" selection-end-line="26" selection-end-column="21" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/UserService/pom.xml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="99">
|
|
|
+ <caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
<file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/pom.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="0">
|
|
|
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
+ <state relative-caret-position="289">
|
|
|
+ <caret line="100" column="23" lean-forward="false" selection-start-line="100" selection-start-column="23" selection-end-line="100" selection-end-column="23" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/MerchantService/README.md">
|
|
|
+ <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
|
|
|
+ <state split_layout="SPLIT">
|
|
|
+ <first_editor relative-caret-position="136">
|
|
|
+ <caret line="8" column="9" lean-forward="false" selection-start-line="8" selection-start-column="9" selection-end-line="8" selection-end-column="9" />
|
|
|
+ <folding />
|
|
|
+ </first_editor>
|
|
|
+ <second_editor />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/OrderService/pom.xml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="218">
|
|
|
+ <caret line="21" column="32" lean-forward="false" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="Readme" pinned="false" current-in-tab="true">
|
|
|
- <entry file="file://$PROJECT_DIR$/Readme">
|
|
|
+ <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/OrderService/README.md">
|
|
|
+ <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
|
|
|
+ <state split_layout="SPLIT">
|
|
|
+ <first_editor relative-caret-position="136">
|
|
|
+ <caret line="8" column="10" lean-forward="false" selection-start-line="8" selection-start-column="10" selection-end-line="8" selection-end-column="10" />
|
|
|
+ <folding />
|
|
|
+ </first_editor>
|
|
|
+ <second_editor />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/PayService/pom.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="306">
|
|
|
- <caret line="18" column="12" lean-forward="true" selection-start-line="18" selection-start-column="12" selection-end-line="18" selection-end-column="12" />
|
|
|
+ <state relative-caret-position="218">
|
|
|
+ <caret line="21" column="32" lean-forward="false" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
+ <file leaf-file-name="README.md" pinned="false" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/PayService/README.md">
|
|
|
+ <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
|
|
|
+ <state split_layout="SPLIT">
|
|
|
+ <first_editor relative-caret-position="170">
|
|
|
+ <caret line="10" column="11" lean-forward="false" selection-start-line="10" selection-start-column="11" selection-end-line="10" selection-end-column="11" />
|
|
|
+ <folding />
|
|
|
+ </first_editor>
|
|
|
+ <second_editor />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/MerchantService/pom.xml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="218">
|
|
|
+ <caret line="21" column="32" lean-forward="false" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/common/README.md">
|
|
|
+ <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
|
|
|
+ <state split_layout="SPLIT">
|
|
|
+ <first_editor relative-caret-position="34">
|
|
|
+ <caret line="2" column="26" lean-forward="false" selection-start-line="2" selection-start-column="26" selection-end-line="2" selection-end-column="26" />
|
|
|
+ <folding />
|
|
|
+ </first_editor>
|
|
|
+ <second_editor />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
</leaf>
|
|
|
</component>
|
|
|
+ <component name="FileTemplateManagerImpl">
|
|
|
+ <option name="RECENT_TEMPLATES">
|
|
|
+ <list>
|
|
|
+ <option value="Class" />
|
|
|
+ </list>
|
|
|
+ </option>
|
|
|
+ </component>
|
|
|
+ <component name="FindInProjectRecents">
|
|
|
+ <findStrings>
|
|
|
+ <find>java110.version</find>
|
|
|
+ </findStrings>
|
|
|
+ <replaceStrings>
|
|
|
+ <replace>microcommunity.version</replace>
|
|
|
+ </replaceStrings>
|
|
|
+ </component>
|
|
|
+ <component name="Git.Settings">
|
|
|
+ <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
|
+ </component>
|
|
|
<component name="IdeDocumentHistory">
|
|
|
<option name="CHANGED_PATHS">
|
|
|
<list>
|
|
|
<option value="$PROJECT_DIR$/Readme" />
|
|
|
+ <option value="$PROJECT_DIR$/bean/pom.xml" />
|
|
|
+ <option value="$PROJECT_DIR$/bean/README.md" />
|
|
|
+ <option value="$PROJECT_DIR$/bean/src/main/java/com/java110/user/User.java" />
|
|
|
+ <option value="$PROJECT_DIR$/common/README.md" />
|
|
|
+ <option value="$PROJECT_DIR$/UserSevice/README.md" />
|
|
|
+ <option value="$PROJECT_DIR$/UserSevice/pom.xml" />
|
|
|
+ <option value="$PROJECT_DIR$/common/pom.xml" />
|
|
|
+ <option value="$PROJECT_DIR$/UserService/pom.xml" />
|
|
|
+ <option value="$PROJECT_DIR$/UserService/README.md" />
|
|
|
+ <option value="$PROJECT_DIR$/MerchantService/pom.xml" />
|
|
|
+ <option value="$PROJECT_DIR$/pom.xml" />
|
|
|
+ <option value="$PROJECT_DIR$/MerchantService/README.md" />
|
|
|
+ <option value="$PROJECT_DIR$/OrderService/pom.xml" />
|
|
|
+ <option value="$PROJECT_DIR$/OrderService/README.md" />
|
|
|
+ <option value="$PROJECT_DIR$/PayService/pom.xml" />
|
|
|
+ <option value="$PROJECT_DIR$/PayService/README.md" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
|
@@ -52,6 +262,17 @@
|
|
|
<detection-done>true</detection-done>
|
|
|
<sorting>DEFINITION_ORDER</sorting>
|
|
|
</component>
|
|
|
+ <component name="MavenImportPreferences">
|
|
|
+ <option name="generalSettings">
|
|
|
+ <MavenGeneralSettings>
|
|
|
+ <option name="mavenHome" value="F:/software/apache-maven-3.3.3" />
|
|
|
+ <option name="userSettingsFile" value="F:\software\apache-maven-3.3.3\conf\settings.xml" />
|
|
|
+ </MavenGeneralSettings>
|
|
|
+ </option>
|
|
|
+ </component>
|
|
|
+ <component name="MavenProjectNavigator">
|
|
|
+ <treeState />
|
|
|
+ </component>
|
|
|
<component name="ProjectFrameBounds">
|
|
|
<option name="x" value="-8" />
|
|
|
<option name="y" value="-8" />
|
|
|
@@ -93,7 +314,7 @@
|
|
|
</panes>
|
|
|
</component>
|
|
|
<component name="PropertiesComponent">
|
|
|
- <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
|
|
|
+ <property name="settings.editor.selected.configurable" value="MavenSettings" />
|
|
|
<property name="settings.editor.splitter.proportion" value="0.24975514" />
|
|
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
|
|
<property name="aspect.path.notification.shown" value="true" />
|
|
|
@@ -354,34 +575,36 @@
|
|
|
<option name="number" value="Default" />
|
|
|
<option name="presentableId" value="Default" />
|
|
|
<updated>1491310271591</updated>
|
|
|
- <workItem from="1491310273233" duration="1737000" />
|
|
|
+ <workItem from="1491310273233" duration="5074000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="1737000" />
|
|
|
+ <option name="totallyTimeSpent" value="5074000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
- <frame x="-8" y="-8" width="1382" height="744" extended-state="7" />
|
|
|
- <editor active="true" />
|
|
|
+ <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
|
|
|
+ <editor active="false" />
|
|
|
<layout>
|
|
|
- <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="-1" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1785174" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
|
|
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295082" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Palette	" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
|
|
|
- <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980332" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
|
|
+ <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.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" 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.33" sideWeight="0.5" order="-1" 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="-1" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20499243" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
|
|
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" 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="-1" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Favorites" 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="-1" side_tool="true" content_ui="tabs" />
|
|
|
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
|
|
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
|
@@ -399,7 +622,32 @@
|
|
|
<watches-manager />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
- <entry file="file://$PROJECT_DIR$/pom.xml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Readme.md">
|
|
|
+ <provider editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="306">
|
|
|
+ <caret line="18" column="12" lean-forward="false" selection-start-line="18" selection-start-column="12" selection-end-line="18" selection-end-column="12" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
|
|
|
+ <state split_layout="SPLIT">
|
|
|
+ <first_editor relative-caret-position="0">
|
|
|
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
+ <folding />
|
|
|
+ </first_editor>
|
|
|
+ <second_editor />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/bean/src/main/java/com/java110/user/User.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="51">
|
|
|
+ <caret line="3" column="7" lean-forward="false" selection-start-line="3" selection-start-column="7" selection-end-line="3" selection-end-column="7" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/bean/pom.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="0">
|
|
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
@@ -407,13 +655,138 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Readme">
|
|
|
+ <entry file="file://$PROJECT_DIR$/bean/README.md">
|
|
|
+ <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
|
|
|
+ <state split_layout="SPLIT">
|
|
|
+ <first_editor relative-caret-position="17">
|
|
|
+ <caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
|
|
|
+ <folding />
|
|
|
+ </first_editor>
|
|
|
+ <second_editor />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/UserSevice/README.md">
|
|
|
+ <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
|
|
|
+ <state split_layout="SPLIT">
|
|
|
+ <first_editor relative-caret-position="34">
|
|
|
+ <caret line="2" column="16" lean-forward="false" selection-start-line="2" selection-start-column="16" selection-end-line="2" selection-end-column="16" />
|
|
|
+ <folding />
|
|
|
+ </first_editor>
|
|
|
+ <second_editor />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/common/README.md">
|
|
|
+ <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
|
|
|
+ <state split_layout="SPLIT">
|
|
|
+ <first_editor relative-caret-position="34">
|
|
|
+ <caret line="2" column="26" lean-forward="false" selection-start-line="2" selection-start-column="26" selection-end-line="2" selection-end-column="26" />
|
|
|
+ <folding />
|
|
|
+ </first_editor>
|
|
|
+ <second_editor />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/common/pom.xml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="442">
|
|
|
+ <caret line="26" column="21" lean-forward="false" selection-start-line="26" selection-start-column="21" selection-end-line="26" selection-end-column="21" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/UserSevice/pom.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="306">
|
|
|
- <caret line="18" column="12" lean-forward="true" selection-start-line="18" selection-start-column="12" selection-end-line="18" selection-end-column="12" />
|
|
|
+ <state relative-caret-position="340">
|
|
|
+ <caret line="20" column="12" lean-forward="false" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="12" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/UserService/pom.xml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="99">
|
|
|
+ <caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/UserService/README.md">
|
|
|
+ <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
|
|
|
+ <state split_layout="SPLIT">
|
|
|
+ <first_editor relative-caret-position="34">
|
|
|
+ <caret line="2" column="21" lean-forward="false" selection-start-line="2" selection-start-column="21" selection-end-line="2" selection-end-column="21" />
|
|
|
+ <folding />
|
|
|
+ </first_editor>
|
|
|
+ <second_editor />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/pom.xml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="289">
|
|
|
+ <caret line="100" column="23" lean-forward="false" selection-start-line="100" selection-start-column="23" selection-end-line="100" selection-end-column="23" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/MerchantService/README.md">
|
|
|
+ <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
|
|
|
+ <state split_layout="SPLIT">
|
|
|
+ <first_editor relative-caret-position="136">
|
|
|
+ <caret line="8" column="9" lean-forward="false" selection-start-line="8" selection-start-column="9" selection-end-line="8" selection-end-column="9" />
|
|
|
+ <folding />
|
|
|
+ </first_editor>
|
|
|
+ <second_editor />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/MerchantService/pom.xml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="218">
|
|
|
+ <caret line="21" column="32" lean-forward="false" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/OrderService/README.md">
|
|
|
+ <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
|
|
|
+ <state split_layout="SPLIT">
|
|
|
+ <first_editor relative-caret-position="136">
|
|
|
+ <caret line="8" column="10" lean-forward="false" selection-start-line="8" selection-start-column="10" selection-end-line="8" selection-end-column="10" />
|
|
|
+ <folding />
|
|
|
+ </first_editor>
|
|
|
+ <second_editor />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/OrderService/pom.xml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="218">
|
|
|
+ <caret line="21" column="32" lean-forward="false" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/PayService/pom.xml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="218">
|
|
|
+ <caret line="21" column="32" lean-forward="false" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/PayService/README.md">
|
|
|
+ <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
|
|
|
+ <state split_layout="SPLIT">
|
|
|
+ <first_editor relative-caret-position="170">
|
|
|
+ <caret line="10" column="11" lean-forward="false" selection-start-line="10" selection-start-column="11" selection-end-line="10" selection-end-column="11" />
|
|
|
+ <folding />
|
|
|
+ </first_editor>
|
|
|
+ <second_editor />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
</component>
|
|
|
</project>
|