郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 cfb7b4ac541c166c65cd269a98cd7b7e77ee2395 1 个父辈 f7b1a31e
1 个管道 的构建 通过 耗费 1 秒

支付

内嵌 并排对比
正在显示 2 个修改的文件 包含 98 行增加 和 101 行删除
... ... @@ -2,12 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/cert/apiclient_cert.p12" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/cert/apiclient_cert.pem" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/cert/apiclient_key.pem" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/cert/证书使用说明.txt" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/extra/verify.php" afterPath="$PROJECT_DIR$/application/extra/verify.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Pay.php" afterPath="$PROJECT_DIR$/application/api/controller/Pay.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -90,50 +85,50 @@
</provider>
</entry>
</file>
<file leaf-file-name="Pay.php" pinned="false" current-in-tab="false">
<file leaf-file-name="Pay.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="474">
<caret line="55" column="45" lean-forward="true" selection-start-line="55" selection-start-column="45" selection-end-line="55" selection-end-column="45" />
<state relative-caret-position="420">
<caret line="284" column="21" lean-forward="true" selection-start-line="284" selection-start-column="21" selection-end-line="284" selection-end-column="21" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#472#591#0#PHP" expanded="false" />
<element signature="e#597#910#0#PHP" expanded="false" />
<element signature="e#915#2960#0#PHP" expanded="false" />
<element signature="e#2966#3286#0#PHP" expanded="false" />
<element signature="e#3291#5342#0#PHP" expanded="false" />
<element signature="e#5348#5766#0#PHP" expanded="false" />
<element signature="e#5771#13038#0#PHP" expanded="false" />
<element signature="e#6572#12991#0#PHP" expanded="false" />
<element signature="e#7407#7695#0#PHP" expanded="false" />
<element signature="e#7772#8045#0#PHP" expanded="false" />
<element signature="e#8201#8511#0#PHP" expanded="false" />
<element signature="e#8586#9037#0#PHP" expanded="false" />
<element signature="e#9114#10158#0#PHP" expanded="false" />
<element signature="e#10252#10370#0#PHP" expanded="false" />
<element signature="e#13055#13352#0#PHP" expanded="false" />
<element signature="e#13358#13753#0#PHP" expanded="false" />
<element signature="e#13759#14179#0#PHP" expanded="false" />
<element signature="e#14184#21450#0#PHP" expanded="false" />
<element signature="e#15818#16106#0#PHP" expanded="false" />
<element signature="e#16182#16455#0#PHP" expanded="false" />
<element signature="e#16610#16920#0#PHP" expanded="false" />
<element signature="e#16995#17446#0#PHP" expanded="false" />
<element signature="e#17523#18567#0#PHP" expanded="false" />
<element signature="e#18661#18779#0#PHP" expanded="false" />
<element signature="e#19636#21382#0#PHP" expanded="false" />
<element signature="e#21477#25179#0#PHP" expanded="false" />
<element signature="e#25209#28153#0#PHP" expanded="false" />
<element signature="e#28182#31605#0#PHP" expanded="false" />
<element signature="e#31634#35371#0#PHP" expanded="false" />
<element signature="e#35394#35611#0#PHP" expanded="false" />
<element signature="e#13075#13372#0#PHP" expanded="false" />
<element signature="e#13378#13773#0#PHP" expanded="false" />
<element signature="e#13779#14199#0#PHP" expanded="false" />
<element signature="e#14204#21470#0#PHP" expanded="false" />
<element signature="e#15838#16126#0#PHP" expanded="false" />
<element signature="e#16202#16475#0#PHP" expanded="false" />
<element signature="e#16630#16940#0#PHP" expanded="false" />
<element signature="e#17015#17466#0#PHP" expanded="false" />
<element signature="e#17543#18587#0#PHP" expanded="false" />
<element signature="e#18681#18799#0#PHP" expanded="false" />
<element signature="e#19656#21402#0#PHP" expanded="false" />
<element signature="e#21497#25199#0#PHP" expanded="false" />
<element signature="e#25229#28173#0#PHP" expanded="false" />
<element signature="e#31654#35391#0#PHP" expanded="false" />
<element signature="e#35414#35631#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="verify.php" pinned="false" current-in-tab="true">
<file leaf-file-name="verify.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/extra/verify.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="397">
<state relative-caret-position="395">
<caret line="17" column="6" lean-forward="true" selection-start-line="17" selection-start-column="6" selection-end-line="17" selection-end-column="6" />
<folding />
</state>
... ... @@ -200,9 +195,9 @@
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/order.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Order.php" />
<option value="$PROJECT_DIR$/application/nsms/nsms.php" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/extra/verify.php" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
</list>
</option>
</component>
... ... @@ -220,11 +215,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="-2" />
<option name="y" value="41" />
<option name="width" value="1776" />
<option name="height" value="1084" />
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="201" />
<option name="y" value="159" />
<option name="width" value="1493" />
<option name="height" value="976" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -349,7 +344,7 @@
<workItem from="1574727687281" duration="17586000" />
<workItem from="1574759184313" duration="4793000" />
<workItem from="1574814989178" duration="1007000" />
<workItem from="1574831367903" duration="224000" />
<workItem from="1574831367903" duration="1301000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -362,7 +357,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="253881000" />
<option name="totallyTimeSpent" value="254958000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -374,17 +369,16 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="-2" y="41" width="1776" height="1084" extended-state="1" />
<editor active="true" />
<frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
<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.1462704" 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.1337953" 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="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="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="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.1281768" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1273123" sideWeight="0.5" order="2" side_tool="false" 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="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="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" />
... ... @@ -432,27 +426,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/src/Kernel/Support/Helpers.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="411">
<caret line="28" column="9" lean-forward="false" selection-start-line="28" selection-start-column="9" selection-end-line="28" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/src/Payment/Application.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="261">
<caret line="25" column="58" lean-forward="false" selection-start-line="25" selection-start-column="58" selection-end-line="25" selection-end-column="58" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/user/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/vip.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
... ... @@ -754,44 +727,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="474">
<caret line="55" column="45" lean-forward="true" selection-start-line="55" selection-start-column="45" selection-end-line="55" selection-end-column="45" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#472#591#0#PHP" expanded="false" />
<element signature="e#597#910#0#PHP" expanded="false" />
<element signature="e#2966#3286#0#PHP" expanded="false" />
<element signature="e#3291#5342#0#PHP" expanded="false" />
<element signature="e#5348#5766#0#PHP" expanded="false" />
<element signature="e#5771#13038#0#PHP" expanded="false" />
<element signature="e#7407#7695#0#PHP" expanded="false" />
<element signature="e#7772#8045#0#PHP" expanded="false" />
<element signature="e#8201#8511#0#PHP" expanded="false" />
<element signature="e#8586#9037#0#PHP" expanded="false" />
<element signature="e#9114#10158#0#PHP" expanded="false" />
<element signature="e#10252#10370#0#PHP" expanded="false" />
<element signature="e#13055#13352#0#PHP" expanded="false" />
<element signature="e#13358#13753#0#PHP" expanded="false" />
<element signature="e#13759#14179#0#PHP" expanded="false" />
<element signature="e#14184#21450#0#PHP" expanded="false" />
<element signature="e#15818#16106#0#PHP" expanded="false" />
<element signature="e#16182#16455#0#PHP" expanded="false" />
<element signature="e#16610#16920#0#PHP" expanded="false" />
<element signature="e#16995#17446#0#PHP" expanded="false" />
<element signature="e#17523#18567#0#PHP" expanded="false" />
<element signature="e#18661#18779#0#PHP" expanded="false" />
<element signature="e#19636#21382#0#PHP" expanded="false" />
<element signature="e#21477#25179#0#PHP" expanded="false" />
<element signature="e#25209#28153#0#PHP" expanded="false" />
<element signature="e#28182#31605#0#PHP" expanded="false" />
<element signature="e#31634#35371#0#PHP" expanded="false" />
<element signature="e#35394#35611#0#PHP" expanded="false" />
</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="871">
... ... @@ -862,13 +797,75 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/cert/证书使用说明.txt">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/cert/apiclient_key.pem">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/cert/apiclient_cert.pem">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/extra/verify.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="397">
<state relative-caret-position="395">
<caret line="17" column="6" lean-forward="true" selection-start-line="17" selection-start-column="6" selection-end-line="17" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<caret line="284" column="21" lean-forward="true" selection-start-line="284" selection-start-column="21" selection-end-line="284" selection-end-column="21" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#472#591#0#PHP" expanded="false" />
<element signature="e#597#910#0#PHP" expanded="false" />
<element signature="e#915#2960#0#PHP" expanded="false" />
<element signature="e#2966#3286#0#PHP" expanded="false" />
<element signature="e#3291#5342#0#PHP" expanded="false" />
<element signature="e#5348#5766#0#PHP" expanded="false" />
<element signature="e#6572#12991#0#PHP" expanded="false" />
<element signature="e#7407#7695#0#PHP" expanded="false" />
<element signature="e#7772#8045#0#PHP" expanded="false" />
<element signature="e#8201#8511#0#PHP" expanded="false" />
<element signature="e#8586#9037#0#PHP" expanded="false" />
<element signature="e#9114#10158#0#PHP" expanded="false" />
<element signature="e#10252#10370#0#PHP" expanded="false" />
<element signature="e#13075#13372#0#PHP" expanded="false" />
<element signature="e#13378#13773#0#PHP" expanded="false" />
<element signature="e#13779#14199#0#PHP" expanded="false" />
<element signature="e#14204#21470#0#PHP" expanded="false" />
<element signature="e#15838#16126#0#PHP" expanded="false" />
<element signature="e#16202#16475#0#PHP" expanded="false" />
<element signature="e#16630#16940#0#PHP" expanded="false" />
<element signature="e#17015#17466#0#PHP" expanded="false" />
<element signature="e#17543#18587#0#PHP" expanded="false" />
<element signature="e#18681#18799#0#PHP" expanded="false" />
<element signature="e#19656#21402#0#PHP" expanded="false" />
<element signature="e#21497#25199#0#PHP" expanded="false" />
<element signature="e#25229#28173#0#PHP" expanded="false" />
<element signature="e#31654#35391#0#PHP" expanded="false" />
<element signature="e#35414#35631#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -265,7 +265,7 @@ class Pay extends Api
'body' => '山东航拍',
'out_trade_no' => $data['num'],//支付订单号
'total_fee' => $data['total']*100,//单位分
'notify_url' => $rule.'api/pay/picOrderNotify', // 支付结果通知网址，如果不设置则会使用配置里的默认地址
'notify_url' => 'http://areial.w.brotop.cn/api/pay/picOrderNotify', // 支付结果通知网址，如果不设置则会使用配置里的默认地址
'trade_type' => 'JSAPI', // 请对应换成你的支付方式对应的值类型
'openid' => $openid,
]);
... ...