kelude / canrd-patent · Commits

Commit bbce2f936823da5244fa509b87bcb82892bcf2fc

Authored by litao
1 parent a0090f51
build: skipped

user all fields

Inline Side-by-side
Showing 3 changed files with 121 additions and 269 deletions
.idea/workspace.xml
  View file @bbce2f9
@@ -2,22 +2,9 @@ @@ -2,22 +2,9 @@
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$/authorized_keys" />  
6 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/UserMapper.java" />  
7 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/UserModel.java" />  
8 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/UserController.java" />  
9 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/resources/mapper/user.xml" />  
10 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.class" afterPath="$PROJECT_DIR$/target/classes/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.class" />  
11 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.class" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/com/canrd/patent/dal/dto/HomePatentTypeOutputDto.class" />  
12 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/artifacts/patent_war_exploded.xml" afterPath="$PROJECT_DIR$/.idea/artifacts/patent_war_exploded.xml" />  
13 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/compiler.xml" afterPath="$PROJECT_DIR$/.idea/compiler.xml" />  
14 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />  
15 <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" />
16 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/patent.iml" afterPath="$PROJECT_DIR$/patent.iml" />  
17 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources.local/props/jdbc.properties" afterPath="$PROJECT_DIR$/src/main/resources.local/props/jdbc.properties" />  
18 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources.prod/props/jdbc.properties" afterPath="$PROJECT_DIR$/src/main/resources.prod/props/jdbc.properties" />  
19 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/props/jdbc.properties" afterPath="$PROJECT_DIR$/target/classes/props/jdbc.properties" />  
20 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/patent/WEB-INF/classes/props/jdbc.properties" afterPath="$PROJECT_DIR$/target/patent/WEB-INF/classes/props/jdbc.properties" /> 6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/UserController.java" afterPath="$PROJECT_DIR$/src/main/java/com/canrd/patent/web/UserController.java" />
  7 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/mapper/user.xml" afterPath="$PROJECT_DIR$/src/main/resources/mapper/user.xml" />
21 </list> 8 </list>
22 <ignored path="patent.iws" /> 9 <ignored path="patent.iws" />
23 <ignored path=".idea/workspace.xml" /> 10 <ignored path=".idea/workspace.xml" />
@@ -43,40 +30,22 @@ @@ -43,40 +30,22 @@
43 <file leaf-file-name="HelloController.java" pinned="false" current-in-tab="false"> 30 <file leaf-file-name="HelloController.java" pinned="false" current-in-tab="false">
44 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HelloController.java"> 31 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HelloController.java">
45 <provider selected="true" editor-type-id="text-editor"> 32 <provider selected="true" editor-type-id="text-editor">
46 - <state relative-caret-position="-15"> 33 + <state relative-caret-position="15">
47 <caret line="58" column="93" selection-start-line="58" selection-start-column="87" selection-end-line="58" selection-end-column="93" /> 34 <caret line="58" column="93" selection-start-line="58" selection-start-column="87" selection-end-line="58" selection-end-column="93" />
48 <folding> 35 <folding>
49 <element signature="imports" expanded="true" /> 36 <element signature="imports" expanded="true" />
50 - <element signature="e#1779#1780#0" expanded="true" />  
51 - <element signature="e#1814#1815#0" expanded="true" />  
52 </folding> 37 </folding>
53 </state> 38 </state>
54 </provider> 39 </provider>
55 </entry> 40 </entry>
56 </file> 41 </file>
57 - <file leaf-file-name="UserController.java" pinned="false" current-in-tab="false"> 42 + <file leaf-file-name="UserController.java" pinned="false" current-in-tab="true">
58 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/UserController.java"> 43 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/UserController.java">
59 <provider selected="true" editor-type-id="text-editor"> 44 <provider selected="true" editor-type-id="text-editor">
60 - <state relative-caret-position="348">  
61 - <caret line="77" column="26" selection-start-line="77" selection-start-column="26" selection-end-line="77" selection-end-column="26" /> 45 + <state relative-caret-position="506">
  46 + <caret line="115" column="29" selection-start-line="115" selection-start-column="29" selection-end-line="115" selection-end-column="29" />
