kelude / canrd-patent · Commits

Commit 477b5828c7d287d2375c4f0f0e3e27ffd10d3e70

Authored by litao
1 parent f01b6989
build: skipped

some little chage

Inline Side-by-side
Showing 3 changed files with 362 additions and 249 deletions
.idea/workspace.xml
  View file @477b582
@@ -2,15 +2,8 @@ @@ -2,15 +2,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="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/AjaxTestController.java" />  
6 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/webapp/ajax_test.jsp" />  
7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
8 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/mapper/MybatisTestMapper.xml" afterPath="$PROJECT_DIR$/src/main/resources/mapper/MybatisTestMapper.xml" />  
9 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/js/index.js" afterPath="$PROJECT_DIR$/src/main/webapp/js/index.js" />  
10 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/mapper/MybatisTestMapper.xml" afterPath="$PROJECT_DIR$/target/classes/mapper/MybatisTestMapper.xml" />  
11 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/mapper/MybatisTestMapper.xml" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/mapper/MybatisTestMapper.xml" />  
12 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/web.xml" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/web.xml" />  
13 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/js/index.js" afterPath="$PROJECT_DIR$/target/patent/js/index.js" /> 6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/home_patent.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/home_patent.jsp" />
14 </list> 7 </list>
15 <ignored path="patent.iws" /> 8 <ignored path="patent.iws" />
16 <ignored path=".idea/workspace.xml" /> 9 <ignored path=".idea/workspace.xml" />
@@ -36,22 +29,33 @@ @@ -36,22 +29,33 @@
36 <file leaf-file-name="IndexController.java" pinned="false" current-in-tab="false"> 29 <file leaf-file-name="IndexController.java" pinned="false" current-in-tab="false">
37 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java"> 30 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java">
38 <provider selected="true" editor-type-id="text-editor"> 31 <provider selected="true" editor-type-id="text-editor">
39 - <state relative-caret-position="285">  
40 - <caret line="19" column="39" selection-start-line="19" selection-start-column="26" selection-end-line="19" selection-end-column="39" /> 32 + <state relative-caret-position="240">
  33 + <caret line="22" column="14" selection-start-line="22" selection-start-column="14" selection-end-line="22" selection-end-column="14" />
41 <folding> 34 <folding>
42 - <element signature="imports" expanded="true" />  
43 <element signature="e#673#674#0" expanded="true" /> 35 <element signature="e#673#674#0" expanded="true" />
44 <element signature="e#703#704#0" expanded="true" /> 36 <element signature="e#703#704#0" expanded="true" />
  37 + <element signature="e#793#794#0" expanded="true" />
  38 + <element signature="e#841#842#0" expanded="true" />
45 </folding> 39 </folding>
46 </state> 40 </state>
47 </provider> 41 </provider>
48 </entry> 42 </entry>
49 </file> 43 </file>
  44 + <file leaf-file-name="index.js" pinned="false" current-in-tab="false">
  45 + <entry file="file://$PROJECT_DIR$/src/main/webapp/js/index.js">
  46 + <provider selected="true" editor-type-id="text-editor">
  47 + <state relative-caret-position="885">
  48 + <caret line="59" column="9" selection-start-line="59" selection-start-column="9" selection-end-line="59" selection-end-column="9" />
  49 + <folding />
  50 + </state>
  51 + </provider>
  52 + </entry>
  53 + </file>
50 <file leaf-file-name="AjaxTestController.java" pinned="false" current-in-tab="false"> 54 <file leaf-file-name="AjaxTestController.java" pinned="false" current-in-tab="false">
51 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/AjaxTestController.java"> 55 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/AjaxTestController.java">
52 <provider selected="true" editor-type-id="text-editor"> 56 <provider selected="true" editor-type-id="text-editor">
53 - <state relative-caret-position="315">  
54 - <caret line="21" column="38" selection-start-line="21" selection-start-column="34" selection-end-line="21" selection-end-column="38" /> 57 + <state relative-caret-position="390">
  58 + <caret line="26" column="32" selection-start-line="26" selection-start-column="32" selection-end-line="26" selection-end-column="32" />
55 <folding> 59 <folding>
56 <element signature="imports" expanded="true" /> 60 <element signature="imports" expanded="true" />
57 </folding> 61 </folding>
@@ -59,11 +63,11 @@ @@ -59,11 +63,11 @@
59 </provider> 63 </provider>
60 </entry> 64 </entry>
61 </file> 65 </file>
62 - <file leaf-file-name="ajax_test.jsp" pinned="false" current-in-tab="true">  
63 - <entry file="file://$PROJECT_DIR$/src/main/webapp/ajax_test.jsp"> 66 + <file leaf-file-name="home.css" pinned="false" current-in-tab="true">
  67 + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/home.css">
64 <provider selected="true" editor-type-id="text-editor"> 68 <provider selected="true" editor-type-id="text-editor">
65 - <state relative-caret-position="240">  
66 - <caret line="25" column="39" selection-start-line="25" selection-start-column="39" selection-end-line="25" selection-end-column="39" /> 69 + <state relative-caret-position="165">
  70 + <caret line="11" column="8" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="8" />
67 <folding /> 71 <folding />
68 </state> 72 </state>
69 </provider> 73 </provider>
@@ -72,19 +76,11 @@ @@ -72,19 +76,11 @@
72 <file leaf-file-name="home_patent.jsp" pinned="false" current-in-tab="false"> 76 <file leaf-file-name="home_patent.jsp" pinned="false" current-in-tab="false">
73 <entry file="file://$PROJECT_DIR$/src/main/webapp/home_patent.jsp"> 77 <entry file="file://$PROJECT_DIR$/src/main/webapp/home_patent.jsp">
74 <provider selected="true" editor-type-id="text-editor"> 78 <provider selected="true" editor-type-id="text-editor">
75 - <state relative-caret-position="3501">  
76 - <caret line="264" column="4" selection-start-line="264" selection-start-column="4" selection-end-line="264" selection-end-column="4" />  
77 - <folding />  
78 - </state>  
79 - </provider>  
80 - </entry>  
81 - </file>  
82 - <file leaf-file-name="CasementDataController.java" pinned="false" current-in-tab="false">  
83 - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementDataController.java">  
84 - <provider selected="true" editor-type-id="text-editor">  
85 - <state relative-caret-position="165">  
86 - <caret line="44" column="82" selection-start-line="44" selection-start-column="74" selection-end-line="44" selection-end-column="82" />  
87 - <folding /> 79 + <state relative-caret-position="485">
  80 + <caret line="53" column="0" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
  81 + <folding>
  82 + <element signature="n#script#0;n#!!top" expanded="false" />
  83 + </folding>
