Commit 430b24817890515e2c12127170b75524349d9bb3
1 parent
6491ca5a
.gitignore
Showing
2 changed files
with
27 additions
and
28 deletions
.gitignore
| 1 | -# eclipse | ||
| 2 | -.project | ||
| 3 | -.classpath | ||
| 4 | -.springBeans | ||
| 5 | -.settings/ | ||
| 6 | - | ||
| 7 | -# idea | ||
| 8 | -.idea/ | ||
| 9 | -*.ipr | ||
| 10 | -*.iml | ||
| 11 | -*.iws | ||
| 12 | - | ||
| 13 | -# p4merge | ||
| 14 | -*.orig | ||
| 15 | - | ||
| 16 | -# maven | ||
| 17 | -target/ | ||
| 18 | - | ||
| 19 | -# logs | ||
| 20 | -logs/ | 1 | +##maven compile |
| 2 | +**/target/ | ||
| 3 | + | ||
| 4 | +##eclipse files | ||
| 5 | +.classpath | ||
| 6 | +.project | ||
| 7 | +.settings/ | ||
| 8 | + | ||
| 9 | +##idea files | ||
| 10 | +*.iml | ||
| 11 | +.idea/ | ||
| 12 | +*.ipr | ||
| 13 | +*.iws | ||
| 14 | + | ||
| 15 | +##mac files | ||
| 16 | +.DS_Store | ||
| 17 | + | ||
| 18 | +##bak files | ||
| 19 | +*.bak | ||
| 20 | + | ||
| 21 | +##other | ||
| 22 | +CATALINA_BASE_IS_UNDEFINED |
.idea/workspace.xml
| 1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
| 2 | <project version="4"> | 2 | <project version="4"> |
| 3 | <component name="ChangeListManager"> | 3 | <component name="ChangeListManager"> |
| 4 | - <list default="true" id="a8f74803-c7c3-405c-9584-6ffd161452f6" name="Default" comment=""> | ||
| 5 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" /> | ||
| 6 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> | ||
| 7 | - </list> | 4 | + <list default="true" id="a8f74803-c7c3-405c-9584-6ffd161452f6" name="Default" comment="" /> |
| 8 | <ignored path="patent.iws" /> | 5 | <ignored path="patent.iws" /> |
| 9 | <ignored path=".idea/workspace.xml" /> | 6 | <ignored path=".idea/workspace.xml" /> |
| 10 | <ignored path="$PROJECT_DIR$/target/" /> | 7 | <ignored path="$PROJECT_DIR$/target/" /> |
| @@ -50,7 +47,7 @@ | @@ -50,7 +47,7 @@ | ||
| 50 | <entry file="file://$PROJECT_DIR$/.idea/workspace.xml"> | 47 | <entry file="file://$PROJECT_DIR$/.idea/workspace.xml"> |
| 51 | <provider selected="true" editor-type-id="text-editor"> | 48 | <provider selected="true" editor-type-id="text-editor"> |
| 52 | <state vertical-scroll-proportion="0.21466905"> | 49 | <state vertical-scroll-proportion="0.21466905"> |
| 53 | - <caret line="11" column="42" selection-start-line="11" selection-start-column="42" selection-end-line="11" selection-end-column="42" /> | 50 | + <caret line="8" column="41" selection-start-line="8" selection-start-column="41" selection-end-line="8" selection-end-column="41" /> |
| 54 | <folding /> | 51 | <folding /> |
| 55 | </state> | 52 | </state> |
| 56 | </provider> | 53 | </provider> |
| @@ -854,12 +851,12 @@ | @@ -854,12 +851,12 @@ | ||
| 854 | <workItem from="1469889447244" duration="6443000" /> | 851 | <workItem from="1469889447244" duration="6443000" /> |
| 855 | <workItem from="1470021636578" duration="1324000" /> | 852 | <workItem from="1470021636578" duration="1324000" /> |
| 856 | <workItem from="1470843908935" duration="3000" /> | 853 | <workItem from="1470843908935" duration="3000" /> |
| 857 | - <workItem from="1471188294361" duration="10252000" /> | 854 | + <workItem from="1471188294361" duration="10344000" /> |
| 858 | </task> | 855 | </task> |
| 859 | <servers /> | 856 | <servers /> |
| 860 | </component> | 857 | </component> |
| 861 | <component name="TimeTrackingManager"> | 858 | <component name="TimeTrackingManager"> |
| 862 | - <option name="totallyTimeSpent" value="113750000" /> | 859 | + <option name="totallyTimeSpent" value="113842000" /> |
| 863 | </component> | 860 | </component> |
| 864 | <component name="ToolWindowManager"> | 861 | <component name="ToolWindowManager"> |
| 865 | <frame x="1280" y="23" width="1920" height="1057" extended-state="6" /> | 862 | <frame x="1280" y="23" width="1920" height="1057" extended-state="6" /> |
| @@ -1296,7 +1293,7 @@ | @@ -1296,7 +1293,7 @@ | ||
| 1296 | <entry file="file://$PROJECT_DIR$/.idea/workspace.xml"> | 1293 | <entry file="file://$PROJECT_DIR$/.idea/workspace.xml"> |
| 1297 | <provider selected="true" editor-type-id="text-editor"> | 1294 | <provider selected="true" editor-type-id="text-editor"> |
| 1298 | <state vertical-scroll-proportion="0.21466905"> | 1295 | <state vertical-scroll-proportion="0.21466905"> |
| 1299 | - <caret line="11" column="42" selection-start-line="11" selection-start-column="42" selection-end-line="11" selection-end-column="42" /> | 1296 | + <caret line="8" column="41" selection-start-line="8" selection-start-column="41" selection-end-line="8" selection-end-column="41" /> |
| 1300 | <folding /> | 1297 | <folding /> |
| 1301 | </state> | 1298 | </state> |
| 1302 | </provider> | 1299 | </provider> |