62 <folding> 47 <folding>
63 <element signature="imports" expanded="true" /> 48 <element signature="imports" expanded="true" />
64 - <element signature="e#1724#1725#0" expanded="true" />  
65 - <element signature="e#1759#1760#0" expanded="true" />  
66 - </folding>  
67 - </state>  
68 - </provider>  
69 - </entry>  
70 - </file>  
71 - <file leaf-file-name="test.xml" pinned="false" current-in-tab="false">  
72 - <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/test.xml">  
73 - <provider selected="true" editor-type-id="text-editor">  
74 - <state relative-caret-position="75">  
75 - <caret line="5" column="16" selection-start-line="5" selection-start-column="16" selection-end-line="5" selection-end-column="16" />  
76 - <folding>  
77 - <marker date="1469608321062" expanded="true" signature="264:294" ph="SELECT id, n... test" />  
78 - <marker date="1469608321062" expanded="true" signature="646:677" ph="delete from " />  
79 - <marker date="1469608321062" expanded="true" signature="781:843" ph="update test " />  
80 </folding> 49 </folding>
81 </state> 50 </state>
82 </provider> 51 </provider>
@@ -86,7 +55,7 @@ @@ -86,7 +55,7 @@
86 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/UserMapper.java"> 55 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/UserMapper.java">
87 <provider selected="true" editor-type-id="text-editor"> 56 <provider selected="true" editor-type-id="text-editor">
88 <state relative-caret-position="195"> 57 <state relative-caret-position="195">
89 - <caret line="13" column="15" selection-start-line="13" selection-start-column="9" selection-end-line="13" selection-end-column="15" /> 58 + <caret line="13" column="35" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="35" />
90 <folding> 59 <folding>
91 <element signature="imports" expanded="true" /> 60 <element signature="imports" expanded="true" />
92 </folding> 61 </folding>
@@ -94,51 +63,15 @@ @@ -94,51 +63,15 @@
94 </provider> 63 </provider>
95 </entry> 64 </entry>
96 </file> 65 </file>
97 - <file leaf-file-name="user.xml" pinned="false" current-in-tab="true"> 66 + <file leaf-file-name="user.xml" pinned="false" current-in-tab="false">
98 <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/user.xml"> 67 <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/user.xml">
99 <provider selected="true" editor-type-id="text-editor"> 68 <provider selected="true" editor-type-id="text-editor">
100 <state relative-caret-position="180"> 69 <state relative-caret-position="180">
101 - <caret line="12" column="32" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="32" />  
102 - <folding>  
103 - <marker date="1469621367307" expanded="true" signature="264:290" ph="SELECT id, n... user" />  
104 - <marker date="1469621367307" expanded="true" signature="656:687" ph="delete from " />  
105 - <marker date="1469621367307" expanded="true" signature="789:851" ph="update user " />  
106 - </folding>  
107 - </state>  
108 - </provider>  
109 - </entry>  
110 - </file>  
111 - <file leaf-file-name="CasementMapper.xml" pinned="false" current-in-tab="false">  
112 - <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/CasementMapper.xml">  
113 - <provider selected="true" editor-type-id="text-editor">  
114 - <state relative-caret-position="0">  
115 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
116 - <folding>  
117 - <marker date="1469608321062" expanded="true" signature="4936:5039" ph="select from casement" />  
118 - <marker date="1469608321062" expanded="true" signature="5252:5309" ph="delete from " />  
119 - <marker date="1469608321062" expanded="true" signature="5547:5567" ph="delete from " />  
120 - <marker date="1469608321062" expanded="true" signature="8994:9023" ph="select count... casement" />  
121 - <marker date="1469608321062" expanded="true" signature="10985:11656" ph="update casem... " />  
122 - <marker date="1469608321062" expanded="true" signature="12001:13154" ph="update casem... " />  
123 - <marker date="1469608321062" expanded="true" signature="13388:13978" ph="update casem... " />  
124 - </folding>  
125 - </state>  
126 - </provider>  
127 - </entry>  
128 - </file>  
129 - <file leaf-file-name="OrderMapper.xml" pinned="false" current-in-tab="false">  
130 - <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/OrderMapper.xml">  
131 - <provider selected="true" editor-type-id="text-editor">  
132 - <state relative-caret-position="-3150">  
133 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 70 + <caret line="12" column="28" selection-start-line="12" selection-start-column="26" selection-end-line="12" selection-end-column="103" />
134 <folding> 71 <folding>
135 - <marker date="1469608321062" expanded="true" signature="5063:5164" ph="select from orders" />  
136 - <marker date="1469608321062" expanded="true" signature="5377:5432" ph="delete from " />  
137 - <marker date="1469608321062" expanded="true" signature="5667:5685" ph="delete from " />  
138 - <marker date="1469608321062" expanded="true" signature="9443:9470" ph="select count... orders" />  
139 - <marker date="1469608321062" expanded="true" signature="11625:12383" ph="update order... " />  
140 - <marker date="1469608321062" expanded="true" signature="12725:14043" ph="update order... " />  
141 - <marker date="1469608321062" expanded="true" signature="14274:14937" ph="update order... " /> 72 + <marker date="1469675490584" expanded="true" signature="264:283" ph="SELECT id, n... user" />
  73 + <marker date="1469675490584" expanded="true" signature="803:834" ph="delete from " />
  74 + <marker date="1469675490584" expanded="true" signature="936:1204" ph="update user " />
