Commit cb6a3f56ea55e5f6452bcbfb42e4d8791fa15117
1 parent
9cfd4f43
案件类型
Showing
3 changed files
with
11 additions
and
145 deletions
.idea/workspace.xml
1 | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | 2 | <project version="4"> |
3 | 3 | <component name="ChangeListManager"> |
4 | - <list default="true" id="a8f74803-c7c3-405c-9584-6ffd161452f6" name="Default" comment=""> | |
5 | - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/constant/FrontConstant.java" /> | |
6 | - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/webapp/include/footer.jsp" /> | |
7 | - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/webapp/include/header.jsp" /> | |
8 | - <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/webapp/package.json" afterPath="" /> | |
9 | - <change type="DELETED" beforePath="$PROJECT_DIR$/target/core-server/META-INF/MANIFEST.MF" afterPath="" /> | |
10 | - <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/case-detail.html" afterPath="" /> | |
11 | - <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/case-manage.html" afterPath="" /> | |
12 | - <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/index.html" afterPath="" /> | |
13 | - <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/package.json" afterPath="" /> | |
14 | - <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/pay.html" afterPath="" /> | |
15 | - <change type="DELETED" beforePath="$PROJECT_DIR$/target/patent/service.html" afterPath="" /> | |
16 | - <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/webapp/case-detail.html" afterPath="$PROJECT_DIR$/src/main/webapp/case-detail.jsp" /> | |
17 | - <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/webapp/case-manage.html" afterPath="$PROJECT_DIR$/src/main/webapp/case-manage.jsp" /> | |
18 | - <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/webapp/index.html" afterPath="$PROJECT_DIR$/src/main/webapp/index.jsp" /> | |
19 | - <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/webapp/pay.html" afterPath="$PROJECT_DIR$/src/main/webapp/pay.jsp" /> | |
20 | - <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/webapp/service.html" afterPath="$PROJECT_DIR$/src/main/webapp/service.jsp" /> | |
21 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java" /> | |
22 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources.local/props/application.properties" afterPath="$PROJECT_DIR$/src/main/resources.local/props/application.properties" /> | |
23 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources.prod/props/application.properties" afterPath="$PROJECT_DIR$/src/main/resources.prod/props/application.properties" /> | |
24 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/js/index.js" afterPath="$PROJECT_DIR$/src/main/webapp/js/index.js" /> | |
25 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/css/service.css" afterPath="$PROJECT_DIR$/src/main/webapp/css/service.css" /> | |
26 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/css/service.css" afterPath="$PROJECT_DIR$/target/patent/css/service.css" /> | |
27 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/springmvc-servlet.xml" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/springmvc-servlet.xml" /> | |
28 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/springmvc-servlet.xml" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/springmvc-servlet.xml" /> | |
29 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> | |
30 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/css/zhuanli-index.css" afterPath="$PROJECT_DIR$/src/main/webapp/css/zhuanli-index.css" /> | |
31 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/css/zhuanli-index.css" afterPath="$PROJECT_DIR$/target/patent/css/zhuanli-index.css" /> | |
32 | - </list> | |
4 | + <list default="true" id="a8f74803-c7c3-405c-9584-6ffd161452f6" name="Default" comment="" /> | |
33 | 5 | <ignored path="patent.iws" /> |
34 | 6 | <ignored path=".idea/workspace.xml" /> |
35 | 7 | <ignored path="$PROJECT_DIR$/target/" /> |
... | ... | @@ -64,8 +36,8 @@ |
64 | 36 | <file leaf-file-name="index.js" pinned="false" current-in-tab="true"> |
65 | 37 | <entry file="file://$PROJECT_DIR$/src/main/webapp/js/index.js"> |
66 | 38 | <provider selected="true" editor-type-id="text-editor"> |
67 | - <state vertical-scroll-proportion="0.7206704"> | |
68 | - <caret line="80" column="26" selection-start-line="80" selection-start-column="26" selection-end-line="80" selection-end-column="26" /> | |
39 | + <state vertical-scroll-proportion="0.3480392"> | |
40 | + <caret line="75" column="3" selection-start-line="75" selection-start-column="3" selection-end-line="75" selection-end-column="3" /> | |
69 | 41 | <folding /> |
70 | 42 | </state> |
71 | 43 | </provider> |
... | ... | @@ -426,113 +398,7 @@ |
426 | 398 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
427 | 399 | </PATH_ELEMENT> |
428 | 400 | <PATH_ELEMENT> |
429 | - <option name="myItemId" value="src" /> | |
430 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
431 | - </PATH_ELEMENT> | |
432 | - <PATH_ELEMENT> | |
433 | - <option name="myItemId" value="main" /> | |
434 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
435 | - </PATH_ELEMENT> | |
436 | - <PATH_ELEMENT> | |
437 | - <option name="myItemId" value="java" /> | |
438 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
439 | - </PATH_ELEMENT> | |
440 | - <PATH_ELEMENT> | |
441 | - <option name="myItemId" value="patent" /> | |
442 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
443 | - </PATH_ELEMENT> | |
444 | - <PATH_ELEMENT> | |
445 | - <option name="myItemId" value="web" /> | |
446 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
447 | - </PATH_ELEMENT> | |
448 | - </PATH> | |
449 | - <PATH> | |
450 | - <PATH_ELEMENT> | |
451 | - <option name="myItemId" value="patent" /> | |
452 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
453 | - </PATH_ELEMENT> | |
454 | - <PATH_ELEMENT> | |
455 | - <option name="myItemId" value="canrd-patent" /> | |
456 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
457 | - </PATH_ELEMENT> | |
458 | - <PATH_ELEMENT> | |
459 | - <option name="myItemId" value="src" /> | |
460 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
461 | - </PATH_ELEMENT> | |
462 | - <PATH_ELEMENT> | |
463 | - <option name="myItemId" value="main" /> | |
464 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
465 | - </PATH_ELEMENT> | |
466 | - <PATH_ELEMENT> | |
467 | - <option name="myItemId" value="java" /> | |
468 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
469 | - </PATH_ELEMENT> | |
470 | - <PATH_ELEMENT> | |
471 | - <option name="myItemId" value="patent" /> | |
472 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
473 | - </PATH_ELEMENT> | |
474 | - </PATH> | |
475 | - <PATH> | |
476 | - <PATH_ELEMENT> | |
477 | - <option name="myItemId" value="patent" /> | |
478 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
479 | - </PATH_ELEMENT> | |
480 | - <PATH_ELEMENT> | |
481 | - <option name="myItemId" value="canrd-patent" /> | |
482 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
483 | - </PATH_ELEMENT> | |
484 | - <PATH_ELEMENT> | |
485 | - <option name="myItemId" value="src" /> | |
486 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
487 | - </PATH_ELEMENT> | |
488 | - <PATH_ELEMENT> | |
489 | - <option name="myItemId" value="main" /> | |
490 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
491 | - </PATH_ELEMENT> | |
492 | - <PATH_ELEMENT> | |
493 | - <option name="myItemId" value="java" /> | |
494 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
495 | - </PATH_ELEMENT> | |
496 | - <PATH_ELEMENT> | |
497 | - <option name="myItemId" value="patent" /> | |
498 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
499 | - </PATH_ELEMENT> | |
500 | - <PATH_ELEMENT> | |
501 | - <option name="myItemId" value="dal" /> | |
502 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
503 | - </PATH_ELEMENT> | |
504 | - </PATH> | |
505 | - <PATH> | |
506 | - <PATH_ELEMENT> | |
507 | - <option name="myItemId" value="patent" /> | |
508 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> | |
509 | - </PATH_ELEMENT> | |
510 | - <PATH_ELEMENT> | |
511 | - <option name="myItemId" value="canrd-patent" /> | |
512 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
513 | - </PATH_ELEMENT> | |
514 | - <PATH_ELEMENT> | |
515 | - <option name="myItemId" value="src" /> | |
516 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
517 | - </PATH_ELEMENT> | |
518 | - <PATH_ELEMENT> | |
519 | - <option name="myItemId" value="main" /> | |
520 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
521 | - </PATH_ELEMENT> | |
522 | - <PATH_ELEMENT> | |
523 | - <option name="myItemId" value="java" /> | |
524 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
525 | - </PATH_ELEMENT> | |
526 | - <PATH_ELEMENT> | |
527 | - <option name="myItemId" value="patent" /> | |
528 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
529 | - </PATH_ELEMENT> | |
530 | - <PATH_ELEMENT> | |
531 | - <option name="myItemId" value="dal" /> | |
532 | - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> | |
533 | - </PATH_ELEMENT> | |
534 | - <PATH_ELEMENT> | |
535 | - <option name="myItemId" value="constant" /> | |
401 | + <option name="myItemId" value="doc" /> | |
536 | 402 | <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
537 | 403 | </PATH_ELEMENT> |
538 | 404 | </PATH> |
... | ... | @@ -917,16 +783,16 @@ |
917 | 783 | <workItem from="1468234772794" duration="330000" /> |
918 | 784 | <workItem from="1468239559791" duration="4887000" /> |
919 | 785 | <workItem from="1468299389349" duration="3387000" /> |
920 | - <workItem from="1468337930753" duration="4245000" /> | |
786 | + <workItem from="1468337930753" duration="4823000" /> | |
921 | 787 | </task> |
922 | 788 | <servers /> |
923 | 789 | </component> |
924 | 790 | <component name="TimeTrackingManager"> |
925 | - <option name="totallyTimeSpent" value="13898000" /> | |
791 | + <option name="totallyTimeSpent" value="14476000" /> | |
926 | 792 | </component> |
927 | 793 | <component name="ToolWindowManager"> |
928 | 794 | <frame x="0" y="23" width="1280" height="732" extended-state="0" /> |
929 | - <editor active="true" /> | |
795 | + <editor active="false" /> | |
930 | 796 | <layout> |
931 | 797 | <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" /> |
932 | 798 | <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" /> |
... | ... | @@ -937,7 +803,7 @@ |
937 | 803 | <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" /> |
938 | 804 | <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" /> |
939 | 805 | <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" /> |
940 | - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.396875" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> | |
806 | + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.31875" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> | |
941 | 807 | <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" /> |
942 | 808 | <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" /> |
943 | 809 | <window_info id="Version Control" 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" /> |
... | ... | @@ -947,7 +813,7 @@ |
947 | 813 | <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" /> |
948 | 814 | <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.0726979" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> |
949 | 815 | <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.53812635" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> |
950 | - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1987076" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> | |
816 | + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1987076" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> | |
951 | 817 | <window_info id="Run" active="false" anchor="bottom" 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 | 818 | <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> |
953 | 819 | <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" /> |
... | ... | @@ -1374,8 +1240,8 @@ |
1374 | 1240 | </entry> |
1375 | 1241 | <entry file="file://$PROJECT_DIR$/src/main/webapp/js/index.js"> |
1376 | 1242 | <provider selected="true" editor-type-id="text-editor"> |
1377 | - <state vertical-scroll-proportion="0.7206704"> | |
1378 | - <caret line="80" column="26" selection-start-line="80" selection-start-column="26" selection-end-line="80" selection-end-column="26" /> | |
1243 | + <state vertical-scroll-proportion="0.3480392"> | |
1244 | + <caret line="75" column="3" selection-start-line="75" selection-start-column="3" selection-end-line="75" selection-end-column="3" /> | |
1379 | 1245 | <folding /> |
1380 | 1246 | </state> |
1381 | 1247 | </provider> | ... | ... |
doc/patent.mwb
0 → 100644
No preview for this file type
doc/patent.mwb.bak
0 → 100644
No preview for this file type