郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 e88f4548fbdd5c8582d54c4ee104fd860ab14a37 1 个父辈 8219ce86
1 个管道 的构建 通过 耗费 7 秒

用户手机号

内嵌 并排对比
正在显示 4 个修改的文件 包含 102 行增加 和 89 行删除
@@ -2,20 +2,10 @@ @@ -2,20 +2,10 @@
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/OrderController.php" />  
6 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/api/index/controller/PayController.php" />  
7 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/api/index/model/OrderModel.php" />  
8 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/admin/controller/MoneyController.php" />  
9 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/add.html" />  
10 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/edit.html" />  
11 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/index.html" />  
12 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/pay.html" />  
13 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/payadd.html" />  
14 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/payedit.html" />  
15 <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" />
16 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />  
17 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/data/lang/zh-cn/admin_menu.php" afterPath="$PROJECT_DIR$/data/lang/zh-cn/admin_menu.php" />  
18 - <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" /> 6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/OrderController.php" afterPath="$PROJECT_DIR$/api/index/controller/OrderController.php" />
  7 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" afterPath="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" />
  8 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/config.php" afterPath="$PROJECT_DIR$/app/config.php" />
19 </list> 9 </list>
20 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
21 <option name="TRACKING_ENABLED" value="true" /> 11 <option name="TRACKING_ENABLED" value="true" />
@@ -58,18 +48,17 @@ @@ -58,18 +48,17 @@
58 </provider> 48 </provider>
59 </entry> 49 </entry>
60 </file> 50 </file>
61 - <file leaf-file-name="OrderController.php" pinned="false" current-in-tab="true"> 51 + <file leaf-file-name="OrderController.php" pinned="false" current-in-tab="false">
62 <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php"> 52 <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
63 <provider selected="true" editor-type-id="text-editor"> 53 <provider selected="true" editor-type-id="text-editor">
64 - <state relative-caret-position="525">  
65 - <caret line="96" column="5" lean-forward="true" selection-start-line="96" selection-start-column="5" selection-end-line="96" selection-end-column="5" /> 54 + <state relative-caret-position="714">
  55 + <caret line="98" column="31" lean-forward="false" selection-start-line="98" selection-start-column="31" selection-end-line="98" selection-end-column="31" />
66 <folding> 56 <folding>
67 <element signature="e#131#162#0#PHP" expanded="true" /> 57 <element signature="e#131#162#0#PHP" expanded="true" />
68 <element signature="e#329#689#0#PHP" expanded="false" /> 58 <element signature="e#329#689#0#PHP" expanded="false" />
69 <element signature="e#694#1752#0#PHP" expanded="false" /> 59 <element signature="e#694#1752#0#PHP" expanded="false" />
70 - <element signature="e#1758#2003#0#PHP" expanded="false" />  
71 - <element signature="e#2008#2708#0#PHP" expanded="false" />  
72 - <element signature="e#2714#2956#0#PHP" expanded="false" /> 60 + <element signature="e#2000#2700#0#PHP" expanded="false" />
  61 + <element signature="e#2706#2948#0#PHP" expanded="false" />
73 </folding> 62 </folding>
74 </state> 63 </state>
75 </provider> 64 </provider>
@@ -78,8 +67,8 @@ @@ -78,8 +67,8 @@
78 <file leaf-file-name="PayController.php" pinned="false" current-in-tab="false"> 67 <file leaf-file-name="PayController.php" pinned="false" current-in-tab="false">
79 <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php"> 68 <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
80 <provider selected="true" editor-type-id="text-editor"> 69 <provider selected="true" editor-type-id="text-editor">
81 - <state relative-caret-position="489">  
82 - <caret line="100" column="62" lean-forward="false" selection-start-line="100" selection-start-column="62" selection-end-line="100" selection-end-column="62" /> 70 + <state relative-caret-position="89">
  71 + <caret line="93" column="29" lean-forward="true" selection-start-line="93" selection-start-column="29" selection-end-line="93" selection-end-column="29" />