142 </folding> 75 </folding>
143 </state> 76 </state>
144 </provider> 77 </provider>
@@ -147,7 +80,7 @@ @@ -147,7 +80,7 @@
147 <file leaf-file-name="MybatisTestMapper.xml" pinned="false" current-in-tab="false"> 80 <file leaf-file-name="MybatisTestMapper.xml" pinned="false" current-in-tab="false">
148 <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/MybatisTestMapper.xml"> 81 <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/MybatisTestMapper.xml">
149 <provider selected="true" editor-type-id="text-editor"> 82 <provider selected="true" editor-type-id="text-editor">
150 - <state relative-caret-position="499"> 83 + <state relative-caret-position="3510">
151 <caret line="234" column="39" selection-start-line="234" selection-start-column="39" selection-end-line="234" selection-end-column="39" /> 84 <caret line="234" column="39" selection-start-line="234" selection-start-column="39" selection-end-line="234" selection-end-column="39" />
152 <folding> 85 <folding>
153 <marker date="1469608321062" expanded="true" signature="4146:4253" ph="select from mybatis_test" /> 86 <marker date="1469608321062" expanded="true" signature="4146:4253" ph="select from mybatis_test" />
@@ -162,52 +95,6 @@ @@ -162,52 +95,6 @@
162 </provider> 95 </provider>
163 </entry> 96 </entry>
164 </file> 97 </file>
165 - <file leaf-file-name="UserModel.java" pinned="false" current-in-tab="false">  
166 - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/UserModel.java">  
167 - <provider selected="true" editor-type-id="text-editor">  
168 - <state relative-caret-position="285">  
169 - <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />  
170 - <folding>  
171 - <element signature="e#450#451#0" expanded="true" />  
172 - <element signature="e#596#597#0" expanded="true" />  
173 - <element signature="e#621#622#0" expanded="true" />  
174 - <element signature="e#654#655#0" expanded="true" />  
175 - <element signature="e#682#683#0" expanded="true" />  
176 - <element signature="e#713#714#0" expanded="true" />  
177 - <element signature="e#740#741#0" expanded="true" />  
178 - <element signature="e#780#781#0" expanded="true" />  
179 - <element signature="e#812#813#0" expanded="true" />  
180 - <element signature="e#847#848#0" expanded="true" />  
181 - <element signature="e#878#879#0" expanded="true" />  
182 - <element signature="e#926#927#0" expanded="true" />  
183 - <element signature="e#966#967#0" expanded="true" />  
184 - <element signature="e#1013#1014#0" expanded="true" />  
185 - <element signature="e#1056#1057#0" expanded="true" />  
186 - <element signature="e#1224#1225#0" expanded="true" />  
187 - <element signature="e#1252#1253#0" expanded="true" />  
188 - <element signature="e#1294#1295#0" expanded="true" />  
189 - <element signature="e#1328#1329#0" expanded="true" />  
190 - <element signature="e#1365#1366#0" expanded="true" />  
191 - <element signature="e#1398#1399#0" expanded="true" />  
192 - <element signature="e#1450#1451#0" expanded="true" />  
193 - <element signature="e#1494#1495#0" expanded="true" />  
194 - <element signature="e#1530#1531#0" expanded="true" />  
195 - <element signature="e#1562#1563#0" expanded="true" />  
196 - <element signature="e#1612#1613#0" expanded="true" />  
197 - <element signature="e#1654#1655#0" expanded="true" />  
198 - <element signature="e#1691#1692#0" expanded="true" />  
199 - <element signature="e#1724#1725#0" expanded="true" />  
200 - <element signature="e#1776#1777#0" expanded="true" />  
201 - <element signature="e#1820#1821#0" expanded="true" />  
202 - <element signature="e#1851#1852#0" expanded="true" />  
203 - <element signature="e#1878#1879#0" expanded="true" />  
204 - <element signature="e#1918#1919#0" expanded="true" />  
205 - <element signature="e#1950#1951#0" expanded="true" />  
206 - </folding>  
207 - </state>  
208 - </provider>  
209 - </entry>  
210 - </file>  
211 </leaf> 98 </leaf>
212 </component> 99 </component>
213 <component name="FileTemplateManagerImpl"> 100 <component name="FileTemplateManagerImpl">
@@ -372,10 +259,10 @@ @@ -372,10 +259,10 @@
372 </treeState> 259 </treeState>
373 </component> 260 </component>
374 <component name="ProjectFrameBounds"> 261 <component name="ProjectFrameBounds">
375 - <option name="x" value="1049" />  
376 - <option name="y" value="107" />  
377 - <option name="width" value="944" />  
378 - <option name="height" value="851" /> 262 + <option name="x" value="65" />
  263 + <option name="y" value="24" />
  264 + <option name="width" value="1855" />
  265 + <option name="height" value="1056" />
379 </component> 266 </component>
380 <component name="ProjectLevelVcsManager" settingsEditedManually="false"> 267 <component name="ProjectLevelVcsManager" settingsEditedManually="false">
381 <OptionsSetting value="true" id="Add" /> 268 <OptionsSetting value="true" id="Add" />
@@ -403,6 +290,8 @@ @@ -403,6 +290,8 @@
403 </navigator> 290 </navigator>
404 <panes> 291 <panes>
405 <pane id="Scope" /> 292 <pane id="Scope" />
  293 + <pane id="PackagesPane" />
  294 + <pane id="Scratches" />
406 <pane id="ProjectPane"> 295 <pane id="ProjectPane">
407 <subPane> 296 <subPane>
408 <PATH> 297 <PATH>
@@ -675,8 +564,6 @@ @@ -675,8 +564,6 @@
675 </PATH> 564 </PATH>
676 </subPane> 565 </subPane>
677 </pane> 566 </pane>
678 - <pane id="Scratches" />  
679 - <pane id="PackagesPane" />  
680 </panes> 567 </panes>
681 </component> 568 </component>
682 <component name="PropertiesComponent"> 569 <component name="PropertiesComponent">
@@ -694,7 +581,7 @@ @@ -694,7 +581,7 @@
694 <property name="OverrideImplement.combined" value="true" /> 581 <property name="OverrideImplement.combined" value="true" />
695 <property name="OverrideImplement.overriding.sorted" value="false" /> 582 <property name="OverrideImplement.overriding.sorted" value="false" />
696 <property name="extract.method.default.visibility" value="private" /> 583 <property name="extract.method.default.visibility" value="private" />
697 - <property name="last_opened_file_path" value="$USER_HOME$/ToolUtil.class" /> 584 + <property name="last_opened_file_path" value="$PROJECT_DIR$" />
698 </component> 585 </component>
699 <component name="RecentsManager"> 586 <component name="RecentsManager">
700 <key name="CopyClassDialog.RECENTS_KEY"> 587 <key name="CopyClassDialog.RECENTS_KEY">
@@ -1281,10 +1168,10 @@ @@ -1281,10 +1168,10 @@
1281 </method> 1168 </method>
1282 </configuration> 1169 </configuration>
1283 <list size="4"> 1170 <list size="4">
1284 - <item index="0" class="java.lang.String" itemvalue="Application.CaseTypeEnum" />  
1285 - <item index="1" class="java.lang.String" itemvalue="Application.TextUtils" />  
1286 - <item index="2" class="java.lang.String" itemvalue="Application.CasementService" />  
1287 - <item index="3" class="java.lang.String" itemvalue="Tomcat Server.patent" /> 1171 + <item index="0" class="java.lang.String" itemvalue="Tomcat Server.patent" />
  1172 + <item index="1" class="java.lang.String" itemvalue="Application.CaseTypeEnum" />
  1173 + <item index="2" class="java.lang.String" itemvalue="Application.TextUtils" />
  1174 + <item index="3" class="java.lang.String" itemvalue="Application.CasementService" />
1288 </list> 1175 </list>
1289 <recent_temporary> 1176 <recent_temporary>
1290 <list size="3"> 1177 <list size="3">
@@ -1322,15 +1209,16 @@ @@ -1322,15 +1209,16 @@
1322 <workItem from="1469243959439" duration="3683000" /> 1209 <workItem from="1469243959439" duration="3683000" />
1323 <workItem from="1469260205882" duration="12837000" /> 1210 <workItem from="1469260205882" duration="12837000" />
1324 <workItem from="1469585749367" duration="1353000" /> 1211 <workItem from="1469585749367" duration="1353000" />
1325 - <workItem from="1469608329981" duration="17025000" /> 1212 + <workItem from="1469608329981" duration="18062000" />
  1213 + <workItem from="1469671147290" duration="4105000" />
