郭盛 / scrap · 提交

转到一个项目

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

用户手机号

内嵌 并排对比
正在显示 4 个修改的文件 包含 102 行增加 和 89 行删除
... ... @@ -2,20 +2,10 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/api/index/controller/OrderController.php" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/api/index/controller/PayController.php" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/api/index/model/OrderModel.php" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/admin/controller/MoneyController.php" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/add.html" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/edit.html" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/index.html" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/pay.html" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/payadd.html" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/payedit.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/data/lang/zh-cn/admin_menu.php" afterPath="$PROJECT_DIR$/data/lang/zh-cn/admin_menu.php" />
<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" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/OrderController.php" afterPath="$PROJECT_DIR$/api/index/controller/OrderController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" afterPath="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/config.php" afterPath="$PROJECT_DIR$/app/config.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -58,18 +48,17 @@
</provider>
</entry>
</file>
<file leaf-file-name="OrderController.php" pinned="false" current-in-tab="true">
<file leaf-file-name="OrderController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
<caret line="96" column="5" lean-forward="true" selection-start-line="96" selection-start-column="5" selection-end-line="96" selection-end-column="5" />
<state relative-caret-position="714">
<caret line="98" column="31" lean-forward="false" selection-start-line="98" selection-start-column="31" selection-end-line="98" selection-end-column="31" />
<folding>
<element signature="e#131#162#0#PHP" expanded="true" />
<element signature="e#329#689#0#PHP" expanded="false" />
<element signature="e#694#1752#0#PHP" expanded="false" />
<element signature="e#1758#2003#0#PHP" expanded="false" />
<element signature="e#2008#2708#0#PHP" expanded="false" />
<element signature="e#2714#2956#0#PHP" expanded="false" />
<element signature="e#2000#2700#0#PHP" expanded="false" />
<element signature="e#2706#2948#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -78,8 +67,8 @@
<file leaf-file-name="PayController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="489">
<caret line="100" column="62" lean-forward="false" selection-start-line="100" selection-start-column="62" selection-end-line="100" selection-end-column="62" />
<state relative-caret-position="89">
<caret line="93" column="29" lean-forward="true" selection-start-line="93" selection-start-column="29" selection-end-line="93" selection-end-column="29" />
<folding>
<element signature="e#3760#3783#0#PHP" expanded="false" />
<element signature="e#3788#4047#0#PHP" expanded="false" />
... ... @@ -90,6 +79,16 @@
</provider>
</entry>
</file>
<file leaf-file-name="PublicController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/wxapp/controller/PublicController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="414">
<caret line="236" column="7" lean-forward="true" selection-start-line="236" selection-start-column="7" selection-end-line="236" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
... ... @@ -110,7 +109,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/edit.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/add.html" />
<option value="$PROJECT_DIR$/app/index/model/ShopgoodsModel.php" />
<option value="$PROJECT_DIR$/app/index/controller/DoorController.php" />
... ... @@ -138,7 +136,6 @@
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html" />
<option value="$PROJECT_DIR$/app/admin/controller/SubscribeController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html" />
<option value="$PROJECT_DIR$/app/config.php" />
<option value="$PROJECT_DIR$/app/extra/wechat.php" />
<option value="$PROJECT_DIR$/simplewind/cmf/controller/WeChatBaseController.php" />
<option value="$PROJECT_DIR$/api/index/controller/ProjectController.php" />
... ... @@ -158,9 +155,11 @@
<option value="$PROJECT_DIR$/app/admin/controller/MoneyController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/payedit.html" />
<option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
<option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />
<option value="$PROJECT_DIR$/api/index/controller/PayController.php" />
<option value="$PROJECT_DIR$/simplewind/vendor/weiwei/api-doc/src/Doc.php" />
<option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />
<option value="$PROJECT_DIR$/app/config.php" />
<option value="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" />
</list>
</option>
</component>
... ... @@ -179,8 +178,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="145" />
<option name="y" value="51" />
<option name="x" value="341" />
<option name="y" value="29" />
<option name="width" value="1935" />
<option name="height" value="1076" />
</component>
... ... @@ -234,37 +233,20 @@
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="weiwei" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="wxapp" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="weiwei" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api-doc" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="wxapp" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="weiwei" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api-doc" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="src" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
... ... @@ -342,15 +324,15 @@
<workItem from="1573517804403" duration="18784000" />
<workItem from="1573542205740" duration="11653000" />
<workItem from="1573604588269" duration="25250000" />
<workItem from="1573690800296" duration="10988000" />
<workItem from="1573690800296" duration="12611000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="250518000" />
<option name="totallyTimeSpent" value="252141000" />
</component>
<component name="ToolWindowManager">
<frame x="145" y="51" width="1935" height="1076" extended-state="0" />
<frame x="341" y="29" width="1935" height="1076" extended-state="0" />
<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.16213334" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
... ... @@ -527,13 +509,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/wxapp/controller/PublicController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1017">
<caret line="223" column="1" lean-forward="true" selection-start-line="223" selection-start-column="1" selection-end-line="223" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/model/ShoppicModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
... ... @@ -801,14 +776,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="713">
<caret line="237" column="51" lean-forward="false" selection-start-line="237" selection-start-column="19" selection-end-line="237" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/model/OrderModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
... ... @@ -825,19 +792,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="489">
<caret line="100" column="62" lean-forward="false" selection-start-line="100" selection-start-column="62" selection-end-line="100" selection-end-column="62" />
<folding>
<element signature="e#3760#3783#0#PHP" expanded="false" />
<element signature="e#3788#4047#0#PHP" expanded="false" />
<element signature="e#4054#4103#0#PHP" expanded="false" />
<element signature="e#4108#4536#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="575">
... ... @@ -872,18 +826,46 @@
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
<caret line="96" column="5" lean-forward="true" selection-start-line="96" selection-start-column="5" selection-end-line="96" selection-end-column="5" />
<state relative-caret-position="714">
<caret line="98" column="31" lean-forward="false" selection-start-line="98" selection-start-column="31" selection-end-line="98" selection-end-column="31" />
<folding>
<element signature="e#131#162#0#PHP" expanded="true" />
<element signature="e#329#689#0#PHP" expanded="false" />
<element signature="e#694#1752#0#PHP" expanded="false" />
<element signature="e#1758#2003#0#PHP" expanded="false" />
<element signature="e#2008#2708#0#PHP" expanded="false" />
<element signature="e#2714#2956#0#PHP" expanded="false" />
<element signature="e#2000#2700#0#PHP" expanded="false" />
<element signature="e#2706#2948#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="89">
<caret line="93" column="29" lean-forward="true" selection-start-line="93" selection-start-column="29" selection-end-line="93" selection-end-column="29" />
<folding>
<element signature="e#3760#3783#0#PHP" expanded="false" />
<element signature="e#3788#4047#0#PHP" expanded="false" />
<element signature="e#4054#4103#0#PHP" expanded="false" />
<element signature="e#4108#4536#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="588">
<caret line="232" column="43" lean-forward="true" selection-start-line="232" selection-start-column="43" selection-end-line="232" selection-end-column="43" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/wxapp/controller/PublicController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="414">
<caret line="236" column="7" lean-forward="true" selection-start-line="236" selection-start-column="7" selection-end-line="236" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -68,8 +68,8 @@ class OrderController extends RestBaseController
}
/**
* @title 支付：看说明
* @author WangXiaogang
* @title 支付
* @author Guosheng
* @url /index/order/pay
* @method GET
*
... ...
... ... @@ -221,4 +221,35 @@ class PublicController extends RestBaseController
$this->success('SUCCESS',$data);
}
/**
* @title 获取用户手机号
* @description 获取用户手机号
* @author Tiger Yang
* @url /wxapp/public/getMobile
* @method POST
*
* @param name:sessionKey type:string require:1 other: desc:scssionkey
* @param name:encryptedDate type:string require:1 other: desc:encryptedDate
* @param name:iv type:string require:1 other: desc: iv
*
* @return phoneNumber:手机号
*/
public function getMobile()
{
$sessionKey = $this->request->param('sessionKey');
$encryptedData = $this->request->param('encryptedDate');
$iv = $this->request->param('iv');
$aesKey = base64_decode($sessionKey);
$aesIV = base64_decode($iv);
$aesCipher = base64_decode($encryptedData);
$result = openssl_decrypt($aesCipher, "AES-128-CBC", $aesKey, 1, $aesIV);
$result = json_decode($result, true);
if ($result) {
return $result['phoneNumber'];
}else{
return '';
}
}
}
... ...
... ... @@ -234,7 +234,7 @@ $configs = [
'cmf_admin_default_theme' => 'admin_simpleboot3',
//公众号配置
'app_id'=>'wxc6ef42cbfc3497cf',
'app_secret'=>'752789aeeb5b72a97e733c79d060e1d4',
'app_id'=>'wxf35ab92c5bd897b2',
'app_secret'=>'18ae3d2d5d18a646a792f4468a3e0e9f',
];
return array_merge($configs, $runtimeConfig,$wechatConfig);
\ No newline at end of file
... ...