郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 5145ba31d0c92cdcb81bd797489e9ecb40bac219 1 个父辈 4a844102
1 个管道 的构建 通过 耗费 1 秒

修改获取用户手机号

内嵌 并排对比
正在显示 3 个修改的文件 包含 81 行增加 和 56 行删除
@@ -2,15 +2,8 @@ @@ -2,15 +2,8 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment=""> 4 <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
5 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/api/index/controller/HomeController.php" />  
6 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/api/index/model/HomeModel.php" />  
7 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />  
8 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/config.php" afterPath="$PROJECT_DIR$/api/config.php" />  
9 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />  
10 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/HomeController.php" afterPath="$PROJECT_DIR$/app/admin/controller/HomeController.php" />  
11 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/add.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/add.html" />  
12 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/edit.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/edit.html" />  
13 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/simplewind/vendor/weiwei/api-doc/src/Doc.php" afterPath="$PROJECT_DIR$/simplewind/vendor/weiwei/api-doc/src/Doc.php" /> 5 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/HomeController.php" afterPath="$PROJECT_DIR$/api/index/controller/HomeController.php" />
  6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" afterPath="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" />
14 </list> 7 </list>
15 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
16 <option name="TRACKING_ENABLED" value="true" /> 9 <option name="TRACKING_ENABLED" value="true" />
@@ -32,11 +25,11 @@ @@ -32,11 +25,11 @@
32 </component> 25 </component>
33 <component name="FileEditorManager"> 26 <component name="FileEditorManager">
34 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 27 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
35 - <file leaf-file-name="HomeController.php" pinned="false" current-in-tab="true"> 28 + <file leaf-file-name="HomeController.php" pinned="false" current-in-tab="false">
36 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php"> 29 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
37 <provider selected="true" editor-type-id="text-editor"> 30 <provider selected="true" editor-type-id="text-editor">
38 - <state relative-caret-position="68">  
39 - <caret line="125" column="25" lean-forward="false" selection-start-line="125" selection-start-column="25" selection-end-line="125" selection-end-column="25" /> 31 + <state relative-caret-position="1343">
  32 + <caret line="134" column="43" lean-forward="true" selection-start-line="134" selection-start-column="43" selection-end-line="134" selection-end-column="43" />
40 <folding> 33 <folding>
41 <element signature="e#131#161#0#PHP" expanded="true" /> 34 <element signature="e#131#161#0#PHP" expanded="true" />
42 <element signature="e#309#524#0#PHP" expanded="false" /> 35 <element signature="e#309#524#0#PHP" expanded="false" />
@@ -50,6 +43,25 @@ @@ -50,6 +43,25 @@
50 </provider> 43 </provider>
51 </entry> 44 </entry>
52 </file> 45 </file>
  46 + <file leaf-file-name="PublicController.php" pinned="false" current-in-tab="true">
  47 + <entry file="file://$PROJECT_DIR$/api/wxapp/controller/PublicController.php">
  48 + <provider selected="true" editor-type-id="text-editor">
  49 + <state relative-caret-position="293">
  50 + <caret line="58" column="0" lean-forward="true" selection-start-line="58" selection-start-column="0" selection-end-line="58" selection-end-column="0" />
  51 + <folding>
  52 + <element signature="e#602#906#0#PHP" expanded="false" />
  53 + <element signature="e#911#1805#0#PHP" expanded="false" />
  54 + <element signature="e#1811#2278#0#PHP" expanded="false" />
  55 + <element signature="e#2283#5971#0#PHP" expanded="false" />
  56 + <element signature="e#5977#6278#0#PHP" expanded="false" />
  57 + <element signature="e#6283#7591#0#PHP" expanded="false" />
  58 + <element signature="e#7598#8002#0#PHP" expanded="false" />
  59 + <element signature="e#8007#8590#0#PHP" expanded="false" />
  60 + </folding>
  61 + </state>
  62 + </provider>
  63 + </entry>
  64 + </file>
