郭盛 / areial · 提交

转到一个项目

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

添加开关

内嵌 并排对比
正在显示 3 个修改的文件 包含 270 行增加 和 151 行删除
@@ -4,10 +4,10 @@ @@ -4,10 +4,10 @@
4 <bookmark url="file://$PROJECT_DIR$/application/admin/view/video/add.html" line="31" /> 4 <bookmark url="file://$PROJECT_DIR$/application/admin/view/video/add.html" line="31" />
5 </component> 5 </component>
6 <component name="ChangeListManager"> 6 <component name="ChangeListManager">
7 - <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="文件下载调试"> 7 + <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
8 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 8 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
9 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Pay.php" afterPath="$PROJECT_DIR$/application/api/controller/Pay.php" />  
10 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" /> 9 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
  10 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
11 </list> 11 </list>
12 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 12 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
13 <option name="TRACKING_ENABLED" value="true" /> 13 <option name="TRACKING_ENABLED" value="true" />
@@ -18,75 +18,108 @@ @@ -18,75 +18,108 @@
18 </component> 18 </component>
19 <component name="FileEditorManager"> 19 <component name="FileEditorManager">
20 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 20 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
21 - <file leaf-file-name="Pay.php" pinned="false" current-in-tab="true">  
22 - <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> 21 + <file leaf-file-name="User.php" pinned="false" current-in-tab="true">
  22 + <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
23 <provider selected="true" editor-type-id="text-editor"> 23 <provider selected="true" editor-type-id="text-editor">
24 - <state relative-caret-position="-550">  
25 - <caret line="54" column="46" lean-forward="false" selection-start-line="54" selection-start-column="46" selection-end-line="54" selection-end-column="46" /> 24 + <state relative-caret-position="718">
  25 + <caret line="2422" column="1" lean-forward="true" selection-start-line="2422" selection-start-column="1" selection-end-line="2422" selection-end-column="1" />
