Commit bf2c591d891c624388d8a61522a44969e76bd95d
1 parent
eea38b8a
style
Showing
4 changed files
with
164 additions
and
52 deletions
.idea/workspace.xml
@@ -2,22 +2,7 @@ | @@ -2,22 +2,7 @@ | ||
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="DELETED" beforePath="$PROJECT_DIR$/src/main/webapp/fragments/footer.html" afterPath="" /> | ||
6 | - <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/webapp/fragments/header.html" afterPath="" /> | ||
7 | - <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/webapp/fragments/user-side-bar.html" afterPath="" /> | ||
8 | - <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/META-INF/MANIFEST.MF" afterPath="" /> | ||
9 | - <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/css/zhuanli-index.css" afterPath="" /> | ||
10 | - <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/fragments/footer.html" afterPath="" /> | ||
11 | - <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/fragments/header.html" afterPath="" /> | ||
12 | - <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/fragments/user-side-bar.html" afterPath="" /> | ||
13 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent.war" afterPath="$PROJECT_DIR$/target/patent.war" /> | ||
14 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/css/case-manage.css" afterPath="$PROJECT_DIR$/target/patent/css/case-manage.css" /> | ||
15 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" /> | ||
16 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/doc/sql/ddl.sql" afterPath="$PROJECT_DIR$/doc/sql/ddl.sql" /> | ||
17 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/test-classes/mbg/generatorConfig.xml" afterPath="$PROJECT_DIR$/target/test-classes/mbg/generatorConfig.xml" /> | ||
18 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" /> | ||
19 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/maven-archiver/pom.properties" afterPath="$PROJECT_DIR$/target/maven-archiver/pom.properties" /> | ||
20 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> | 5 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/index.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/index.jsp" /> |
21 | </list> | 6 | </list> |
22 | <ignored path="patent.iws" /> | 7 | <ignored path="patent.iws" /> |
23 | <ignored path=".idea/workspace.xml" /> | 8 | <ignored path=".idea/workspace.xml" /> |
@@ -60,11 +45,41 @@ | @@ -60,11 +45,41 @@ | ||
60 | </provider> | 45 | </provider> |
61 | </entry> | 46 | </entry> |
62 | </file> | 47 | </file> |
63 | - <file leaf-file-name="Untitled.sql" pinned="false" current-in-tab="true"> | 48 | + <file leaf-file-name="Untitled.sql" pinned="false" current-in-tab="false"> |
64 | <entry file="file://$PROJECT_DIR$/doc/sql/Untitled.sql"> | 49 | <entry file="file://$PROJECT_DIR$/doc/sql/Untitled.sql"> |
65 | <provider selected="true" editor-type-id="text-editor"> | 50 | <provider selected="true" editor-type-id="text-editor"> |
66 | - <state vertical-scroll-proportion="0.34330985"> | ||
67 | - <caret line="13" column="22" selection-start-line="13" selection-start-column="22" selection-end-line="13" selection-end-column="22" /> | 51 | + <state vertical-scroll-proportion="-2.2222223"> |
52 | + <caret line="8" column="39" selection-start-line="8" selection-start-column="39" selection-end-line="8" selection-end-column="39" /> | ||
53 | + <folding /> | ||
54 | + </state> | ||
55 | + </provider> | ||
56 | + </entry> | ||
57 | + </file> | ||
58 | + <file leaf-file-name="fdfs.properties" pinned="false" current-in-tab="false"> | ||
59 | + <entry file="file://$PROJECT_DIR$/src/main/resources.local/props/fdfs.properties"> | ||
60 | + <provider selected="true" editor-type-id="text-editor"> | ||
61 | + <state vertical-scroll-proportion="0.0"> | ||
62 | + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | ||
63 | + <folding /> | ||
64 | + </state> | ||
65 | + </provider> | ||
66 | + </entry> | ||
67 | + </file> | ||
68 | + <file leaf-file-name="jdbc.properties" pinned="false" current-in-tab="false"> | ||
69 | + <entry file="file://$PROJECT_DIR$/src/main/resources.local/props/jdbc.properties"> | ||
70 | + <provider selected="true" editor-type-id="text-editor"> | ||
71 | + <state vertical-scroll-proportion="0.0"> | ||
72 | + <caret line="1" column="51" selection-start-line="1" selection-start-column="45" selection-end-line="1" selection-end-column="51" /> | ||
73 | + <folding /> | ||
74 | + </state> | ||
75 | + </provider> | ||
76 | + </entry> | ||
77 | + </file> | ||
78 | + <file leaf-file-name="index.jsp" pinned="false" current-in-tab="true"> | ||
79 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp"> | ||
80 | + <provider selected="true" editor-type-id="text-editor"> | ||
81 | + <state vertical-scroll-proportion="0.18844222"> | ||
82 | + <caret line="6" column="66" selection-start-line="6" selection-start-column="66" selection-end-line="6" selection-end-column="66" /> | ||
68 | <folding /> | 83 | <folding /> |
69 | </state> | 84 | </state> |
70 | </provider> | 85 | </provider> |
@@ -94,7 +109,6 @@ | @@ -94,7 +109,6 @@ | ||
94 | <component name="IdeDocumentHistory"> | 109 | <component name="IdeDocumentHistory"> |
95 | <option name="CHANGED_PATHS"> | 110 | <option name="CHANGED_PATHS"> |
96 | <list> | 111 | <list> |
97 | - <option value="$PROJECT_DIR$/src/main/webapp/include/header.jsp" /> | ||
98 | <option value="$PROJECT_DIR$/src/main/webapp/include/footer.jsp" /> | 112 | <option value="$PROJECT_DIR$/src/main/webapp/include/footer.jsp" /> |
99 | <option value="$PROJECT_DIR$/src/main/webapp/case-manage.jsp" /> | 113 | <option value="$PROJECT_DIR$/src/main/webapp/case-manage.jsp" /> |
100 | <option value="$PROJECT_DIR$/src/main/webapp/css/home.css" /> | 114 | <option value="$PROJECT_DIR$/src/main/webapp/css/home.css" /> |
@@ -145,6 +159,7 @@ | @@ -145,6 +159,7 @@ | ||
145 | <option value="$PROJECT_DIR$/src/main/webapp/case_manage.jsp" /> | 159 | <option value="$PROJECT_DIR$/src/main/webapp/case_manage.jsp" /> |
146 | <option value="$PROJECT_DIR$/src/main/webapp/css/case-manage.css" /> | 160 | <option value="$PROJECT_DIR$/src/main/webapp/css/case-manage.css" /> |
147 | <option value="$PROJECT_DIR$/doc/sql/ddl.sql" /> | 161 | <option value="$PROJECT_DIR$/doc/sql/ddl.sql" /> |
162 | + <option value="$PROJECT_DIR$/src/main/webapp/index.jsp" /> | ||
148 | </list> | 163 | </list> |
149 | </option> | 164 | </option> |
150 | </component> | 165 | </component> |
@@ -306,6 +321,98 @@ | @@ -306,6 +321,98 @@ | ||
306 | <option name="myItemId" value="main" /> | 321 | <option name="myItemId" value="main" /> |
307 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | 322 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
308 | </PATH_ELEMENT> | 323 | </PATH_ELEMENT> |
324 | + <PATH_ELEMENT> | ||
325 | + <option name="myItemId" value="webapp" /> | ||
326 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
327 | + </PATH_ELEMENT> | ||
328 | + </PATH> | ||
329 | + <PATH> | ||
330 | + <PATH_ELEMENT> | ||
331 | + <option name="myItemId" value="patent" /> | ||
332 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
333 | + </PATH_ELEMENT> | ||
334 | + <PATH_ELEMENT> | ||
335 | + <option name="myItemId" value="canrd-patent" /> | ||
336 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
337 | + </PATH_ELEMENT> | ||
338 | + <PATH_ELEMENT> | ||
339 | + <option name="myItemId" value="src" /> | ||
340 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
341 | + </PATH_ELEMENT> | ||
342 | + <PATH_ELEMENT> | ||
343 | + <option name="myItemId" value="main" /> | ||
344 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
345 | + </PATH_ELEMENT> | ||
346 | + <PATH_ELEMENT> | ||
347 | + <option name="myItemId" value="webapp" /> | ||
348 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
349 | + </PATH_ELEMENT> | ||
350 | + <PATH_ELEMENT> | ||
351 | + <option name="myItemId" value="css" /> | ||
352 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
353 | + </PATH_ELEMENT> | ||
354 | + </PATH> | ||
355 | + <PATH> | ||
356 | + <PATH_ELEMENT> | ||
357 | + <option name="myItemId" value="patent" /> | ||
358 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
359 | + </PATH_ELEMENT> | ||
360 | + <PATH_ELEMENT> | ||
361 | + <option name="myItemId" value="canrd-patent" /> | ||
362 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
363 | + </PATH_ELEMENT> | ||
364 | + <PATH_ELEMENT> | ||
365 | + <option name="myItemId" value="src" /> | ||
366 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
367 | + </PATH_ELEMENT> | ||
368 | + <PATH_ELEMENT> | ||
369 | + <option name="myItemId" value="main" /> | ||
370 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
371 | + </PATH_ELEMENT> | ||
372 | + </PATH> | ||
373 | + <PATH> | ||
374 | + <PATH_ELEMENT> | ||
375 | + <option name="myItemId" value="patent" /> | ||
376 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
377 | + </PATH_ELEMENT> | ||
378 | + <PATH_ELEMENT> | ||
379 | + <option name="myItemId" value="canrd-patent" /> | ||
380 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
381 | + </PATH_ELEMENT> | ||
382 | + <PATH_ELEMENT> | ||
383 | + <option name="myItemId" value="src" /> | ||
384 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
385 | + </PATH_ELEMENT> | ||
386 | + <PATH_ELEMENT> | ||
387 | + <option name="myItemId" value="main" /> | ||
388 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
389 | + </PATH_ELEMENT> | ||
390 | + <PATH_ELEMENT> | ||
391 | + <option name="myItemId" value="resources.local" /> | ||
392 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
393 | + </PATH_ELEMENT> | ||
394 | + </PATH> | ||
395 | + <PATH> | ||
396 | + <PATH_ELEMENT> | ||
397 | + <option name="myItemId" value="patent" /> | ||
398 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | ||
399 | + </PATH_ELEMENT> | ||
400 | + <PATH_ELEMENT> | ||
401 | + <option name="myItemId" value="canrd-patent" /> | ||
402 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
403 | + </PATH_ELEMENT> | ||
404 | + <PATH_ELEMENT> | ||
405 | + <option name="myItemId" value="src" /> | ||
406 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
407 | + </PATH_ELEMENT> | ||
408 | + <PATH_ELEMENT> | ||
409 | + <option name="myItemId" value="main" /> | ||
410 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
411 | + </PATH_ELEMENT> | ||
412 | + <PATH_ELEMENT> | ||
413 | + <option name="myItemId" value="resources.dev" /> | ||
414 | + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | ||
415 | + </PATH_ELEMENT> | ||
309 | </PATH> | 416 | </PATH> |
310 | <PATH> | 417 | <PATH> |
311 | <PATH_ELEMENT> | 418 | <PATH_ELEMENT> |
@@ -830,28 +937,30 @@ | @@ -830,28 +937,30 @@ | ||
830 | <workItem from="1469242140776" duration="1637000" /> | 937 | <workItem from="1469242140776" duration="1637000" /> |
831 | <workItem from="1469243959439" duration="3683000" /> | 938 | <workItem from="1469243959439" duration="3683000" /> |
832 | <workItem from="1469260205882" duration="12837000" /> | 939 | <workItem from="1469260205882" duration="12837000" /> |
833 | - <workItem from="1469585749367" duration="704000" /> | 940 | + <workItem from="1469585749367" duration="1353000" /> |
834 | </task> | 941 | </task> |
835 | <servers /> | 942 | <servers /> |
836 | </component> | 943 | </component> |
837 | <component name="TimeTrackingManager"> | 944 | <component name="TimeTrackingManager"> |
838 | - <option name="totallyTimeSpent" value="95079000" /> | 945 | + <option name="totallyTimeSpent" value="95728000" /> |
839 | </component> | 946 | </component> |
840 | <component name="ToolWindowManager"> | 947 | <component name="ToolWindowManager"> |
841 | - <frame x="1280" y="23" width="1920" height="1057" extended-state="7" /> | 948 | + <frame x="1280" y="23" width="1920" height="1057" extended-state="6" /> |
842 | <editor active="true" /> | 949 | <editor active="true" /> |
843 | <layout> | 950 | <layout> |
844 | <window_info id="Palette	" 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" /> | 951 | <window_info id="Palette	" 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" /> |
845 | <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" /> | 952 | <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" /> |
846 | <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" /> | 953 | <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" /> |
847 | - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32642487" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | 954 | + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.55129534" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> |
848 | <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" /> | 955 | <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" /> |
849 | <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" /> | 956 | <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" /> |
850 | <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" /> | 957 | <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" /> |
851 | <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | 958 | <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> |
959 | + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.53367877" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> | ||
852 | <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> | 960 | <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> |
853 | <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> | 961 | <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> |
854 | <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32953367" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | 962 | <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32953367" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> |
963 | + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.44974095" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | ||
855 | <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> | 964 | <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> |
856 | <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> | 965 | <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> |
857 | <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> | 966 | <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> |
@@ -863,8 +972,6 @@ | @@ -863,8 +972,6 @@ | ||
863 | <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> | 972 | <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> |
864 | <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> | 973 | <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> |
865 | <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3896373" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> | 974 | <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3896373" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> |
866 | - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.53367877" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> | ||
867 | - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.44974095" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | ||
868 | <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> | 975 | <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> |
869 | <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> | 976 | <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> |
870 | </layout> | 977 | </layout> |
@@ -919,18 +1026,11 @@ | @@ -919,18 +1026,11 @@ | ||
919 | <option name="FILTER_TARGETS" value="false" /> | 1026 | <option name="FILTER_TARGETS" value="false" /> |
920 | </component> | 1027 | </component> |
921 | <component name="editorHistoryManager"> | 1028 | <component name="editorHistoryManager"> |
922 | - <entry file="file://$PROJECT_DIR$/pom.xml"> | ||
923 | - <provider selected="true" editor-type-id="text-editor"> | ||
924 | - <state vertical-scroll-proportion="0.0"> | ||
925 | - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | ||
926 | - <folding /> | ||
927 | - </state> | ||
928 | - </provider> | ||
929 | - </entry> | ||
930 | <entry file="jar://$APPLICATION_HOME_DIR$/lib/idea.jar!/resources/html5-schema/html5/block.rnc"> | 1029 | <entry file="jar://$APPLICATION_HOME_DIR$/lib/idea.jar!/resources/html5-schema/html5/block.rnc"> |
931 | <provider selected="true" editor-type-id="text-editor"> | 1030 | <provider selected="true" editor-type-id="text-editor"> |
932 | <state vertical-scroll-proportion="0.0"> | 1031 | <state vertical-scroll-proportion="0.0"> |
933 | <caret line="12" column="16" selection-start-line="12" selection-start-column="16" selection-end-line="12" selection-end-column="16" /> | 1032 | <caret line="12" column="16" selection-start-line="12" selection-start-column="16" selection-end-line="12" selection-end-column="16" /> |
1033 | + <folding /> | ||
934 | </state> | 1034 | </state> |
935 | </provider> | 1035 | </provider> |
936 | </entry> | 1036 | </entry> |
@@ -952,6 +1052,7 @@ | @@ -952,6 +1052,7 @@ | ||
952 | <provider selected="true" editor-type-id="text-editor"> | 1052 | <provider selected="true" editor-type-id="text-editor"> |
953 | <state vertical-scroll-proportion="-6.111111"> | 1053 | <state vertical-scroll-proportion="-6.111111"> |
954 | <caret line="11" column="43" selection-start-line="11" selection-start-column="43" selection-end-line="11" selection-end-column="43" /> | 1054 | <caret line="11" column="43" selection-start-line="11" selection-start-column="43" selection-end-line="11" selection-end-column="43" /> |
1055 | + <folding /> | ||
955 | </state> | 1056 | </state> |
956 | </provider> | 1057 | </provider> |
957 | </entry> | 1058 | </entry> |
@@ -994,6 +1095,7 @@ | @@ -994,6 +1095,7 @@ | ||
994 | <provider selected="true" editor-type-id="text-editor"> | 1095 | <provider selected="true" editor-type-id="text-editor"> |
995 | <state vertical-scroll-proportion="0.0"> | 1096 | <state vertical-scroll-proportion="0.0"> |
996 | <caret line="51" column="204" selection-start-line="51" selection-start-column="13" selection-end-line="51" selection-end-column="204" /> | 1097 | <caret line="51" column="204" selection-start-line="51" selection-start-column="13" selection-end-line="51" selection-end-column="204" /> |
1098 | + <folding /> | ||
997 | </state> | 1099 | </state> |
998 | </provider> | 1100 | </provider> |
999 | </entry> | 1101 | </entry> |
@@ -1165,13 +1267,6 @@ | @@ -1165,13 +1267,6 @@ | ||
1165 | </state> | 1267 | </state> |
1166 | </provider> | 1268 | </provider> |
1167 | </entry> | 1269 | </entry> |
1168 | - <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp"> | ||
1169 | - <provider selected="true" editor-type-id="text-editor"> | ||
1170 | - <state vertical-scroll-proportion="-3.75"> | ||
1171 | - <caret line="6" column="64" selection-start-line="6" selection-start-column="64" selection-end-line="6" selection-end-column="64" /> | ||
1172 | - </state> | ||
1173 | - </provider> | ||
1174 | - </entry> | ||
1175 | <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp"> | 1270 | <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp"> |
1176 | <provider selected="true" editor-type-id="text-editor"> | 1271 | <provider selected="true" editor-type-id="text-editor"> |
1177 | <state vertical-scroll-proportion="0.9375"> | 1272 | <state vertical-scroll-proportion="0.9375"> |
@@ -1239,13 +1334,6 @@ | @@ -1239,13 +1334,6 @@ | ||
1239 | <state /> | 1334 | <state /> |
1240 | </provider> | 1335 | </provider> |
1241 | </entry> | 1336 | </entry> |
1242 | - <entry file="file://$PROJECT_DIR$/src/main/resources.local/props/jdbc.properties"> | ||
1243 | - <provider selected="true" editor-type-id="text-editor"> | ||
1244 | - <state vertical-scroll-proportion="0.0"> | ||
1245 | - <caret line="1" column="51" selection-start-line="1" selection-start-column="45" selection-end-line="1" selection-end-column="51" /> | ||
1246 | - </state> | ||
1247 | - </provider> | ||
1248 | - </entry> | ||
1249 | <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HelloController.java"> | 1337 | <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HelloController.java"> |
1250 | <provider selected="true" editor-type-id="text-editor"> | 1338 | <provider selected="true" editor-type-id="text-editor"> |
1251 | <state vertical-scroll-proportion="0.0"> | 1339 | <state vertical-scroll-proportion="0.0"> |
@@ -1264,8 +1352,32 @@ | @@ -1264,8 +1352,32 @@ | ||
1264 | </entry> | 1352 | </entry> |
1265 | <entry file="file://$PROJECT_DIR$/doc/sql/Untitled.sql"> | 1353 | <entry file="file://$PROJECT_DIR$/doc/sql/Untitled.sql"> |
1266 | <provider selected="true" editor-type-id="text-editor"> | 1354 | <provider selected="true" editor-type-id="text-editor"> |
1267 | - <state vertical-scroll-proportion="0.34330985"> | ||
1268 | - <caret line="13" column="22" selection-start-line="13" selection-start-column="22" selection-end-line="13" selection-end-column="22" /> | 1355 | + <state vertical-scroll-proportion="-2.2222223"> |
1356 | + <caret line="8" column="39" selection-start-line="8" selection-start-column="39" selection-end-line="8" selection-end-column="39" /> | ||
1357 | + <folding /> | ||
1358 | + </state> | ||
1359 | + </provider> | ||
1360 | + </entry> | ||
1361 | + <entry file="file://$PROJECT_DIR$/src/main/resources.local/props/fdfs.properties"> | ||
1362 | + <provider selected="true" editor-type-id="text-editor"> | ||
1363 | + <state vertical-scroll-proportion="0.0"> | ||
1364 | + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | ||
1365 | + <folding /> | ||
1366 | + </state> | ||
1367 | + </provider> | ||
1368 | + </entry> | ||
1369 | + <entry file="file://$PROJECT_DIR$/src/main/resources.local/props/jdbc.properties"> | ||
1370 | + <provider selected="true" editor-type-id="text-editor"> | ||
1371 | + <state vertical-scroll-proportion="0.0"> | ||
1372 | + <caret line="1" column="51" selection-start-line="1" selection-start-column="45" selection-end-line="1" selection-end-column="51" /> | ||
1373 | + <folding /> | ||
1374 | + </state> | ||
1375 | + </provider> | ||
1376 | + </entry> | ||
1377 | + <entry file="file://$PROJECT_DIR$/src/main/webapp/index.jsp"> | ||
1378 | + <provider selected="true" editor-type-id="text-editor"> | ||
1379 | + <state vertical-scroll-proportion="0.18844222"> | ||
1380 | + <caret line="6" column="66" selection-start-line="6" selection-start-column="66" selection-end-line="6" selection-end-column="66" /> | ||
1269 | <folding /> | 1381 | <folding /> |
1270 | </state> | 1382 | </state> |
1271 | </provider> | 1383 | </provider> |
src/main/webapp/index.jsp
@@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
4 | <head> | 4 | <head> |
5 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> | 5 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> |
6 | <title>科路得</title> | 6 | <title>科路得</title> |
7 | - <link rel="stylesheet" type="text/css" href="/css/zhuanli-index.css"> | 7 | + <link rel="stylesheet" type="text/css" href="/css/patent-index.css"> |
8 | </head> | 8 | </head> |
9 | 9 | ||
10 | <body> | 10 | <body> |
target/patent/index.jsp
@@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
4 | <head> | 4 | <head> |
5 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> | 5 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> |
6 | <title>科路得</title> | 6 | <title>科路得</title> |
7 | - <link rel="stylesheet" type="text/css" href="/css/zhuanli-index.css"> | 7 | + <link rel="stylesheet" type="text/css" href="/css/patent-index.css"> |
8 | </head> | 8 | </head> |
9 | 9 | ||
10 | <body> | 10 | <body> |
target/test-classes/mbg/generatorConfig.xml
100644 → 100755