53 </leaf> 65 </leaf>
54 </component> 66 </component>
55 <component name="FileTemplateManagerImpl"> 67 <component name="FileTemplateManagerImpl">
@@ -102,7 +114,6 @@ @@ -102,7 +114,6 @@
102 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/payadd.html" /> 114 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/payadd.html" />
103 <option value="$PROJECT_DIR$/app/admin/controller/MoneyController.php" /> 115 <option value="$PROJECT_DIR$/app/admin/controller/MoneyController.php" />
104 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/payedit.html" /> 116 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/payedit.html" />
105 - <option value="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" />  
106 <option value="$PROJECT_DIR$/app/config.php" /> 117 <option value="$PROJECT_DIR$/app/config.php" />
107 <option value="$PROJECT_DIR$/api/index/controller/PayController.php" /> 118 <option value="$PROJECT_DIR$/api/index/controller/PayController.php" />
108 <option value="$PROJECT_DIR$/app/admin/controller/KnowController.php" /> 119 <option value="$PROJECT_DIR$/app/admin/controller/KnowController.php" />
@@ -119,8 +130,9 @@ @@ -119,8 +130,9 @@
119 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/edit.html" /> 130 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/edit.html" />
120 <option value="$PROJECT_DIR$/app/admin/controller/HomeController.php" /> 131 <option value="$PROJECT_DIR$/app/admin/controller/HomeController.php" />
121 <option value="$PROJECT_DIR$/api/index/model/HomeModel.php" /> 132 <option value="$PROJECT_DIR$/api/index/model/HomeModel.php" />
122 - <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />  
123 <option value="$PROJECT_DIR$/api/config.php" /> 133 <option value="$PROJECT_DIR$/api/config.php" />
  134 + <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
  135 + <option value="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" />
124 </list> 136 </list>
125 </option> 137 </option>
126 </component> 138 </component>
@@ -139,8 +151,8 @@ @@ -139,8 +151,8 @@
139 </component> 151 </component>
140 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 152 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
141 <component name="ProjectFrameBounds" extendedState="1"> 153 <component name="ProjectFrameBounds" extendedState="1">
142 - <option name="x" value="332" />  
143 - <option name="y" value="46" /> 154 + <option name="x" value="86" />
  155 + <option name="y" value="62" />
144 <option name="width" value="1582" /> 156 <option name="width" value="1582" />
145 <option name="height" value="930" /> 157 <option name="height" value="930" />
146 </component> 158 </component>
@@ -175,13 +187,13 @@ @@ -175,13 +187,13 @@
175 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 187 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
176 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 188 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
177 <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> 189 <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
178 - <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" /> 190 + <item name="wxapp" type="2a2b976b:PhpTreeStructureProvider$1" />
179 </path> 191 </path>
180 <path> 192 <path>
181 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 193 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
182 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 194 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
183 <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> 195 <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
184 - <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" /> 196 + <item name="wxapp" type="2a2b976b:PhpTreeStructureProvider$1" />
185 <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> 197 <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
186 </path> 198 </path>
187 </expand> 199 </expand>
@@ -276,17 +288,18 @@ @@ -276,17 +288,18 @@
276 <workItem from="1574763377500" duration="4019000" /> 288 <workItem from="1574763377500" duration="4019000" />
277 <workItem from="1574815992559" duration="11623000" /> 289 <workItem from="1574815992559" duration="11623000" />
278 <workItem from="1574837405404" duration="1203000" /> 290 <workItem from="1574837405404" duration="1203000" />
279 - <workItem from="1574903328460" duration="7085000" /> 291 + <workItem from="1574903328460" duration="7264000" />
280 </task> 292 </task>
281 <servers /> 293 <servers />
282 </component> 294 </component>
283 <component name="TimeTrackingManager"> 295 <component name="TimeTrackingManager">
284 - <option name="totallyTimeSpent" value="339565000" /> 296 + <option name="totallyTimeSpent" value="339744000" />
285 </component> 297 </component>
286 <component name="ToolWindowManager"> 298 <component name="ToolWindowManager">
287 - <frame x="332" y="46" width="1582" height="930" extended-state="1" /> 299 + <frame x="86" y="62" width="1582" height="930" extended-state="1" />
  300 + <editor active="true" />