88 </state> 84 </state>
89 </provider> 85 </provider>
90 </entry> 86 </entry>
@@ -118,7 +114,6 @@ @@ -118,7 +114,6 @@
118 <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/springmvc-servlet.xml" /> 114 <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/springmvc-servlet.xml" />
119 <option value="$PROJECT_DIR$/doc/manual/开发规范.txt" /> 115 <option value="$PROJECT_DIR$/doc/manual/开发规范.txt" />
120 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentPageController.java" /> 116 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentPageController.java" />
121 - <option value="$PROJECT_DIR$/src/main/webapp/home_patent.jsp" />  
122 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentDataController.java" /> 117 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HomePatentDataController.java" />
123 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementDataController.java" /> 118 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementDataController.java" />
124 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/PaymentDataController.java" /> 119 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/PaymentDataController.java" />
@@ -163,8 +158,9 @@ @@ -163,8 +158,9 @@
163 <option value="$PROJECT_DIR$/src/main/webapp/js/index.js" /> 158 <option value="$PROJECT_DIR$/src/main/webapp/js/index.js" />
164 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/AjaxTestContrller.java" /> 159 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/AjaxTestContrller.java" />
165 <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" /> 160 <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" />
166 - <option value="$PROJECT_DIR$/src/main/webapp/ajax_test.jsp" />  
167 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/AjaxTestController.java" /> 161 <option value="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/AjaxTestController.java" />
  162 + <option value="$PROJECT_DIR$/src/main/webapp/ajax_test.jsp" />
  163 + <option value="$PROJECT_DIR$/src/main/webapp/home_patent.jsp" />
168 </list> 164 </list>
169 </option> 165 </option>
170 </component> 166 </component>
@@ -283,9 +279,9 @@ @@ -283,9 +279,9 @@
283 <foldersAlwaysOnTop value="true" /> 279 <foldersAlwaysOnTop value="true" />
284 </navigator> 280 </navigator>
285 <panes> 281 <panes>
286 - <pane id="Scope" />  
287 - <pane id="PackagesPane" />  
288 <pane id="Scratches" /> 282 <pane id="Scratches" />
  283 + <pane id="PackagesPane" />
  284 + <pane id="Scope" />
289 <pane id="ProjectPane"> 285 <pane id="ProjectPane">
290 <subPane> 286 <subPane>
291 <PATH> 287 <PATH>
@@ -314,6 +310,38 @@ @@ -314,6 +310,38 @@
314 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 310 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
315 </PATH_ELEMENT> 311 </PATH_ELEMENT>
316 <PATH_ELEMENT> 312 <PATH_ELEMENT>
  313 + <option name="myItemId" value="target" />
  314 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  315 + </PATH_ELEMENT>
  316 + </PATH>
  317 + <PATH>
  318 + <PATH_ELEMENT>
  319 + <option name="myItemId" value="patent" />
  320 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  321 + </PATH_ELEMENT>
  322 + <PATH_ELEMENT>
  323 + <option name="myItemId" value="canrd-patent" />
  324 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  325 + </PATH_ELEMENT>
  326 + <PATH_ELEMENT>
  327 + <option name="myItemId" value="target" />
  328 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  329 + </PATH_ELEMENT>
  330 + <PATH_ELEMENT>
  331 + <option name="myItemId" value="classes" />
  332 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  333 + </PATH_ELEMENT>
  334 + </PATH>
  335 + <PATH>
  336 + <PATH_ELEMENT>
  337 + <option name="myItemId" value="patent" />
  338 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  339 + </PATH_ELEMENT>
  340 + <PATH_ELEMENT>
  341 + <option name="myItemId" value="canrd-patent" />
  342 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  343 + </PATH_ELEMENT>
  344 + <PATH_ELEMENT>
317 <option name="myItemId" value="src" /> 345 <option name="myItemId" value="src" />
318 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 346 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
319 </PATH_ELEMENT> 347 </PATH_ELEMENT>
@@ -366,7 +394,99 @@ @@ -366,7 +394,99 @@
366 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 394 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
367 </PATH_ELEMENT> 395 </PATH_ELEMENT>
368 <PATH_ELEMENT> 396 <PATH_ELEMENT>
369 - <option name="myItemId" value="WEB-INF" /> 397 + <option name="myItemId" value="css" />
  398 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  399 + </PATH_ELEMENT>
  400 + </PATH>
  401 + <PATH>
  402 + <PATH_ELEMENT>
  403 + <option name="myItemId" value="patent" />
  404 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  405 + </PATH_ELEMENT>
  406 + <PATH_ELEMENT>
  407 + <option name="myItemId" value="canrd-patent" />
  408 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  409 + </PATH_ELEMENT>
  410 + <PATH_ELEMENT>
  411 + <option name="myItemId" value="src" />
  412 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  413 + </PATH_ELEMENT>
  414 + <PATH_ELEMENT>
  415 + <option name="myItemId" value="main" />
  416 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  417 + </PATH_ELEMENT>
  418 + </PATH>
  419 + <PATH>
  420 + <PATH_ELEMENT>
  421 + <option name="myItemId" value="patent" />
  422 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  423 + </PATH_ELEMENT>
  424 + <PATH_ELEMENT>
  425 + <option name="myItemId" value="canrd-patent" />
  426 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  427 + </PATH_ELEMENT>
  428 + <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="resources" />
  438 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  439 + </PATH_ELEMENT>
  440 + </PATH>
  441 + <PATH>
  442 + <PATH_ELEMENT>
  443 + <option name="myItemId" value="patent" />
  444 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  445 + </PATH_ELEMENT>
  446 + <PATH_ELEMENT>
  447 + <option name="myItemId" value="canrd-patent" />
  448 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  449 + </PATH_ELEMENT>
  450 + <PATH_ELEMENT>
  451 + <option name="myItemId" value="src" />
  452 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  453 + </PATH_ELEMENT>
  454 + <PATH_ELEMENT>
  455 + <option name="myItemId" value="main" />
  456 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  457 + </PATH_ELEMENT>
  458 + <PATH_ELEMENT>
  459 + <option name="myItemId" value="resources" />
  460 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  461 + </PATH_ELEMENT>
  462 + <PATH_ELEMENT>
  463 + <option name="myItemId" value="spring" />
  464 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  465 + </PATH_ELEMENT>
  466 + </PATH>
  467 + <PATH>
  468 + <PATH_ELEMENT>
  469 + <option name="myItemId" value="patent" />
  470 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  471 + </PATH_ELEMENT>
  472 + <PATH_ELEMENT>
  473 + <option name="myItemId" value="canrd-patent" />
  474 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  475 + </PATH_ELEMENT>
  476 + <PATH_ELEMENT>
  477 + <option name="myItemId" value="src" />
  478 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  479 + </PATH_ELEMENT>
  480 + <PATH_ELEMENT>
  481 + <option name="myItemId" value="main" />
  482 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  483 + </PATH_ELEMENT>
  484 + <PATH_ELEMENT>
  485 + <option name="myItemId" value="resources" />
  486 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  487 + </PATH_ELEMENT>
  488 + <PATH_ELEMENT>
  489 + <option name="myItemId" value="mapper" />
370 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 490 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
371 </PATH_ELEMENT> 491 </PATH_ELEMENT>
372 </PATH> 492 </PATH>
@@ -387,6 +507,44 @@ @@ -387,6 +507,44 @@
387 <option name="myItemId" value="main" /> 507 <option name="myItemId" value="main" />
388 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 508 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
389 </PATH_ELEMENT> 509 </PATH_ELEMENT>
  510 + <PATH_ELEMENT>
  511 + <option name="myItemId" value="java" />
  512 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  513 + </PATH_ELEMENT>
  514 + <PATH_ELEMENT>
  515 + <option name="myItemId" value="patent" />
  516 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  517 + </PATH_ELEMENT>
  518 + </PATH>
  519 + <PATH>
  520 + <PATH_ELEMENT>
  521 + <option name="myItemId" value="patent" />
  522 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  523 + </PATH_ELEMENT>
  524 + <PATH_ELEMENT>
  525 + <option name="myItemId" value="canrd-patent" />
  526 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  527 + </PATH_ELEMENT>
  528 + <PATH_ELEMENT>
  529 + <option name="myItemId" value="src" />
  530 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  531 + </PATH_ELEMENT>
  532 + <PATH_ELEMENT>
  533 + <option name="myItemId" value="main" />
  534 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  535 + </PATH_ELEMENT>
  536 + <PATH_ELEMENT>
  537 + <option name="myItemId" value="java" />
  538 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  539 + </PATH_ELEMENT>
  540 + <PATH_ELEMENT>
  541 + <option name="myItemId" value="patent" />
  542 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  543 + </PATH_ELEMENT>
  544 + <PATH_ELEMENT>
  545 + <option name="myItemId" value="dal" />
  546 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  547 + </PATH_ELEMENT>
