From 06e417f1bdc22e180b4e04d42c2753cc20d82149 Mon Sep 17 00:00:00 2001 From: guosheng <gs@bronet.cn> Date: Tue, 19 Nov 2019 14:33:29 +0800 Subject: [PATCH] 调试 --- .idea/workspace.xml | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------ application/api/controller/User.php | 2 +- 2 files changed, 57 insertions(+), 49 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 97a3046..095e85c 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,8 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/extra/verify.php" afterPath="$PROJECT_DIR$/application/extra/verify.php" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="TRACKING_ENABLED" value="true" /> @@ -13,11 +14,11 @@ </component> <component name="FileEditorManager"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file leaf-file-name="User.php" pinned="false" current-in-tab="false"> + <file leaf-file-name="User.php" pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="294"> - <caret line="49" column="44" lean-forward="true" selection-start-line="49" selection-start-column="44" selection-end-line="49" selection-end-column="44" /> + <state relative-caret-position="137"> + <caret line="54" column="65" lean-forward="true" selection-start-line="54" selection-start-column="65" selection-end-line="54" selection-end-column="65" /> <folding> <element signature="e#38#68#0#PHP" expanded="true" /> <element signature="e#391#463#0#PHP" expanded="false" /> @@ -27,16 +28,6 @@ </provider> </entry> </file> - <file leaf-file-name="verify.php" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/application/extra/verify.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="100"> - <caret line="4" column="55" lean-forward="true" selection-start-line="4" selection-start-column="55" selection-end-line="4" selection-end-column="55" /> - <folding /> - </state> - </provider> - </entry> - </file> </leaf> </component> <component name="FindInProjectRecents"> @@ -84,8 +75,8 @@ <option value="$PROJECT_DIR$/.gitlab-ci.yml" /> <option value="$PROJECT_DIR$/.gitignore" /> <option value="$PROJECT_DIR$/public/.gitignore" /> - <option value="$PROJECT_DIR$/application/api/controller/User.php" /> <option value="$PROJECT_DIR$/application/extra/verify.php" /> + <option value="$PROJECT_DIR$/application/api/controller/User.php" /> </list> </option> </component> @@ -104,8 +95,8 @@ </component> <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> <component name="ProjectFrameBounds"> - <option name="x" value="330" /> - <option name="y" value="90" /> + <option name="x" value="200" /> + <option name="y" value="8" /> <option name="width" value="1940" /> <option name="height" value="1074" /> </component> @@ -144,6 +135,11 @@ <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="extra" type="2a2b976b:PhpTreeStructureProvider$1" /> </path> + <path> + <item name="areial" type="b2602c69:ProjectViewProjectNode" /> + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> + </path> </expand> <select /> </subPane> @@ -187,15 +183,23 @@ <workItem from="1574062081278" duration="18239000" /> <workItem from="1574122453532" duration="15780000" /> <workItem from="1574141466352" duration="745000" /> - <workItem from="1574143209694" duration="1668000" /> + <workItem from="1574143209694" duration="1978000" /> + </task> + <task id="LOCAL-00001" summary="调试"> + <created>1574145133364</created> + <option name="number" value="00001" /> + <option name="presentableId" value="LOCAL-00001" /> + <option name="project" value="LOCAL" /> + <updated>1574145133364</updated> </task> + <option name="localTasksCounter" value="2" /> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="46361000" /> + <option name="totallyTimeSpent" value="46671000" /> </component> <component name="ToolWindowManager"> - <frame x="330" y="90" width="1940" height="1074" extended-state="0" /> + <frame x="200" y="8" width="1940" height="1074" extended-state="0" /> <editor active="true" /> <layout> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14893617" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> @@ -242,6 +246,10 @@ <component name="VcsContentAnnotationSettings"> <option name="myLimit" value="2678400000" /> </component> + <component name="VcsManagerConfiguration"> + <MESSAGE value="调试" /> + <option name="LAST_COMMIT_MESSAGE" value="调试" /> + </component> <component name="XDebuggerManager"> <breakpoint-manager> <option name="time" value="3" /> @@ -541,58 +549,66 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/.gitlab-ci.yml"> + <entry file="file://$PROJECT_DIR$/application/common/library/Auth.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="200"> - <caret line="8" column="33" lean-forward="false" selection-start-line="8" selection-start-column="33" selection-end-line="8" selection-end-column="33" /> + <state relative-caret-position="303"> + <caret line="195" column="20" lean-forward="false" selection-start-line="195" selection-start-column="20" selection-end-line="195" selection-end-column="20" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/.gitignore"> + <entry file="file://$PROJECT_DIR$/application/common/controller/Api.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="25"> - <caret line="1" column="0" lean-forward="true" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" /> + <state relative-caret-position="303"> + <caret line="57" column="14" lean-forward="false" selection-start-line="57" selection-start-column="14" selection-end-line="57" selection-end-column="14" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/public/.gitignore"> + <entry file="file://$PROJECT_DIR$/thinkphp/helper.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="0"> - <caret line="0" column="7" lean-forward="false" selection-start-line="0" selection-start-column="7" selection-end-line="0" selection-end-column="7" /> + <state relative-caret-position="3"> + <caret line="99" column="38" lean-forward="true" selection-start-line="99" selection-start-column="38" selection-end-line="99" selection-end-column="38" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/application/common/library/Auth.php"> + <entry file="file://$PROJECT_DIR$/application/extra/verify.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="303"> - <caret line="195" column="20" lean-forward="false" selection-start-line="195" selection-start-column="20" selection-end-line="195" selection-end-column="20" /> + <state relative-caret-position="100"> + <caret line="4" column="55" lean-forward="true" selection-start-line="4" selection-start-column="55" selection-end-line="4" selection-end-column="55" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/application/common/controller/Api.php"> + <entry file="file://$PROJECT_DIR$/.gitignore"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="303"> - <caret line="57" column="14" lean-forward="false" selection-start-line="57" selection-start-column="14" selection-end-line="57" selection-end-column="14" /> + <state relative-caret-position="25"> + <caret line="1" column="0" lean-forward="true" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/thinkphp/helper.php"> + <entry file="file://$PROJECT_DIR$/public/.gitignore"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="3"> - <caret line="99" column="38" lean-forward="true" selection-start-line="99" selection-start-column="38" selection-end-line="99" selection-end-column="38" /> + <state relative-caret-position="0"> + <caret line="0" column="7" lean-forward="false" selection-start-line="0" selection-start-column="7" selection-end-line="0" selection-end-column="7" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/.gitlab-ci.yml"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="200"> + <caret line="8" column="33" lean-forward="false" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="33" /> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="294"> - <caret line="49" column="44" lean-forward="true" selection-start-line="49" selection-start-column="44" selection-end-line="49" selection-end-column="44" /> + <state relative-caret-position="137"> + <caret line="54" column="65" lean-forward="true" selection-start-line="54" selection-start-column="65" selection-end-line="54" selection-end-column="65" /> <folding> <element signature="e#38#68#0#PHP" expanded="true" /> <element signature="e#391#463#0#PHP" expanded="false" /> @@ -601,13 +617,5 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/application/extra/verify.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="100"> - <caret line="4" column="55" lean-forward="true" selection-start-line="4" selection-start-column="55" selection-end-line="4" selection-end-column="55" /> - <folding /> - </state> - </provider> - </entry> </component> </project> \ No newline at end of file diff --git a/application/api/controller/User.php b/application/api/controller/User.php index e4a71a0..d1afbd0 100644 --- a/application/api/controller/User.php +++ b/application/api/controller/User.php @@ -52,7 +52,7 @@ class User extends Api $raw_data = $this->request->post(); //验证表数据 $rule = config('verify.user'); - $validate = new Validate($rule['rule'],$rule['msg']);// + $validate = new Validate($rule['rule'],$rule['msg']); if (!$validate->check($raw_data)) { $this->error($validate->getError()); } -- libgit2 0.24.0