1326 </task> 1214 </task>
1327 <servers /> 1215 <servers />
1328 </component> 1216 </component>
1329 <component name="TimeTrackingManager"> 1217 <component name="TimeTrackingManager">
1330 - <option name="totallyTimeSpent" value="112753000" /> 1218 + <option name="totallyTimeSpent" value="117895000" />
1331 </component> 1219 </component>
1332 <component name="ToolWindowManager"> 1220 <component name="ToolWindowManager">
1333 - <frame x="1049" y="107" width="944" height="851" extended-state="0" /> 1221 + <frame x="65" y="24" width="1855" height="1056" extended-state="6" />
1334 <editor active="false" /> 1222 <editor active="false" />
1335 <layout> 1223 <layout>
1336 <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" /> 1224 <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" />
@@ -1338,20 +1226,19 @@ @@ -1338,20 +1226,19 @@
1338 <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4495708" sideWeight="0.49806523" order="7" side_tool="false" content_ui="tabs" /> 1226 <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4495708" sideWeight="0.49806523" order="7" side_tool="false" content_ui="tabs" />
1339 <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" /> 1227 <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" />
1340 <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" /> 1228 <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" />
1341 - <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="-1" side_tool="false" content_ui="tabs" />  
1342 - <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="1.0" sideWeight="0.25501114" order="7" side_tool="true" content_ui="tabs" /> 1229 + <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" />
  1230 + <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.26147044" order="7" side_tool="true" content_ui="tabs" />
1343 <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" /> 1231 <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" />
1344 - <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.38641426" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 1232 + <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.19181868" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
1345 <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" /> 1233 <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" />
1346 - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5337143" sideWeight="0.49585405" order="2" side_tool="false" content_ui="tabs" />  
1347 - <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="-1" side_tool="false" content_ui="tabs" />  
1348 - <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="1.0" sideWeight="0.74498886" order="7" side_tool="false" content_ui="tabs" />  
1349 - <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="-1" side_tool="false" content_ui="tabs" /> 1234 + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2811159" sideWeight="0.79159755" order="2" side_tool="false" content_ui="tabs" />
  1235 + <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" />
  1236 + <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.73852956" order="7" side_tool="false" content_ui="tabs" />
  1237 + <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" />
1350 <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" /> 1238 <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" />
1351 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.40311804" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 1239 + <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" />
1352 <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" /> 1240 <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" />
1353 <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" /> 1241 <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" />
1354 - <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" />  
1355 <window_info id="Structure" active="false" anchor="left" 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" /> 1242 <window_info id="Structure" active="false" anchor="left" 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" />
1356 <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" /> 1243 <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" />
1357 <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" /> 1244 <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" />
@@ -1362,6 +1249,7 @@ @@ -1362,6 +1249,7 @@
1362 <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" /> 1249 <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" />
1363 <window_info id="Hierarchy" 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="2" side_tool="false" content_ui="combo" /> 1250 <window_info id="Hierarchy" 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="2" side_tool="false" content_ui="combo" />
1364 <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> 1251 <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
  1252 + <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" />