390 </PATH> 548 </PATH>
391 </subPane> 549 </subPane>
392 </pane> 550 </pane>
@@ -407,7 +565,7 @@ @@ -407,7 +565,7 @@
407 <property name="OverrideImplement.combined" value="true" /> 565 <property name="OverrideImplement.combined" value="true" />
408 <property name="OverrideImplement.overriding.sorted" value="false" /> 566 <property name="OverrideImplement.overriding.sorted" value="false" />
409 <property name="extract.method.default.visibility" value="private" /> 567 <property name="extract.method.default.visibility" value="private" />
410 - <property name="last_opened_file_path" value="$PROJECT_DIR$/../canrd" /> 568 + <property name="last_opened_file_path" value="$PROJECT_DIR$" />
411 </component> 569 </component>
412 <component name="RecentsManager"> 570 <component name="RecentsManager">
413 <key name="CopyClassDialog.RECENTS_KEY"> 571 <key name="CopyClassDialog.RECENTS_KEY">
@@ -1036,16 +1194,18 @@ @@ -1036,16 +1194,18 @@
1036 <workItem from="1469260205882" duration="12837000" /> 1194 <workItem from="1469260205882" duration="12837000" />
1037 <workItem from="1469585749367" duration="1353000" /> 1195 <workItem from="1469585749367" duration="1353000" />
1038 <workItem from="1469608329981" duration="18062000" /> 1196 <workItem from="1469608329981" duration="18062000" />
1039 - <workItem from="1469671147290" duration="25199000" /> 1197 + <workItem from="1469671147290" duration="27544000" />
  1198 + <workItem from="1469753514902" duration="7465000" />
  1199 + <workItem from="1470012287196" duration="2233000" />
