From 0acdffcee476a0aa5ff03a993ab9edbeaf875913 Mon Sep 17 00:00:00 2001
From: guosheng <gs@bronet.cn>
Date: Wed, 27 Nov 2019 18:45:58 +0800
Subject: [PATCH] 手机号

---
 .idea/workspace.xml                 | 43 +++++++++++++++++++++----------------------
 application/api/controller/User.php |  7 ++-----
 public/api.html                     |  8 ++++----
 3 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index bdf0d79..d22d09e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,6 +4,7 @@
     <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
       <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" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -17,8 +18,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="394">
-              <caret line="1648" column="34" lean-forward="false" selection-start-line="1648" selection-start-column="34" selection-end-line="1648" selection-end-column="34" />
+            <state relative-caret-position="29">
+              <caret line="1614" column="7" lean-forward="false" selection-start-line="1614" selection-start-column="7" selection-end-line="1614" selection-end-column="7" />
               <folding>
                 <element signature="e#365#484#0#PHP" expanded="false" />
                 <element signature="e#490#1228#0#PHP" expanded="false" />
@@ -80,9 +81,8 @@
                 <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#57419#58134#0#PHP" expanded="false" />
-                <element signature="e#58140#58567#0#PHP" expanded="false" />
-                <element signature="e#58572#58837#0#PHP" expanded="false" />
+                <element signature="e#58071#58498#0#PHP" expanded="false" />
+                <element signature="e#58503#58768#0#PHP" expanded="false" />
               </folding>
             </state>
           </provider>
@@ -174,11 +174,11 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
-  <component name="ProjectFrameBounds">
-    <option name="x" value="463" />
-    <option name="y" value="38" />
+  <component name="ProjectFrameBounds" extendedState="7">
+    <option name="x" value="178" />
+    <option name="y" value="-19" />
     <option name="width" value="1776" />
-    <option name="height" value="1081" />
+    <option name="height" value="1077" />
   </component>
   <component name="ProjectView">
     <navigator currentView="ProjectPane" proportions="" version="1">
@@ -223,7 +223,7 @@
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../hotel" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../project/competition" />
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
@@ -280,7 +280,7 @@
       <workItem from="1574759184313" duration="4793000" />
       <workItem from="1574814989178" duration="1007000" />
       <workItem from="1574831367903" duration="17171000" />
-      <workItem from="1574849431656" duration="248000" />
+      <workItem from="1574849431656" duration="2118000" />
     </task>
     <task id="LOCAL-00001" summary="调试">
       <created>1574145133364</created>
@@ -293,7 +293,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="271076000" />
+    <option name="totallyTimeSpent" value="272946000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -305,17 +305,17 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="463" y="38" width="1776" height="1081" extended-state="0" />
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
     <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.14801864" 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.13539445" 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" />
       <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" />
       <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" />
       <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" />
-      <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" />
+      <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" />
       <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" />
       <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" />
       <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 @@
     </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="52" lean-forward="true" selection-start-line="4" selection-start-column="52" selection-end-line="4" selection-end-column="52" />
+        <state relative-caret-position="75">
+          <caret line="3" column="39" lean-forward="false" selection-start-line="3" selection-start-column="21" selection-end-line="3" selection-end-column="39" />
           <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="394">
-          <caret line="1648" column="34" lean-forward="false" selection-start-line="1648" selection-start-column="34" selection-end-line="1648" selection-end-column="34" />
+        <state relative-caret-position="29">
+          <caret line="1614" column="7" lean-forward="false" selection-start-line="1614" selection-start-column="7" selection-end-line="1614" selection-end-column="7" />
           <folding>
             <element signature="e#365#484#0#PHP" expanded="false" />
             <element signature="e#490#1228#0#PHP" expanded="false" />
@@ -765,9 +765,8 @@
             <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#57419#58134#0#PHP" expanded="false" />
-            <element signature="e#58140#58567#0#PHP" expanded="false" />
-            <element signature="e#58572#58837#0#PHP" expanded="false" />
+            <element signature="e#58071#58498#0#PHP" expanded="false" />
+            <element signature="e#58503#58768#0#PHP" expanded="false" />
           </folding>
         </state>
       </provider>
diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index 118b3b3..9fe7d85 100644
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -1619,7 +1619,7 @@ class User extends Api
      * @ApiRoute    (/api/user/getMobile)
      *
      * @ApiParams   (name="sessionKey", type="string", required=true, description="sessionkey")
-     * @ApiParams   (name="encryptedDate", type="string", required=true, description="encryptedDate")
+     * @ApiParams   (name="encryptedData", type="string", required=true, description="encryptedDate")
      * @ApiParams   (name="iv", type="string", required=true, description="iv")
      *
      * @ApiReturn({
@@ -1633,8 +1633,7 @@ class User extends Api
      */
     public function getMobile()
     {
-        $rule = config('verify.raw');
-        $appid = $rule['app_id'];
+        $appid = 'wx4300d933e5abd5ba';
         $sessionKey = $this->request->param('sessionKey');
         $encryptedData = $this->request->param('encryptedData');
         $iv = $this->request->param('iv');
@@ -1646,7 +1645,6 @@ class User extends Api
         } else {
             $return['code'] = 301;
             $return['data'] = $errCode;
-            dump($return['data']);
             $return['code'] = json_encode($return['code']);
             $return['code'] = json_decode($return['code'],true);
             $return['data'] = json_encode($return['data']);
@@ -1663,7 +1661,6 @@ class User extends Api
         }
         $aesKey=base64_decode($sessionKey);
 
-
         if (strlen($iv) != 24) {
             return -41002;
         }
diff --git a/public/api.html b/public/api.html
index 80deb7a..53365eb 100644
--- a/public/api.html
+++ b/public/api.html
@@ -2289,7 +2289,7 @@
                                                         <td>sessionkey</td>
                                                     </tr>
                                                                                                         <tr>
-                                                        <td>encryptedDate</td>
+                                                        <td>encryptedData</td>
                                                         <td>string</td>
                                                         <td>是</td>
                                                         <td>encryptedDate</td>
@@ -2323,8 +2323,8 @@
                                                             <input type="string" class="form-control input-sm" id="sessionKey" required placeholder="sessionkey" name="sessionKey">
                                                         </div>
                                                                                                                 <div class="form-group">
-                                                            <label class="control-label" for="encryptedDate">encryptedDate</label>
-                                                            <input type="string" class="form-control input-sm" id="encryptedDate" required placeholder="encryptedDate" name="encryptedDate">
+                                                            <label class="control-label" for="encryptedData">encryptedData</label>
+                                                            <input type="string" class="form-control input-sm" id="encryptedData" required placeholder="encryptedDate" name="encryptedData">
                                                         </div>
                                                                                                                 <div class="form-group">
                                                             <label class="control-label" for="iv">iv</label>
@@ -6482,7 +6482,7 @@
 
             <div class="row mt0 footer">
                 <div class="col-md-6" align="left">
-                    Generated on 2019-11-27 16:19:29                </div>
+                    Generated on 2019-11-27 18:44:45                </div>
                 <div class="col-md-6" align="right">
                     <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
                 </div>
--
libgit2 0.24.0