1365 </layout> 1253 </layout>
1366 <layout-to-restore> 1254 <layout-to-restore>
1367 <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" /> 1255 <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" />
@@ -1541,7 +1429,6 @@ @@ -1541,7 +1429,6 @@
1541 <provider selected="true" editor-type-id="text-editor"> 1429 <provider selected="true" editor-type-id="text-editor">
1542 <state relative-caret-position="45"> 1430 <state relative-caret-position="45">
1543 <caret line="3" column="28" selection-start-line="3" selection-start-column="28" selection-end-line="3" selection-end-column="28" /> 1431 <caret line="3" column="28" selection-start-line="3" selection-start-column="28" selection-end-line="3" selection-end-column="28" />
1544 - <folding />  
1545 </state> 1432 </state>
1546 </provider> 1433 </provider>
1547 </entry> 1434 </entry>
@@ -1549,7 +1436,6 @@ @@ -1549,7 +1436,6 @@
1549 <provider selected="true" editor-type-id="text-editor"> 1436 <provider selected="true" editor-type-id="text-editor">
1550 <state relative-caret-position="75"> 1437 <state relative-caret-position="75">
1551 <caret line="5" column="23" selection-start-line="5" selection-start-column="23" selection-end-line="5" selection-end-column="23" /> 1438 <caret line="5" column="23" selection-start-line="5" selection-start-column="23" selection-end-line="5" selection-end-column="23" />
1552 - <folding />  
1553 </state> 1439 </state>
1554 </provider> 1440 </provider>
1555 </entry> 1441 </entry>
@@ -1557,7 +1443,6 @@ @@ -1557,7 +1443,6 @@
1557 <provider selected="true" editor-type-id="text-editor"> 1443 <provider selected="true" editor-type-id="text-editor">
1558 <state relative-caret-position="240"> 1444 <state relative-caret-position="240">
1559 <caret line="16" column="23" selection-start-line="16" selection-start-column="23" selection-end-line="16" selection-end-column="23" /> 1445 <caret line="16" column="23" selection-start-line="16" selection-start-column="23" selection-end-line="16" selection-end-column="23" />
1560 - <folding />  
1561 </state> 1446 </state>
1562 </provider> 1447 </provider>
1563 </entry> 1448 </entry>
@@ -1565,7 +1450,6 @@ @@ -1565,7 +1450,6 @@
1565 <provider selected="true" editor-type-id="text-editor"> 1450 <provider selected="true" editor-type-id="text-editor">
1566 <state relative-caret-position="15"> 1451 <state relative-caret-position="15">
1567 <caret line="8" column="39" selection-start-line="8" selection-start-column="39" selection-end-line="8" selection-end-column="39" /> 1452 <caret line="8" column="39" selection-start-line="8" selection-start-column="39" selection-end-line="8" selection-end-column="39" />
1568 - <folding />  
1569 </state> 1453 </state>
1570 </provider> 1454 </provider>
1571 </entry> 1455 </entry>
@@ -1573,7 +1457,6 @@ @@ -1573,7 +1457,6 @@
1573 <provider selected="true" editor-type-id="text-editor"> 1457 <provider selected="true" editor-type-id="text-editor">
1574 <state relative-caret-position="15"> 1458 <state relative-caret-position="15">
1575 <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" /> 1459 <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
1576 - <folding />  
1577 </state> 1460 </state>
1578 </provider> 1461 </provider>
1579 </entry> 1462 </entry>
@@ -1581,9 +1464,6 @@ @@ -1581,9 +1464,6 @@
1581 <provider selected="true" editor-type-id="text-editor"> 1464 <provider selected="true" editor-type-id="text-editor">
1582 <state relative-caret-position="240"> 1465 <state relative-caret-position="240">
1583 <caret line="16" column="0" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" /> 1466 <caret line="16" column="0" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
1584 - <folding>  
1585 - <element signature="imports" expanded="false" />  
1586 - </folding>  
1587 </state> 1467 </state>
1588 </provider> 1468 </provider>
1589 </entry> 1469 </entry>
@@ -1591,7 +1471,6 @@ @@ -1591,7 +1471,6 @@
1591 <provider selected="true" editor-type-id="text-editor"> 1471 <provider selected="true" editor-type-id="text-editor">
1592 <state relative-caret-position="-101"> 1472 <state relative-caret-position="-101">
1593 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 1473 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1594 - <folding />  
1595 </state> 1474 </state>
1596 </provider> 1475 </provider>
1597 </entry> 1476 </entry>
@@ -1615,7 +1494,6 @@ @@ -1615,7 +1494,6 @@
1615 <provider selected="true" editor-type-id="text-editor"> 1494 <provider selected="true" editor-type-id="text-editor">
1616 <state relative-caret-position="75"> 1495 <state relative-caret-position="75">
1617 <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" /> 1496 <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
1618 - <folding />  
1619 </state> 1497 </state>
1620 </provider> 1498 </provider>
1621 </entry> 1499 </entry>
@@ -1639,7 +1517,6 @@ @@ -1639,7 +1517,6 @@
1639 <provider selected="true" editor-type-id="text-editor"> 1517 <provider selected="true" editor-type-id="text-editor">
1640 <state relative-caret-position="315"> 1518 <state relative-caret-position="315">
1641 <caret line="33" column="1" selection-start-line="33" selection-start-column="1" selection-end-line="33" selection-end-column="1" /> 1519 <caret line="33" column="1" selection-start-line="33" selection-start-column="1" selection-end-line="33" selection-end-column="1" />
1642 - <folding />  
1643 </state> 1520 </state>
1644 </provider> 1521 </provider>
1645 </entry> 1522 </entry>
@@ -1677,55 +1554,10 @@ @@ -1677,55 +1554,10 @@
1677 </state> 1554 </state>
1678 </provider> 1555 </provider>
1679 </entry> 1556 </entry>
1680 - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/UserModel.java">  
1681 - <provider selected="true" editor-type-id="text-editor">  
1682 - <state relative-caret-position="285">  
1683 - <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />  
1684 - <folding>  
1685 - <element signature="e#450#451#0" expanded="true" />  
1686 - <element signature="e#596#597#0" expanded="true" />  
1687 - <element signature="e#621#622#0" expanded="true" />  
1688 - <element signature="e#654#655#0" expanded="true" />  
1689 - <element signature="e#682#683#0" expanded="true" />  
1690 - <element signature="e#713#714#0" expanded="true" />  
1691 - <element signature="e#740#741#0" expanded="true" />  
1692 - <element signature="e#780#781#0" expanded="true" />  
1693 - <element signature="e#812#813#0" expanded="true" />  
1694 - <element signature="e#847#848#0" expanded="true" />  
1695 - <element signature="e#878#879#0" expanded="true" />  
1696 - <element signature="e#926#927#0" expanded="true" />  
1697 - <element signature="e#966#967#0" expanded="true" />  
1698 - <element signature="e#1013#1014#0" expanded="true" />  
1699 - <element signature="e#1056#1057#0" expanded="true" />  
1700 - <element signature="e#1224#1225#0" expanded="true" />  
1701 - <element signature="e#1252#1253#0" expanded="true" />  
1702 - <element signature="e#1294#1295#0" expanded="true" />  
1703 - <element signature="e#1328#1329#0" expanded="true" />  
1704 - <element signature="e#1365#1366#0" expanded="true" />  
1705 - <element signature="e#1398#1399#0" expanded="true" />  
1706 - <element signature="e#1450#1451#0" expanded="true" />  
1707 - <element signature="e#1494#1495#0" expanded="true" />  
1708 - <element signature="e#1530#1531#0" expanded="true" />  
1709 - <element signature="e#1562#1563#0" expanded="true" />  
1710 - <element signature="e#1612#1613#0" expanded="true" />  
1711 - <element signature="e#1654#1655#0" expanded="true" />  
1712 - <element signature="e#1691#1692#0" expanded="true" />  
1713 - <element signature="e#1724#1725#0" expanded="true" />  
1714 - <element signature="e#1776#1777#0" expanded="true" />  
1715 - <element signature="e#1820#1821#0" expanded="true" />  
1716 - <element signature="e#1851#1852#0" expanded="true" />  
1717 - <element signature="e#1878#1879#0" expanded="true" />  
1718 - <element signature="e#1918#1919#0" expanded="true" />  
1719 - <element signature="e#1950#1951#0" expanded="true" />  
1720 - </folding>  
1721 - </state>  
1722 - </provider>  
1723 - </entry>  
1724 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/MybatisTestMapper.java"> 1557 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/MybatisTestMapper.java">
1725 <provider selected="true" editor-type-id="text-editor"> 1558 <provider selected="true" editor-type-id="text-editor">
1726 <state relative-caret-position="870"> 1559 <state relative-caret-position="870">
1727 <caret line="61" column="7" selection-start-line="61" selection-start-column="7" selection-end-line="61" selection-end-column="7" /> 1560 <caret line="61" column="7" selection-start-line="61" selection-start-column="7" selection-end-line="61" selection-end-column="7" />
1728 - <folding />  
1729 </state> 1561 </state>
1730 </provider> 1562 </provider>
1731 </entry> 1563 </entry>
@@ -1733,15 +1565,27 @@ @@ -1733,15 +1565,27 @@
1733 <provider selected="true" editor-type-id="text-editor"> 1565 <provider selected="true" editor-type-id="text-editor">
1734 <state relative-caret-position="120"> 1566 <state relative-caret-position="120">
1735 <caret line="8" column="24" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="24" /> 1567 <caret line="8" column="24" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="24" />
1736 - <folding />  
1737 </state> 1568 </state>
1738 </provider> 1569 </provider>
1739 </entry> 1570 </entry>
1740 - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis-config.xml"> 1571 + <entry file="file://$PROJECT_DIR$/src/test/java/com/canrd/patent/dal/mapper/TestMapperTest.java">
1741 <provider selected="true" editor-type-id="text-editor"> 1572 <provider selected="true" editor-type-id="text-editor">
1742 - <state relative-caret-position="60">  
1743 - <caret line="4" column="47" selection-start-line="4" selection-start-column="23" selection-end-line="4" selection-end-column="47" />  
1744 - <folding /> 1573 + <state relative-caret-position="105">
  1574 + <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
  1575 + </state>
  1576 + </provider>
  1577 + </entry>
  1578 + <entry file="file://$PROJECT_DIR$/src/test/java/com/canrd/patent/common/Test.java">
  1579 + <provider selected="true" editor-type-id="text-editor">
  1580 + <state relative-caret-position="75">
  1581 + <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
  1582 + </state>
  1583 + </provider>
  1584 + </entry>
  1585 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/TestMapper.java">
  1586 + <provider selected="true" editor-type-id="text-editor">
  1587 + <state relative-caret-position="195">
  1588 + <caret line="13" column="35" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="35" />