26 <folding> 26 <folding>
27 - <element signature="e#706#1019#0#PHP" expanded="false" />  
28 - <element signature="e#3223#3543#0#PHP" expanded="false" />  
29 - <element signature="e#3548#5747#0#PHP" expanded="false" />  
30 - <element signature="e#5753#6167#0#PHP" expanded="false" />  
31 - <element signature="e#6172#16193#0#PHP" expanded="false" />  
32 - <element signature="e#7148#16126#0#PHP" expanded="false" />  
33 - <element signature="e#16200#16517#0#PHP" expanded="false" />  
34 - <element signature="e#16522#17000#0#PHP" expanded="false" />  
35 - <element signature="e#17017#17314#0#PHP" expanded="false" />  
36 - <element signature="e#17319#17712#0#PHP" expanded="false" />  
37 - <element signature="e#17739#20985#0#PHP" expanded="false" />  
38 - <element signature="e#21014#23685#0#PHP" expanded="false" />  
39 - <element signature="e#21500#23355#0#PHP" expanded="false" />  
40 - <element signature="e#23718#30045#0#PHP" expanded="false" />  
41 - <element signature="e#24513#29803#0#PHP" expanded="false" />  
42 - <element signature="e#30068#30285#0#PHP" expanded="false" /> 27 + <element signature="e#4287#4721#0#PHP" expanded="false" />
  28 + <element signature="e#4726#5084#0#PHP" expanded="false" />
  29 + <element signature="e#5090#5497#0#PHP" expanded="false" />
  30 + <element signature="e#5502#5845#0#PHP" expanded="false" />
  31 + <element signature="e#5851#6264#0#PHP" expanded="false" />
  32 + <element signature="e#6269#6586#0#PHP" expanded="false" />
  33 + <element signature="e#6592#7691#0#PHP" expanded="false" />
  34 + <element signature="e#7696#13097#0#PHP" expanded="false" />
  35 + <element signature="e#13103#13783#0#PHP" expanded="false" />
  36 + <element signature="e#13788#14646#0#PHP" expanded="false" />
  37 + <element signature="e#14652#15441#0#PHP" expanded="false" />
  38 + <element signature="e#15446#16795#0#PHP" expanded="false" />
  39 + <element signature="e#16801#17503#0#PHP" expanded="false" />
  40 + <element signature="e#17508#18828#0#PHP" expanded="false" />
  41 + <element signature="e#18834#19410#0#PHP" expanded="false" />
  42 + <element signature="e#19415#20027#0#PHP" expanded="false" />
  43 + <element signature="e#20033#20749#0#PHP" expanded="false" />
  44 + <element signature="e#20754#25622#0#PHP" expanded="false" />
  45 + <element signature="e#25631#26561#0#PHP" expanded="false" />
  46 + <element signature="e#26566#31707#0#PHP" expanded="false" />
  47 + <element signature="e#31713#32090#0#PHP" expanded="false" />
  48 + <element signature="e#32095#32534#0#PHP" expanded="false" />
  49 + <element signature="e#32540#33361#0#PHP" expanded="false" />
  50 + <element signature="e#33366#36770#0#PHP" expanded="false" />
  51 + <element signature="e#36776#37281#0#PHP" expanded="false" />
  52 + <element signature="e#37286#37537#0#PHP" expanded="false" />
  53 + <element signature="e#37543#38022#0#PHP" expanded="false" />
  54 + <element signature="e#38027#38784#0#PHP" expanded="false" />
  55 + <element signature="e#38790#39271#0#PHP" expanded="false" />
  56 + <element signature="e#39276#40146#0#PHP" expanded="false" />
  57 + <element signature="e#40152#40515#0#PHP" expanded="false" />
  58 + <element signature="e#40520#40711#0#PHP" expanded="false" />
  59 + <element signature="e#40717#41075#0#PHP" expanded="false" />
  60 + <element signature="e#41080#41271#0#PHP" expanded="false" />
  61 + <element signature="e#41277#42420#0#PHP" expanded="false" />
  62 + <element signature="e#42425#45090#0#PHP" expanded="false" />
  63 + <element signature="e#45096#45594#0#PHP" expanded="false" />
  64 + <element signature="e#45599#47345#0#PHP" expanded="false" />
  65 + <element signature="e#47351#47764#0#PHP" expanded="false" />
  66 + <element signature="e#47769#48248#0#PHP" expanded="false" />
  67 + <element signature="e#48254#48788#0#PHP" expanded="false" />
  68 + <element signature="e#48793#50178#0#PHP" expanded="false" />
  69 + <element signature="e#50184#50838#0#PHP" expanded="false" />
  70 + <element signature="e#50843#52858#0#PHP" expanded="false" />
  71 + <element signature="e#52864#53624#0#PHP" expanded="false" />
  72 + <element signature="e#53629#56338#0#PHP" expanded="false" />
  73 + <element signature="e#56364#57195#0#PHP" expanded="false" />
  74 + <element signature="e#57201#57621#0#PHP" expanded="false" />
  75 + <element signature="e#57626#58109#0#PHP" expanded="false" />
  76 + <element signature="e#58115#58921#0#PHP" expanded="false" />
  77 + <element signature="e#58926#62084#0#PHP" expanded="false" />
  78 + <element signature="e#62099#63434#0#PHP" expanded="false" />
  79 + <element signature="e#63450#64484#0#PHP" expanded="false" />
  80 + <element signature="e#64490#65248#0#PHP" expanded="false" />
  81 + <element signature="e#65253#68996#0#PHP" expanded="false" />
  82 + <element signature="e#69002#69394#0#PHP" expanded="false" />
  83 + <element signature="e#69399#70351#0#PHP" expanded="false" />
  84 + <element signature="e#70375#70948#0#PHP" expanded="false" />
  85 + <element signature="e#70954#71553#0#PHP" expanded="false" />
  86 + <element signature="e#71558#72485#0#PHP" expanded="false" />
  87 + <element signature="e#72491#73205#0#PHP" expanded="false" />
  88 + <element signature="e#73211#73638#0#PHP" expanded="false" />
  89 + <element signature="e#73643#74112#0#PHP" expanded="false" />
  90 + <element signature="e#74119#75324#0#PHP" expanded="false" />
  91 + <element signature="e#75329#77032#0#PHP" expanded="false" />
  92 + <element signature="e#77038#77815#0#PHP" expanded="false" />
  93 + <element signature="e#77820#81758#0#PHP" expanded="false" />
  94 + <element signature="e#81764#82273#0#PHP" expanded="false" />
  95 + <element signature="e#82278#82950#0#PHP" expanded="false" />
43 </folding> 96 </folding>
44 </state> 97 </state>
45 </provider> 98 </provider>
46 </entry> 99 </entry>
47 </file> 100 </file>
48 - <file leaf-file-name="User.php" pinned="false" current-in-tab="false">  
49 - <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 101 + <file leaf-file-name="Pay.php" pinned="false" current-in-tab="false">
  102 + <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
50 <provider selected="true" editor-type-id="text-editor"> 103 <provider selected="true" editor-type-id="text-editor">
51 - <state relative-caret-position="208">  
52 - <caret line="1117" column="35" lean-forward="true" selection-start-line="1117" selection-start-column="35" selection-end-line="1117" selection-end-column="35" /> 104 + <state relative-caret-position="218">
  105 + <caret line="335" column="5" lean-forward="true" selection-start-line="335" selection-start-column="5" selection-end-line="335" selection-end-column="5" />
