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 2 <project version="4">
3 3 <component name="ChangeListManager">
4 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 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 8 </list>
22 9 <ignored path="patent.iws" />
23 10 <ignored path=".idea/workspace.xml" />
... ... @@ -43,40 +30,22 @@
43 30 <file leaf-file-name="HelloController.java" pinned="false" current-in-tab="false">
44 31 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/HelloController.java">
45 32 <provider selected="true" editor-type-id="text-editor">
46   - <state relative-caret-position="-15">
  33 + <state relative-caret-position="15">
47 34 <caret line="58" column="93" selection-start-line="58" selection-start-column="87" selection-end-line="58" selection-end-column="93" />
48 35 <folding>
49 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 37 </folding>
53 38 </state>
54 39 </provider>
55 40 </entry>
56 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 43 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/web/UserController.java">
59 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 47 <folding>
63 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 49 </folding>
81 50 </state>
82 51 </provider>
... ... @@ -86,7 +55,7 @@
86 55 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/UserMapper.java">
87 56 <provider selected="true" editor-type-id="text-editor">
88 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 59 <folding>
91 60 <element signature="imports" expanded="true" />
92 61 </folding>
... ... @@ -94,51 +63,15 @@
94 63 </provider>
95 64 </entry>
96 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 67 <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/user.xml">
99 68 <provider selected="true" editor-type-id="text-editor">
100 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 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 75 </folding>
143 76 </state>
144 77 </provider>
... ... @@ -147,7 +80,7 @@
147 80 <file leaf-file-name="MybatisTestMapper.xml" pinned="false" current-in-tab="false">
148 81 <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/MybatisTestMapper.xml">
149 82 <provider selected="true" editor-type-id="text-editor">
150   - <state relative-caret-position="499">
  83 + <state relative-caret-position="3510">
151 84 <caret line="234" column="39" selection-start-line="234" selection-start-column="39" selection-end-line="234" selection-end-column="39" />
152 85 <folding>
153 86 <marker date="1469608321062" expanded="true" signature="4146:4253" ph="select from mybatis_test" />
... ... @@ -162,52 +95,6 @@
162 95 </provider>
163 96 </entry>
164 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 98 </leaf>
212 99 </component>
213 100 <component name="FileTemplateManagerImpl">
... ... @@ -372,10 +259,10 @@
372 259 </treeState>
373 260 </component>
374 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 266 </component>
380 267 <component name="ProjectLevelVcsManager" settingsEditedManually="false">
381 268 <OptionsSetting value="true" id="Add" />
... ... @@ -403,6 +290,8 @@
403 290 </navigator>
404 291 <panes>
405 292 <pane id="Scope" />
  293 + <pane id="PackagesPane" />
  294 + <pane id="Scratches" />
406 295 <pane id="ProjectPane">
407 296 <subPane>
408 297 <PATH>
... ... @@ -675,8 +564,6 @@
675 564 </PATH>
676 565 </subPane>
677 566 </pane>
678   - <pane id="Scratches" />
679   - <pane id="PackagesPane" />
680 567 </panes>
681 568 </component>
682 569 <component name="PropertiesComponent">
... ... @@ -694,7 +581,7 @@
694 581 <property name="OverrideImplement.combined" value="true" />
695 582 <property name="OverrideImplement.overriding.sorted" value="false" />
696 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 585 </component>
699 586 <component name="RecentsManager">
700 587 <key name="CopyClassDialog.RECENTS_KEY">
... ... @@ -1281,10 +1168,10 @@
1281 1168 </method>
1282 1169 </configuration>
1283 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 1175 </list>
1289 1176 <recent_temporary>
1290 1177 <list size="3">
... ... @@ -1322,15 +1209,16 @@
1322 1209 <workItem from="1469243959439" duration="3683000" />
1323 1210 <workItem from="1469260205882" duration="12837000" />
1324 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 1214 </task>
1327 1215 <servers />
1328 1216 </component>
1329 1217 <component name="TimeTrackingManager">
1330   - <option name="totallyTimeSpent" value="112753000" />
  1218 + <option name="totallyTimeSpent" value="117895000" />
