diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fb9b1da..4d61d69 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,12 +2,8 @@
<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$/application/api/controller/Notify.php" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/vip/add.html" afterPath="$PROJECT_DIR$/application/admin/view/vip/add.html" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Notify.php" afterPath="$PROJECT_DIR$/application/api/controller/Notify.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Pay.php" afterPath="$PROJECT_DIR$/application/api/controller/Pay.php" />
- <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" />
@@ -21,8 +17,8 @@
<file leaf-file-name="User.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="448">
- <caret line="446" column="5" lean-forward="true" selection-start-line="446" selection-start-column="5" selection-end-line="446" selection-end-column="5" />
+ <state relative-caret-position="275">
+ <caret line="17" column="26" lean-forward="false" selection-start-line="17" selection-start-column="14" selection-end-line="17" selection-end-column="26" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
@@ -95,8 +91,8 @@
<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="-125">
- <caret line="20" column="101" lean-forward="false" selection-start-line="20" selection-start-column="101" selection-end-line="20" selection-end-column="101" />
+ <state relative-caret-position="-450">
+ <caret line="261" column="58" lean-forward="true" selection-start-line="261" selection-start-column="58" selection-end-line="261" selection-end-column="58" />
<folding>
<element signature="e#541#660#0#PHP" expanded="false" />
<element signature="e#666#979#0#PHP" expanded="false" />
@@ -104,32 +100,31 @@
<element signature="e#3065#3385#0#PHP" expanded="false" />
<element signature="e#3390#5471#0#PHP" expanded="false" />
<element signature="e#5477#5895#0#PHP" expanded="false" />
- <element signature="e#5900#13197#0#PHP" expanded="false" />
- <element signature="e#6701#13130#0#PHP" expanded="false" />
+ <element signature="e#6701#13133#0#PHP" expanded="false" />
<element signature="e#7536#7824#0#PHP" expanded="false" />
<element signature="e#7901#8174#0#PHP" expanded="false" />
<element signature="e#8330#8640#0#PHP" expanded="false" />
<element signature="e#8715#9166#0#PHP" expanded="false" />
<element signature="e#9243#10287#0#PHP" expanded="false" />
<element signature="e#10381#10499#0#PHP" expanded="false" />
- <element signature="e#13214#13511#0#PHP" expanded="false" />
- <element signature="e#13517#13912#0#PHP" expanded="false" />
- <element signature="e#13918#14338#0#PHP" expanded="false" />
- <element signature="e#14343#21639#0#PHP" expanded="false" />
- <element signature="e#15977#16265#0#PHP" expanded="false" />
- <element signature="e#16341#16614#0#PHP" expanded="false" />
- <element signature="e#16769#17079#0#PHP" expanded="false" />
- <element signature="e#17154#17605#0#PHP" expanded="false" />
- <element signature="e#17682#18726#0#PHP" expanded="false" />
- <element signature="e#18820#18938#0#PHP" expanded="false" />
- <element signature="e#21666#25368#0#PHP" expanded="false" />
- <element signature="e#25398#28342#0#PHP" expanded="false" />
- <element signature="e#28371#31860#0#PHP" expanded="false" />
- <element signature="e#29286#29891#0#PHP" expanded="false" />
- <element signature="e#29912#31349#0#PHP" expanded="false" />
- <element signature="e#31397#31499#0#PHP" expanded="false" />
- <element signature="e#31889#35626#0#PHP" expanded="false" />
- <element signature="e#35649#35866#0#PHP" expanded="false" />
+ <element signature="e#13217#13514#0#PHP" expanded="false" />
+ <element signature="e#13520#13915#0#PHP" expanded="false" />
+ <element signature="e#13921#14341#0#PHP" expanded="false" />
+ <element signature="e#14346#21642#0#PHP" expanded="false" />
+ <element signature="e#15980#16268#0#PHP" expanded="false" />
+ <element signature="e#16344#16617#0#PHP" expanded="false" />
+ <element signature="e#16772#17082#0#PHP" expanded="false" />
+ <element signature="e#17157#17608#0#PHP" expanded="false" />
+ <element signature="e#17685#18729#0#PHP" expanded="false" />
+ <element signature="e#18823#18941#0#PHP" expanded="false" />
+ <element signature="e#21669#25371#0#PHP" expanded="false" />
+ <element signature="e#25401#28345#0#PHP" expanded="false" />
+ <element signature="e#28374#31863#0#PHP" expanded="false" />
+ <element signature="e#29289#29894#0#PHP" expanded="false" />
+ <element signature="e#29915#31352#0#PHP" expanded="false" />
+ <element signature="e#31400#31502#0#PHP" expanded="false" />
+ <element signature="e#31892#35629#0#PHP" expanded="false" />
+ <element signature="e#35652#35869#0#PHP" expanded="false" />
</folding>
</state>
</provider>
@@ -138,8 +133,8 @@
<file leaf-file-name="Notify.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/api/controller/Notify.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="300">
- <caret line="33" column="60" lean-forward="true" selection-start-line="33" selection-start-column="60" selection-end-line="33" selection-end-column="60" />
+ <state relative-caret-position="203">
+ <caret line="26" column="22" lean-forward="true" selection-start-line="26" selection-start-column="22" selection-end-line="26" selection-end-column="22" />
<folding>
<element signature="e#1386#1991#0#PHP" expanded="false" />
<element signature="e#2012#3449#0#PHP" expanded="false" />
@@ -235,9 +230,8 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
- <component name="ProjectFrameBounds" extendedState="7">
- <option name="x" value="-50" />
- <option name="y" value="102" />
+ <component name="ProjectFrameBounds">
+ <option name="x" value="187" />
<option name="width" value="1776" />
<option name="height" value="1082" />
</component>
@@ -347,7 +341,7 @@
<workItem from="1574727687281" duration="17586000" />
<workItem from="1574759184313" duration="4793000" />
<workItem from="1574814989178" duration="1007000" />
- <workItem from="1574831367903" duration="11305000" />
+ <workItem from="1574831367903" duration="11678000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
@@ -360,7 +354,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="264962000" />
+ <option name="totallyTimeSpent" value="265335000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -372,9 +366,10 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
+ <frame x="187" y="0" width="1776" height="1082" 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.1337953" 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.1462704" 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" />
@@ -382,7 +377,7 @@
<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="true" 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="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="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" />
@@ -716,10 +711,58 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/application/admin/view/vip/add.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="175">
+ <caret line="7" column="10" lean-forward="true" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/application/admin/controller/Vip.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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/application/admin/view/vip/index.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="150">
+ <caret line="6" column="52" lean-forward="true" selection-start-line="6" selection-start-column="52" selection-end-line="6" selection-end-column="52" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/application/admin/view/vip/edit.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="325">
+ <caret line="13" column="10" lean-forward="true" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/public/assets/js/backend/vip.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-205">
+ <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/common/controller/Api.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="225">
+ <caret line="18" column="6" lean-forward="false" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="6" />
+ <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="448">
- <caret line="446" column="5" lean-forward="true" selection-start-line="446" selection-start-column="5" selection-end-line="446" selection-end-column="5" />
+ <state relative-caret-position="275">
+ <caret line="17" column="26" lean-forward="false" selection-start-line="17" selection-start-column="14" selection-end-line="17" selection-end-column="26" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
@@ -788,58 +831,10 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/application/admin/view/vip/add.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="175">
- <caret line="7" column="10" lean-forward="true" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/application/admin/controller/Vip.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" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/application/admin/view/vip/index.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="150">
- <caret line="6" column="52" lean-forward="true" selection-start-line="6" selection-start-column="52" selection-end-line="6" selection-end-column="52" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/application/admin/view/vip/edit.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="325">
- <caret line="13" column="10" lean-forward="true" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/public/assets/js/backend/vip.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-205">
- <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/common/controller/Api.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="225">
- <caret line="18" column="6" lean-forward="false" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="6" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Notify.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="300">
- <caret line="33" column="60" lean-forward="true" selection-start-line="33" selection-start-column="60" selection-end-line="33" selection-end-column="60" />
+ <state relative-caret-position="203">
+ <caret line="26" column="22" lean-forward="true" selection-start-line="26" selection-start-column="22" selection-end-line="26" selection-end-column="22" />
<folding>
<element signature="e#1386#1991#0#PHP" expanded="false" />
<element signature="e#2012#3449#0#PHP" expanded="false" />
@@ -850,8 +845,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-125">
- <caret line="20" column="101" lean-forward="false" selection-start-line="20" selection-start-column="101" selection-end-line="20" selection-end-column="101" />
+ <state relative-caret-position="-450">
+ <caret line="261" column="58" lean-forward="true" selection-start-line="261" selection-start-column="58" selection-end-line="261" selection-end-column="58" />
<folding>
<element signature="e#541#660#0#PHP" expanded="false" />
<element signature="e#666#979#0#PHP" expanded="false" />
@@ -859,32 +854,31 @@
<element signature="e#3065#3385#0#PHP" expanded="false" />
<element signature="e#3390#5471#0#PHP" expanded="false" />
<element signature="e#5477#5895#0#PHP" expanded="false" />
- <element signature="e#5900#13197#0#PHP" expanded="false" />
- <element signature="e#6701#13130#0#PHP" expanded="false" />
+ <element signature="e#6701#13133#0#PHP" expanded="false" />
<element signature="e#7536#7824#0#PHP" expanded="false" />
<element signature="e#7901#8174#0#PHP" expanded="false" />
<element signature="e#8330#8640#0#PHP" expanded="false" />
<element signature="e#8715#9166#0#PHP" expanded="false" />
<element signature="e#9243#10287#0#PHP" expanded="false" />
<element signature="e#10381#10499#0#PHP" expanded="false" />
- <element signature="e#13214#13511#0#PHP" expanded="false" />
- <element signature="e#13517#13912#0#PHP" expanded="false" />
- <element signature="e#13918#14338#0#PHP" expanded="false" />
- <element signature="e#14343#21639#0#PHP" expanded="false" />
- <element signature="e#15977#16265#0#PHP" expanded="false" />
- <element signature="e#16341#16614#0#PHP" expanded="false" />
- <element signature="e#16769#17079#0#PHP" expanded="false" />
- <element signature="e#17154#17605#0#PHP" expanded="false" />
- <element signature="e#17682#18726#0#PHP" expanded="false" />
- <element signature="e#18820#18938#0#PHP" expanded="false" />
- <element signature="e#21666#25368#0#PHP" expanded="false" />
- <element signature="e#25398#28342#0#PHP" expanded="false" />
- <element signature="e#28371#31860#0#PHP" expanded="false" />
- <element signature="e#29286#29891#0#PHP" expanded="false" />
- <element signature="e#29912#31349#0#PHP" expanded="false" />
- <element signature="e#31397#31499#0#PHP" expanded="false" />
- <element signature="e#31889#35626#0#PHP" expanded="false" />
- <element signature="e#35649#35866#0#PHP" expanded="false" />
+ <element signature="e#13217#13514#0#PHP" expanded="false" />
+ <element signature="e#13520#13915#0#PHP" expanded="false" />
+ <element signature="e#13921#14341#0#PHP" expanded="false" />
+ <element signature="e#14346#21642#0#PHP" expanded="false" />
+ <element signature="e#15980#16268#0#PHP" expanded="false" />
+ <element signature="e#16344#16617#0#PHP" expanded="false" />
+ <element signature="e#16772#17082#0#PHP" expanded="false" />
+ <element signature="e#17157#17608#0#PHP" expanded="false" />
+ <element signature="e#17685#18729#0#PHP" expanded="false" />
+ <element signature="e#18823#18941#0#PHP" expanded="false" />
+ <element signature="e#21669#25371#0#PHP" expanded="false" />
+ <element signature="e#25401#28345#0#PHP" expanded="false" />
+ <element signature="e#28374#31863#0#PHP" expanded="false" />
+ <element signature="e#29289#29894#0#PHP" expanded="false" />
+ <element signature="e#29915#31352#0#PHP" expanded="false" />
+ <element signature="e#31400#31502#0#PHP" expanded="false" />
+ <element signature="e#31892#35629#0#PHP" expanded="false" />
+ <element signature="e#35652#35869#0#PHP" expanded="false" />
</folding>
</state>
</provider>
diff --git a/application/api/controller/Notify.php b/application/api/controller/Notify.php
index d07fc48..f950d81 100644
--- a/application/api/controller/Notify.php
+++ b/application/api/controller/Notify.php
@@ -22,7 +22,7 @@ use app\nsms\sendAPI;
class Notify extends Api
{
- protected $noNeedRight = ['picOrderNotify'];
+ protected $noNeedLogin = ['picOrderNotify'];
//图片支付订单结果通知（无需调用）
public function picOrderNotify(){
diff --git a/application/api/controller/Pay.php b/application/api/controller/Pay.php
index 945e690..c64e386 100644
--- a/application/api/controller/Pay.php
+++ b/application/api/controller/Pay.php
@@ -265,7 +265,7 @@ class Pay extends Api
'body' => '山东航拍',
'out_trade_no' => $data['num'],//支付订单号
'total_fee' => $data['total']*100,//单位分
- 'notify_url' => 'http://areial.w.brotop.cn/api/pay/picOrderNotify', // 支付结果通知网址，如果不设置则会使用配置里的默认地址
+ 'notify_url' => 'http://areial.w.brotop.cn/api/notify/picOrderNotify', // 支付结果通知网址，如果不设置则会使用配置里的默认地址
'trade_type' => 'JSAPI', // 请对应换成你的支付方式对应的值类型
'openid' => $openid['openid'],
]);