1745 </state> 1589 </state>
1746 </provider> 1590 </provider>
1747 </entry> 1591 </entry>
@@ -1763,7 +1607,7 @@ @@ -1763,7 +1607,7 @@
1763 </entry> 1607 </entry>
1764 <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/OrderMapper.xml"> 1608 <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/OrderMapper.xml">
1765 <provider selected="true" editor-type-id="text-editor"> 1609 <provider selected="true" editor-type-id="text-editor">
1766 - <state relative-caret-position="-3150"> 1610 + <state relative-caret-position="0">
1767 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 1611 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1768 <folding> 1612 <folding>
1769 <marker date="1469608321062" expanded="true" signature="5063:5164" ph="select from orders" /> 1613 <marker date="1469608321062" expanded="true" signature="5063:5164" ph="select from orders" />
@@ -1777,68 +1621,58 @@ @@ -1777,68 +1621,58 @@
1777 </state> 1621 </state>
1778 </provider> 1622 </provider>
1779 </entry> 1623 </entry>
1780 - <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/MybatisTestMapper.xml"> 1624 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/model/UserModel.java">
1781 <provider selected="true" editor-type-id="text-editor"> 1625 <provider selected="true" editor-type-id="text-editor">
1782 - <state relative-caret-position="499">  
1783 - <caret line="234" column="39" selection-start-line="234" selection-start-column="39" selection-end-line="234" selection-end-column="39" /> 1626 + <state relative-caret-position="285">
  1627 + <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
1784 <folding> 1628 <folding>
1785 - <marker date="1469608321062" expanded="true" signature="4146:4253" ph="select from mybatis_test" />  
1786 - <marker date="1469608321062" expanded="true" signature="4466:4527" ph="delete from " />  
1787 - <marker date="1469608321062" expanded="true" signature="4768:4792" ph="delete from " />  
1788 - <marker date="1469608321062" expanded="true" signature="6382:6415" ph="select count... mybatis_test" />  
1789 - <marker date="1469608321062" expanded="true" signature="7340:7491" ph="update mybat... " />  
1790 - <marker date="1469608321062" expanded="true" signature="7839:8081" ph="update mybat... " />  
1791 - <marker date="1469608321062" expanded="true" signature="8318:8451" ph="update mybat... " /> 1629 + <element signature="e#450#451#0" expanded="true" />
1792 </folding> 1630 </folding>
1793 </state> 1631 </state>
1794 </provider> 1632 </provider>
1795 </entry> 1633 </entry>
1796 - <entry file="file://$PROJECT_DIR$/src/test/java/com/canrd/patent/dal/mapper/TestMapperTest.java"> 1634 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HelloController.java">
1797 <provider selected="true" editor-type-id="text-editor"> 1635 <provider selected="true" editor-type-id="text-editor">
1798 - <state relative-caret-position="105">  
1799 - <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />  
1800 - <folding /> 1636 + <state relative-caret-position="15">
  1637 + <caret line="58" column="93" selection-start-line="58" selection-start-column="87" selection-end-line="58" selection-end-column="93" />
  1638 + <folding>
  1639 + <element signature="imports" expanded="true" />
  1640 + </folding>