1331 1219 </component>
1332 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 1222 <editor active="false" />
1335 1223 <layout>
1336 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 1253 </layout>
1366 1254 <layout-to-restore>
1367 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 1429 <provider selected="true" editor-type-id="text-editor">
1542 1430 <state relative-caret-position="45">
1543 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 1432 </state>
1546 1433 </provider>
1547 1434 </entry>
... ... @@ -1549,7 +1436,6 @@
1549 1436 <provider selected="true" editor-type-id="text-editor">
1550 1437 <state relative-caret-position="75">
1551 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 1439 </state>
1554 1440 </provider>
1555 1441 </entry>
... ... @@ -1557,7 +1443,6 @@
1557 1443 <provider selected="true" editor-type-id="text-editor">
1558 1444 <state relative-caret-position="240">
1559 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 1446 </state>
1562 1447 </provider>
1563 1448 </entry>
... ... @@ -1565,7 +1450,6 @@
1565 1450 <provider selected="true" editor-type-id="text-editor">
1566 1451 <state relative-caret-position="15">
1567 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 1453 </state>
1570 1454 </provider>
1571 1455 </entry>
... ... @@ -1573,7 +1457,6 @@
1573 1457 <provider selected="true" editor-type-id="text-editor">
1574 1458 <state relative-caret-position="15">
1575 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 1460 </state>
1578 1461 </provider>
1579 1462 </entry>
... ... @@ -1581,9 +1464,6 @@
1581 1464 <provider selected="true" editor-type-id="text-editor">
1582 1465 <state relative-caret-position="240">
1583 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 1467 </state>
1588 1468 </provider>
1589 1469 </entry>
... ... @@ -1591,7 +1471,6 @@
1591 1471 <provider selected="true" editor-type-id="text-editor">
1592 1472 <state relative-caret-position="-101">
1593 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 1474 </state>
1596 1475 </provider>
1597 1476 </entry>
... ... @@ -1615,7 +1494,6 @@
1615 1494 <provider selected="true" editor-type-id="text-editor">
1616 1495 <state relative-caret-position="75">
1617 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 1497 </state>
1620 1498 </provider>
1621 1499 </entry>
... ... @@ -1639,7 +1517,6 @@
1639 1517 <provider selected="true" editor-type-id="text-editor">
1640 1518 <state relative-caret-position="315">
1641 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 1520 </state>
1644 1521 </provider>
1645 1522 </entry>
... ... @@ -1677,55 +1554,10 @@
1677 1554 </state>
1678 1555 </provider>
1679 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 1557 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/MybatisTestMapper.java">
1725 1558 <provider selected="true" editor-type-id="text-editor">
1726 1559 <state relative-caret-position="870">
1727 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 1561 </state>
1730 1562 </provider>
1731 1563 </entry>
... ... @@ -1733,15 +1565,27 @@
1733 1565 <provider selected="true" editor-type-id="text-editor">
1734 1566 <state relative-caret-position="120">
1735 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 1568 </state>
1738 1569 </provider>
1739 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 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 1589 </state>
1746 1590 </provider>
1747 1591 </entry>
... ... @@ -1763,7 +1607,7 @@
1763 1607 </entry>
1764 1608 <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/OrderMapper.xml">
1765 1609 <provider selected="true" editor-type-id="text-editor">
1766   - <state relative-caret-position="-3150">
  1610 + <state relative-caret-position="0">
1767 1611 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1768 1612 <folding>
1769 1613 <marker date="1469608321062" expanded="true" signature="5063:5164" ph="select from orders" />
... ... @@ -1777,68 +1621,58 @@
1777 1621 </state>
1778 1622 </provider>
1779 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 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 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 1630 </folding>
1793 1631 </state>
1794 1632 </provider>
1795 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 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 1641 </state>
1802 1642 </provider>
1803 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 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 1648 <folding />
1809 1649 </state>
1810 1650 </provider>
1811 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 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 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 1664 </folding>
1831 1665 </state>
1832 1666 </provider>
1833 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 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 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 1676 </folding>
1843 1677 </state>
1844 1678 </provider>
... ... @@ -1846,33 +1680,31 @@
1846 1680 <entry file="file://$PROJECT_DIR$/src/main/java/com/canrd/patent/dal/mapper/UserMapper.java">
1847 1681 <provider selected="true" editor-type-id="text-editor">
1848 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 1684 <folding>
1851 1685 <element signature="imports" expanded="true" />
1852 1686 </folding>
1853 1687 </state>
1854 1688 </provider>
1855 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 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 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 1698 </folding>
1865 1699 </state>
1866 1700 </provider>
1867 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 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 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 1708 </folding>
1877 1709 </state>
1878 1710 </provider>
... ...
src/main/java/com/canrd/patent/web/UserController.java
  View file @bbce2f9
... ... @@ -58,7 +58,11 @@ public class UserController {
58 58  
59 59 Set<UserModel> userModelSet = userMapper.finds();
60 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 67 return "conn";
64 68 }
... ... @@ -75,8 +79,15 @@ public class UserController {
75 79 @Transactional
76 80 private String addService() {
77 81 UserModel user = new UserModel();
  82 + //name,password,password_recover_key,email,role,createTime,updateTime,loginTime
78 83 user.setName("test");
  84 + user.setPassword("password");
  85 + user.setPassword_recover_key("password_recover_key");
79 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 91 userMapper.add(user);
81 92 return "add success";
82 93 }
... ... @@ -98,7 +109,14 @@ public class UserController {
98 109 @RequestMapping(value="/mybatis_handle_user_update")
99 110 public String handl_update(){
100 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 120 user.setId(1);
103 121 userMapper.update(user);
104 122 return "update success";
... ...
src/main/resources/mapper/user.xml
  View file @bbce2f9
... ... @@ -3,15 +3,15 @@
3 3 <mapper namespace="com.canrd.patent.dal.mapper.UserMapper">
4 4 <select id="finds" resultType="UserModel"><![CDATA[
5 5 SELECT
6   - id, name
  6 + *
7 7 FROM user
8 8 ]]></select>
9 9 <insert id="add" parameterType="com.canrd.patent.dal.model.UserModel">
10 10 <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
11 11 select LAST_INSERT_ID()
12 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 15 </insert>
16 16  
17 17 <delete id="delete" parameterType="int">
... ... @@ -19,7 +19,9 @@ FROM user
19 19 </delete>
20 20  
21 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 25 where id=#{id}
24 26 </update>
25 27 </mapper>
26 28 \ No newline at end of file
... ...