53 <folding> 106 <folding>
54 - <element signature="e#5493#5836#0#PHP" expanded="false" />  
55 - <element signature="e#5842#6255#0#PHP" expanded="false" />  
56 - <element signature="e#6260#6577#0#PHP" expanded="false" />  
57 - <element signature="e#6583#7682#0#PHP" expanded="false" />  
58 - <element signature="e#7687#13088#0#PHP" expanded="false" />  
59 - <element signature="e#13094#13774#0#PHP" expanded="false" />  
60 - <element signature="e#13779#14637#0#PHP" expanded="false" />  
61 - <element signature="e#14643#15432#0#PHP" expanded="false" />  
62 - <element signature="e#15437#16786#0#PHP" expanded="false" />  
63 - <element signature="e#16792#17494#0#PHP" expanded="false" />  
64 - <element signature="e#17499#18819#0#PHP" expanded="false" />  
65 - <element signature="e#18825#19401#0#PHP" expanded="false" />  
66 - <element signature="e#19406#20018#0#PHP" expanded="false" />  
67 - <element signature="e#20024#20740#0#PHP" expanded="false" />  
68 - <element signature="e#20745#25613#0#PHP" expanded="false" />  
69 - <element signature="e#25622#26552#0#PHP" expanded="false" />  
70 - <element signature="e#26557#31698#0#PHP" expanded="false" />  
71 - <element signature="e#31704#32081#0#PHP" expanded="false" />  
72 - <element signature="e#32086#32525#0#PHP" expanded="false" />  
73 - <element signature="e#32531#33352#0#PHP" expanded="false" />  
74 - <element signature="e#33357#36761#0#PHP" expanded="false" />  
75 - <element signature="e#36767#37272#0#PHP" expanded="false" />  
76 - <element signature="e#37277#37528#0#PHP" expanded="false" />  
77 - <element signature="e#37534#38013#0#PHP" expanded="false" />  
78 - <element signature="e#38883#39364#0#PHP" expanded="false" />  
79 - <element signature="e#39369#40239#0#PHP" expanded="false" />  
80 - <element signature="e#40245#40608#0#PHP" expanded="false" />  
81 - <element signature="e#40613#40804#0#PHP" expanded="false" />  
82 - <element signature="e#40810#41168#0#PHP" expanded="false" />  
83 - <element signature="e#41173#41364#0#PHP" expanded="false" />  
84 - <element signature="e#41370#42513#0#PHP" expanded="false" />  
85 - <element signature="e#42518#45183#0#PHP" expanded="false" />  
86 - <element signature="e#45189#45687#0#PHP" expanded="false" />  
87 - <element signature="e#45692#47438#0#PHP" expanded="false" />  
88 - <element signature="e#47444#47857#0#PHP" expanded="false" />  
89 - <element signature="e#47862#48341#0#PHP" expanded="false" /> 107 + <element signature="e#706#1019#0#PHP" expanded="false" />
  108 + <element signature="e#1024#3100#0#PHP" expanded="false" />
  109 + <element signature="e#3106#3426#0#PHP" expanded="false" />
  110 + <element signature="e#3431#5630#0#PHP" expanded="false" />
  111 + <element signature="e#5636#6050#0#PHP" expanded="false" />
  112 + <element signature="e#6055#16076#0#PHP" expanded="false" />
  113 + <element signature="e#7031#16009#0#PHP" expanded="false" />
  114 + <element signature="e#16083#16400#0#PHP" expanded="false" />
  115 + <element signature="e#16405#16883#0#PHP" expanded="false" />
  116 + <element signature="e#16900#17197#0#PHP" expanded="false" />
  117 + <element signature="e#17202#17595#0#PHP" expanded="false" />
  118 + <element signature="e#17622#20883#0#PHP" expanded="false" />
  119 + <element signature="e#20912#23550#0#PHP" expanded="false" />
  120 + <element signature="e#23583#29910#0#PHP" expanded="false" />
  121 + <element signature="e#24378#29668#0#PHP" expanded="false" />
  122 + <element signature="e#29933#30150#0#PHP" expanded="false" />
90 </folding> 123 </folding>
91 </state> 124 </state>
92 </provider> 125 </provider>
@@ -120,6 +153,7 @@ @@ -120,6 +153,7 @@
120 <find>Db::name('viporder')</find> 153 <find>Db::name('viporder')</find>
121 <find>vippayOrderNotify</find> 154 <find>vippayOrderNotify</find>
122 <find>充值</find> 155 <find>充值</find>
  156 + <find>$data['money']</find>
123 </findStrings> 157 </findStrings>
124 <replaceStrings> 158 <replaceStrings>
125 <replace /> 159 <replace />
@@ -183,8 +217,8 @@ @@ -183,8 +217,8 @@
183 <option value="$PROJECT_DIR$/application/admin/library/Auth.php" /> 217 <option value="$PROJECT_DIR$/application/admin/library/Auth.php" />
184 <option value="$PROJECT_DIR$/application/admin/controller/Index.php" /> 218 <option value="$PROJECT_DIR$/application/admin/controller/Index.php" />
185 <option value="$PROJECT_DIR$/application/config.php" /> 219 <option value="$PROJECT_DIR$/application/config.php" />
186 - <option value="$PROJECT_DIR$/application/api/controller/User.php" />  
187 <option value="$PROJECT_DIR$/application/api/controller/Pay.php" /> 220 <option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
  221 + <option value="$PROJECT_DIR$/application/api/controller/User.php" />