288 <layout> 301 <layout>
289 - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20367937" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 302 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20367937" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
290 <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" /> 303 <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" />
291 <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="7" side_tool="true" content_ui="tabs" /> 304 <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="7" side_tool="true" content_ui="tabs" />
292 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32982457" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 305 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32982457" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -380,20 +393,6 @@ @@ -380,20 +393,6 @@
380 </state> 393 </state>
381 </provider> 394 </provider>
382 </entry> 395 </entry>
383 - <entry file="file://$PROJECT_DIR$/simplewind/thinkphp/library/think/Config.php">  
384 - <provider selected="true" editor-type-id="text-editor">  
385 - <state relative-caret-position="304">  
386 - <caret line="100" column="27" lean-forward="false" selection-start-line="100" selection-start-column="27" selection-end-line="100" selection-end-column="27" />  
387 - </state>  
388 - </provider>  
389 - </entry>  
390 - <entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">  
391 - <provider selected="true" editor-type-id="text-editor">  
392 - <state relative-caret-position="229">  
393 - <caret line="102" column="13" lean-forward="false" selection-start-line="102" selection-start-column="13" selection-end-line="102" selection-end-column="13" />  
394 - </state>  
395 - </provider>  
396 - </entry>  
397 <entry file="file://$PROJECT_DIR$/simplewind/vendor/overtrue/wechat/src/Foundation/Application.php"> 396 <entry file="file://$PROJECT_DIR$/simplewind/vendor/overtrue/wechat/src/Foundation/Application.php">
398 <provider selected="true" editor-type-id="text-editor"> 397 <provider selected="true" editor-type-id="text-editor">
399 <state relative-caret-position="304"> 398 <state relative-caret-position="304">
@@ -408,13 +407,6 @@ @@ -408,13 +407,6 @@
408 </state> 407 </state>
409 </provider> 408 </provider>
410 </entry> 409 </entry>
411 - <entry file="file://$PROJECT_DIR$/api/wxapp/controller/PublicController.php">  
412 - <provider selected="true" editor-type-id="text-editor">  
413 - <state relative-caret-position="639">  
414 - <caret line="224" column="4" lean-forward="false" selection-start-line="224" selection-start-column="4" selection-end-line="252" selection-end-column="5" />  
415 - </state>  
416 - </provider>  
417 - </entry>  
418 <entry file="file://$PROJECT_DIR$/app/config.php"> 410 <entry file="file://$PROJECT_DIR$/app/config.php">
419 <provider selected="true" editor-type-id="text-editor"> 411 <provider selected="true" editor-type-id="text-editor">
420 <state relative-caret-position="689"> 412 <state relative-caret-position="689">
@@ -816,18 +808,10 @@ @@ -816,18 +808,10 @@
816 </state> 808 </state>
817 </provider> 809 </provider>
818 </entry> 810 </entry>
819 - <entry file="file://$PROJECT_DIR$/api/config.php">  
820 - <provider selected="true" editor-type-id="text-editor">  
821 - <state relative-caret-position="1914">  
822 - <caret line="258" column="11" lean-forward="true" selection-start-line="258" selection-start-column="11" selection-end-line="258" selection-end-column="11" />  
823 - <folding />  
824 - </state>  
825 - </provider>  
826 - </entry>  
827 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php"> 811 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
828 <provider selected="true" editor-type-id="text-editor"> 812 <provider selected="true" editor-type-id="text-editor">
829 - <state relative-caret-position="68">  
830 - <caret line="125" column="25" lean-forward="false" selection-start-line="125" selection-start-column="25" selection-end-line="125" selection-end-column="25" /> 813 + <state relative-caret-position="1343">
  814 + <caret line="134" column="43" lean-forward="true" selection-start-line="134" selection-start-column="43" selection-end-line="134" selection-end-column="43" />
