正在显示
3 个修改的文件
包含
27 行增加
和
31 行删除
@@ -4,6 +4,7 @@ | @@ -4,6 +4,7 @@ | ||
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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> |
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$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" /> |
7 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" /> | ||
7 | </list> | 8 | </list> |
8 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 9 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
9 | <option name="TRACKING_ENABLED" value="true" /> | 10 | <option name="TRACKING_ENABLED" value="true" /> |
@@ -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="394"> | ||
21 | - <caret line="1648" column="34" lean-forward="false" selection-start-line="1648" selection-start-column="34" selection-end-line="1648" selection-end-column="34" /> | 21 | + <state relative-caret-position="29"> |
22 | + <caret line="1614" column="7" lean-forward="false" selection-start-line="1614" selection-start-column="7" selection-end-line="1614" selection-end-column="7" /> | ||
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" /> |
@@ -80,9 +81,8 @@ | @@ -80,9 +81,8 @@ | ||
80 | <element signature="e#54259#55211#0#PHP" expanded="false" /> | 81 | <element signature="e#54259#55211#0#PHP" expanded="false" /> |
81 | <element signature="e#55235#55808#0#PHP" expanded="false" /> | 82 | <element signature="e#55235#55808#0#PHP" expanded="false" /> |
82 | <element signature="e#55814#56413#0#PHP" expanded="false" /> | 83 | <element signature="e#55814#56413#0#PHP" expanded="false" /> |
83 | - <element signature="e#57419#58134#0#PHP" expanded="false" /> | ||
84 | - <element signature="e#58140#58567#0#PHP" expanded="false" /> | ||
85 | - <element signature="e#58572#58837#0#PHP" expanded="false" /> | 84 | + <element signature="e#58071#58498#0#PHP" expanded="false" /> |
85 | + <element signature="e#58503#58768#0#PHP" expanded="false" /> | ||
86 | </folding> | 86 | </folding> |
87 | </state> | 87 | </state> |
88 | </provider> | 88 | </provider> |
@@ -174,11 +174,11 @@ | @@ -174,11 +174,11 @@ | ||
174 | <sorting>DEFINITION_ORDER</sorting> | 174 | <sorting>DEFINITION_ORDER</sorting> |
175 | </component> | 175 | </component> |
176 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> | 176 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> |
177 | - <component name="ProjectFrameBounds"> | ||
178 | - <option name="x" value="463" /> | ||
179 | - <option name="y" value="38" /> | 177 | + <component name="ProjectFrameBounds" extendedState="7"> |
178 | + <option name="x" value="178" /> | ||
179 | + <option name="y" value="-19" /> | ||
180 | <option name="width" value="1776" /> | 180 | <option name="width" value="1776" /> |
181 | - <option name="height" value="1081" /> | 181 | + <option name="height" value="1077" /> |
182 | </component> | 182 | </component> |
183 | <component name="ProjectView"> | 183 | <component name="ProjectView"> |
184 | <navigator currentView="ProjectPane" proportions="" version="1"> | 184 | <navigator currentView="ProjectPane" proportions="" version="1"> |
@@ -223,7 +223,7 @@ | @@ -223,7 +223,7 @@ | ||
223 | </component> | 223 | </component> |
224 | <component name="PropertiesComponent"> | 224 | <component name="PropertiesComponent"> |
225 | <property name="WebServerToolWindowFactoryState" value="false" /> | 225 | <property name="WebServerToolWindowFactoryState" value="false" /> |
226 | - <property name="last_opened_file_path" value="$PROJECT_DIR$/../hotel" /> | 226 | + <property name="last_opened_file_path" value="$PROJECT_DIR$/../project/competition" /> |
227 | </component> | 227 | </component> |
228 | <component name="RecentsManager"> | 228 | <component name="RecentsManager"> |
229 | <key name="CopyFile.RECENT_KEYS"> | 229 | <key name="CopyFile.RECENT_KEYS"> |
@@ -280,7 +280,7 @@ | @@ -280,7 +280,7 @@ | ||
280 | <workItem from="1574759184313" duration="4793000" /> | 280 | <workItem from="1574759184313" duration="4793000" /> |
281 | <workItem from="1574814989178" duration="1007000" /> | 281 | <workItem from="1574814989178" duration="1007000" /> |
282 | <workItem from="1574831367903" duration="17171000" /> | 282 | <workItem from="1574831367903" duration="17171000" /> |
283 | - <workItem from="1574849431656" duration="248000" /> | 283 | + <workItem from="1574849431656" duration="2118000" /> |
284 | </task> | 284 | </task> |
285 | <task id="LOCAL-00001" summary="调试"> | 285 | <task id="LOCAL-00001" summary="调试"> |
286 | <created>1574145133364</created> | 286 | <created>1574145133364</created> |
@@ -293,7 +293,7 @@ | @@ -293,7 +293,7 @@ | ||
293 | <servers /> | 293 | <servers /> |
294 | </component> | 294 | </component> |
295 | <component name="TimeTrackingManager"> | 295 | <component name="TimeTrackingManager"> |
296 | - <option name="totallyTimeSpent" value="271076000" /> | 296 | + <option name="totallyTimeSpent" value="272946000" /> |
297 | </component> | 297 | </component> |
298 | <component name="TodoView"> | 298 | <component name="TodoView"> |
299 | <todo-panel id="selected-file"> | 299 | <todo-panel id="selected-file"> |
@@ -305,17 +305,17 @@ | @@ -305,17 +305,17 @@ | ||
305 | </todo-panel> | 305 | </todo-panel> |
306 | </component> | 306 | </component> |
307 | <component name="ToolWindowManager"> | 307 | <component name="ToolWindowManager"> |
308 | - <frame x="463" y="38" width="1776" height="1081" extended-state="0" /> | 308 | + <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" /> |
309 | <editor active="true" /> | 309 | <editor active="true" /> |
310 | <layout> | 310 | <layout> |
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" /> | 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.13539445" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> |
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" /> | 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 | <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" /> | 313 | <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" /> |
314 | <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="0" side_tool="false" content_ui="tabs" /> | 314 | <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="0" 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" /> | 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" /> |
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" /> | 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" /> |
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" /> | 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" /> |
318 | - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.12295974" 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.12295974" sideWeight="0.5" order="2" side_tool="false" 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" /> | 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" /> |
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" /> | 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" /> |
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" /> | 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" /> |
@@ -694,16 +694,16 @@ | @@ -694,16 +694,16 @@ | ||
694 | </entry> | 694 | </entry> |
695 | <entry file="file://$PROJECT_DIR$/application/extra/verify.php"> | 695 | <entry file="file://$PROJECT_DIR$/application/extra/verify.php"> |
696 | <provider selected="true" editor-type-id="text-editor"> | 696 | <provider selected="true" editor-type-id="text-editor"> |
697 | - <state relative-caret-position="100"> | ||
698 | - <caret line="4" column="52" lean-forward="true" selection-start-line="4" selection-start-column="52" selection-end-line="4" selection-end-column="52" /> | 697 | + <state relative-caret-position="75"> |
698 | + <caret line="3" column="39" lean-forward="false" selection-start-line="3" selection-start-column="21" selection-end-line="3" selection-end-column="39" /> | ||
699 | <folding /> | 699 | <folding /> |
700 | </state> | 700 | </state> |
701 | </provider> | 701 | </provider> |
702 | </entry> | 702 | </entry> |
703 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> | 703 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> |
704 | <provider selected="true" editor-type-id="text-editor"> | 704 | <provider selected="true" editor-type-id="text-editor"> |
705 | - <state relative-caret-position="394"> | ||
706 | - <caret line="1648" column="34" lean-forward="false" selection-start-line="1648" selection-start-column="34" selection-end-line="1648" selection-end-column="34" /> | 705 | + <state relative-caret-position="29"> |
706 | + <caret line="1614" column="7" lean-forward="false" selection-start-line="1614" selection-start-column="7" selection-end-line="1614" selection-end-column="7" /> | ||
707 | <folding> | 707 | <folding> |
708 | <element signature="e#365#484#0#PHP" expanded="false" /> | 708 | <element signature="e#365#484#0#PHP" expanded="false" /> |
709 | <element signature="e#490#1228#0#PHP" expanded="false" /> | 709 | <element signature="e#490#1228#0#PHP" expanded="false" /> |
@@ -765,9 +765,8 @@ | @@ -765,9 +765,8 @@ | ||
765 | <element signature="e#54259#55211#0#PHP" expanded="false" /> | 765 | <element signature="e#54259#55211#0#PHP" expanded="false" /> |
766 | <element signature="e#55235#55808#0#PHP" expanded="false" /> | 766 | <element signature="e#55235#55808#0#PHP" expanded="false" /> |
767 | <element signature="e#55814#56413#0#PHP" expanded="false" /> | 767 | <element signature="e#55814#56413#0#PHP" expanded="false" /> |
768 | - <element signature="e#57419#58134#0#PHP" expanded="false" /> | ||
769 | - <element signature="e#58140#58567#0#PHP" expanded="false" /> | ||
770 | - <element signature="e#58572#58837#0#PHP" expanded="false" /> | 768 | + <element signature="e#58071#58498#0#PHP" expanded="false" /> |
769 | + <element signature="e#58503#58768#0#PHP" expanded="false" /> | ||
771 | </folding> | 770 | </folding> |
772 | </state> | 771 | </state> |
773 | </provider> | 772 | </provider> |
@@ -1619,7 +1619,7 @@ class User extends Api | @@ -1619,7 +1619,7 @@ class User extends Api | ||
1619 | * @ApiRoute (/api/user/getMobile) | 1619 | * @ApiRoute (/api/user/getMobile) |
1620 | * | 1620 | * |
1621 | * @ApiParams (name="sessionKey", type="string", required=true, description="sessionkey") | 1621 | * @ApiParams (name="sessionKey", type="string", required=true, description="sessionkey") |
1622 | - * @ApiParams (name="encryptedDate", type="string", required=true, description="encryptedDate") | 1622 | + * @ApiParams (name="encryptedData", type="string", required=true, description="encryptedDate") |
1623 | * @ApiParams (name="iv", type="string", required=true, description="iv") | 1623 | * @ApiParams (name="iv", type="string", required=true, description="iv") |
1624 | * | 1624 | * |
1625 | * @ApiReturn({ | 1625 | * @ApiReturn({ |
@@ -1633,8 +1633,7 @@ class User extends Api | @@ -1633,8 +1633,7 @@ class User extends Api | ||
1633 | */ | 1633 | */ |
1634 | public function getMobile() | 1634 | public function getMobile() |
1635 | { | 1635 | { |
1636 | - $rule = config('verify.raw'); | ||
1637 | - $appid = $rule['app_id']; | 1636 | + $appid = 'wx4300d933e5abd5ba'; |
1638 | $sessionKey = $this->request->param('sessionKey'); | 1637 | $sessionKey = $this->request->param('sessionKey'); |
1639 | $encryptedData = $this->request->param('encryptedData'); | 1638 | $encryptedData = $this->request->param('encryptedData'); |
1640 | $iv = $this->request->param('iv'); | 1639 | $iv = $this->request->param('iv'); |
@@ -1646,7 +1645,6 @@ class User extends Api | @@ -1646,7 +1645,6 @@ class User extends Api | ||
1646 | } else { | 1645 | } else { |
1647 | $return['code'] = 301; | 1646 | $return['code'] = 301; |
1648 | $return['data'] = $errCode; | 1647 | $return['data'] = $errCode; |
1649 | - dump($return['data']); | ||
1650 | $return['code'] = json_encode($return['code']); | 1648 | $return['code'] = json_encode($return['code']); |
1651 | $return['code'] = json_decode($return['code'],true); | 1649 | $return['code'] = json_decode($return['code'],true); |
1652 | $return['data'] = json_encode($return['data']); | 1650 | $return['data'] = json_encode($return['data']); |
@@ -1663,7 +1661,6 @@ class User extends Api | @@ -1663,7 +1661,6 @@ class User extends Api | ||
1663 | } | 1661 | } |
1664 | $aesKey=base64_decode($sessionKey); | 1662 | $aesKey=base64_decode($sessionKey); |
1665 | 1663 | ||
1666 | - | ||
1667 | if (strlen($iv) != 24) { | 1664 | if (strlen($iv) != 24) { |
1668 | return -41002; | 1665 | return -41002; |
1669 | } | 1666 | } |
@@ -2289,7 +2289,7 @@ | @@ -2289,7 +2289,7 @@ | ||
2289 | <td>sessionkey</td> | 2289 | <td>sessionkey</td> |
2290 | </tr> | 2290 | </tr> |
2291 | <tr> | 2291 | <tr> |
2292 | - <td>encryptedDate</td> | 2292 | + <td>encryptedData</td> |
2293 | <td>string</td> | 2293 | <td>string</td> |
2294 | <td>是</td> | 2294 | <td>是</td> |
2295 | <td>encryptedDate</td> | 2295 | <td>encryptedDate</td> |
@@ -2323,8 +2323,8 @@ | @@ -2323,8 +2323,8 @@ | ||
2323 | <input type="string" class="form-control input-sm" id="sessionKey" required placeholder="sessionkey" name="sessionKey"> | 2323 | <input type="string" class="form-control input-sm" id="sessionKey" required placeholder="sessionkey" name="sessionKey"> |
2324 | </div> | 2324 | </div> |
2325 | <div class="form-group"> | 2325 | <div class="form-group"> |
2326 | - <label class="control-label" for="encryptedDate">encryptedDate</label> | ||
2327 | - <input type="string" class="form-control input-sm" id="encryptedDate" required placeholder="encryptedDate" name="encryptedDate"> | 2326 | + <label class="control-label" for="encryptedData">encryptedData</label> |
2327 | + <input type="string" class="form-control input-sm" id="encryptedData" required placeholder="encryptedDate" name="encryptedData"> | ||
2328 | </div> | 2328 | </div> |
2329 | <div class="form-group"> | 2329 | <div class="form-group"> |
2330 | <label class="control-label" for="iv">iv</label> | 2330 | <label class="control-label" for="iv">iv</label> |
@@ -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 16:19:29 </div> | 6485 | + Generated on 2019-11-27 18:44:45 </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> |
-
请 注册 或 登录 后发表评论