188 </list> 222 </list>
189 </option> 223 </option>
190 </component> 224 </component>
@@ -203,10 +237,9 @@ @@ -203,10 +237,9 @@
203 </component> 237 </component>
204 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 238 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
205 <component name="ProjectFrameBounds"> 239 <component name="ProjectFrameBounds">
206 - <option name="x" value="794" />  
207 - <option name="y" value="50" /> 240 + <option name="x" value="676" />
208 <option name="width" value="1747" /> 241 <option name="width" value="1747" />
209 - <option name="height" value="1064" /> 242 + <option name="height" value="1030" />
210 </component> 243 </component>
211 <component name="ProjectView"> 244 <component name="ProjectView">
212 <navigator currentView="ProjectPane" proportions="" version="1"> 245 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -224,7 +257,6 @@ @@ -224,7 +257,6 @@
224 </navigator> 257 </navigator>
225 <panes> 258 <panes>
226 <pane id="Scope" /> 259 <pane id="Scope" />
227 - <pane id="Scratches" />  
228 <pane id="ProjectPane"> 260 <pane id="ProjectPane">
229 <subPane> 261 <subPane>
230 <expand> 262 <expand>
@@ -254,6 +286,7 @@ @@ -254,6 +286,7 @@
254 <select /> 286 <select />
255 </subPane> 287 </subPane>
256 </pane> 288 </pane>
  289 + <pane id="Scratches" />
257 </panes> 290 </panes>
258 </component> 291 </component>
259 <component name="PropertiesComponent"> 292 <component name="PropertiesComponent">
@@ -418,7 +451,8 @@ @@ -418,7 +451,8 @@
418 <workItem from="1587002358297" duration="983000" /> 451 <workItem from="1587002358297" duration="983000" />
419 <workItem from="1587016148758" duration="630000" /> 452 <workItem from="1587016148758" duration="630000" />
420 <workItem from="1587698628412" duration="1095000" /> 453 <workItem from="1587698628412" duration="1095000" />
421 - <workItem from="1590118157459" duration="10581000" /> 454 + <workItem from="1590118157459" duration="15359000" />
  455 + <workItem from="1590137451444" duration="774000" />
422 </task> 456 </task>
423 <task id="LOCAL-00001" summary="调试"> 457 <task id="LOCAL-00001" summary="调试">
424 <created>1574145133364</created> 458 <created>1574145133364</created>
@@ -553,11 +587,60 @@ @@ -553,11 +587,60 @@
553 <option name="project" value="LOCAL" /> 587 <option name="project" value="LOCAL" />
554 <updated>1590129354341</updated> 588 <updated>1590129354341</updated>
555 </task> 589 </task>
556 - <option name="localTasksCounter" value="20" /> 590 + <task id="LOCAL-00020" summary="文件下载调试">
  591 + <created>1590130515205</created>
  592 + <option name="number" value="00020" />
  593 + <option name="presentableId" value="LOCAL-00020" />
  594 + <option name="project" value="LOCAL" />
  595 + <updated>1590130515205</updated>
  596 + </task>
  597 + <task id="LOCAL-00021" summary="文件下载调试">
  598 + <created>1590131723621</created>
  599 + <option name="number" value="00021" />
  600 + <option name="presentableId" value="LOCAL-00021" />
  601 + <option name="project" value="LOCAL" />
  602 + <updated>1590131723621</updated>
  603 + </task>
  604 + <task id="LOCAL-00022" summary="文件下载调试">
  605 + <created>1590132380234</created>
  606 + <option name="number" value="00022" />
  607 + <option name="presentableId" value="LOCAL-00022" />
  608 + <option name="project" value="LOCAL" />
  609 + <updated>1590132380234</updated>
  610 + </task>
  611 + <task id="LOCAL-00023" summary="文件下载调试">
  612 + <created>1590134105880</created>
  613 + <option name="number" value="00023" />
  614 + <option name="presentableId" value="LOCAL-00023" />
  615 + <option name="project" value="LOCAL" />
  616 + <updated>1590134105880</updated>
  617 + </task>
  618 + <task id="LOCAL-00024" summary="文件下载调试">
  619 + <created>1590134161628</created>
  620 + <option name="number" value="00024" />
  621 + <option name="presentableId" value="LOCAL-00024" />
  622 + <option name="project" value="LOCAL" />
  623 + <updated>1590134161628</updated>
  624 + </task>
  625 + <task id="LOCAL-00025" summary="订单支付回调调试">
  626 + <created>1590134543060</created>
  627 + <option name="number" value="00025" />
  628 + <option name="presentableId" value="LOCAL-00025" />
  629 + <option name="project" value="LOCAL" />
  630 + <updated>1590134543060</updated>
  631 + </task>
  632 + <task id="LOCAL-00026" summary="订单支付回调调试">
  633 + <created>1590134877187</created>
  634 + <option name="number" value="00026" />
  635 + <option name="presentableId" value="LOCAL-00026" />
  636 + <option name="project" value="LOCAL" />
  637 + <updated>1590134877187</updated>
  638 + </task>
  639 + <option name="localTasksCounter" value="27" />