1040 </task> 1200 </task>
1041 <servers /> 1201 <servers />
1042 </component> 1202 </component>
1043 <component name="TimeTrackingManager"> 1203 <component name="TimeTrackingManager">
1044 - <option name="totallyTimeSpent" value="138989000" /> 1204 + <option name="totallyTimeSpent" value="151032000" />
1045 </component> 1205 </component>
1046 <component name="ToolWindowManager"> 1206 <component name="ToolWindowManager">
1047 <frame x="65" y="24" width="1855" height="1056" extended-state="6" /> 1207 <frame x="65" y="24" width="1855" height="1056" extended-state="6" />
1048 - <editor active="true" /> 1208 + <editor active="false" />
1049 <layout> 1209 <layout>
1050 <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" /> 1210 <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" />
1051 <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" /> 1211 <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" />
@@ -1053,16 +1213,16 @@ @@ -1053,16 +1213,16 @@
1053 <window_info id="Palette&#9;" 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="false" content_ui="tabs" /> 1213 <window_info id="Palette&#9;" 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="false" content_ui="tabs" />
1054 <window_info id="Java Enterprise" 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" /> 1214 <window_info id="Java Enterprise" 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" />
1055 <window_info id="Capture Analysis" 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="4" side_tool="false" content_ui="tabs" /> 1215 <window_info id="Capture Analysis" 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="4" side_tool="false" content_ui="tabs" />
1056 - <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.42167383" sideWeight="0.21171919" order="7" side_tool="true" content_ui="tabs" /> 1216 + <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24785408" sideWeight="0.2714207" order="7" side_tool="true" content_ui="tabs" />
1057 <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.53812635" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 1217 <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.53812635" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
1058 - <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1509121" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 1218 + <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14648977" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
1059 <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.32953367" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 1219 <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.32953367" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
1060 - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.42167383" sideWeight="0.78828084" order="2" side_tool="false" content_ui="tabs" /> 1220 + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.35729614" sideWeight="0.7816473" order="2" side_tool="false" content_ui="tabs" />
1061 <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32939914" sideWeight="0.49806523" order="8" side_tool="false" content_ui="tabs" /> 1221 <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32939914" sideWeight="0.49806523" order="8" side_tool="false" content_ui="tabs" />
1062 - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24785408" sideWeight="0.73852956" order="7" side_tool="false" content_ui="tabs" /> 1222 + <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24785408" sideWeight="0.72857934" order="7" side_tool="false" content_ui="tabs" />
1063 <window_info id="Capture Tool" 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="3" side_tool="false" content_ui="tabs" /> 1223 <window_info id="Capture Tool" 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="3" side_tool="false" content_ui="tabs" />
1064 <window_info id="Designer" 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" /> 1224 <window_info id="Designer" 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" />
1065 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20011055" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 1225 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22111663" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
1066 <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" /> 1226 <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" />
1067 <window_info id="Database" 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" /> 1227 <window_info id="Database" 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" />
1068 <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3896373" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 1228 <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3896373" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -1070,7 +1230,7 @@ @@ -1070,7 +1230,7 @@
1070 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 1230 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
1071 <window_info id="UI Designer" 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="false" content_ui="tabs" /> 1231 <window_info id="UI Designer" 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="false" content_ui="tabs" />
1072 <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" /> 1232 <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" />
1073 - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.18133047" sideWeight="0.84964067" order="3" side_tool="false" content_ui="tabs" /> 1233 + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.18133047" sideWeight="0.8463239" order="3" side_tool="false" content_ui="tabs" />
1074 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> 1234 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
1075 <window_info id="Message" 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="0" side_tool="false" content_ui="tabs" /> 1235 <window_info id="Message" 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="0" side_tool="false" content_ui="tabs" />
1076 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> 1236 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -1119,14 +1279,6 @@ @@ -1119,14 +1279,6 @@
1119 </component> 1279 </component>
1120 <component name="XDebuggerManager"> 1280 <component name="XDebuggerManager">
1121 <breakpoint-manager> 1281 <breakpoint-manager>
1122 - <breakpoints>  
1123 - <line-breakpoint enabled="true" type="java-field">  
1124 - <url>file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java</url>  
1125 - <line>16</line>  
1126 - <properties field="MEMBER_ID" class="com.canrd.patent.web.IndexController" />  
1127 - <option name="timeStamp" value="40" />  
1128 - </line-breakpoint>  
1129 - </breakpoints>  
1130 <option name="time" value="41" /> 1282 <option name="time" value="41" />
1131 </breakpoint-manager> 1283 </breakpoint-manager>
1132 <watches-manager /> 1284 <watches-manager />
@@ -1136,114 +1288,10 @@ @@ -1136,114 +1288,10 @@
1136 <option name="FILTER_TARGETS" value="false" /> 1288 <option name="FILTER_TARGETS" value="false" />
1137 </component> 1289 </component>
1138 <component name="editorHistoryManager"> 1290 <component name="editorHistoryManager">
1139 - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.2.3.RELEASE/spring-core-4.2.3.RELEASE.jar!/org/springframework/util/Assert.class">  
1140 - <provider selected="true" editor-type-id="text-editor">  
1141 - <state relative-caret-position="150">  
1142 - <caret line="41" column="0" selection-start-line="41" selection-start-column="0" selection-end-line="41" selection-end-column="0" />  
1143 - <folding />  
1144 - </state>  
1145 - </provider>  
1146 - </entry>  
1147 - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.2.3.RELEASE/spring-core-4.2.3.RELEASE.jar!/org/springframework/core/annotation/AnnotationUtils.class">  
1148 - <provider selected="true" editor-type-id="text-editor">  
1149 - <state relative-caret-position="177">  
1150 - <caret line="442" column="0" selection-start-line="442" selection-start-column="0" selection-end-line="442" selection-end-column="0" />  
1151 - <folding />  
1152 - </state>  
1153 - </provider>  
1154 - </entry>  
1155 - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.2.3.RELEASE/spring-core-4.2.3.RELEASE.jar!/org/springframework/core/annotation/AnnotatedElementUtils.class">  
1156 - <provider selected="true" editor-type-id="text-editor">  
1157 - <state relative-caret-position="162">  
1158 - <caret line="128" column="0" selection-start-line="128" selection-start-column="0" selection-end-line="128" selection-end-column="0" />  
1159 - <folding />  
1160 - </state>  
1161 - </provider>  
1162 - </entry>  
1163 - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.2.3.RELEASE/spring-core-4.2.3.RELEASE.jar!/org/springframework/util/ReflectionUtils.class">  
1164 - <provider selected="true" editor-type-id="text-editor">  
1165 - <state relative-caret-position="372">  
1166 - <caret line="290" column="0" selection-start-line="290" selection-start-column="0" selection-end-line="290" selection-end-column="0" />  
1167 - <folding />  
1168 - </state>  
1169 - </provider>  
1170 - </entry>  
1171 - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.2.3.RELEASE/spring-beans-4.2.3.RELEASE.jar!/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.class">  
1172 - <provider selected="true" editor-type-id="text-editor">  
1173 - <state relative-caret-position="222">  
1174 - <caret line="124" column="0" selection-start-line="124" selection-start-column="0" selection-end-line="124" selection-end-column="0" />  
1175 - <folding>  
1176 - <element signature="e#14310#16097#0" expanded="true" />  
1177 - <element signature="e#16096#16097#0" expanded="true" />  
1178 - </folding>  
1179 - </state>  
1180 - </provider>  
1181 - </entry>  
1182 - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.2.3.RELEASE/spring-beans-4.2.3.RELEASE.jar!/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.class">  
1183 - <provider selected="true" editor-type-id="text-editor">  
1184 - <state relative-caret-position="172">  
1185 - <caret line="66" column="0" selection-start-line="66" selection-start-column="0" selection-end-line="66" selection-end-column="0" />  
1186 - <folding />  
1187 - </state>  
1188 - </provider>  
1189 - </entry>  
1190 - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-beans/4.2.3.RELEASE/spring-beans-4.2.3.RELEASE.jar!/org/springframework/beans/factory/support/AbstractBeanDefinition.class">  
1191 - <provider selected="true" editor-type-id="text-editor">  
1192 - <state relative-caret-position="292">  
1193 - <caret line="285" column="0" selection-start-line="285" selection-start-column="0" selection-end-line="285" selection-end-column="0" />  
1194 - <folding>  
1195 - <element signature="e#11232#11233#0" expanded="true" />  
1196 - <element signature="e#11310#11311#0" expanded="true" />  
1197 - <element signature="e#11535#11536#0" expanded="true" />  
1198 - <element signature="e#11575#11576#0" expanded="true" />  
1199 - <element signature="e#11735#11736#0" expanded="true" />  
1200 - </folding>  
1201 - </state>  
1202 - </provider>  
1203 - </entry>  
1204 - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.2.3.RELEASE/spring-core-4.2.3.RELEASE.jar!/org/springframework/util/ConcurrentReferenceHashMap.class">  
1205 - <provider selected="true" editor-type-id="text-editor">  
1206 - <state relative-caret-position="202">  
1207 - <caret line="208" column="0" selection-start-line="208" selection-start-column="0" selection-end-line="208" selection-end-column="0" />  
1208 - <folding />  
1209 - </state>  
1210 - </provider>  
1211 - </entry>  
1212 - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.2.3.RELEASE/spring-core-4.2.3.RELEASE.jar!/org/springframework/core/ResolvableType.class">  
1213 - <provider selected="true" editor-type-id="text-editor">  
1214 - <state relative-caret-position="52">  
1215 - <caret line="785" column="0" selection-start-line="785" selection-start-column="0" selection-end-line="785" selection-end-column="0" />  
1216 - <folding>  
1217 - <element signature="e#32165#32166#0" expanded="true" />  
1218 - </folding>  
1219 - </state>  
1220 - </provider>  
1221 - </entry>  
1222 - <entry file="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.3/logback-classic-1.1.3.jar!/ch/qos/logback/classic/LoggerContext.class">  
1223 - <provider selected="true" editor-type-id="text-editor">  
1224 - <state relative-caret-position="82">  
1225 - <caret line="195" column="0" selection-start-line="195" selection-start-column="0" selection-end-line="195" selection-end-column="0" />  
1226 - <folding />  
1227 - </state>  
1228 - </provider>  
1229 - </entry>  
1230 - <entry file="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.3/logback-classic-1.1.3.jar!/ch/qos/logback/classic/Logger.class">  
1231 - <provider selected="true" editor-type-id="text-editor">  
1232 - <state relative-caret-position="142">  
1233 - <caret line="329" column="0" selection-start-line="329" selection-start-column="0" selection-end-line="329" selection-end-column="0" />  
1234 - <folding>  
1235 - <element signature="e#11705#11706#0" expanded="true" />  
1236 - </folding>  
1237 - </state>  
1238 - </provider>  
1239 - </entry>  
1240 <entry file="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.13/jcl-over-slf4j-1.7.13.jar!/org/apache/commons/logging/impl/SLF4JLocationAwareLog.class"> 1291 <entry file="jar://$MAVEN_REPOSITORY$/org/slf4j/jcl-over-slf4j/1.7.13/jcl-over-slf4j-1.7.13.jar!/org/apache/commons/logging/impl/SLF4JLocationAwareLog.class">
1241 <provider selected="true" editor-type-id="text-editor"> 1292 <provider selected="true" editor-type-id="text-editor">
1242 <state relative-caret-position="75"> 1293 <state relative-caret-position="75">
1243 <caret line="31" column="0" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" /> 1294 <caret line="31" column="0" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
1244 - <folding>  
1245 - <element signature="e#981#982#0" expanded="true" />  
1246 - </folding>  
1247 </state> 1295 </state>
1248 </provider> 1296 </provider>
1249 </entry> 1297 </entry>
@@ -1251,7 +1299,6 @@ @@ -1251,7 +1299,6 @@
1251 <provider selected="true" editor-type-id="text-editor"> 1299 <provider selected="true" editor-type-id="text-editor">
1252 <state relative-caret-position="94"> 1300 <state relative-caret-position="94">
1253 <caret line="59" column="0" selection-start-line="59" selection-start-column="0" selection-end-line="59" selection-end-column="0" /> 1301 <caret line="59" column="0" selection-start-line="59" selection-start-column="0" selection-end-line="59" selection-end-column="0" />
1254 - <folding />  
1255 </state> 1302 </state>
1256 </provider> 1303 </provider>
1257 </entry> 1304 </entry>
@@ -1259,10 +1306,6 @@ @@ -1259,10 +1306,6 @@
1259 <provider selected="true" editor-type-id="text-editor"> 1306 <provider selected="true" editor-type-id="text-editor">
1260 <state relative-caret-position="172"> 1307 <state relative-caret-position="172">
1261 <caret line="130" column="0" selection-start-line="130" selection-start-column="0" selection-end-line="130" selection-end-column="0" /> 1308 <caret line="130" column="0" selection-start-line="130" selection-start-column="0" selection-end-line="130" selection-end-column="0" />
1262 - <folding>  
1263 - <element signature="e#8398#8399#0" expanded="true" />  
1264 - <element signature="e#8464#8465#0" expanded="true" />  
1265 - </folding>  
1266 </state> 1309 </state>
1267 </provider> 1310 </provider>
1268 </entry> 1311 </entry>
@@ -1270,7 +1313,6 @@ @@ -1270,7 +1313,6 @@
1270 <provider selected="true" editor-type-id="text-editor"> 1313 <provider selected="true" editor-type-id="text-editor">
1271 <state relative-caret-position="162"> 1314 <state relative-caret-position="162">
1272 <caret line="62" column="0" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" /> 1315 <caret line="62" column="0" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
1273 - <folding />  
1274 </state> 1316 </state>
1275 </provider> 1317 </provider>
1276 </entry> 1318 </entry>
@@ -1278,7 +1320,6 @@ @@ -1278,7 +1320,6 @@
1278 <provider selected="true" editor-type-id="text-editor"> 1320 <provider selected="true" editor-type-id="text-editor">
1279 <state relative-caret-position="162"> 1321 <state relative-caret-position="162">
1280 <caret line="196" column="0" selection-start-line="196" selection-start-column="0" selection-end-line="196" selection-end-column="0" /> 1322 <caret line="196" column="0" selection-start-line="196" selection-start-column="0" selection-end-line="196" selection-end-column="0" />
1281 - <folding />  
1282 </state> 1323 </state>
1283 </provider> 1324 </provider>
1284 </entry> 1325 </entry>
@@ -1286,7 +1327,6 @@ @@ -1286,7 +1327,6 @@
1286 <provider selected="true" editor-type-id="text-editor"> 1327 <provider selected="true" editor-type-id="text-editor">
1287 <state relative-caret-position="162"> 1328 <state relative-caret-position="162">
1288 <caret line="270" column="0" selection-start-line="270" selection-start-column="0" selection-end-line="270" selection-end-column="0" /> 1329 <caret line="270" column="0" selection-start-line="270" selection-start-column="0" selection-end-line="270" selection-end-column="0" />
1289 - <folding />  
1290 </state> 1330 </state>
1291 </provider> 1331 </provider>
1292 </entry> 1332 </entry>
@@ -1294,7 +1334,6 @@ @@ -1294,7 +1334,6 @@
1294 <provider selected="true" editor-type-id="text-editor"> 1334 <provider selected="true" editor-type-id="text-editor">
1295 <state relative-caret-position="172"> 1335 <state relative-caret-position="172">
1296 <caret line="585" column="0" selection-start-line="585" selection-start-column="0" selection-end-line="585" selection-end-column="0" /> 1336 <caret line="585" column="0" selection-start-line="585" selection-start-column="0" selection-end-line="585" selection-end-column="0" />
1297 - <folding />  
1298 </state> 1337 </state>
1299 </provider> 1338 </provider>
1300 </entry> 1339 </entry>
@@ -1302,10 +1341,6 @@ @@ -1302,10 +1341,6 @@
1302 <provider selected="true" editor-type-id="text-editor"> 1341 <provider selected="true" editor-type-id="text-editor">
1303 <state relative-caret-position="162"> 1342 <state relative-caret-position="162">
1304 <caret line="100" column="0" selection-start-line="100" selection-start-column="0" selection-end-line="100" selection-end-column="0" /> 1343 <caret line="100" column="0" selection-start-line="100" selection-start-column="0" selection-end-line="100" selection-end-column="0" />
1305 - <folding>  
1306 - <element signature="e#8349#8842#0" expanded="true" />  
1307 - <element signature="e#8841#8842#0" expanded="true" />  
1308 - </folding>  
1309 </state> 1344 </state>
1310 </provider> 1345 </provider>
1311 </entry> 1346 </entry>
@@ -1313,7 +1348,6 @@ @@ -1313,7 +1348,6 @@
1313 <provider selected="true" editor-type-id="text-editor"> 1348 <provider selected="true" editor-type-id="text-editor">
1314 <state relative-caret-position="162"> 1349 <state relative-caret-position="162">
1315 <caret line="315" column="0" selection-start-line="315" selection-start-column="0" selection-end-line="315" selection-end-column="0" /> 1350 <caret line="315" column="0" selection-start-line="315" selection-start-column="0" selection-end-line="315" selection-end-column="0" />
1316 - <folding />  
1317 </state> 1351 </state>
1318 </provider> 1352 </provider>
1319 </entry> 1353 </entry>
@@ -1321,7 +1355,6 @@ @@ -1321,7 +1355,6 @@
1321 <provider selected="true" editor-type-id="text-editor"> 1355 <provider selected="true" editor-type-id="text-editor">
1322 <state relative-caret-position="450"> 1356 <state relative-caret-position="450">
1323 <caret line="62" column="0" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" /> 1357 <caret line="62" column="0" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
1324 - <folding />  
1325 </state> 1358 </state>
1326 </provider> 1359 </provider>
1327 </entry> 1360 </entry>
@@ -1329,7 +1362,6 @@ @@ -1329,7 +1362,6 @@
1329 <provider selected="true" editor-type-id="text-editor"> 1362 <provider selected="true" editor-type-id="text-editor">
1330 <state relative-caret-position="135"> 1363 <state relative-caret-position="135">
1331 <caret line="80" column="0" selection-start-line="80" selection-start-column="0" selection-end-line="80" selection-end-column="0" /> 1364 <caret line="80" column="0" selection-start-line="80" selection-start-column="0" selection-end-line="80" selection-end-column="0" />
1332 - <folding />  
1333 </state> 1365 </state>
1334 </provider> 1366 </provider>
1335 </entry> 1367 </entry>
@@ -1337,17 +1369,6 @@ @@ -1337,17 +1369,6 @@
1337 <provider selected="true" editor-type-id="text-editor"> 1369 <provider selected="true" editor-type-id="text-editor">
1338 <state relative-caret-position="195"> 1370 <state relative-caret-position="195">
1339 <caret line="16" column="29" selection-start-line="16" selection-start-column="28" selection-end-line="16" selection-end-column="29" /> 1371 <caret line="16" column="29" selection-start-line="16" selection-start-column="28" selection-end-line="16" selection-end-column="29" />
1340 - <folding>  
1341 - <element signature="imports" expanded="true" />  
1342 - </folding>  
1343 - </state>  
1344 - </provider>  
1345 - </entry>  
1346 - <entry file="file://$PROJECT_DIR$/src/main/resources/spring/task.xml">  
1347 - <provider selected="true" editor-type-id="text-editor">  
1348 - <state relative-caret-position="-287">  
1349 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
1350 - <folding />  
1351 </state> 1372 </state>
1352 </provider> 1373 </provider>
1353 </entry> 1374 </entry>
@@ -1355,7 +1376,6 @@ @@ -1355,7 +1376,6 @@
1355 <provider selected="true" editor-type-id="text-editor"> 1376 <provider selected="true" editor-type-id="text-editor">
1356 <state relative-caret-position="30"> 1377 <state relative-caret-position="30">
1357 <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" /> 1378 <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
1358 - <folding />  
1359 </state> 1379 </state>
1360 </provider> 1380 </provider>
1361 </entry> 1381 </entry>
@@ -1363,7 +1383,6 @@ @@ -1363,7 +1383,6 @@
1363 <provider selected="true" editor-type-id="text-editor"> 1383 <provider selected="true" editor-type-id="text-editor">
1364 <state relative-caret-position="-23"> 1384 <state relative-caret-position="-23">
1365 <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" /> 1385 <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
1366 - <folding />  
1367 </state> 1386 </state>
1368 </provider> 1387 </provider>
1369 </entry> 1388 </entry>
@@ -1371,15 +1390,6 @@ @@ -1371,15 +1390,6 @@
1371 <provider selected="true" editor-type-id="text-editor"> 1390 <provider selected="true" editor-type-id="text-editor">
1372 <state relative-caret-position="217"> 1391 <state relative-caret-position="217">
1373 <caret line="25" column="34" selection-start-line="25" selection-start-column="21" selection-end-line="25" selection-end-column="34" /> 1392 <caret line="25" column="34" selection-start-line="25" selection-start-column="21" selection-end-line="25" selection-end-column="34" />
1374 - <folding />  
1375 - </state>  
1376 - </provider>  
1377 - </entry>  
1378 - <entry file="file://$PROJECT_DIR$/src/main/resources/spring/tool.xml">  
1379 - <provider selected="true" editor-type-id="text-editor">  
1380 - <state relative-caret-position="0">  
1381 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
1382 - <folding />  
1383 </state> 1393 </state>
1384 </provider> 1394 </provider>
1385 </entry> 1395 </entry>
@@ -1387,7 +1397,6 @@ @@ -1387,7 +1397,6 @@
1387 <provider selected="true" editor-type-id="text-editor"> 1397 <provider selected="true" editor-type-id="text-editor">
1388 <state relative-caret-position="-3960"> 1398 <state relative-caret-position="-3960">
1389 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 1399 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1390 - <folding />  
1391 </state> 1400 </state>
1392 </provider> 1401 </provider>
1393 </entry> 1402 </entry>
@@ -1395,19 +1404,6 @@ @@ -1395,19 +1404,6 @@
1395 <provider selected="true" editor-type-id="text-editor"> 1404 <provider selected="true" editor-type-id="text-editor">
1396 <state relative-caret-position="60"> 1405 <state relative-caret-position="60">
1397 <caret line="7" column="39" selection-start-line="7" selection-start-column="39" selection-end-line="7" selection-end-column="39" /> 1406 <caret line="7" column="39" selection-start-line="7" selection-start-column="39" selection-end-line="7" selection-end-column="39" />
1398 - <folding />  
1399 - </state>  
1400 - </provider>  
1401 - </entry>  
1402 - <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/test.xml">  
1403 - <provider selected="true" editor-type-id="text-editor">  
1404 - <state relative-caret-position="0">  
1405 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
1406 - <folding>  
1407 - <marker date="1469608321062" expanded="true" signature="264:294" ph="SELECT id, n... test" />  
1408 - <marker date="1469608321062" expanded="true" signature="646:677" ph="delete from " />  
1409 - <marker date="1469608321062" expanded="true" signature="781:843" ph="update test " />  
1410 - </folding>  
1411 </state> 1407 </state>
1412 </provider> 1408 </provider>
1413 </entry> 1409 </entry>
@@ -1423,7 +1419,6 @@ @@ -1423,7 +1419,6 @@
1423 <provider selected="true" editor-type-id="text-editor"> 1419 <provider selected="true" editor-type-id="text-editor">
1424 <state relative-caret-position="-355"> 1420 <state relative-caret-position="-355">
1425 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 1421 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1426 - <folding />  
1427 </state> 1422 </state>
1428 </provider> 1423 </provider>
1429 </entry> 1424 </entry>
@@ -1439,7 +1434,6 @@ @@ -1439,7 +1434,6 @@
1439 <provider selected="true" editor-type-id="text-editor"> 1434 <provider selected="true" editor-type-id="text-editor">
1440 <state relative-caret-position="165"> 1435 <state relative-caret-position="165">
1441 <caret line="12" column="14" selection-start-line="12" selection-start-column="14" selection-end-line="12" selection-end-column="27" /> 1436 <caret line="12" column="14" selection-start-line="12" selection-start-column="14" selection-end-line="12" selection-end-column="27" />
1442 - <folding />  
1443 </state> 1437 </state>
1444 </provider> 1438 </provider>
1445 </entry> 1439 </entry>
@@ -1447,7 +1441,6 @@ @@ -1447,7 +1441,6 @@
1447 <provider selected="true" editor-type-id="text-editor"> 1441 <provider selected="true" editor-type-id="text-editor">
1448 <state relative-caret-position="120"> 1442 <state relative-caret-position="120">
1449 <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" /> 1443 <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
1450 - <folding />  
1451 </state> 1444 </state>
1452 </provider> 1445 </provider>
1453 </entry> 1446 </entry>
@@ -1455,7 +1448,6 @@ @@ -1455,7 +1448,6 @@
1455 <provider selected="true" editor-type-id="text-editor"> 1448 <provider selected="true" editor-type-id="text-editor">
1456 <state relative-caret-position="196"> 1449 <state relative-caret-position="196">
1457 <caret line="22" column="14" selection-start-line="22" selection-start-column="14" selection-end-line="22" selection-end-column="14" /> 1450 <caret line="22" column="14" selection-start-line="22" selection-start-column="14" selection-end-line="22" selection-end-column="14" />
1458 - <folding />  
1459 </state> 1451 </state>
1460 </provider> 1452 </provider>
1461 </entry> 1453 </entry>
@@ -1483,96 +1475,217 @@ @@ -1483,96 +1475,217 @@
1483 </state> 1475 </state>
1484 </provider> 1476 </provider>
1485 </entry> 1477 </entry>
1486 - <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/springmvc-servlet.xml"> 1478 + <entry file="file://$PROJECT_DIR$/src/main/webapp/include/header.jsp">
1487 <provider selected="true" editor-type-id="text-editor"> 1479 <provider selected="true" editor-type-id="text-editor">
1488 - <state relative-caret-position="75">  
1489 - <caret line="11" column="54" selection-start-line="11" selection-start-column="48" selection-end-line="11" selection-end-column="54" /> 1480 + <state relative-caret-position="195">
  1481 + <caret line="13" column="45" selection-start-line="13" selection-start-column="40" selection-end-line="13" selection-end-column="45" />
  1482 + </state>
  1483 + </provider>
  1484 + </entry>
  1485 + <entry file="file://$PROJECT_DIR$/src/main/webapp/js/pay.js">
  1486 + <provider selected="true" editor-type-id="text-editor">
  1487 + <state relative-caret-position="0">
  1488 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1489 + </state>
  1490 + </provider>
  1491 + </entry>
  1492 + <entry file="file://$PROJECT_DIR$/src/main/webapp/order_detail.jsp">
  1493 + <provider selected="true" editor-type-id="text-editor">
  1494 + <state relative-caret-position="420">
  1495 + <caret line="28" column="0" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="70" />