831 <folding> 815 <folding>
832 <element signature="e#131#161#0#PHP" expanded="true" /> 816 <element signature="e#131#161#0#PHP" expanded="true" />
833 <element signature="e#309#524#0#PHP" expanded="false" /> 817 <element signature="e#309#524#0#PHP" expanded="false" />
@@ -840,5 +824,46 @@ @@ -840,5 +824,46 @@
840 </state> 824 </state>
841 </provider> 825 </provider>
842 </entry> 826 </entry>
  827 + <entry file="file://$PROJECT_DIR$/api/config.php">
  828 + <provider selected="true" editor-type-id="text-editor">
  829 + <state relative-caret-position="418">
  830 + <caret line="258" column="11" lean-forward="true" selection-start-line="258" selection-start-column="11" selection-end-line="258" selection-end-column="11" />
  831 + <folding />
  832 + </state>
  833 + </provider>
  834 + </entry>
  835 + <entry file="file://$PROJECT_DIR$/simplewind/thinkphp/library/think/Config.php">
  836 + <provider selected="true" editor-type-id="text-editor">
  837 + <state relative-caret-position="-2200">
  838 + <caret line="13" column="6" lean-forward="false" selection-start-line="13" selection-start-column="6" selection-end-line="13" selection-end-column="6" />
  839 + <folding />
  840 + </state>
  841 + </provider>
  842 + </entry>
  843 + <entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">
  844 + <provider selected="true" editor-type-id="text-editor">
  845 + <state relative-caret-position="280">
  846 + <caret line="103" column="5" lean-forward="true" selection-start-line="103" selection-start-column="5" selection-end-line="103" selection-end-column="5" />
  847 + <folding />
  848 + </state>
  849 + </provider>
  850 + </entry>
  851 + <entry file="file://$PROJECT_DIR$/api/wxapp/controller/PublicController.php">
  852 + <provider selected="true" editor-type-id="text-editor">
  853 + <state relative-caret-position="293">
  854 + <caret line="58" column="0" lean-forward="true" selection-start-line="58" selection-start-column="0" selection-end-line="58" selection-end-column="0" />
  855 + <folding>
  856 + <element signature="e#602#906#0#PHP" expanded="false" />
  857 + <element signature="e#911#1805#0#PHP" expanded="false" />
  858 + <element signature="e#1811#2278#0#PHP" expanded="false" />
  859 + <element signature="e#2283#5971#0#PHP" expanded="false" />
  860 + <element signature="e#5977#6278#0#PHP" expanded="false" />
  861 + <element signature="e#6283#7591#0#PHP" expanded="false" />
  862 + <element signature="e#7598#8002#0#PHP" expanded="false" />
  863 + <element signature="e#8007#8590#0#PHP" expanded="false" />
  864 + </folding>
  865 + </state>
  866 + </provider>
  867 + </entry>
843 </component> 868 </component>
844 </project> 869 </project>
@@ -132,7 +132,7 @@ class HomeController extends RestBaseController @@ -132,7 +132,7 @@ class HomeController extends RestBaseController
132 ->alias('a') 132 ->alias('a')
133 ->join('user b','a.user_id = b.id') 133 ->join('user b','a.user_id = b.id')
134 ->field('a.*,b.user_nickname') 134 ->field('a.*,b.user_nickname')
135 - ->where('shopgood_id',$goods_id) 135 + ->where('shopgood_id',$home_id)
136 ->page($page,$pageNum) 136 ->page($page,$pageNum)
137 ->select() 137 ->select()
138 ->toArray(); 138 ->toArray();
@@ -230,7 +230,7 @@ class PublicController extends RestBaseController @@ -230,7 +230,7 @@ class PublicController extends RestBaseController
230 * @method POST 230 * @method POST
231 * 231 *
232 * @param name:sessionKey type:string require:1 other: desc:scssionkey 232 * @param name:sessionKey type:string require:1 other: desc:scssionkey
233 - * @param name:encryptedDate type:string require:1 other: desc:encryptedDate 233 + * @param name:encryptedData type:string require:1 other: desc:encryptedDate
234 * @param name:iv type:string require:1 other: desc: iv 234 * @param name:iv type:string require:1 other: desc: iv
235 * 235 *
236 * @return phoneNumber:手机号 236 * @return phoneNumber:手机号
@@ -238,7 +238,7 @@ class PublicController extends RestBaseController @@ -238,7 +238,7 @@ class PublicController extends RestBaseController
238 public function getMobile() 238 public function getMobile()
239 { 239 {
240 $sessionKey = $this->request->param('sessionKey'); 240 $sessionKey = $this->request->param('sessionKey');
241 - $encryptedData = $this->request->param('encryptedDate'); 241 + $encryptedData = $this->request->param('encryptedData');
242 $iv = $this->request->param('iv'); 242 $iv = $this->request->param('iv');
243 $aesKey = base64_decode($sessionKey); 243 $aesKey = base64_decode($sessionKey);
244 $aesIV = base64_decode($iv); 244 $aesIV = base64_decode($iv);