83 <folding> 72 <folding>
84 <element signature="e#3760#3783#0#PHP" expanded="false" /> 73 <element signature="e#3760#3783#0#PHP" expanded="false" />
85 <element signature="e#3788#4047#0#PHP" expanded="false" /> 74 <element signature="e#3788#4047#0#PHP" expanded="false" />
@@ -90,6 +79,16 @@ @@ -90,6 +79,16 @@
90 </provider> 79 </provider>
91 </entry> 80 </entry>
92 </file> 81 </file>
  82 + <file leaf-file-name="PublicController.php" pinned="false" current-in-tab="true">
  83 + <entry file="file://$PROJECT_DIR$/api/wxapp/controller/PublicController.php">
  84 + <provider selected="true" editor-type-id="text-editor">
  85 + <state relative-caret-position="414">
  86 + <caret line="236" column="7" lean-forward="true" selection-start-line="236" selection-start-column="7" selection-end-line="236" selection-end-column="7" />
  87 + <folding />
  88 + </state>
  89 + </provider>
  90 + </entry>
  91 + </file>
93 </leaf> 92 </leaf>
94 </component> 93 </component>
95 <component name="FileTemplateManagerImpl"> 94 <component name="FileTemplateManagerImpl">
@@ -110,7 +109,6 @@ @@ -110,7 +109,6 @@
110 <component name="IdeDocumentHistory"> 109 <component name="IdeDocumentHistory">
111 <option name="CHANGED_PATHS"> 110 <option name="CHANGED_PATHS">
112 <list> 111 <list>
113 - <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/edit.html" />  
114 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/add.html" /> 112 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/add.html" />
115 <option value="$PROJECT_DIR$/app/index/model/ShopgoodsModel.php" /> 113 <option value="$PROJECT_DIR$/app/index/model/ShopgoodsModel.php" />
116 <option value="$PROJECT_DIR$/app/index/controller/DoorController.php" /> 114 <option value="$PROJECT_DIR$/app/index/controller/DoorController.php" />
@@ -138,7 +136,6 @@ @@ -138,7 +136,6 @@
138 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html" /> 136 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html" />
139 <option value="$PROJECT_DIR$/app/admin/controller/SubscribeController.php" /> 137 <option value="$PROJECT_DIR$/app/admin/controller/SubscribeController.php" />
140 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html" /> 138 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html" />
141 - <option value="$PROJECT_DIR$/app/config.php" />  
142 <option value="$PROJECT_DIR$/app/extra/wechat.php" /> 139 <option value="$PROJECT_DIR$/app/extra/wechat.php" />
143 <option value="$PROJECT_DIR$/simplewind/cmf/controller/WeChatBaseController.php" /> 140 <option value="$PROJECT_DIR$/simplewind/cmf/controller/WeChatBaseController.php" />
144 <option value="$PROJECT_DIR$/api/index/controller/ProjectController.php" /> 141 <option value="$PROJECT_DIR$/api/index/controller/ProjectController.php" />
@@ -158,9 +155,11 @@ @@ -158,9 +155,11 @@
158 <option value="$PROJECT_DIR$/app/admin/controller/MoneyController.php" /> 155 <option value="$PROJECT_DIR$/app/admin/controller/MoneyController.php" />
159 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/payedit.html" /> 156 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/payedit.html" />
160 <option value="$PROJECT_DIR$/api/index/controller/UserController.php" /> 157 <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
161 - <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />  
162 <option value="$PROJECT_DIR$/api/index/controller/PayController.php" /> 158 <option value="$PROJECT_DIR$/api/index/controller/PayController.php" />
163 <option value="$PROJECT_DIR$/simplewind/vendor/weiwei/api-doc/src/Doc.php" /> 159 <option value="$PROJECT_DIR$/simplewind/vendor/weiwei/api-doc/src/Doc.php" />
  160 + <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />
  161 + <option value="$PROJECT_DIR$/app/config.php" />
  162 + <option value="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" />
164 </list> 163 </list>
165 </option> 164 </option>
166 </component> 165 </component>
@@ -179,8 +178,8 @@ @@ -179,8 +178,8 @@
179 </component> 178 </component>
180 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 179 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
181 <component name="ProjectFrameBounds"> 180 <component name="ProjectFrameBounds">
182 - <option name="x" value="145" />  
183 - <option name="y" value="51" /> 181 + <option name="x" value="341" />
  182 + <option name="y" value="29" />