1490 <folding /> 1496 <folding />
1491 </state> 1497 </state>
1492 </provider> 1498 </provider>
1493 </entry> 1499 </entry>
1494 - <entry file="file://$PROJECT_DIR$/src/main/webapp/include/header.jsp"> 1500 + <entry file="file://$PROJECT_DIR$/target/classes/applicationContext.xml">
1495 <provider selected="true" editor-type-id="text-editor"> 1501 <provider selected="true" editor-type-id="text-editor">
1496 - <state relative-caret-position="195">  
1497 - <caret line="13" column="45" selection-start-line="13" selection-start-column="40" selection-end-line="13" selection-end-column="45" /> 1502 + <state relative-caret-position="0">
  1503 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1498 <folding /> 1504 <folding />
1499 </state> 1505 </state>
1500 </provider> 1506 </provider>
1501 </entry> 1507 </entry>
1502 - <entry file="file://$PROJECT_DIR$/src/main/webapp/js/index.js"> 1508 + <entry file="file://$PROJECT_DIR$/target/classes/logback.xml">
1503 <provider selected="true" editor-type-id="text-editor"> 1509 <provider selected="true" editor-type-id="text-editor">
1504 - <state relative-caret-position="810">  
1505 - <caret line="54" column="28" selection-start-line="54" selection-start-column="25" selection-end-line="54" selection-end-column="28" /> 1510 + <state relative-caret-position="0">
  1511 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1506 <folding /> 1512 <folding />