557 <servers /> 640 <servers />
558 </component> 641 </component>
559 <component name="TimeTrackingManager"> 642 <component name="TimeTrackingManager">
560 - <option name="totallyTimeSpent" value="670807000" /> 643 + <option name="totallyTimeSpent" value="676359000" />
561 </component> 644 </component>
562 <component name="TodoView"> 645 <component name="TodoView">
563 <todo-panel id="selected-file"> 646 <todo-panel id="selected-file">
@@ -569,18 +652,17 @@ @@ -569,18 +652,17 @@
569 </todo-panel> 652 </todo-panel>
570 </component> 653 </component>
571 <component name="ToolWindowManager"> 654 <component name="ToolWindowManager">
572 - <frame x="794" y="50" width="1747" height="1064" extended-state="0" /> 655 + <frame x="676" y="0" width="1747" height="1030" extended-state="0" />
573 <editor active="true" /> 656 <editor active="true" />
574 <layout> 657 <layout>
575 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.14285715" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> 658 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14285715" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
576 <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" /> 659 <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" />
577 <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" /> 660 <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" />
578 <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" /> 661 <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" />
579 - <window_info id="Find" 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="4" side_tool="false" content_ui="tabs" />  
580 <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" /> 662 <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" />
581 <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" /> 663 <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" />
582 <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" /> 664 <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" />
583 - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.46463546" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 665 + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.45048967" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
584 <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" /> 666 <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" />
585 <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" /> 667 <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" />
586 <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" /> 668 <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" />
@@ -588,6 +670,7 @@ @@ -588,6 +670,7 @@
588 <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" /> 670 <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" />
589 <window_info id="Inspection" 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="8" side_tool="false" content_ui="tabs" /> 671 <window_info id="Inspection" 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="8" side_tool="false" content_ui="tabs" />
590 <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" /> 672 <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
  673 + <window_info id="Find" 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="4" side_tool="false" content_ui="tabs" />
591 <window_info id="Ant Build" active="false" anchor="right" 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" /> 674 <window_info id="Ant Build" active="false" anchor="right" 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" />
592 </layout> 675 </layout>
593 <layout-to-restore> 676 <layout-to-restore>
@@ -618,10 +701,11 @@ @@ -618,10 +701,11 @@
618 </component> 701 </component>
619 <component name="VcsManagerConfiguration"> 702 <component name="VcsManagerConfiguration">
620 <MESSAGE value="调试" /> 703 <MESSAGE value="调试" />
621 - <MESSAGE value="文件下载调试" />  
622 <MESSAGE value="支付回调调试" /> 704 <MESSAGE value="支付回调调试" />
623 <MESSAGE value="调试支付" /> 705 <MESSAGE value="调试支付" />
624 - <option name="LAST_COMMIT_MESSAGE" value="调试支付" /> 706 + <MESSAGE value="文件下载调试" />
  707 + <MESSAGE value="订单支付回调调试" />
  708 + <option name="LAST_COMMIT_MESSAGE" value="订单支付回调调试" />
625 </component> 709 </component>
626 <component name="XDebuggerManager"> 710 <component name="XDebuggerManager">
627 <breakpoint-manager> 711 <breakpoint-manager>
@@ -877,12 +961,6 @@ @@ -877,12 +961,6 @@
877 <provider selected="true" editor-type-id="text-editor"> 961 <provider selected="true" editor-type-id="text-editor">
878 <state relative-caret-position="-24"> 962 <state relative-caret-position="-24">
879 <caret line="27" column="5" lean-forward="true" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" /> 963 <caret line="27" column="5" lean-forward="true" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
880 - <folding>  
881 - <element signature="e#2201#6736#0#PHP" expanded="false" />  
882 - <element signature="e#6768#11257#0#PHP" expanded="false" />  
883 - <element signature="e#11513#11770#0#PHP" expanded="false" />  
884 - <element signature="e#12199#18000#0#PHP" expanded="false" />  
885 - </folding>  
886 </state> 964 </state>
887 </provider> 965 </provider>
888 </entry> 966 </entry>
@@ -905,7 +983,6 @@ @@ -905,7 +983,6 @@
905 <provider selected="true" editor-type-id="text-editor"> 983 <provider selected="true" editor-type-id="text-editor">
906 <state relative-caret-position="50"> 984 <state relative-caret-position="50">
907 <caret line="63" column="55" lean-forward="false" selection-start-line="63" selection-start-column="55" selection-end-line="63" selection-end-column="55" /> 985 <caret line="63" column="55" lean-forward="false" selection-start-line="63" selection-start-column="55" selection-end-line="63" selection-end-column="55" />
908 - <folding />  
909 </state> 986 </state>
910 </provider> 987 </provider>
911 </entry> 988 </entry>
@@ -913,9 +990,6 @@ @@ -913,9 +990,6 @@
913 <provider selected="true" editor-type-id="text-editor"> 990 <provider selected="true" editor-type-id="text-editor">
914 <state relative-caret-position="280"> 991 <state relative-caret-position="280">
915 <caret line="154" column="66" lean-forward="false" selection-start-line="154" selection-start-column="66" selection-end-line="154" selection-end-column="66" /> 992 <caret line="154" column="66" lean-forward="false" selection-start-line="154" selection-start-column="66" selection-end-line="154" selection-end-column="66" />
916 - <folding>  
917 - <element signature="e#5424#8624#0#PHP" expanded="false" />  
918 - </folding>  
919 </state> 993 </state>
920 </provider> 994 </provider>
921 </entry> 995 </entry>
@@ -1349,11 +1423,6 @@ @@ -1349,11 +1423,6 @@
1349 <provider selected="true" editor-type-id="text-editor"> 1423 <provider selected="true" editor-type-id="text-editor">
1350 <state relative-caret-position="450"> 1424 <state relative-caret-position="450">
1351 <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" /> 1425 <caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
1352 - <folding>  
1353 - <element signature="e#390#411#0#PHP" expanded="false" />  
1354 - <element signature="e#416#1420#0#PHP" expanded="false" />  
1355 - <element signature="e#1452#1826#0#PHP" expanded="false" />  
1356 - </folding>  
1357 </state> 1426 </state>
1358 </provider> 1427 </provider>
1359 </entry> 1428 </entry>
@@ -1361,7 +1430,6 @@ @@ -1361,7 +1430,6 @@
1361 <provider selected="true" editor-type-id="text-editor"> 1430 <provider selected="true" editor-type-id="text-editor">
1362 <state relative-caret-position="500"> 1431 <state relative-caret-position="500">
1363 <caret line="44" column="131" lean-forward="true" selection-start-line="44" selection-start-column="131" selection-end-line="44" selection-end-column="131" /> 1432 <caret line="44" column="131" lean-forward="true" selection-start-line="44" selection-start-column="131" selection-end-line="44" selection-end-column="131" />
1364 - <folding />  
1365 </state> 1433 </state>
1366 </provider> 1434 </provider>
1367 </entry> 1435 </entry>
@@ -1373,72 +1441,105 @@ @@ -1373,72 +1441,105 @@
1373 </state> 1441 </state>
1374 </provider> 1442 </provider>
1375 </entry> 1443 </entry>
1376 - <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 1444 + <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
1377 <provider selected="true" editor-type-id="text-editor"> 1445 <provider selected="true" editor-type-id="text-editor">
1378 - <state relative-caret-position="208">  
1379 - <caret line="1117" column="35" lean-forward="true" selection-start-line="1117" selection-start-column="35" selection-end-line="1117" selection-end-column="35" /> 1446 + <state relative-caret-position="218">
  1447 + <caret line="335" column="5" lean-forward="true" selection-start-line="335" selection-start-column="5" selection-end-line="335" selection-end-column="5" />
