正在显示
3 个修改的文件
包含
12 行增加
和
13 行删除
@@ -2,6 +2,7 @@ | @@ -2,6 +2,7 @@ | ||
2 | <project version="4"> | 2 | <project version="4"> |
3 | <component name="ChangeListManager"> | 3 | <component name="ChangeListManager"> |
4 | <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> | 4 | <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> |
5 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> | ||
5 | <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" /> | 6 | <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" /> |
6 | <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" /> | 7 | <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" /> |
7 | </list> | 8 | </list> |
@@ -17,8 +18,8 @@ | @@ -17,8 +18,8 @@ | ||
17 | <file leaf-file-name="User.php" pinned="false" current-in-tab="true"> | 18 | <file leaf-file-name="User.php" pinned="false" current-in-tab="true"> |
18 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> | 19 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> |
19 | <provider selected="true" editor-type-id="text-editor"> | 20 | <provider selected="true" editor-type-id="text-editor"> |
20 | - <state relative-caret-position="515"> | ||
21 | - <caret line="1711" column="46" lean-forward="true" selection-start-line="1711" selection-start-column="46" selection-end-line="1711" selection-end-column="46" /> | 21 | + <state relative-caret-position="415"> |
22 | + <caret line="1707" column="9" lean-forward="true" selection-start-line="1707" selection-start-column="9" selection-end-line="1707" selection-end-column="9" /> | ||
22 | <folding> | 23 | <folding> |
23 | <element signature="e#365#484#0#PHP" expanded="false" /> | 24 | <element signature="e#365#484#0#PHP" expanded="false" /> |
24 | <element signature="e#490#1228#0#PHP" expanded="false" /> | 25 | <element signature="e#490#1228#0#PHP" expanded="false" /> |
@@ -173,7 +174,7 @@ | @@ -173,7 +174,7 @@ | ||
173 | <sorting>DEFINITION_ORDER</sorting> | 174 | <sorting>DEFINITION_ORDER</sorting> |
174 | </component> | 175 | </component> |
175 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> | 176 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> |
176 | - <component name="ProjectFrameBounds"> | 177 | + <component name="ProjectFrameBounds" extendedState="1"> |
177 | <option name="x" value="145" /> | 178 | <option name="x" value="145" /> |
178 | <option name="y" value="8" /> | 179 | <option name="y" value="8" /> |
179 | <option name="width" value="1776" /> | 180 | <option name="width" value="1776" /> |
@@ -279,7 +280,7 @@ | @@ -279,7 +280,7 @@ | ||
279 | <workItem from="1574759184313" duration="4793000" /> | 280 | <workItem from="1574759184313" duration="4793000" /> |
280 | <workItem from="1574814989178" duration="1007000" /> | 281 | <workItem from="1574814989178" duration="1007000" /> |
281 | <workItem from="1574831367903" duration="17171000" /> | 282 | <workItem from="1574831367903" duration="17171000" /> |
282 | - <workItem from="1574849431656" duration="4651000" /> | 283 | + <workItem from="1574849431656" duration="4760000" /> |
283 | </task> | 284 | </task> |
284 | <task id="LOCAL-00001" summary="调试"> | 285 | <task id="LOCAL-00001" summary="调试"> |
285 | <created>1574145133364</created> | 286 | <created>1574145133364</created> |
@@ -292,7 +293,7 @@ | @@ -292,7 +293,7 @@ | ||
292 | <servers /> | 293 | <servers /> |
293 | </component> | 294 | </component> |
294 | <component name="TimeTrackingManager"> | 295 | <component name="TimeTrackingManager"> |
295 | - <option name="totallyTimeSpent" value="275479000" /> | 296 | + <option name="totallyTimeSpent" value="275588000" /> |
296 | </component> | 297 | </component> |
297 | <component name="TodoView"> | 298 | <component name="TodoView"> |
298 | <todo-panel id="selected-file"> | 299 | <todo-panel id="selected-file"> |
@@ -304,7 +305,8 @@ | @@ -304,7 +305,8 @@ | ||
304 | </todo-panel> | 305 | </todo-panel> |
305 | </component> | 306 | </component> |
306 | <component name="ToolWindowManager"> | 307 | <component name="ToolWindowManager"> |
307 | - <frame x="145" y="8" width="1776" height="1077" extended-state="0" /> | 308 | + <frame x="145" y="8" width="1776" height="1077" extended-state="1" /> |
309 | + <editor active="true" /> | ||
308 | <layout> | 310 | <layout> |
309 | <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14801864" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> | 311 | <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14801864" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> |
310 | <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> | 312 | <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> |
@@ -313,7 +315,7 @@ | @@ -313,7 +315,7 @@ | ||
313 | <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.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> | 315 | <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.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> |
314 | <window_info id="Run" 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="5" side_tool="false" content_ui="tabs" /> | 316 | <window_info id="Run" 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="5" side_tool="false" content_ui="tabs" /> |
315 | <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="2" side_tool="false" content_ui="tabs" /> | 317 | <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="2" side_tool="false" content_ui="tabs" /> |
316 | - <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.11702128" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> | 318 | + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.11702128" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> |
317 | <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" /> | 319 | <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" /> |
318 | <window_info id="Debug" 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="6" side_tool="false" content_ui="tabs" /> | 320 | <window_info id="Debug" 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="6" side_tool="false" content_ui="tabs" /> |
319 | <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="7" side_tool="false" content_ui="tabs" /> | 321 | <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="7" side_tool="false" content_ui="tabs" /> |
@@ -700,8 +702,8 @@ | @@ -700,8 +702,8 @@ | ||
700 | </entry> | 702 | </entry> |
701 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> | 703 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> |
702 | <provider selected="true" editor-type-id="text-editor"> | 704 | <provider selected="true" editor-type-id="text-editor"> |
703 | - <state relative-caret-position="515"> | ||
704 | - <caret line="1711" column="46" lean-forward="true" selection-start-line="1711" selection-start-column="46" selection-end-line="1711" selection-end-column="46" /> | 705 | + <state relative-caret-position="415"> |
706 | + <caret line="1707" column="9" lean-forward="true" selection-start-line="1707" selection-start-column="9" selection-end-line="1707" selection-end-column="9" /> | ||
705 | <folding> | 707 | <folding> |
706 | <element signature="e#365#484#0#PHP" expanded="false" /> | 708 | <element signature="e#365#484#0#PHP" expanded="false" /> |
707 | <element signature="e#490#1228#0#PHP" expanded="false" /> | 709 | <element signature="e#490#1228#0#PHP" expanded="false" /> |
@@ -1709,13 +1709,10 @@ class User extends Api | @@ -1709,13 +1709,10 @@ class User extends Api | ||
1709 | $data = Db::name('user') | 1709 | $data = Db::name('user') |
1710 | ->where('id',$user_id) | 1710 | ->where('id',$user_id) |
1711 | ->update(['mobile'=>$phone]); | 1711 | ->update(['mobile'=>$phone]); |
1712 | - $res = Db::name('user')->getLastSql(); | ||
1713 | - $this->success('SUCCESS',$res); | ||
1714 | if(!empty($data)){ | 1712 | if(!empty($data)){ |
1715 | $this->success('SUCCESS',$data); | 1713 | $this->success('SUCCESS',$data); |
1716 | }else{ | 1714 | }else{ |
1717 | $this->error(['code'=>2,'msg'=>'sql运行失败']); | 1715 | $this->error(['code'=>2,'msg'=>'sql运行失败']); |
1718 | } | 1716 | } |
1719 | - | ||
1720 | } | 1717 | } |
1721 | } | 1718 | } |
@@ -6482,7 +6482,7 @@ | @@ -6482,7 +6482,7 @@ | ||
6482 | 6482 | ||
6483 | <div class="row mt0 footer"> | 6483 | <div class="row mt0 footer"> |
6484 | <div class="col-md-6" align="left"> | 6484 | <div class="col-md-6" align="left"> |
6485 | - Generated on 2019-11-27 19:30:40 </div> | 6485 | + Generated on 2019-11-27 19:32:34 </div> |
6486 | <div class="col-md-6" align="right"> | 6486 | <div class="col-md-6" align="right"> |
6487 | <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a> | 6487 | <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a> |
6488 | </div> | 6488 | </div> |
-
请 注册 或 登录 后发表评论