1801 </state> 1641 </state>
1802 </provider> 1642 </provider>
1803 </entry> 1643 </entry>
1804 - <entry file="file://$PROJECT_DIR$/src/test/java/com/canrd/patent/common/Test.java"> 1644 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis-config.xml">
1805 <provider selected="true" editor-type-id="text-editor"> 1645 <provider selected="true" editor-type-id="text-editor">
1806 - <state relative-caret-position="75">  
1807 - <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" /> 1646 + <state relative-caret-position="60">
  1647 + <caret line="4" column="47" selection-start-line="4" selection-start-column="23" selection-end-line="4" selection-end-column="47" />
1808 <folding /> 1648 <folding />
1809 </state> 1649 </state>
1810 </provider> 1650 </provider>
1811 </entry> 1651 </entry>
1812 - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/TestMapper.java">  
1813 - <provider selected="true" editor-type-id="text-editor">  
1814 - <state relative-caret-position="195">  
1815 - <caret line="13" column="35" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="35" />  
1816 - <folding>  
1817 - <element signature="imports" expanded="false" />  
1818 - </folding>  
1819 - </state>  
1820 - </provider>  
1821 - </entry>  
1822 - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HelloController.java"> 1652 + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/MybatisTestMapper.xml">
1823 <provider selected="true" editor-type-id="text-editor"> 1653 <provider selected="true" editor-type-id="text-editor">
1824 - <state relative-caret-position="-15">  
1825 - <caret line="58" column="93" selection-start-line="58" selection-start-column="87" selection-end-line="58" selection-end-column="93" /> 1654 + <state relative-caret-position="3510">
  1655 + <caret line="234" column="39" selection-start-line="234" selection-start-column="39" selection-end-line="234" selection-end-column="39" />
1826 <folding> 1656 <folding>
1827 - <element signature="imports" expanded="true" />  
1828 - <element signature="e#1779#1780#0" expanded="true" />  
1829 - <element signature="e#1814#1815#0" expanded="true" /> 1657 + <marker date="1469608321062" expanded="true" signature="4146:4253" ph="select from mybatis_test" />
  1658 + <marker date="1469608321062" expanded="true" signature="4466:4527" ph="delete from " />
  1659 + <marker date="1469608321062" expanded="true" signature="4768:4792" ph="delete from " />
  1660 + <marker date="1469608321062" expanded="true" signature="6382:6415" ph="select count... mybatis_test" />
  1661 + <marker date="1469608321062" expanded="true" signature="7340:7491" ph="update mybat... " />
  1662 + <marker date="1469608321062" expanded="true" signature="7839:8081" ph="update mybat... " />
  1663 + <marker date="1469608321062" expanded="true" signature="8318:8451" ph="update mybat... " />
1830 </folding> 1664 </folding>
1831 </state> 1665 </state>
1832 </provider> 1666 </provider>
1833 </entry> 1667 </entry>
1834 - <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/UserController.java"> 1668 + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/test.xml">
1835 <provider selected="true" editor-type-id="text-editor"> 1669 <provider selected="true" editor-type-id="text-editor">
1836 - <state relative-caret-position="348">  
1837 - <caret line="77" column="26" selection-start-line="77" selection-start-column="26" selection-end-line="77" selection-end-column="26" /> 1670 + <state relative-caret-position="75">
  1671 + <caret line="5" column="16" selection-start-line="5" selection-start-column="16" selection-end-line="5" selection-end-column="16" />
1838 <folding> 1672 <folding>
1839 - <element signature="imports" expanded="true" />  
1840 - <element signature="e#1724#1725#0" expanded="true" />  
1841 - <element signature="e#1759#1760#0" expanded="true" /> 1673 + <marker date="1469608321062" expanded="true" signature="264:294" ph="SELECT id, n... test" />
  1674 + <marker date="1469608321062" expanded="true" signature="646:677" ph="delete from " />
  1675 + <marker date="1469608321062" expanded="true" signature="781:843" ph="update test " />
1842 </folding> 1676 </folding>
1843 </state> 1677 </state>
1844 </provider> 1678 </provider>
@@ -1846,33 +1680,31 @@ @@ -1846,33 +1680,31 @@
1846 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/UserMapper.java"> 1680 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/UserMapper.java">
1847 <provider selected="true" editor-type-id="text-editor"> 1681 <provider selected="true" editor-type-id="text-editor">
1848 <state relative-caret-position="195"> 1682 <state relative-caret-position="195">
1849 - <caret line="13" column="15" selection-start-line="13" selection-start-column="9" selection-end-line="13" selection-end-column="15" /> 1683 + <caret line="13" column="35" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="35" />
1850 <folding> 1684 <folding>
1851 <element signature="imports" expanded="true" /> 1685 <element signature="imports" expanded="true" />
1852 </folding> 1686 </folding>
1853 </state> 1687 </state>
1854 </provider> 1688 </provider>
1855 </entry> 1689 </entry>
1856 - <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/test.xml"> 1690 + <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/user.xml">
1857 <provider selected="true" editor-type-id="text-editor"> 1691 <provider selected="true" editor-type-id="text-editor">
1858 - <state relative-caret-position="75">  
1859 - <caret line="5" column="16" selection-start-line="5" selection-start-column="16" selection-end-line="5" selection-end-column="16" /> 1692 + <state relative-caret-position="180">
  1693 + <caret line="12" column="28" selection-start-line="12" selection-start-column="26" selection-end-line="12" selection-end-column="103" />
1860 <folding> 1694 <folding>
1861 - <marker date="1469608321062" expanded="true" signature="264:294" ph="SELECT id, n... test" />  
1862 - <marker date="1469608321062" expanded="true" signature="646:677" ph="delete from " />  
1863 - <marker date="1469608321062" expanded="true" signature="781:843" ph="update test " /> 1695 + <marker date="1469675490584" expanded="true" signature="264:283" ph="SELECT id, n... user" />
  1696 + <marker date="1469675490584" expanded="true" signature="803:834" ph="delete from " />
  1697 + <marker date="1469675490584" expanded="true" signature="936:1204" ph="update user " />