184 <option name="width" value="1935" /> 183 <option name="width" value="1935" />
185 <option name="height" value="1076" /> 184 <option name="height" value="1076" />
186 </component> 185 </component>
@@ -234,37 +233,20 @@ @@ -234,37 +233,20 @@
234 <path> 233 <path>
235 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 234 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
236 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 235 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
237 - <item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />  
238 - </path>  
239 - <path>  
240 - <item name="scrap" type="b2602c69:ProjectViewProjectNode" />  
241 - <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />  
242 - <item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />  
243 - <item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />  
244 - </path>  
245 - <path>  
246 - <item name="scrap" type="b2602c69:ProjectViewProjectNode" />  
247 - <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />  
248 - <item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />  
249 - <item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />  
250 - <item name="weiwei" type="2a2b976b:PhpTreeStructureProvider$1" /> 236 + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
  237 + <item name="wxapp" type="2a2b976b:PhpTreeStructureProvider$1" />
251 </path> 238 </path>
252 <path> 239 <path>
253 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 240 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
254 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 241 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
255 - <item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />  
256 - <item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />  
257 - <item name="weiwei" type="2a2b976b:PhpTreeStructureProvider$1" />  
258 - <item name="api-doc" type="2a2b976b:PhpTreeStructureProvider$1" /> 242 + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
  243 + <item name="wxapp" type="2a2b976b:PhpTreeStructureProvider$1" />
  244 + <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