1380 <folding> 1448 <folding>
1381 - <element signature="e#5493#5836#0#PHP" expanded="false" />  
1382 - <element signature="e#5842#6255#0#PHP" expanded="false" />  
1383 - <element signature="e#6260#6577#0#PHP" expanded="false" />  
1384 - <element signature="e#6583#7682#0#PHP" expanded="false" />  
1385 - <element signature="e#7687#13088#0#PHP" expanded="false" />  
1386 - <element signature="e#13094#13774#0#PHP" expanded="false" />  
1387 - <element signature="e#13779#14637#0#PHP" expanded="false" />  
1388 - <element signature="e#14643#15432#0#PHP" expanded="false" />  
1389 - <element signature="e#15437#16786#0#PHP" expanded="false" />  
1390 - <element signature="e#16792#17494#0#PHP" expanded="false" />  
1391 - <element signature="e#17499#18819#0#PHP" expanded="false" />  
1392 - <element signature="e#18825#19401#0#PHP" expanded="false" />  
1393 - <element signature="e#19406#20018#0#PHP" expanded="false" />  
1394 - <element signature="e#20024#20740#0#PHP" expanded="false" />  
1395 - <element signature="e#20745#25613#0#PHP" expanded="false" />  
1396 - <element signature="e#25622#26552#0#PHP" expanded="false" />  
1397 - <element signature="e#26557#31698#0#PHP" expanded="false" />  
1398 - <element signature="e#31704#32081#0#PHP" expanded="false" />  
1399 - <element signature="e#32086#32525#0#PHP" expanded="false" />  
1400 - <element signature="e#32531#33352#0#PHP" expanded="false" />  
1401 - <element signature="e#33357#36761#0#PHP" expanded="false" />  
1402 - <element signature="e#36767#37272#0#PHP" expanded="false" />  
1403 - <element signature="e#37277#37528#0#PHP" expanded="false" />  
1404 - <element signature="e#37534#38013#0#PHP" expanded="false" />  
1405 - <element signature="e#38883#39364#0#PHP" expanded="false" />  
1406 - <element signature="e#39369#40239#0#PHP" expanded="false" />  
1407 - <element signature="e#40245#40608#0#PHP" expanded="false" />  
1408 - <element signature="e#40613#40804#0#PHP" expanded="false" />  
1409 - <element signature="e#40810#41168#0#PHP" expanded="false" />  
1410 - <element signature="e#41173#41364#0#PHP" expanded="false" />  
1411 - <element signature="e#41370#42513#0#PHP" expanded="false" />  
1412 - <element signature="e#42518#45183#0#PHP" expanded="false" />  
1413 - <element signature="e#45189#45687#0#PHP" expanded="false" />  
1414 - <element signature="e#45692#47438#0#PHP" expanded="false" />  
1415 - <element signature="e#47444#47857#0#PHP" expanded="false" />  
1416 - <element signature="e#47862#48341#0#PHP" expanded="false" /> 1449 + <element signature="e#706#1019#0#PHP" expanded="false" />
  1450 + <element signature="e#1024#3100#0#PHP" expanded="false" />
  1451 + <element signature="e#3106#3426#0#PHP" expanded="false" />
  1452 + <element signature="e#3431#5630#0#PHP" expanded="false" />
  1453 + <element signature="e#5636#6050#0#PHP" expanded="false" />
  1454 + <element signature="e#6055#16076#0#PHP" expanded="false" />
  1455 + <element signature="e#7031#16009#0#PHP" expanded="false" />
  1456 + <element signature="e#16083#16400#0#PHP" expanded="false" />
  1457 + <element signature="e#16405#16883#0#PHP" expanded="false" />
  1458 + <element signature="e#16900#17197#0#PHP" expanded="false" />
  1459 + <element signature="e#17202#17595#0#PHP" expanded="false" />
  1460 + <element signature="e#17622#20883#0#PHP" expanded="false" />
  1461 + <element signature="e#20912#23550#0#PHP" expanded="false" />
  1462 + <element signature="e#23583#29910#0#PHP" expanded="false" />
  1463 + <element signature="e#24378#29668#0#PHP" expanded="false" />
  1464 + <element signature="e#29933#30150#0#PHP" expanded="false" />
