From d0033ccca00906f0905a1dda598544d99fa75a2e Mon Sep 17 00:00:00 2001
From: guosheng <gs@bronet.cn>
Date: Wed, 27 Nov 2019 17:53:04 +0800
Subject: [PATCH] 修改授权
---
.idea/workspace.xml | 104 ++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------
application/api/controller/User.php | 2 +-
2 files changed, 49 insertions(+), 57 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a4b8cd0..96b05e3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
- <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="" />
+ <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
+ <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" />
<option name="SHOW_DIALOG" value="false" />
@@ -14,8 +16,8 @@
<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="302">
- <caret line="768" column="5" lean-forward="true" selection-start-line="768" selection-start-column="5" selection-end-line="768" selection-end-column="5" />
+ <state relative-caret-position="244">
+ <caret line="1635" column="37" lean-forward="true" selection-start-line="1635" selection-start-column="37" selection-end-line="1635" selection-end-column="37" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
@@ -77,35 +79,14 @@
<element signature="e#54259#55211#0#PHP" expanded="false" />
<element signature="e#55235#55808#0#PHP" expanded="false" />
<element signature="e#55814#56413#0#PHP" expanded="false" />
- <element signature="e#56418#57360#0#PHP" expanded="false" />
- <element signature="e#57366#58081#0#PHP" expanded="false" />
- <element signature="e#58087#58514#0#PHP" expanded="false" />
- <element signature="e#58519#58784#0#PHP" expanded="false" />
+ <element signature="e#57365#58080#0#PHP" expanded="false" />
+ <element signature="e#58086#58513#0#PHP" expanded="false" />
+ <element signature="e#58518#58783#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="edit.html" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/application/admin/view/vip/edit.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="325">
- <caret line="13" column="10" lean-forward="true" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="vip.js" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/public/assets/js/backend/vip.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-25">
- <caret line="17" column="0" lean-forward="true" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
</leaf>
</component>
<component name="FindInProjectRecents">
@@ -173,8 +154,8 @@
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/vip.php" />
<option value="$PROJECT_DIR$/application/admin/view/vip/edit.html" />
- <option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$USER_HOME$/Desktop/1.html" />
+ <option value="$PROJECT_DIR$/application/api/controller/User.php" />
</list>
</option>
</component>
@@ -193,8 +174,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
- <option name="x" value="-6" />
- <option name="y" value="93" />
+ <option name="x" value="125" />
+ <option name="y" value="24" />
<option name="width" value="1776" />
<option name="height" value="1081" />
</component>
@@ -221,6 +202,17 @@
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
+ <path>
+ <item name="areial" type="b2602c69:ProjectViewProjectNode" />
+ <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
+ <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
+ </path>
+ <path>
+ <item name="areial" type="b2602c69:ProjectViewProjectNode" />
+ <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
+ <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
+ <item name="extra" type="2a2b976b:PhpTreeStructureProvider$1" />
+ </path>
</expand>
<select />
</subPane>
@@ -286,7 +278,7 @@
<workItem from="1574727687281" duration="17586000" />
<workItem from="1574759184313" duration="4793000" />
<workItem from="1574814989178" duration="1007000" />
- <workItem from="1574831367903" duration="15841000" />
+ <workItem from="1574831367903" duration="16525000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
@@ -299,7 +291,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="269498000" />
+ <option name="totallyTimeSpent" value="270182000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -311,9 +303,10 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="-6" y="93" width="1776" height="1081" extended-state="1" />
+ <frame x="125" y="24" width="1776" height="1081" extended-state="1" />
+ <editor active="true" />
<layout>
- <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1462704" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1462704" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<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" />
<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" />
<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" />
@@ -611,14 +604,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/application/extra/verify.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="525">
- <caret line="21" column="51" lean-forward="false" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="51" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/src/Payment/Kernel/BaseClient.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="531">
@@ -736,14 +721,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/application/admin/view/vip/edit.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="325">
- <caret line="13" column="10" lean-forward="true" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/vip.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-25">
@@ -788,10 +765,26 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/application/admin/view/vip/edit.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="325">
+ <caret line="13" column="10" lean-forward="true" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/application/extra/verify.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="50">
+ <caret line="2" column="8" lean-forward="false" selection-start-line="2" selection-start-column="5" selection-end-line="2" selection-end-column="8" />
+ <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="302">
- <caret line="768" column="5" lean-forward="true" selection-start-line="768" selection-start-column="5" selection-end-line="768" selection-end-column="5" />
+ <state relative-caret-position="244">
+ <caret line="1635" column="37" lean-forward="true" selection-start-line="1635" selection-start-column="37" selection-end-line="1635" selection-end-column="37" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
@@ -853,10 +846,9 @@
<element signature="e#54259#55211#0#PHP" expanded="false" />
<element signature="e#55235#55808#0#PHP" expanded="false" />
<element signature="e#55814#56413#0#PHP" expanded="false" />
- <element signature="e#56418#57360#0#PHP" expanded="false" />
- <element signature="e#57366#58081#0#PHP" expanded="false" />
- <element signature="e#58087#58514#0#PHP" expanded="false" />
- <element signature="e#58519#58784#0#PHP" expanded="false" />
+ <element signature="e#57365#58080#0#PHP" expanded="false" />
+ <element signature="e#58086#58513#0#PHP" expanded="false" />
+ <element signature="e#58518#58783#0#PHP" expanded="false" />
</folding>
</state>
</provider>
diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index 3a90cc7..33f0a09 100644
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -1633,7 +1633,7 @@ class User extends Api
*/
public function getMobile()
{
- $rule = config('verify.path');
+ $rule = config('verify.raw');
$appid = $rule['app_id'];
$sessionKey = $this->request->param('sessionKey');
$encryptedData = $this->request->param('encryptedData');
--
libgit2 0.24.0