259 </path> 245 </path>
260 <path> 246 <path>
261 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 247 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
262 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 248 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
263 - <item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />  
264 - <item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />  
265 - <item name="weiwei" type="2a2b976b:PhpTreeStructureProvider$1" />  
266 - <item name="api-doc" type="2a2b976b:PhpTreeStructureProvider$1" />  
267 - <item name="src" type="2a2b976b:PhpTreeStructureProvider$1" /> 249 + <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
268 </path> 250 </path>
269 </expand> 251 </expand>
270 <select /> 252 <select />
@@ -342,15 +324,15 @@ @@ -342,15 +324,15 @@
342 <workItem from="1573517804403" duration="18784000" /> 324 <workItem from="1573517804403" duration="18784000" />
343 <workItem from="1573542205740" duration="11653000" /> 325 <workItem from="1573542205740" duration="11653000" />
344 <workItem from="1573604588269" duration="25250000" /> 326 <workItem from="1573604588269" duration="25250000" />
345 - <workItem from="1573690800296" duration="10988000" /> 327 + <workItem from="1573690800296" duration="12611000" />
346 </task> 328 </task>
347 <servers /> 329 <servers />
348 </component> 330 </component>
349 <component name="TimeTrackingManager"> 331 <component name="TimeTrackingManager">
350 - <option name="totallyTimeSpent" value="250518000" /> 332 + <option name="totallyTimeSpent" value="252141000" />
351 </component> 333 </component>
352 <component name="ToolWindowManager"> 334 <component name="ToolWindowManager">
353 - <frame x="145" y="51" width="1935" height="1076" extended-state="0" /> 335 + <frame x="341" y="29" width="1935" height="1076" extended-state="0" />
354 <editor active="true" /> 336 <editor active="true" />
355 <layout> 337 <layout>
356 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16213334" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 338 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16213334" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -527,13 +509,6 @@ @@ -527,13 +509,6 @@
527 </state> 509 </state>
528 </provider> 510 </provider>
529 </entry> 511 </entry>
530 - <entry file="file://$PROJECT_DIR$/api/wxapp/controller/PublicController.php">  
531 - <provider selected="true" editor-type-id="text-editor">  
532 - <state relative-caret-position="1017">  
533 - <caret line="223" column="1" lean-forward="true" selection-start-line="223" selection-start-column="1" selection-end-line="223" selection-end-column="1" />  
534 - </state>  
535 - </provider>  
536 - </entry>  
537 <entry file="file://$PROJECT_DIR$/api/index/model/ShoppicModel.php"> 512 <entry file="file://$PROJECT_DIR$/api/index/model/ShoppicModel.php">
538 <provider selected="true" editor-type-id="text-editor"> 513 <provider selected="true" editor-type-id="text-editor">
539 <state relative-caret-position="275"> 514 <state relative-caret-position="275">
@@ -801,14 +776,6 @@ @@ -801,14 +776,6 @@
801 </state> 776 </state>
802 </provider> 777 </provider>
803 </entry> 778 </entry>
804 - <entry file="file://$PROJECT_DIR$/app/config.php">  
805 - <provider selected="true" editor-type-id="text-editor">  
806 - <state relative-caret-position="713">  
807 - <caret line="237" column="51" lean-forward="false" selection-start-line="237" selection-start-column="19" selection-end-line="237" selection-end-column="51" />  
808 - <folding />  
809 - </state>  
810 - </provider>  
811 - </entry>  
812 <entry file="file://$PROJECT_DIR$/api/index/model/OrderModel.php"> 779 <entry file="file://$PROJECT_DIR$/api/index/model/OrderModel.php">
813 <provider selected="true" editor-type-id="text-editor"> 780 <provider selected="true" editor-type-id="text-editor">
814 <state relative-caret-position="325"> 781 <state relative-caret-position="325">
@@ -825,19 +792,6 @@ @@ -825,19 +792,6 @@
825 </state> 792 </state>
826 </provider> 793 </provider>
827 </entry> 794 </entry>
828 - <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">  
829 - <provider selected="true" editor-type-id="text-editor">  
830 - <state relative-caret-position="489">  
831 - <caret line="100" column="62" lean-forward="false" selection-start-line="100" selection-start-column="62" selection-end-line="100" selection-end-column="62" />  
832 - <folding>  
833 - <element signature="e#3760#3783#0#PHP" expanded="false" />  
834 - <element signature="e#3788#4047#0#PHP" expanded="false" />  
835 - <element signature="e#4054#4103#0#PHP" expanded="false" />  
836 - <element signature="e#4108#4536#0#PHP" expanded="false" />  
837 - </folding>  
838 - </state>  
839 - </provider>  
840 - </entry>  
841 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 795 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
842 <provider selected="true" editor-type-id="text-editor"> 796 <provider selected="true" editor-type-id="text-editor">
843 <state relative-caret-position="575"> 797 <state relative-caret-position="575">
@@ -872,18 +826,46 @@ @@ -872,18 +826,46 @@
872 </entry> 826 </entry>
873 <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php"> 827 <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
874 <provider selected="true" editor-type-id="text-editor"> 828 <provider selected="true" editor-type-id="text-editor">
875 - <state relative-caret-position="525">  
876 - <caret line="96" column="5" lean-forward="true" selection-start-line="96" selection-start-column="5" selection-end-line="96" selection-end-column="5" /> 829 + <state relative-caret-position="714">
  830 + <caret line="98" column="31" lean-forward="false" selection-start-line="98" selection-start-column="31" selection-end-line="98" selection-end-column="31" />
877 <folding> 831 <folding>
878 <element signature="e#131#162#0#PHP" expanded="true" /> 832 <element signature="e#131#162#0#PHP" expanded="true" />
879 <element signature="e#329#689#0#PHP" expanded="false" /> 833 <element signature="e#329#689#0#PHP" expanded="false" />
880 <element signature="e#694#1752#0#PHP" expanded="false" /> 834 <element signature="e#694#1752#0#PHP" expanded="false" />
881 - <element signature="e#1758#2003#0#PHP" expanded="false" />  
882 - <element signature="e#2008#2708#0#PHP" expanded="false" />  
883 - <element signature="e#2714#2956#0#PHP" expanded="false" /> 835 + <element signature="e#2000#2700#0#PHP" expanded="false" />
  836 + <element signature="e#2706#2948#0#PHP" expanded="false" />
  837 + </folding>
  838 + </state>
  839 + </provider>
  840 + </entry>
  841 + <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
  842 + <provider selected="true" editor-type-id="text-editor">
  843 + <state relative-caret-position="89">
  844 + <caret line="93" column="29" lean-forward="true" selection-start-line="93" selection-start-column="29" selection-end-line="93" selection-end-column="29" />
  845 + <folding>
  846 + <element signature="e#3760#3783#0#PHP" expanded="false" />
  847 + <element signature="e#3788#4047#0#PHP" expanded="false" />
  848 + <element signature="e#4054#4103#0#PHP" expanded="false" />
  849 + <element signature="e#4108#4536#0#PHP" expanded="false" />
