郭盛 / areial · 提交

转到一个项目

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

修改短信

内嵌 并排对比
正在显示 3 个修改的文件 包含 43 行增加 和 35 行删除
... ... @@ -5,8 +5,9 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<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" />
... ... @@ -20,8 +21,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="400">
<caret line="282" column="77" lean-forward="false" selection-start-line="282" selection-start-column="77" selection-end-line="282" selection-end-column="77" />
<state relative-caret-position="101">
<caret line="1329" column="7" lean-forward="false" selection-start-line="1329" selection-start-column="7" selection-end-line="1329" selection-end-column="7" />
<folding>
<element signature="e#535#1273#0#PHP" expanded="false" />
<element signature="e#1278#2941#0#PHP" expanded="false" />
... ... @@ -35,6 +36,8 @@
<element signature="e#5446#5789#0#PHP" expanded="false" />
<element signature="e#5795#6208#0#PHP" expanded="false" />
<element signature="e#6213#6530#0#PHP" expanded="false" />
<element signature="e#6536#7626#0#PHP" expanded="false" />
<element signature="e#7631#8806#0#PHP" expanded="false" />
<element signature="e#8812#9492#0#PHP" expanded="false" />
<element signature="e#9497#10355#0#PHP" expanded="false" />
<element signature="e#10361#11150#0#PHP" expanded="false" />
... ... @@ -48,6 +51,7 @@
<element signature="e#20101#21031#0#PHP" expanded="false" />
<element signature="e#21036#25086#0#PHP" expanded="false" />
<element signature="e#25092#25469#0#PHP" expanded="false" />
<element signature="e#25474#25916#0#PHP" expanded="false" />
<element signature="e#25922#26657#0#PHP" expanded="false" />
<element signature="e#26662#28334#0#PHP" expanded="false" />
<element signature="e#28340#28845#0#PHP" expanded="false" />
... ... @@ -105,8 +109,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="622">
<caret line="615" column="24" lean-forward="true" selection-start-line="615" selection-start-column="24" selection-end-line="615" selection-end-column="24" />
<state relative-caret-position="444">
<caret line="605" column="33" lean-forward="true" selection-start-line="605" selection-start-column="33" selection-end-line="605" selection-end-column="33" />
<folding>
<element signature="e#581#700#0#PHP" expanded="false" />
<element signature="e#706#1019#0#PHP" expanded="false" />
... ... @@ -114,16 +118,16 @@
<element signature="e#3106#3426#0#PHP" expanded="false" />
<element signature="e#3431#5513#0#PHP" expanded="false" />
<element signature="e#5519#5937#0#PHP" expanded="false" />
<element signature="e#5942#15962#0#PHP" expanded="false" />
<element signature="e#5942#15963#0#PHP" expanded="false" />
<element signature="e#6918#15896#0#PHP" expanded="false" />
<element signature="e#7706#9115#0#PHP" expanded="false" />
<element signature="e#9144#13082#0#PHP" expanded="false" />
<element signature="e#14120#15895#0#PHP" expanded="false" />
<element signature="e#15979#16276#0#PHP" expanded="false" />
<element signature="e#16281#16674#0#PHP" expanded="false" />
<element signature="e#16701#20179#0#PHP" expanded="false" />
<element signature="e#20208#23113#0#PHP" expanded="false" />
<element signature="e#24097#25353#0#PHP" expanded="false" />
<element signature="e#29562#29779#0#PHP" expanded="false" />
<element signature="e#15980#16277#0#PHP" expanded="false" />
<element signature="e#16282#16675#0#PHP" expanded="false" />
<element signature="e#16702#20180#0#PHP" expanded="false" />
<element signature="e#20209#23114#0#PHP" expanded="false" />
<element signature="e#24098#25354#0#PHP" expanded="false" />
<element signature="e#29538#29755#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -211,8 +215,8 @@
<option value="$PROJECT_DIR$/application/admin/controller/Pic.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
<option value="$PROJECT_DIR$/application/api/controller/a.php" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
</list>
</option>
</component>
... ... @@ -230,8 +234,8 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="413" />
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="389" />
<option name="y" value="45" />
<option name="width" value="1393" />
<option name="height" value="948" />
... ... @@ -432,7 +436,7 @@
<workItem from="1583799928944" duration="18981000" />
<workItem from="1583826020973" duration="10927000" />
<workItem from="1583848752159" duration="3638000" />
<workItem from="1583886688361" duration="3991000" />
<workItem from="1583886688361" duration="5166000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -459,7 +463,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="601130000" />
<option name="totallyTimeSpent" value="602305000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -471,16 +475,17 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="413" y="45" width="1393" height="948" extended-state="1" />
<frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.19729933" 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.1401919" 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.32876712" 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="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="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="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.46855733" 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.4678999" sideWeight="0.5" order="2" 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="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="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" />
... ... @@ -906,8 +911,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="282" column="77" lean-forward="false" selection-start-line="282" selection-start-column="77" selection-end-line="282" selection-end-column="77" />
<state relative-caret-position="101">
<caret line="1329" column="7" lean-forward="false" selection-start-line="1329" selection-start-column="7" selection-end-line="1329" selection-end-column="7" />
<folding>
<element signature="e#535#1273#0#PHP" expanded="false" />
<element signature="e#1278#2941#0#PHP" expanded="false" />
... ... @@ -921,6 +926,8 @@
<element signature="e#5446#5789#0#PHP" expanded="false" />
<element signature="e#5795#6208#0#PHP" expanded="false" />
<element signature="e#6213#6530#0#PHP" expanded="false" />
<element signature="e#6536#7626#0#PHP" expanded="false" />
<element signature="e#7631#8806#0#PHP" expanded="false" />
<element signature="e#8812#9492#0#PHP" expanded="false" />
<element signature="e#9497#10355#0#PHP" expanded="false" />
<element signature="e#10361#11150#0#PHP" expanded="false" />
... ... @@ -934,6 +941,7 @@
<element signature="e#20101#21031#0#PHP" expanded="false" />
<element signature="e#21036#25086#0#PHP" expanded="false" />
<element signature="e#25092#25469#0#PHP" expanded="false" />
<element signature="e#25474#25916#0#PHP" expanded="false" />
<element signature="e#25922#26657#0#PHP" expanded="false" />
<element signature="e#26662#28334#0#PHP" expanded="false" />
<element signature="e#28340#28845#0#PHP" expanded="false" />
... ... @@ -989,8 +997,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="622">
<caret line="615" column="24" lean-forward="true" selection-start-line="615" selection-start-column="24" selection-end-line="615" selection-end-column="24" />
<state relative-caret-position="444">
<caret line="605" column="33" lean-forward="true" selection-start-line="605" selection-start-column="33" selection-end-line="605" selection-end-column="33" />
<folding>
<element signature="e#581#700#0#PHP" expanded="false" />
<element signature="e#706#1019#0#PHP" expanded="false" />
... ... @@ -998,16 +1006,16 @@
<element signature="e#3106#3426#0#PHP" expanded="false" />
<element signature="e#3431#5513#0#PHP" expanded="false" />
<element signature="e#5519#5937#0#PHP" expanded="false" />
<element signature="e#5942#15962#0#PHP" expanded="false" />
<element signature="e#5942#15963#0#PHP" expanded="false" />
<element signature="e#6918#15896#0#PHP" expanded="false" />
<element signature="e#7706#9115#0#PHP" expanded="false" />
<element signature="e#9144#13082#0#PHP" expanded="false" />
<element signature="e#14120#15895#0#PHP" expanded="false" />
<element signature="e#15979#16276#0#PHP" expanded="false" />
<element signature="e#16281#16674#0#PHP" expanded="false" />
<element signature="e#16701#20179#0#PHP" expanded="false" />
<element signature="e#20208#23113#0#PHP" expanded="false" />
<element signature="e#24097#25353#0#PHP" expanded="false" />
<element signature="e#29562#29779#0#PHP" expanded="false" />
<element signature="e#15980#16277#0#PHP" expanded="false" />
<element signature="e#16282#16675#0#PHP" expanded="false" />
<element signature="e#16702#20180#0#PHP" expanded="false" />
<element signature="e#20209#23114#0#PHP" expanded="false" />
<element signature="e#24098#25354#0#PHP" expanded="false" />
<element signature="e#29538#29755#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -321,6 +321,7 @@ class Pay extends Api
$this->success('成功',$params);
}
$this->error($result['err_code_des']);
}
}else{
$this->error('无效的订单');
... ... @@ -613,7 +614,6 @@ class Pay extends Api
}else{
return $fail('通信失败，请稍后再通知我');
}
return true;
});
$response->send();
}
... ...
... ... @@ -7530,7 +7530,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2020-03-11 09:50:21 </div>
Generated on 2020-03-11 10:09:56 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...