kelude / canrd-patent · Commits

Commit 6491ca5a149ea274e6c7f04d728ba2d14d2a1ed6

Authored by maoyangou
1 parent dc9880ae
build: skipped

ignore

Inline Side-by-side
Showing 2 changed files with 39 additions and 92 deletions
.gitignore
  View file @6491ca5
1 # eclipse 1 # eclipse
2 -/.project  
3 -/.classpath  
4 -/.springBeans  
5 -/.settings/ 2 +.project
  3 +.classpath
  4 +.springBeans
  5 +.settings/
6 6
7 # idea 7 # idea
8 -/.idea/  
9 -/*.ipr  
10 -/*.iml  
11 -/*.iws 8 +.idea/
  9 +*.ipr
  10 +*.iml
  11 +*.iws
12 12
13 # p4merge 13 # p4merge
14 *.orig 14 *.orig
15 15
16 # maven 16 # maven
17 -/target/ 17 +target/
18 18
19 # logs 19 # logs
20 -/logs/ 20 +logs/
.idea/workspace.xml
  View file @6491ca5
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="" /> 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>
5 <ignored path="patent.iws" /> 8 <ignored path="patent.iws" />
6 <ignored path=".idea/workspace.xml" /> 9 <ignored path=".idea/workspace.xml" />
7 <ignored path="$PROJECT_DIR$/target/" /> 10 <ignored path="$PROJECT_DIR$/target/" />
@@ -33,18 +36,21 @@ @@ -33,18 +36,21 @@
33 </provider> 36 </provider>
34 </entry> 37 </entry>
35 </file> 38 </file>
36 - <file leaf-file-name="logo.png" pinned="false" current-in-tab="false">  
37 - <entry file="file://$PROJECT_DIR$/src/main/webapp/img/logo.png">  
38 - <provider selected="true" editor-type-id="images">  
39 - <state /> 39 + <file leaf-file-name="generatorConfig.xml" pinned="false" current-in-tab="false">
  40 + <entry file="file://$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml">
  41 + <provider selected="true" editor-type-id="text-editor">
  42 + <state vertical-scroll-proportion="0.0">
  43 + <caret line="9" column="58" selection-start-line="9" selection-start-column="58" selection-end-line="9" selection-end-column="58" />
  44 + <folding />
  45 + </state>
40 </provider> 46 </provider>
41 </entry> 47 </entry>
42 </file> 48 </file>
43 - <file leaf-file-name="generatorConfig.xml" pinned="false" current-in-tab="true">  
44 - <entry file="file://$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml"> 49 + <file leaf-file-name="workspace.xml" pinned="false" current-in-tab="true">
  50 + <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
45 <provider selected="true" editor-type-id="text-editor"> 51 <provider selected="true" editor-type-id="text-editor">
46 - <state vertical-scroll-proportion="0.24150269">  
47 - <caret line="9" column="58" selection-start-line="9" selection-start-column="58" selection-end-line="9" selection-end-column="58" /> 52 + <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" />
48 <folding /> 54 <folding />
49 </state> 55 </state>
50 </provider> 56 </provider>
@@ -144,7 +150,6 @@ @@ -144,7 +150,6 @@
144 <component name="IdeDocumentHistory"> 150 <component name="IdeDocumentHistory">
145 <option name="CHANGED_PATHS"> 151 <option name="CHANGED_PATHS">
146 <list> 152 <list>
147 - <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/enums/PaidTypeEnum.java" />  
148 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.java" /> 153 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.java" />
149 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/TextUtils.java" /> 154 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/TextUtils.java" />
150 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/CasementExample.java" /> 155 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/CasementExample.java" />
@@ -195,6 +200,7 @@ @@ -195,6 +200,7 @@
195 <option value="$PROJECT_DIR$/src/main/webapp/customer_contact.jsp" /> 200 <option value="$PROJECT_DIR$/src/main/webapp/customer_contact.jsp" />
196 <option value="$PROJECT_DIR$/src/main/webapp/pay.jsp" /> 201 <option value="$PROJECT_DIR$/src/main/webapp/pay.jsp" />
197 <option value="$PROJECT_DIR$/src/main/webapp/css/pay.css" /> 202 <option value="$PROJECT_DIR$/src/main/webapp/css/pay.css" />
  203 + <option value="$PROJECT_DIR$/.idea/workspace.xml" />
198 </list> 204 </list>
199 </option> 205 </option>
200 </component> 206 </component>
@@ -336,66 +342,6 @@ @@ -336,66 +342,6 @@
336 <option name="myItemId" value="src" /> 342 <option name="myItemId" value="src" />
337 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 343 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
338 </PATH_ELEMENT> 344 </PATH_ELEMENT>
339 - <PATH_ELEMENT>  
340 - <option name="myItemId" value="test" />  
341 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
342 - </PATH_ELEMENT>  
343 - <PATH_ELEMENT>  
344 - <option name="myItemId" value="resources" />  
345 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
346 - </PATH_ELEMENT>  
347 - </PATH>  
348 - <PATH>  
349 - <PATH_ELEMENT>  
350 - <option name="myItemId" value="patent" />  
351 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
352 - </PATH_ELEMENT>  
353 - <PATH_ELEMENT>  
354 - <option name="myItemId" value="canrd-patent" />  
355 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
356 - </PATH_ELEMENT>  
357 - <PATH_ELEMENT>  
358 - <option name="myItemId" value="src" />  
359 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
360 - </PATH_ELEMENT>  
361 - <PATH_ELEMENT>  
362 - <option name="myItemId" value="test" />  
363 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
364 - </PATH_ELEMENT>  
365 - <PATH_ELEMENT>  
366 - <option name="myItemId" value="resources" />  
367 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
368 - </PATH_ELEMENT>  
369 - <PATH_ELEMENT>  
370 - <option name="myItemId" value="mbg" />  
371 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
372 - </PATH_ELEMENT>  
373 - </PATH>  
374 - <PATH>  
375 - <PATH_ELEMENT>  
376 - <option name="myItemId" value="patent" />  
377 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
378 - </PATH_ELEMENT>  
379 - <PATH_ELEMENT>  
380 - <option name="myItemId" value="canrd-patent" />  
381 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
382 - </PATH_ELEMENT>  
383 - <PATH_ELEMENT>  
384 - <option name="myItemId" value="src" />  
385 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
386 - </PATH_ELEMENT>  
387 - <PATH_ELEMENT>  
388 - <option name="myItemId" value="test" />  
389 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
390 - </PATH_ELEMENT>  
391 - <PATH_ELEMENT>  
392 - <option name="myItemId" value="java" />  
393 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
394 - </PATH_ELEMENT>  
395 - <PATH_ELEMENT>  
396 - <option name="myItemId" value="patent" />  
397 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
398 - </PATH_ELEMENT>  
399 </PATH> 345 </PATH>
400 <PATH> 346 <PATH>
401 <PATH_ELEMENT> 347 <PATH_ELEMENT>
@@ -407,7 +353,7 @@ @@ -407,7 +353,7 @@
407 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 353 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
408 </PATH_ELEMENT> 354 </PATH_ELEMENT>
409 <PATH_ELEMENT> 355 <PATH_ELEMENT>
410 - <option name="myItemId" value="src" /> 356 + <option name="myItemId" value=".idea" />
411 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 357 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
412 </PATH_ELEMENT> 358 </PATH_ELEMENT>
413 </PATH> 359 </PATH>
@@ -908,12 +854,12 @@ @@ -908,12 +854,12 @@
908 <workItem from="1469889447244" duration="6443000" /> 854 <workItem from="1469889447244" duration="6443000" />
909 <workItem from="1470021636578" duration="1324000" /> 855 <workItem from="1470021636578" duration="1324000" />
910 <workItem from="1470843908935" duration="3000" /> 856 <workItem from="1470843908935" duration="3000" />
911 - <workItem from="1471188294361" duration="10035000" /> 857 + <workItem from="1471188294361" duration="10252000" />
912 </task> 858 </task>
913 <servers /> 859 <servers />
914 </component> 860 </component>
915 <component name="TimeTrackingManager"> 861 <component name="TimeTrackingManager">
916 - <option name="totallyTimeSpent" value="113533000" /> 862 + <option name="totallyTimeSpent" value="113750000" />
917 </component> 863 </component>
918 <component name="ToolWindowManager"> 864 <component name="ToolWindowManager">
919 <frame x="1280" y="23" width="1920" height="1057" extended-state="6" /> 865 <frame x="1280" y="23" width="1920" height="1057" extended-state="6" />
@@ -922,7 +868,7 @@ @@ -922,7 +868,7 @@
922 <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 868 <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
923 <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 869 <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
924 <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 870 <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
925 - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.39170983" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 871 + <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.39170983" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
926 <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 872 <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
927 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 873 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
928 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 874 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -997,13 +943,6 @@ @@ -997,13 +943,6 @@
997 <option name="FILTER_TARGETS" value="false" /> 943 <option name="FILTER_TARGETS" value="false" />
998 </component> 944 </component>
999 <component name="editorHistoryManager"> 945 <component name="editorHistoryManager">
1000 - <entry file="file://$PROJECT_DIR$/src/main/webapp/error.jsp">  
1001 - <provider selected="true" editor-type-id="text-editor">  
1002 - <state vertical-scroll-proportion="0.0">  
1003 - <caret line="6" column="58" selection-start-line="6" selection-start-column="58" selection-end-line="6" selection-end-column="58" />  
1004 - </state>  
1005 - </provider>  
1006 - </entry>  
1007 <entry file="file://$PROJECT_DIR$/src/main/webapp/notice.jsp"> 946 <entry file="file://$PROJECT_DIR$/src/main/webapp/notice.jsp">
1008 <provider selected="true" editor-type-id="text-editor"> 947 <provider selected="true" editor-type-id="text-editor">
1009 <state vertical-scroll-proportion="0.0"> 948 <state vertical-scroll-proportion="0.0">
@@ -1348,11 +1287,19 @@ @@ -1348,11 +1287,19 @@
1348 </entry> 1287 </entry>
1349 <entry file="file://$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml"> 1288 <entry file="file://$PROJECT_DIR$/src/test/resources/mbg/generatorConfig.xml">
1350 <provider selected="true" editor-type-id="text-editor"> 1289 <provider selected="true" editor-type-id="text-editor">
1351 - <state vertical-scroll-proportion="0.24150269"> 1290 + <state vertical-scroll-proportion="0.0">
1352 <caret line="9" column="58" selection-start-line="9" selection-start-column="58" selection-end-line="9" selection-end-column="58" /> 1291 <caret line="9" column="58" selection-start-line="9" selection-start-column="58" selection-end-line="9" selection-end-column="58" />
1353 <folding /> 1292 <folding />
1354 </state> 1293 </state>
1355 </provider> 1294 </provider>
1356 </entry> 1295 </entry>
  1296 + <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
  1297 + <provider selected="true" editor-type-id="text-editor">
  1298 + <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" />
  1300 + <folding />
  1301 + </state>
  1302 + </provider>
  1303 + </entry>
1357 </component> 1304 </component>
1358 </project> 1305 </project>
1359 \ No newline at end of file 1306 \ No newline at end of file