From e1507e683132a5e3beadb0e2643d9ba79d4eedff Mon Sep 17 00:00:00 2001
From: XZJ <xingzujian@haomo-studio.com>
Date: Wed, 1 Aug 2018 10:17:21 +0800
Subject: [PATCH] coding
---
.idea/workspace.xml | 384 ++++++++++++++++-----
README.md | 2 +-
dao/pom.xml | 8 +-
deploy.sh | 6 +-
domain/pom.xml | 4 +-
pom.xml | 12 +-
service/pom.xml | 12 +-
web/pom.xml | 16 +-
web/src/main/resources/filePath.properties | 2 +-
9 files changed, 328 insertions(+), 118 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d976947..4ed22f4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,8 +7,6 @@
</component>
<component name="ChangeListManager">
<list default="true" id="25ecaea8-e2ba-4d5b-9049-a2c72815edfc" name="Default" comment="">
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/docs/pdm/org.pdm" />
- <change type="DELETED" beforePath="$PROJECT_DIR$/docs/pdm/milk.pdm" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
<ignored path="$PROJECT_DIR$/web/target/" />
@@ -25,60 +23,68 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/pom.xml">
+ <file leaf-file-name="dev.properties" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/web/src/main/filters/dev.properties">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="105">
- <caret line="7" column="33" lean-forward="false" selection-start-line="7" selection-start-column="33" selection-end-line="7" selection-end-column="33" />
+ <state relative-caret-position="0">
+ <caret line="0" column="42" lean-forward="false" selection-start-line="0" selection-start-column="42" selection-end-line="0" selection-end-column="42" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="dev.properties" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/web/src/main/filters/dev.properties">
+ <file leaf-file-name="EnableSwagger2.class" pinned="false" current-in-tab="false">
+ <entry file="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger2/2.4.0/springfox-swagger2-2.4.0.jar!/springfox/documentation/swagger2/annotations/EnableSwagger2.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="150">
+ <caret line="19" column="34" lean-forward="false" selection-start-line="19" selection-start-column="34" selection-end-line="19" selection-end-column="34" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="org.pdm" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/docs/pdm/org.pdm">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
- <caret line="0" column="42" lean-forward="false" selection-start-line="0" selection-start-column="42" selection-end-line="0" selection-end-column="42" />
+ <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 />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Resp.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/web/src/main/java/com/haomostudio/SpringMVCTemplate/common/Resp.java">
+ <file leaf-file-name=".gitKeep" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/dao/src/main/java/com/haomostudio/SpringMVCTemplate/dao/.gitKeep">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="405">
- <caret line="40" column="45" lean-forward="false" selection-start-line="40" selection-start-column="38" selection-end-line="40" selection-end-column="45" />
+ <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" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="SwaggerConfig.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/web/src/main/java/com/haomostudio/SpringMVCTemplate/SwaggerConfig.java">
+ <file leaf-file-name=".gitKeep" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/domain/src/main/java/com/haomostudio/SpringMVCTemplate/po/.gitKeep">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="90">
- <caret line="8" column="7" lean-forward="false" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <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" />
+ <folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="EnableSwagger2.class" pinned="false" current-in-tab="false">
- <entry file="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger2/2.4.0/springfox-swagger2-2.4.0.jar!/springfox/documentation/swagger2/annotations/EnableSwagger2.class">
+ <file leaf-file-name=".gitKeep" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/domain/src/main/java/com/haomostudio/SpringMVCTemplate/vo/.gitKeep">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="150">
- <caret line="19" column="34" lean-forward="false" selection-start-line="19" selection-start-column="34" selection-end-line="19" selection-end-column="34" />
+ <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" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="org.pdm" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/docs/pdm/org.pdm">
+ <file leaf-file-name=".gitKeep" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/service/src/main/java/com/haomostudio/SpringMVCTemplate/service/impl/.gitKeep">
<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" />
@@ -87,21 +93,31 @@
</provider>
</entry>
</file>
- <file leaf-file-name="PropertyConfigurer.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/web/src/main/java/com/haomostudio/SpringMVCTemplate/common/PropertyConfigurer.java">
+ <file leaf-file-name=".gitKeep" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/service/src/main/java/com/haomostudio/SpringMVCTemplate/service/.gitKeep">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="165">
- <caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+ <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" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="MyJob.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/web/src/main/java/com/haomostudio/SpringMVCTemplate/common/MyJob.java">
+ <file leaf-file-name=".gitKeep" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/web/src/main/java/com/haomostudio/SpringMVCTemplate/controller/.gitKeep">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="120">
- <caret line="11" column="13" lean-forward="false" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name=".gitKeep" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/web/src/main/resources/mybatis/com/haomostudio/SpringMVCTemplate/.gitKeep">
+ <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" />
<folding />
</state>
</provider>
@@ -152,7 +168,7 @@
<select />
</treeState>
</component>
- <component name="ProjectFrameBounds" extendedState="6" fullScreen="true">
+ <component name="ProjectFrameBounds">
<option name="y" value="23" />
<option name="width" value="1404" />
<option name="height" value="877" />
@@ -574,8 +590,10 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="Scratches" />
+ <pane id="Scope" />
<pane id="AndroidView" />
+ <pane id="PackagesPane" />
+ <pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -586,59 +604,33 @@
<path>
<item name="milk" type="b2602c69:ProjectViewProjectNode" />
<item name="SpringMVCTemplate" type="462c0819:PsiDirectoryNode" />
- <item name="docs" type="462c0819:PsiDirectoryNode" />
+ <item name="web" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="milk" type="b2602c69:ProjectViewProjectNode" />
<item name="SpringMVCTemplate" type="462c0819:PsiDirectoryNode" />
- <item name="domain" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="milk" type="b2602c69:ProjectViewProjectNode" />
- <item name="SpringMVCTemplate" type="462c0819:PsiDirectoryNode" />
- <item name="domain" type="462c0819:PsiDirectoryNode" />
+ <item name="web" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="milk" type="b2602c69:ProjectViewProjectNode" />
<item name="SpringMVCTemplate" type="462c0819:PsiDirectoryNode" />
- <item name="domain" type="462c0819:PsiDirectoryNode" />
+ <item name="web" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="milk" type="b2602c69:ProjectViewProjectNode" />
<item name="SpringMVCTemplate" type="462c0819:PsiDirectoryNode" />
- <item name="domain" type="462c0819:PsiDirectoryNode" />
+ <item name="web" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="java" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="milk" type="b2602c69:ProjectViewProjectNode" />
- <item name="SpringMVCTemplate" type="462c0819:PsiDirectoryNode" />
- <item name="domain" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="java" type="462c0819:PsiDirectoryNode" />
- <item name="haomostudio" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="milk" type="b2602c69:ProjectViewProjectNode" />
- <item name="SpringMVCTemplate" type="462c0819:PsiDirectoryNode" />
- <item name="domain" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="java" type="462c0819:PsiDirectoryNode" />
- <item name="haomostudio" type="462c0819:PsiDirectoryNode" />
- <item name="SpringMVCTemplate" type="462c0819:PsiDirectoryNode" />
+ <item name="filters" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
- <pane id="Scope" />
- <pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -650,7 +642,11 @@
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
- <recent name="$PROJECT_DIR$/docs/pdm" />
+ <recent name="$PROJECT_DIR$/web/src/main/resources/mybatis/com/haomostudio/SpringMVCTemplate" />
+ <recent name="$PROJECT_DIR$/web/src/main/java/com/haomostudio/SpringMVCTemplate/controller" />
+ <recent name="$PROJECT_DIR$/service/src/main/java/com/haomostudio/SpringMVCTemplate/service" />
+ <recent name="$PROJECT_DIR$/service/src/main/java/com/haomostudio/SpringMVCTemplate/service/impl" />
+ <recent name="$PROJECT_DIR$/domain/src/main/java/com/haomostudio/SpringMVCTemplate/vo" />
</key>
</component>
<component name="RunDashboard">
@@ -877,15 +873,17 @@
<option name="presentableId" value="Default" />
<updated>1532932228765</updated>
<workItem from="1532932231682" duration="2048000" />
- <workItem from="1532945465137" duration="388000" />
+ <workItem from="1532945465137" duration="479000" />
+ <workItem from="1532946141002" duration="8000" />
+ <workItem from="1533089616010" duration="14000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="2436000" />
+ <option name="totallyTimeSpent" value="2549000" />
</component>
<component name="ToolWindowManager">
- <frame x="0" y="0" width="1440" height="900" extended-state="6" />
+ <frame x="0" y="23" width="1404" height="877" extended-state="0" />
<layout>
<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="3" 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="7" side_tool="true" content_ui="tabs" />
@@ -908,8 +906,8 @@
<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="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="7" 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="7" side_tool="false" content_ui="tabs" />
- <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.329602" sideWeight="0.5" order="7" 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.2811159" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+ <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32938075" 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="true" show_stripe_button="true" weight="0.28854626" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Web" 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="2" side_tool="true" content_ui="tabs" />
<window_info id="Theme Preview" 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="3" 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="2" side_tool="true" content_ui="tabs" />
@@ -933,6 +931,168 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
+ <entry file="file://$PROJECT_DIR$/web/src/main/filters/dev.properties">
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger2/2.4.0/springfox-swagger2-2.4.0.jar!/springfox/documentation/swagger2/annotations/EnableSwagger2.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="150">
+ <caret line="19" column="34" lean-forward="false" selection-start-line="19" selection-start-column="34" selection-end-line="19" selection-end-column="34" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/docs/pdm/org.pdm">
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/dao/src/main/java/com/haomostudio/SpringMVCTemplate/dao/.gitKeep">
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/domain/src/main/java/com/haomostudio/SpringMVCTemplate/po/.gitKeep">
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/domain/src/main/java/com/haomostudio/SpringMVCTemplate/vo/.gitKeep">
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/service/src/main/java/com/haomostudio/SpringMVCTemplate/service/impl/.gitKeep">
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/service/src/main/java/com/haomostudio/SpringMVCTemplate/service/.gitKeep">
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/web/src/main/java/com/haomostudio/SpringMVCTemplate/controller/.gitKeep">
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/web/src/main/resources/mybatis/com/haomostudio/SpringMVCTemplate/.gitKeep">
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/web/src/main/java/com/haomostudio/SpringMVCTemplate/SwaggerConfig.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="90">
+ <caret line="8" column="7" lean-forward="false" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger2/2.4.0/springfox-swagger2-2.4.0.jar!/springfox/documentation/swagger2/annotations/EnableSwagger2.class">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="150">
+ <caret line="19" column="34" lean-forward="false" selection-start-line="19" selection-start-column="34" selection-end-line="19" selection-end-column="34" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/docs/pdm/org.pdm">
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/dao/src/main/java/com/haomostudio/SpringMVCTemplate/dao/.gitKeep">
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/domain/src/main/java/com/haomostudio/SpringMVCTemplate/po/.gitKeep">
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/domain/src/main/java/com/haomostudio/SpringMVCTemplate/vo/.gitKeep">
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/service/src/main/java/com/haomostudio/SpringMVCTemplate/service/impl/.gitKeep">
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/service/src/main/java/com/haomostudio/SpringMVCTemplate/service/.gitKeep">
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/web/src/main/java/com/haomostudio/SpringMVCTemplate/controller/.gitKeep">
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/web/src/main/resources/mybatis/com/haomostudio/SpringMVCTemplate/.gitKeep">
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
@@ -953,7 +1113,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405">
<caret line="40" column="45" lean-forward="false" selection-start-line="40" selection-start-column="38" selection-end-line="40" selection-end-column="45" />
- <folding />
</state>
</provider>
</entry>
@@ -971,7 +1130,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
- <folding />
</state>
</provider>
</entry>
@@ -979,7 +1137,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="11" column="13" lean-forward="false" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
- <folding />
</state>
</provider>
</entry>
@@ -999,19 +1156,10 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/web/src/main/filters/dev.properties">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="42" lean-forward="false" selection-start-line="0" selection-start-column="42" selection-end-line="0" selection-end-column="42" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/web/src/main/java/com/haomostudio/SpringMVCTemplate/common/PropertyConfigurer.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
- <folding />
</state>
</provider>
</entry>
@@ -1019,7 +1167,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="11" column="13" lean-forward="false" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
- <folding />
</state>
</provider>
</entry>
@@ -1027,7 +1174,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405">
<caret line="40" column="45" lean-forward="false" selection-start-line="40" selection-start-column="38" selection-end-line="40" selection-end-column="45" />
- <folding />
</state>
</provider>
</entry>
@@ -1057,6 +1203,70 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/dao/src/main/java/com/haomostudio/SpringMVCTemplate/dao/.gitKeep">
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/domain/src/main/java/com/haomostudio/SpringMVCTemplate/po/.gitKeep">
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/domain/src/main/java/com/haomostudio/SpringMVCTemplate/vo/.gitKeep">
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/service/src/main/java/com/haomostudio/SpringMVCTemplate/service/impl/.gitKeep">
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/service/src/main/java/com/haomostudio/SpringMVCTemplate/service/.gitKeep">
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/web/src/main/java/com/haomostudio/SpringMVCTemplate/controller/.gitKeep">
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/web/src/main/resources/mybatis/com/haomostudio/SpringMVCTemplate/.gitKeep">
+ <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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/web/src/main/filters/dev.properties">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="0">
+ <caret line="0" column="42" lean-forward="false" selection-start-line="0" selection-start-column="42" selection-end-line="0" selection-end-column="42" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
</component>
<component name="masterDetails">
<states>
diff --git a/README.md b/README.md
index 126268f..e00d55d 100644
--- a/README.md
+++ b/README.md
@@ -21,5 +21,5 @@ mvn install:install-file -Dfile=docs/jar/excel-1.1.1-SNAPSHOT.jar -DgroupId=exc
>jar项目维护在gitlab.haomo-studio.com上的excel-jar的项目
->使用请看的demo请看：web/src/main/test/com/haomostudio/milk/test/Test.java
+>使用请看的demo请看：web/src/main/test/com/haomostudio/SpringMVCTemplate/test/Test.java
diff --git a/dao/pom.xml b/dao/pom.xml
index fc9029c..385827b 100755
--- a/dao/pom.xml
+++ b/dao/pom.xml
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>com.haomostudio.milk</groupId>
- <artifactId>milk</artifactId>
+ <groupId>com.haomostudio.SpringMVCTemplate</groupId>
+ <artifactId>SpringMVCTemplate</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
@@ -21,9 +21,9 @@
<dependencies>
<dependency>
- <groupId>com.haomostudio.milk</groupId>
+ <groupId>com.haomostudio.SpringMVCTemplate</groupId>
<artifactId>domain</artifactId>
- <version>${milk.domain.version}</version>
+ <version>${SpringMVCTemplate.domain.version}</version>
</dependency>
</dependencies>
diff --git a/deploy.sh b/deploy.sh
index 84f2794..d03f564 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-#rsync -avz web/target/milk.war member@tentop.com.cn:/opt/tomcat8/webapps/milk.war
-#rsync -avz web/target/milk.war member@haomo-tech.com:/data/tomcat/webapps/milk.war
+#rsync -avz web/target/SpringMVCTemplate.war member@tentop.com.cn:/opt/tomcat8/webapps/SpringMVCTemplate.war
+#rsync -avz web/target/SpringMVCTemplate.war member@haomo-tech.com:/data/tomcat/webapps/SpringMVCTemplate.war
-rsync -avz -e "ssh -p12322" web/target/milk.war haomo@haomo-studio.com:/opt/hm_tomcat/webapps
\ No newline at end of file
+rsync -avz -e "ssh -p12322" web/target/SpringMVCTemplate.war haomo@haomo-studio.com:/opt/hm_tomcat/webapps
\ No newline at end of file
diff --git a/domain/pom.xml b/domain/pom.xml
index 22701dc..6320925 100755
--- a/domain/pom.xml
+++ b/domain/pom.xml
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>com.haomostudio.milk</groupId>
- <artifactId>milk</artifactId>
+ <groupId>com.haomostudio.SpringMVCTemplate</groupId>
+ <artifactId>SpringMVCTemplate</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
diff --git a/pom.xml b/pom.xml
index 6832089..69ff551 100755
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>com.haomostudio.milk</groupId>
+ <groupId>com.haomostudio.SpringMVCTemplate</groupId>
<artifactId>SpringMVCTemplate</artifactId>
<packaging>pom</packaging>
<version>0.0.1-SNAPSHOT</version>
@@ -16,10 +16,10 @@
</modules>
<properties>
- <milk.web.version>0.0.1-SNAPSHOT</milk.web.version>
- <milk.service.version>0.0.1-SNAPSHOT</milk.service.version>
- <milk.dao.version>0.0.1-SNAPSHOT</milk.dao.version>
- <milk.domain.version>0.0.1-SNAPSHOT</milk.domain.version>
+ <SpringMVCTemplate.web.version>0.0.1-SNAPSHOT</SpringMVCTemplate.web.version>
+ <SpringMVCTemplate.service.version>0.0.1-SNAPSHOT</SpringMVCTemplate.service.version>
+ <SpringMVCTemplate.dao.version>0.0.1-SNAPSHOT</SpringMVCTemplate.dao.version>
+ <SpringMVCTemplate.domain.version>0.0.1-SNAPSHOT</SpringMVCTemplate.domain.version>
<spring.version>4.1.4.RELEASE</spring.version>
<spring-data-jpa.version>1.9.1.RELEASE</spring-data-jpa.version>
<jackson.version>2.5.0</jackson.version>
@@ -506,7 +506,7 @@
<artifactId>maven-war-plugin</artifactId>
<version>2.4</version>
<configuration>
- <warName>milk</warName>
+ <warName>SpringMVCTemplate</warName>
<webXml>src/main/resources/webapp/WEB-INF/web.xml</webXml>
</configuration>
</plugin>
diff --git a/service/pom.xml b/service/pom.xml
index 214fd72..5b430f6 100755
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>com.haomostudio.milk</groupId>
- <artifactId>milk</artifactId>
+ <groupId>com.haomostudio.SpringMVCTemplate</groupId>
+ <artifactId>SpringMVCTemplate</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
@@ -21,14 +21,14 @@
<dependencies>
<dependency>
- <groupId>com.haomostudio.milk</groupId>
+ <groupId>com.haomostudio.SpringMVCTemplate</groupId>
<artifactId>dao</artifactId>
- <version>${milk.dao.version}</version>
+ <version>${SpringMVCTemplate.dao.version}</version>
</dependency>
<dependency>
- <groupId>com.haomostudio.milk</groupId>
+ <groupId>com.haomostudio.SpringMVCTemplate</groupId>
<artifactId>domain</artifactId>
- <version>${milk.dao.version}</version>
+ <version>${SpringMVCTemplate.dao.version}</version>
</dependency>
<dependency>
<groupId>com.sap</groupId>
diff --git a/web/pom.xml b/web/pom.xml
index 7050a76..330c3d9 100755
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>com.haomostudio.milk</groupId>
- <artifactId>milk</artifactId>
+ <groupId>com.haomostudio.SpringMVCTemplate</groupId>
+ <artifactId>SpringMVCTemplate</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
@@ -20,19 +20,19 @@
<dependencies>
<dependency>
- <groupId>com.haomostudio.milk</groupId>
+ <groupId>com.haomostudio.SpringMVCTemplate</groupId>
<artifactId>service</artifactId>
- <version>${milk.service.version}</version>
+ <version>${SpringMVCTemplate.service.version}</version>
</dependency>
<dependency>
- <groupId>com.haomostudio.milk</groupId>
+ <groupId>com.haomostudio.SpringMVCTemplate</groupId>
<artifactId>dao</artifactId>
- <version>${milk.dao.version}</version>
+ <version>${SpringMVCTemplate.dao.version}</version>
</dependency>
<dependency>
- <groupId>com.haomostudio.milk</groupId>
+ <groupId>com.haomostudio.SpringMVCTemplate</groupId>
<artifactId>domain</artifactId>
- <version>${milk.domain.version}</version>
+ <version>${SpringMVCTemplate.domain.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
diff --git a/web/src/main/resources/filePath.properties b/web/src/main/resources/filePath.properties
index b55b3b4..6819fd4 100755
--- a/web/src/main/resources/filePath.properties
+++ b/web/src/main/resources/filePath.properties
@@ -1,4 +1,4 @@
#upload_file_path=/Users/haomo/Desktop/
-upload_file_path=/root/hm_tomcat/webapps/file/milk/
+upload_file_path=/root/hm_tomcat/webapps/file/SpringMVCTemplate/
#pdf_export_path=/Users/liuranran/Tomcat8/
\ No newline at end of file
--
2.21.0