郭盛 / areial · 提交

转到一个项目

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

消费记录

内嵌 并排对比
正在显示 2 个修改的文件 包含 80 行增加 和 115 行删除
... ... @@ -2,8 +2,7 @@
<project version="4">
<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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -14,11 +13,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="User.php" pinned="false" current-in-tab="false">
<file leaf-file-name="User.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1702">
<caret line="1584" column="5" lean-forward="true" selection-start-line="1584" selection-start-column="5" selection-end-line="1584" selection-end-column="5" />
<state relative-caret-position="310">
<caret line="1509" column="18" lean-forward="true" selection-start-line="1509" selection-start-column="18" selection-end-line="1509" selection-end-column="18" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -75,25 +74,24 @@
<element signature="e#46972#48300#0#PHP" expanded="false" />
<element signature="e#48316#49343#0#PHP" expanded="false" />
<element signature="e#49349#50107#0#PHP" expanded="false" />
<element signature="e#50112#52499#0#PHP" expanded="false" />
<element signature="e#52505#52897#0#PHP" expanded="false" />
<element signature="e#52902#53854#0#PHP" expanded="false" />
<element signature="e#53878#54451#0#PHP" expanded="false" />
<element signature="e#54457#55056#0#PHP" expanded="false" />
<element signature="e#55061#56003#0#PHP" expanded="false" />
<element signature="e#56009#56724#0#PHP" expanded="false" />
<element signature="e#56730#57157#0#PHP" expanded="false" />
<element signature="e#57162#57427#0#PHP" expanded="false" />
<element signature="e#52463#52855#0#PHP" expanded="false" />
<element signature="e#52860#53812#0#PHP" expanded="false" />
<element signature="e#53836#54409#0#PHP" expanded="false" />
<element signature="e#54415#55014#0#PHP" expanded="false" />
<element signature="e#55019#55961#0#PHP" expanded="false" />
<element signature="e#55967#56682#0#PHP" expanded="false" />
<element signature="e#56688#57115#0#PHP" expanded="false" />
<element signature="e#57120#57385#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Pay.php" pinned="false" current-in-tab="true">
<file leaf-file-name="Pay.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-748">
<caret line="364" column="40" lean-forward="true" selection-start-line="364" selection-start-column="40" selection-end-line="364" selection-end-column="40" />
<state relative-caret-position="227">
<caret line="329" column="31" lean-forward="false" selection-start-line="329" selection-start-column="31" selection-end-line="329" selection-end-column="31" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#472#591#0#PHP" expanded="false" />
... ... @@ -112,6 +110,7 @@
<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" />
... ... @@ -189,9 +188,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/extra/verify.php" />
<option value="$PROJECT_DIR$/application/api/controller/User.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" />
</list>
</option>
</component>
... ... @@ -209,11 +208,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="-33" />
<option name="y" value="37" />
<component name="ProjectFrameBounds">
<option name="x" value="643" />
<option name="y" value="22" />
<option name="width" value="1776" />
<option name="height" value="1014" />
<option name="height" value="1042" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -259,8 +258,8 @@
<select />
</subPane>
</pane>
<pane id="Scratches" />
<pane id="Scope" />
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
... ... @@ -318,6 +317,7 @@
<workItem from="1574641631900" duration="15479000" />
<workItem from="1574669596135" duration="11747000" />
<workItem from="1574727687281" duration="17586000" />
<workItem from="1574759184313" duration="1785000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -330,7 +330,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="247857000" />
<option name="totallyTimeSpent" value="249642000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -342,18 +342,19 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="-33" y="37" width="1776" height="1014" extended-state="1" />
<frame x="643" y="22" width="1776" height="1042" 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.14160839" 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="false" show_stripe_button="true" weight="0.14335664" 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="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.12884834" 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="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1281768" 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" />
<window_info id="Message" 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="3" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
... ... @@ -515,7 +516,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="19" column="38" lean-forward="true" selection-start-line="19" selection-start-column="38" selection-end-line="19" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
... ... @@ -523,7 +523,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="20" column="38" lean-forward="true" selection-start-line="20" selection-start-column="38" selection-end-line="20" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
... ... @@ -592,10 +591,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="39" column="4" lean-forward="true" selection-start-line="39" selection-start-column="4" selection-end-line="69" selection-end-column="5" />
<folding>
<element signature="e#450#914#0#PHP" expanded="false" />
<marker date="1562338656000" expanded="true" signature="13159:13266" ph="SELECT COLUM... COLUMNS" />
</folding>
</state>
</provider>
</entry>
... ... @@ -617,7 +612,6 @@
<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>
... ... @@ -653,12 +647,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="494">
<caret line="60" column="12" lean-forward="false" selection-start-line="60" selection-start-column="12" selection-end-line="63" selection-end-column="13" />
<folding>
<element signature="e#1854#3656#0#PHP" expanded="false" />
<element signature="e#3688#5728#0#PHP" expanded="false" />
<element signature="e#5734#5978#0#PHP" expanded="false" />
<element signature="e#6135#11936#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -680,7 +668,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="6" column="34" lean-forward="true" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
... ... @@ -688,13 +675,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="637">
<caret line="99" column="0" lean-forward="true" selection-start-line="99" selection-start-column="0" selection-end-line="99" selection-end-column="0" />
<folding>
<element signature="e#392#610#0#PHP" expanded="false" />
<element signature="e#643#2829#0#PHP" expanded="false" />
<element signature="e#2193#2467#0#PHP" expanded="false" />
<element signature="e#2288#2388#0#PHP" expanded="false" />
<element signature="e#2388#2467#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -702,7 +682,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-17250">
<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>
... ... @@ -710,7 +689,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="4" column="55" lean-forward="true" selection-start-line="4" selection-start-column="55" selection-end-line="4" selection-end-column="55" />
<folding />
</state>
</provider>
</entry>
... ... @@ -718,7 +696,6 @@
<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>
... ... @@ -726,7 +703,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-311">
<caret line="19" column="0" lean-forward="true" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -734,23 +710,14 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="414">
<caret line="67" column="0" lean-forward="true" selection-start-line="67" selection-start-column="0" selection-end-line="67" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/extend/nsms/nsms.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="14" column="13" lean-forward="false" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/extend/nsms/nsms.php" />
<entry file="file://$PROJECT_DIR$/application/common/controller/Backend.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="5" column="17" lean-forward="true" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
... ... @@ -765,10 +732,49 @@
</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="227">
<caret line="329" column="31" lean-forward="false" selection-start-line="329" selection-start-column="31" selection-end-line="329" selection-end-column="31" />
<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#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="1702">
<caret line="1584" column="5" lean-forward="true" selection-start-line="1584" selection-start-column="5" selection-end-line="1584" selection-end-column="5" />
<state relative-caret-position="310">
<caret line="1509" column="18" lean-forward="true" selection-start-line="1509" selection-start-column="18" selection-end-line="1509" selection-end-column="18" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -825,53 +831,14 @@
<element signature="e#46972#48300#0#PHP" expanded="false" />
<element signature="e#48316#49343#0#PHP" expanded="false" />
<element signature="e#49349#50107#0#PHP" expanded="false" />
<element signature="e#50112#52499#0#PHP" expanded="false" />
<element signature="e#52505#52897#0#PHP" expanded="false" />
<element signature="e#52902#53854#0#PHP" expanded="false" />
<element signature="e#53878#54451#0#PHP" expanded="false" />
<element signature="e#54457#55056#0#PHP" expanded="false" />
<element signature="e#55061#56003#0#PHP" expanded="false" />
<element signature="e#56009#56724#0#PHP" expanded="false" />
<element signature="e#56730#57157#0#PHP" expanded="false" />
<element signature="e#57162#57427#0#PHP" expanded="false" />
</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="-748">
<caret line="364" column="40" lean-forward="true" selection-start-line="364" selection-start-column="40" selection-end-line="364" selection-end-column="40" />
<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#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#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#52463#52855#0#PHP" expanded="false" />
<element signature="e#52860#53812#0#PHP" expanded="false" />
<element signature="e#53836#54409#0#PHP" expanded="false" />
<element signature="e#54415#55014#0#PHP" expanded="false" />
<element signature="e#55019#55961#0#PHP" expanded="false" />
<element signature="e#55967#56682#0#PHP" expanded="false" />
<element signature="e#56688#57115#0#PHP" expanded="false" />
<element signature="e#57120#57385#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -1482,8 +1482,6 @@ class User extends Api
->select();
foreach ($data as &$v){
$v['createtime'] = date('Y-m-d',$v['createtime']);
}
foreach ($data as &$v){
if(!empty($v['pic_id'])){
$v['pic_id'] = explode(',',$v['pic_id']);
foreach ($v['pic_id'] as &$v1){
... ...