1864 </folding> 1698 </folding>
1865 </state> 1699 </state>
1866 </provider> 1700 </provider>
1867 </entry> 1701 </entry>
1868 - <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/user.xml"> 1702 + <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/UserController.java">
1869 <provider selected="true" editor-type-id="text-editor"> 1703 <provider selected="true" editor-type-id="text-editor">
1870 - <state relative-caret-position="180">  
1871 - <caret line="12" column="32" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="32" /> 1704 + <state relative-caret-position="506">
  1705 + <caret line="115" column="29" selection-start-line="115" selection-start-column="29" selection-end-line="115" selection-end-column="29" />
1872 <folding> 1706 <folding>
1873 - <marker date="1469621367307" expanded="true" signature="264:290" ph="SELECT id, n... user" />  
1874 - <marker date="1469621367307" expanded="true" signature="656:687" ph="delete from " />  
1875 - <marker date="1469621367307" expanded="true" signature="789:851" ph="update user " /> 1707 + <element signature="imports" expanded="true" />
1876 </folding> 1708 </folding>
1877 </state> 1709 </state>
1878 </provider> 1710 </provider>
src/main/java/com/canrd/patent/web/UserController.java
  View file @bbce2f9
@@ -58,7 +58,11 @@ public class UserController { @@ -58,7 +58,11 @@ public class UserController {
58 58
59 Set<UserModel> userModelSet = userMapper.finds(); 59 Set<UserModel> userModelSet = userMapper.finds();
60 for(UserModel userModel:userModelSet){ 60 for(UserModel userModel:userModelSet){
61 - System.out.println(userModel.getId()+","+userModel.getName()); 61 + System.out.println(userModel.getId()+","+userModel.getName()
  62 + +","+userModel.getPassword() +","+userModel.getPassword_recover_key()
  63 + +","+userModel.getEmail() +","+userModel.getRole()
  64 + +","+userModel.getCreateTime() +","+userModel.getUpdateTime()
  65 + +","+userModel.getLoginTime());
62 } 66 }
63 return "conn"; 67 return "conn";
64 } 68 }
@@ -75,8 +79,15 @@ public class UserController { @@ -75,8 +79,15 @@ public class UserController {
75 @Transactional 79 @Transactional
76 private String addService() { 80 private String addService() {
77 UserModel user = new UserModel(); 81 UserModel user = new UserModel();
  82 + //name,password,password_recover_key,email,role,createTime,updateTime,loginTime
78 user.setName("test"); 83 user.setName("test");
  84 + user.setPassword("password");
  85 + user.setPassword_recover_key("password_recover_key");
79 user.setEmail("user@163.com"); 86 user.setEmail("user@163.com");
  87 + user.setRole("role");
  88 + user.setCreateTime("20160728-000000");
  89 + user.setUpdateTime("20160728-000000");
  90 + user.setLoginTime("20160728-000000");
80 userMapper.add(user); 91 userMapper.add(user);
81 return "add success"; 92 return "add success";
82 } 93 }
@@ -98,7 +109,14 @@ public class UserController { @@ -98,7 +109,14 @@ public class UserController {
98 @RequestMapping(value="/mybatis_handle_user_update") 109 @RequestMapping(value="/mybatis_handle_user_update")
99 public String handl_update(){ 110 public String handl_update(){
100 UserModel user = new UserModel(); 111 UserModel user = new UserModel();
101 - user.setName("xxx"); 112 + user.setName("test");
  113 + user.setPassword("111111");
  114 + user.setPassword_recover_key("11111111");
  115 + user.setEmail("user@163.com");
  116 + user.setRole("1111111");
  117 + user.setCreateTime("20160728-000000");
  118 + user.setUpdateTime("20160728-000000");
  119 + user.setLoginTime("20160728-000000");
102 user.setId(1); 120 user.setId(1);
103 userMapper.update(user); 121 userMapper.update(user);
104 return "update success"; 122 return "update success";
src/main/resources/mapper/user.xml
  View file @bbce2f9
@@ -3,15 +3,15 @@ @@ -3,15 +3,15 @@
3 <mapper namespace="com.canrd.patent.dal.mapper.UserMapper"> 3 <mapper namespace="com.canrd.patent.dal.mapper.UserMapper">
4 <select id="finds" resultType="UserModel"><![CDATA[ 4 <select id="finds" resultType="UserModel"><![CDATA[
5 SELECT 5 SELECT
6 - id, name 6 + *
7 FROM user 7 FROM user
8 ]]></select> 8 ]]></select>
9 <insert id="add" parameterType="com.canrd.patent.dal.model.UserModel"> 9 <insert id="add" parameterType="com.canrd.patent.dal.model.UserModel">
10 <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer"> 10 <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
11 select LAST_INSERT_ID() 11 select LAST_INSERT_ID()
12 </selectKey> 12 </selectKey>
13 - insert into user(name,email)  
14 - values(#{name},#{email}) 13 + insert into user( name,password,password_recover_key,email,role,createTime,updateTime,loginTime )
  14 + values(#{name},#{password},#{password_recover_key},#{email},#{role},#{createTime},#{updateTime},#{loginTime})
15 </insert> 15 </insert>
16 16
17 <delete id="delete" parameterType="int"> 17 <delete id="delete" parameterType="int">
@@ -19,7 +19,9 @@ FROM user @@ -19,7 +19,9 @@ FROM user
19 </delete> 19 </delete>
20 20
21 <update id="update" parameterType="com.canrd.patent.dal.model.UserModel"> 21 <update id="update" parameterType="com.canrd.patent.dal.model.UserModel">
22 - update user set name=#{name},age=#{age} 22 + update user set name=#{name},password=#{password},password_recover_key=#{password_recover_key},
  23 + email=#{email},role=#{role},
  24 + createTime=#{createTime},updateTime=#{updateTime},loginTime=#{loginTime}
23 where id=#{id} 25 where id=#{id}
24 </update> 26 </update>
25 </mapper> 27 </mapper>
26 \ No newline at end of file 28 \ No newline at end of file