1507 </state> 1513 </state>
1508 </provider> 1514 </provider>
1509 </entry> 1515 </entry>
1510 - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java"> 1516 + <entry file="file://$PROJECT_DIR$/src/main/resources/spring/tool.xml">
1511 <provider selected="true" editor-type-id="text-editor"> 1517 <provider selected="true" editor-type-id="text-editor">
1512 - <state relative-caret-position="285">  
1513 - <caret line="19" column="39" selection-start-line="19" selection-start-column="26" selection-end-line="19" selection-end-column="39" /> 1518 + <state relative-caret-position="300">
  1519 + <caret line="20" column="27" selection-start-line="20" selection-start-column="27" selection-end-line="20" selection-end-column="27" />
  1520 + <folding />
  1521 + </state>
  1522 + </provider>
  1523 + </entry>
  1524 + <entry file="file://$PROJECT_DIR$/src/main/webapp/ajax_test.jsp">
  1525 + <provider selected="true" editor-type-id="text-editor">
  1526 + <state relative-caret-position="240">
  1527 + <caret line="16" column="29" selection-start-line="16" selection-start-column="29" selection-end-line="16" selection-end-column="29" />
  1528 + <folding />
  1529 + </state>
  1530 + </provider>
  1531 + </entry>
  1532 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/common/utils/SpringUtils.java">
  1533 + <provider selected="true" editor-type-id="text-editor">
  1534 + <state relative-caret-position="191">
  1535 + <caret line="19" column="59" selection-start-line="19" selection-start-column="36" selection-end-line="19" selection-end-column="59" />
  1536 + </state>
  1537 + </provider>
  1538 + </entry>
  1539 + <entry file="file://$PROJECT_DIR$/src/main/resources/spring/task.xml">
  1540 + <provider selected="true" editor-type-id="text-editor">
  1541 + <state relative-caret-position="45">
  1542 + <caret line="3" column="58" selection-start-line="3" selection-start-column="54" selection-end-line="3" selection-end-column="58" />
