调试授权

王晓刚
.idea/workspace.xml
application/home/controller/User.php
--- a/.idea/workspace.xml
查看文件 @e864d66
+++ b/.idea/workspace.xml
查看文件 @e864d66
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/home/model/User.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/model/User.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/home/controller/Server.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Server.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/home/controller/User.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/User.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -65,11 +65,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Server.php" pinned="false" current-in-tab="false">
+      <file leaf-file-name="Server.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/application/home/controller/Server.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1088">
-              <caret line="71" column="29" selection-start-line="71" selection-start-column="29" selection-end-line="71" selection-end-column="29" />
+            <state relative-caret-position="436">
+              <caret line="139" column="25" selection-start-line="139" selection-start-column="25" selection-end-line="139" selection-end-column="25" />
               <folding>
                 <element signature="e#130#167#0#PHP" expanded="true" />
               </folding>
@@ -101,8 +101,8 @@
       <file leaf-file-name="User.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="623">
-              <caret line="84" column="34" lean-forward="true" selection-start-line="84" selection-start-column="34" selection-end-line="84" selection-end-column="34" />
+            <state relative-caret-position="519">
+              <caret line="115" column="22" selection-start-line="115" selection-start-column="22" selection-end-line="115" selection-end-column="22" />
               <folding>
                 <element signature="e#128#160#0#PHP" expanded="true" />
               </folding>
@@ -110,11 +110,20 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="User.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="WechatBase.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/common/controller/WechatBase.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="572">
+              <caret line="78" column="48" selection-start-line="78" selection-start-column="48" selection-end-line="78" selection-end-column="48" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="User.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/application/home/model/User.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="493">
-              <caret line="34" column="17" selection-start-line="34" selection-start-column="17" selection-end-line="34" selection-end-column="17" />
+            <state relative-caret-position="459">
+              <caret line="32" column="14" lean-forward="true" selection-start-line="32" selection-start-column="14" selection-end-line="32" selection-end-column="14" />
               <folding>
                 <element signature="e#125#138#0#PHP" expanded="true" />
               </folding>
@@ -130,7 +139,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/application/common/controller/WechatBase.php" />
         <option value="$PROJECT_DIR$/application/extra/wechat.php" />
         <option value="$PROJECT_DIR$/application/home/model/Goods.php" />
         <option value="$PROJECT_DIR$/application/config.php" />
@@ -143,14 +151,15 @@
         <option value="$PROJECT_DIR$/application/home/controller/Collect.php" />
         <option value="$PROJECT_DIR$/application/home/controller/Upload.php" />
         <option value="$PROJECT_DIR$/application/home/controller/Share.php" />
-        <option value="$PROJECT_DIR$/application/home/controller/Server.php" />
         <option value="$PROJECT_DIR$/application/home/controller/Question.php" />
         <option value="$PROJECT_DIR$/application/home/controller/Member.php" />
         <option value="$PROJECT_DIR$/.gitlab-ci.yml" />
         <option value="$PROJECT_DIR$/application/database.php" />
-        <option value="$PROJECT_DIR$/application/home/controller/User.php" />
         <option value="$PROJECT_DIR$/application/home/controller/Index.php" />
         <option value="$PROJECT_DIR$/application/home/model/User.php" />
+        <option value="$PROJECT_DIR$/application/common/controller/WechatBase.php" />
+        <option value="$PROJECT_DIR$/application/home/controller/User.php" />
+        <option value="$PROJECT_DIR$/application/home/controller/Server.php" />
       </list>
     </option>
   </component>
@@ -321,7 +330,7 @@
       <workItem from="1571705047810" duration="3754000" />
       <workItem from="1571790358186" duration="28939000" />
       <workItem from="1571877780953" duration="28080000" />
-      <workItem from="1571963886703" duration="9075000" />
+      <workItem from="1571963886703" duration="9921000" />
     </task>
     <task id="LOCAL-00001" summary="数据库配置">
       <created>1571972429395</created>
@@ -358,11 +367,32 @@
       <option name="project" value="LOCAL" />
       <updated>1571975758832</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="调试授权">
+      <created>1571975940473</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1571975940473</updated>
+    </task>
+    <task id="LOCAL-00007" summary="调试授权">
+      <created>1571975978410</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1571975978410</updated>
+    </task>
+    <task id="LOCAL-00008" summary="调试授权">
+      <created>1571976018612</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1571976018612</updated>
+    </task>
+    <option name="localTasksCounter" value="9" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="79416000" />
+    <option name="totallyTimeSpent" value="80262000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -537,13 +567,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/common/controller/WechatBase.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="419">
-          <caret line="69" column="20" selection-start-line="69" selection-start-column="20" selection-end-line="69" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/thinkphp/library/think/Request.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="289">
@@ -644,16 +667,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/home/controller/Server.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1088">
-          <caret line="71" column="29" selection-start-line="71" selection-start-column="29" selection-end-line="71" selection-end-column="29" />
-          <folding>
-            <element signature="e#130#167#0#PHP" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/home/controller/Question.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="573">
@@ -718,6 +731,23 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/application/common/controller/WechatBase.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="572">
+          <caret line="78" column="48" selection-start-line="78" selection-start-column="48" selection-end-line="78" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/home/model/User.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="459">
+          <caret line="32" column="14" lean-forward="true" selection-start-line="32" selection-start-column="14" selection-end-line="32" selection-end-column="14" />
+          <folding>
+            <element signature="e#125#138#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="306">
@@ -730,20 +760,20 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="623">
-          <caret line="84" column="34" lean-forward="true" selection-start-line="84" selection-start-column="34" selection-end-line="84" selection-end-column="34" />
+        <state relative-caret-position="519">
+          <caret line="115" column="22" selection-start-line="115" selection-start-column="22" selection-end-line="115" selection-end-column="22" />
           <folding>
             <element signature="e#128#160#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/home/model/User.php">
+    <entry file="file://$PROJECT_DIR$/application/home/controller/Server.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="493">
-          <caret line="34" column="17" selection-start-line="34" selection-start-column="17" selection-end-line="34" selection-end-column="17" />
+        <state relative-caret-position="436">
+          <caret line="139" column="25" selection-start-line="139" selection-start-column="25" selection-end-line="139" selection-end-column="25" />
           <folding>
-            <element signature="e#125#138#0#PHP" expanded="true" />
+            <element signature="e#130#167#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
--- a/application/home/controller/User.php
查看文件 @e864d66
+++ b/application/home/controller/User.php
查看文件 @e864d66
@@ -130,7 +130,7 @@ class User extends WechatBase
         ]);
         if($userId && $row){
             $token = generate_user_token($userId);
-            $userModel=new User();
+            $userModel=new \app\home\model\User();
             $user=$userModel->getUserInfo(['user_id'=>$userId,'app_id'=>$appId]);
             update_current_user($user);
             session('token',$token);