884 </folding> 850 </folding>
885 </state> 851 </state>
886 </provider> 852 </provider>
887 </entry> 853 </entry>
  854 + <entry file="file://$PROJECT_DIR$/app/config.php">
  855 + <provider selected="true" editor-type-id="text-editor">
  856 + <state relative-caret-position="588">
  857 + <caret line="232" column="43" lean-forward="true" selection-start-line="232" selection-start-column="43" selection-end-line="232" selection-end-column="43" />
  858 + <folding />
  859 + </state>
  860 + </provider>
  861 + </entry>
  862 + <entry file="file://$PROJECT_DIR$/api/wxapp/controller/PublicController.php">
  863 + <provider selected="true" editor-type-id="text-editor">
  864 + <state relative-caret-position="414">
  865 + <caret line="236" column="7" lean-forward="true" selection-start-line="236" selection-start-column="7" selection-end-line="236" selection-end-column="7" />
  866 + <folding />
  867 + </state>
  868 + </provider>
  869 + </entry>
888 </component> 870 </component>
889 </project> 871 </project>
@@ -68,8 +68,8 @@ class OrderController extends RestBaseController @@ -68,8 +68,8 @@ class OrderController extends RestBaseController
68 } 68 }
69 69
70 /** 70 /**
71 - * @title 支付：看说明  
72 - * @author WangXiaogang 71 + * @title 支付
  72 + * @author Guosheng
73 * @url /index/order/pay 73 * @url /index/order/pay
74 * @method GET 74 * @method GET
75 * 75 *
@@ -221,4 +221,35 @@ class PublicController extends RestBaseController @@ -221,4 +221,35 @@ class PublicController extends RestBaseController
221 $this->success('SUCCESS',$data); 221 $this->success('SUCCESS',$data);
222 } 222 }
223 223
  224 +
  225 + /**
  226 + * @title 获取用户手机号
  227 + * @description 获取用户手机号
  228 + * @author Tiger Yang
  229 + * @url /wxapp/public/getMobile
  230 + * @method POST
  231 + *
  232 + * @param name:sessionKey type:string require:1 other: desc:scssionkey
  233 + * @param name:encryptedDate type:string require:1 other: desc:encryptedDate
  234 + * @param name:iv type:string require:1 other: desc: iv
  235 + *
  236 + * @return phoneNumber:手机号
  237 + */
  238 + public function getMobile()
  239 + {
  240 + $sessionKey = $this->request->param('sessionKey');
  241 + $encryptedData = $this->request->param('encryptedDate');
  242 + $iv = $this->request->param('iv');
  243 + $aesKey = base64_decode($sessionKey);
  244 + $aesIV = base64_decode($iv);
  245 + $aesCipher = base64_decode($encryptedData);
  246 + $result = openssl_decrypt($aesCipher, "AES-128-CBC", $aesKey, 1, $aesIV);
  247 + $result = json_decode($result, true);
  248 + if ($result) {
  249 + return $result['phoneNumber'];
  250 + }else{
  251 + return '';
  252 + }
  253 + }
  254 +
224 } 255 }
@@ -234,7 +234,7 @@ $configs = [ @@ -234,7 +234,7 @@ $configs = [
234 'cmf_admin_default_theme' => 'admin_simpleboot3', 234 'cmf_admin_default_theme' => 'admin_simpleboot3',
235 235
236 //公众号配置 236 //公众号配置
237 - 'app_id'=>'wxc6ef42cbfc3497cf',  
238 - 'app_secret'=>'752789aeeb5b72a97e733c79d060e1d4', 237 + 'app_id'=>'wxf35ab92c5bd897b2',
  238 + 'app_secret'=>'18ae3d2d5d18a646a792f4468a3e0e9f',
239 ]; 239 ];
240 return array_merge($configs, $runtimeConfig,$wechatConfig); 240 return array_merge($configs, $runtimeConfig,$wechatConfig);