1514 <folding> 1543 <folding>
1515 - <element signature="imports" expanded="true" />  
1516 - <element signature="e#673#674#0" expanded="true" />  
1517 - <element signature="e#703#704#0" expanded="true" /> 1544 + <element signature="e#490#513#0" expanded="false" />
1518 </folding> 1545 </folding>
1519 </state> 1546 </state>
1520 </provider> 1547 </provider>
1521 </entry> 1548 </entry>
1522 - <entry file="file://$PROJECT_DIR$/src/main/webapp/js/pay.js"> 1549 + <entry file="file://$PROJECT_DIR$/src/main/resources/spring/dao.xml">
1523 <provider selected="true" editor-type-id="text-editor"> 1550 <provider selected="true" editor-type-id="text-editor">
1524 - <state relative-caret-position="0">  
1525 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 1551 + <state relative-caret-position="135">
  1552 + <caret line="9" column="34" selection-start-line="9" selection-start-column="24" selection-end-line="9" selection-end-column="34" />
1526 <folding /> 1553 <folding />
1527 </state> 1554 </state>
1528 </provider> 1555 </provider>
1529 </entry> 1556 </entry>
1530 - <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml"> 1557 + <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/springmvc-servlet.xml">
1531 <provider selected="true" editor-type-id="text-editor"> 1558 <provider selected="true" editor-type-id="text-editor">
1532 - <state relative-caret-position="146">  
1533 - <caret line="18" column="22" selection-start-line="18" selection-start-column="22" selection-end-line="18" selection-end-column="22" /> 1559 + <state relative-caret-position="375">
  1560 + <caret line="25" column="0" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" />
1534 <folding /> 1561 <folding />
1535 </state> 1562 </state>
1536 </provider> 1563 </provider>
1537 </entry> 1564 </entry>
1538 - <entry file="file://$PROJECT_DIR$/src/main/webapp/order_detail.jsp"> 1565 + <entry file="file://$PROJECT_DIR$/src/main/resources/applicationContext.xml">
1539 <provider selected="true" editor-type-id="text-editor"> 1566 <provider selected="true" editor-type-id="text-editor">
1540 - <state relative-caret-position="420">  
1541 - <caret line="28" column="0" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="70" /> 1567 + <state relative-caret-position="240">
  1568 + <caret line="16" column="0" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
  1569 + <folding />
  1570 + </state>
  1571 + </provider>
  1572 + </entry>
  1573 + <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
  1574 + <provider selected="true" editor-type-id="text-editor">
  1575 + <state relative-caret-position="60">
  1576 + <caret line="4" column="5" selection-start-line="4" selection-start-column="5" selection-end-line="4" selection-end-column="5" />
1542 <folding /> 1577 <folding />
1543 </state> 1578 </state>
1544 </provider> 1579 </provider>
1545 </entry> 1580 </entry>
  1581 + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/test.xml">
  1582 + <provider selected="true" editor-type-id="text-editor">
  1583 + <state relative-caret-position="0">
  1584 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1585 + <folding>
  1586 + <marker date="1469608321062" expanded="true" signature="264:294" ph="SELECT id, n... test" />
  1587 + <marker date="1469608321062" expanded="true" signature="646:677" ph="delete from " />
  1588 + <marker date="1469608321062" expanded="true" signature="781:843" ph="update test " />
  1589 + </folding>
  1590 + </state>
  1591 + </provider>
  1592 + </entry>
  1593 + <entry file="file://$PROJECT_DIR$/src/test/java/com/canrd/patent/BaseTest.java">
  1594 + <provider selected="true" editor-type-id="text-editor">
  1595 + <state relative-caret-position="120">
  1596 + <caret line="12" column="33" selection-start-line="12" selection-start-column="33" selection-end-line="12" selection-end-column="33" />
  1597 + </state>
  1598 + </provider>
  1599 + </entry>