1417 </folding> 1465 </folding>
1418 </state> 1466 </state>
1419 </provider> 1467 </provider>
1420 </entry> 1468 </entry>
1421 - <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> 1469 + <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
1422 <provider selected="true" editor-type-id="text-editor"> 1470 <provider selected="true" editor-type-id="text-editor">
1423 - <state relative-caret-position="-550">  
1424 - <caret line="54" column="46" lean-forward="false" selection-start-line="54" selection-start-column="46" selection-end-line="54" selection-end-column="46" /> 1471 + <state relative-caret-position="718">
  1472 + <caret line="2422" column="1" lean-forward="true" selection-start-line="2422" selection-start-column="1" selection-end-line="2422" selection-end-column="1" />
1425 <folding> 1473 <folding>
1426 - <element signature="e#706#1019#0#PHP" expanded="false" />  
1427 - <element signature="e#3223#3543#0#PHP" expanded="false" />  
1428 - <element signature="e#3548#5747#0#PHP" expanded="false" />  
1429 - <element signature="e#5753#6167#0#PHP" expanded="false" />  
1430 - <element signature="e#6172#16193#0#PHP" expanded="false" />  
1431 - <element signature="e#7148#16126#0#PHP" expanded="false" />  
1432 - <element signature="e#16200#16517#0#PHP" expanded="false" />  
1433 - <element signature="e#16522#17000#0#PHP" expanded="false" />  
1434 - <element signature="e#17017#17314#0#PHP" expanded="false" />  
1435 - <element signature="e#17319#17712#0#PHP" expanded="false" />  
1436 - <element signature="e#17739#20985#0#PHP" expanded="false" />  
1437 - <element signature="e#21014#23685#0#PHP" expanded="false" />  
1438 - <element signature="e#21500#23355#0#PHP" expanded="false" />  
1439 - <element signature="e#23718#30045#0#PHP" expanded="false" />  
1440 - <element signature="e#24513#29803#0#PHP" expanded="false" />  
1441 - <element signature="e#30068#30285#0#PHP" expanded="false" /> 1474 + <element signature="e#4287#4721#0#PHP" expanded="false" />
  1475 + <element signature="e#4726#5084#0#PHP" expanded="false" />
  1476 + <element signature="e#5090#5497#0#PHP" expanded="false" />
  1477 + <element signature="e#5502#5845#0#PHP" expanded="false" />
  1478 + <element signature="e#5851#6264#0#PHP" expanded="false" />
  1479 + <element signature="e#6269#6586#0#PHP" expanded="false" />
  1480 + <element signature="e#6592#7691#0#PHP" expanded="false" />
  1481 + <element signature="e#7696#13097#0#PHP" expanded="false" />
  1482 + <element signature="e#13103#13783#0#PHP" expanded="false" />
  1483 + <element signature="e#13788#14646#0#PHP" expanded="false" />
  1484 + <element signature="e#14652#15441#0#PHP" expanded="false" />
  1485 + <element signature="e#15446#16795#0#PHP" expanded="false" />
  1486 + <element signature="e#16801#17503#0#PHP" expanded="false" />
  1487 + <element signature="e#17508#18828#0#PHP" expanded="false" />
  1488 + <element signature="e#18834#19410#0#PHP" expanded="false" />
  1489 + <element signature="e#19415#20027#0#PHP" expanded="false" />
  1490 + <element signature="e#20033#20749#0#PHP" expanded="false" />
  1491 + <element signature="e#20754#25622#0#PHP" expanded="false" />
  1492 + <element signature="e#25631#26561#0#PHP" expanded="false" />
  1493 + <element signature="e#26566#31707#0#PHP" expanded="false" />
  1494 + <element signature="e#31713#32090#0#PHP" expanded="false" />
  1495 + <element signature="e#32095#32534#0#PHP" expanded="false" />
  1496 + <element signature="e#32540#33361#0#PHP" expanded="false" />
  1497 + <element signature="e#33366#36770#0#PHP" expanded="false" />
  1498 + <element signature="e#36776#37281#0#PHP" expanded="false" />
  1499 + <element signature="e#37286#37537#0#PHP" expanded="false" />
  1500 + <element signature="e#37543#38022#0#PHP" expanded="false" />
  1501 + <element signature="e#38027#38784#0#PHP" expanded="false" />
  1502 + <element signature="e#38790#39271#0#PHP" expanded="false" />
  1503 + <element signature="e#39276#40146#0#PHP" expanded="false" />
  1504 + <element signature="e#40152#40515#0#PHP" expanded="false" />
  1505 + <element signature="e#40520#40711#0#PHP" expanded="false" />
  1506 + <element signature="e#40717#41075#0#PHP" expanded="false" />
  1507 + <element signature="e#41080#41271#0#PHP" expanded="false" />
  1508 + <element signature="e#41277#42420#0#PHP" expanded="false" />
  1509 + <element signature="e#42425#45090#0#PHP" expanded="false" />
  1510 + <element signature="e#45096#45594#0#PHP" expanded="false" />
  1511 + <element signature="e#45599#47345#0#PHP" expanded="false" />
  1512 + <element signature="e#47351#47764#0#PHP" expanded="false" />
  1513 + <element signature="e#47769#48248#0#PHP" expanded="false" />
  1514 + <element signature="e#48254#48788#0#PHP" expanded="false" />
  1515 + <element signature="e#48793#50178#0#PHP" expanded="false" />
  1516 + <element signature="e#50184#50838#0#PHP" expanded="false" />
  1517 + <element signature="e#50843#52858#0#PHP" expanded="false" />
  1518 + <element signature="e#52864#53624#0#PHP" expanded="false" />
  1519 + <element signature="e#53629#56338#0#PHP" expanded="false" />
  1520 + <element signature="e#56364#57195#0#PHP" expanded="false" />
  1521 + <element signature="e#57201#57621#0#PHP" expanded="false" />
  1522 + <element signature="e#57626#58109#0#PHP" expanded="false" />
  1523 + <element signature="e#58115#58921#0#PHP" expanded="false" />
  1524 + <element signature="e#58926#62084#0#PHP" expanded="false" />
  1525 + <element signature="e#62099#63434#0#PHP" expanded="false" />
  1526 + <element signature="e#63450#64484#0#PHP" expanded="false" />
  1527 + <element signature="e#64490#65248#0#PHP" expanded="false" />
  1528 + <element signature="e#65253#68996#0#PHP" expanded="false" />
  1529 + <element signature="e#69002#69394#0#PHP" expanded="false" />
  1530 + <element signature="e#69399#70351#0#PHP" expanded="false" />
  1531 + <element signature="e#70375#70948#0#PHP" expanded="false" />
  1532 + <element signature="e#70954#71553#0#PHP" expanded="false" />
  1533 + <element signature="e#71558#72485#0#PHP" expanded="false" />
  1534 + <element signature="e#72491#73205#0#PHP" expanded="false" />
  1535 + <element signature="e#73211#73638#0#PHP" expanded="false" />
  1536 + <element signature="e#73643#74112#0#PHP" expanded="false" />
  1537 + <element signature="e#74119#75324#0#PHP" expanded="false" />
  1538 + <element signature="e#75329#77032#0#PHP" expanded="false" />
  1539 + <element signature="e#77038#77815#0#PHP" expanded="false" />
  1540 + <element signature="e#77820#81758#0#PHP" expanded="false" />
  1541 + <element signature="e#81764#82273#0#PHP" expanded="false" />
  1542 + <element signature="e#82278#82950#0#PHP" expanded="false" />