1546 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementDataController.java"> 1600 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/CasementDataController.java">
1547 <provider selected="true" editor-type-id="text-editor"> 1601 <provider selected="true" editor-type-id="text-editor">
1548 - <state relative-caret-position="165">  
1549 - <caret line="44" column="82" selection-start-line="44" selection-start-column="74" selection-end-line="44" selection-end-column="82" /> 1602 + <state relative-caret-position="450">
  1603 + <caret line="48" column="11" selection-start-line="48" selection-start-column="11" selection-end-line="48" selection-end-column="11" />
1550 <folding /> 1604 <folding />
1551 </state> 1605 </state>
1552 </provider> 1606 </provider>
1553 </entry> 1607 </entry>
1554 - <entry file="file://$PROJECT_DIR$/src/main/webapp/home_patent.jsp"> 1608 + <entry file="file://$PROJECT_DIR$/src/main/webapp/pay.jsp">
1555 <provider selected="true" editor-type-id="text-editor"> 1609 <provider selected="true" editor-type-id="text-editor">
1556 - <state relative-caret-position="3501">  
1557 - <caret line="264" column="4" selection-start-line="264" selection-start-column="4" selection-end-line="264" selection-end-column="4" /> 1610 + <state relative-caret-position="1980">
  1611 + <caret line="132" column="40" selection-start-line="132" selection-start-column="40" selection-end-line="132" selection-end-column="40" />
  1612 + <folding />
  1613 + </state>
  1614 + </provider>
  1615 + </entry>
  1616 + <entry file="file://$PROJECT_DIR$/src/main/webapp/js/index.js">
  1617 + <provider selected="true" editor-type-id="text-editor">
  1618 + <state relative-caret-position="885">
  1619 + <caret line="59" column="9" selection-start-line="59" selection-start-column="9" selection-end-line="59" selection-end-column="9" />
  1620 + <folding />
  1621 + </state>
  1622 + </provider>
  1623 + </entry>
  1624 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/IndexController.java">
  1625 + <provider selected="true" editor-type-id="text-editor">
  1626 + <state relative-caret-position="240">
  1627 + <caret line="22" column="14" selection-start-line="22" selection-start-column="14" selection-end-line="22" selection-end-column="14" />
  1628 + <folding>
  1629 + <element signature="e#673#674#0" expanded="true" />
  1630 + <element signature="e#703#704#0" expanded="true" />
  1631 + <element signature="e#793#794#0" expanded="true" />
  1632 + <element signature="e#841#842#0" expanded="true" />
  1633 + </folding>
  1634 + </state>
  1635 + </provider>
  1636 + </entry>
  1637 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/UserModel.java">
  1638 + <provider selected="true" editor-type-id="text-editor">
  1639 + <state relative-caret-position="285">
  1640 + <caret line="21" column="5" selection-start-line="21" selection-start-column="5" selection-end-line="21" selection-end-column="5" />
1558 <folding /> 1641 <folding />
1559 </state> 1642 </state>
1560 </provider> 1643 </provider>
1561 </entry> 1644 </entry>
1562 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/AjaxTestController.java"> 1645 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/AjaxTestController.java">
1563 <provider selected="true" editor-type-id="text-editor"> 1646 <provider selected="true" editor-type-id="text-editor">
1564 - <state relative-caret-position="315">  
1565 - <caret line="21" column="38" selection-start-line="21" selection-start-column="34" selection-end-line="21" selection-end-column="38" /> 1647 + <state relative-caret-position="390">
  1648 + <caret line="26" column="32" selection-start-line="26" selection-start-column="32" selection-end-line="26" selection-end-column="32" />
1566 <folding> 1649 <folding>
1567 <element signature="imports" expanded="true" /> 1650 <element signature="imports" expanded="true" />
1568 </folding> 1651 </folding>
1569 </state> 1652 </state>
1570 </provider> 1653 </provider>
1571 </entry> 1654 </entry>
1572 - <entry file="file://$PROJECT_DIR$/src/main/webapp/ajax_test.jsp"> 1655 + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/user.xml">
1573 <provider selected="true" editor-type-id="text-editor"> 1656 <provider selected="true" editor-type-id="text-editor">
1574 - <state relative-caret-position="240">  
1575 - <caret line="25" column="39" selection-start-line="25" selection-start-column="39" selection-end-line="25" selection-end-column="39" /> 1657 + <state relative-caret-position="0">
  1658 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1659 + <folding>
  1660 + <marker date="1469675490584" expanded="true" signature="264:283" ph="SELECT * FRO... user" />
  1661 + <marker date="1469675490584" expanded="true" signature="803:834" ph="delete from " />
  1662 + <marker date="1469675490584" expanded="true" signature="936:1204" ph="update user " />
  1663 + </folding>
  1664 + </state>
  1665 + </provider>
  1666 + </entry>
  1667 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/UserController.java">
  1668 + <provider selected="true" editor-type-id="text-editor">
  1669 + <state relative-caret-position="-441">
  1670 + <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
  1671 + <folding />
  1672 + </state>
  1673 + </provider>
  1674 + </entry>
  1675 + <entry file="file://$PROJECT_DIR$/src/main/webapp/home_patent.jsp">
  1676 + <provider selected="true" editor-type-id="text-editor">
  1677 + <state relative-caret-position="485">
  1678 + <caret line="53" column="0" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
  1679 + <folding>
  1680 + <element signature="n#script#0;n#!!top" expanded="false" />
  1681 + </folding>
  1682 + </state>
  1683 + </provider>
  1684 + </entry>
  1685 + <entry file="file://$PROJECT_DIR$/src/main/webapp/css/home.css">
  1686 + <provider selected="true" editor-type-id="text-editor">
  1687 + <state relative-caret-position="165">
  1688 + <caret line="11" column="8" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="8" />
1576 <folding /> 1689 <folding />
1577 </state> 1690 </state>
1578 </provider> 1691 </provider>
src/main/webapp/home_patent.jsp
  View file @477b582
@@ -77,7 +77,7 @@ @@ -77,7 +77,7 @@
77 //默认选择 77 //默认选择
78 if(i==0){ 78 if(i==0){
79 caseTypeLi.css("background","#1287cd"); 79 caseTypeLi.css("background","#1287cd");
80 - selectTypeFlag['caseType']=ct.name; 80 + selectTypeFlag['caseType']=ct.name;caculate_price
81 } 81 }
82 //描述信息 82 //描述信息
83 if(i==0&&ct.description!=null){ 83 if(i==0&&ct.description!=null){
target/patent/home_patent.jsp
  View file @477b582
@@ -77,7 +77,7 @@ @@ -77,7 +77,7 @@
77 //默认选择 77 //默认选择
78 if(i==0){ 78 if(i==0){
79 caseTypeLi.css("background","#1287cd"); 79 caseTypeLi.css("background","#1287cd");
80 - selectTypeFlag['caseType']=ct.name; 80 + selectTypeFlag['caseType']=ct.name;caculate_price
81 } 81 }
82 //描述信息 82 //描述信息
83 if(i==0&&ct.description!=null){ 83 if(i==0&&ct.description!=null){