1442 </folding> 1543 </folding>
1443 </state> 1544 </state>
1444 </provider> 1545 </provider>
@@ -17,7 +17,7 @@ use fast\Http; @@ -17,7 +17,7 @@ use fast\Http;
17 */ 17 */
18 class User extends Api 18 class User extends Api
19 { 19 {
20 - protected $noNeedLogin = ['login','index','type','mine','car','cover','words','share']; 20 + protected $noNeedLogin = ['login','index','type','mine','car','cover','words','share','change'];
21 protected $noNeedRight = '*'; 21 protected $noNeedRight = '*';
22 protected $uid = ''; 22 protected $uid = '';
23 23
@@ -2402,4 +2402,22 @@ class User extends Api @@ -2402,4 +2402,22 @@ class User extends Api
2402 } 2402 }
2403 } 2403 }
2404 2404
  2405 + /**
  2406 + * @ApiTitle (切换数值)
  2407 + * @ApiSummary (切换数值)
  2408 + * @ApiMethod (POST)
  2409 + * @ApiRoute (/api/user/change)
  2410 + *
  2411 + * @ApiReturn({
  2412 + "code": 1,
  2413 + "msg": "成功",
  2414 + "time": "1571492001",
  2415 + })
  2416 + */
  2417 + public function change()
  2418 + {
  2419 + $this->success('success',['type'=>0]);
  2420 + }
  2421 +
  2422 +
2405 } 2423 }
此 diff 太大无法显示。