郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 94a216ee4f7d5b4401679b1cf390c468c2c778e1 1 个父辈 96928507
1 个管道 的构建 通过 耗费 11 秒

删除token

内嵌 并排对比
正在显示 3 个修改的文件 包含 143 行增加 和 204 行删除
@@ -5,8 +5,6 @@ @@ -5,8 +5,6 @@
5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/HomeController.php" afterPath="$PROJECT_DIR$/api/index/controller/HomeController.php" /> 6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/HomeController.php" afterPath="$PROJECT_DIR$/api/index/controller/HomeController.php" />
7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" afterPath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" /> 7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" afterPath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
8 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/SubscribeController.php" afterPath="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />  
9 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />  
10 </list> 8 </list>
11 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 9 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
12 <option name="TRACKING_ENABLED" value="true" /> 10 <option name="TRACKING_ENABLED" value="true" />
@@ -28,109 +26,11 @@ @@ -28,109 +26,11 @@
28 </component> 26 </component>
29 <component name="FileEditorManager"> 27 <component name="FileEditorManager">
30 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 28 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
31 - <file leaf-file-name="UserController.php" pinned="false" current-in-tab="false">  
32 - <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">  
33 - <provider selected="true" editor-type-id="text-editor">  
34 - <state relative-caret-position="911">  
35 - <caret line="1143" column="14" lean-forward="true" selection-start-line="1143" selection-start-column="14" selection-end-line="1143" selection-end-column="14" />  
36 - <folding>  
37 - <element signature="e#131#169#0#PHP" expanded="true" />  
38 - <element signature="e#366#791#0#PHP" expanded="false" />  
39 - <element signature="e#796#1608#0#PHP" expanded="false" />  
40 - <element signature="e#1614#1872#0#PHP" expanded="false" />  
41 - <element signature="e#1877#2260#0#PHP" expanded="false" />  
42 - <element signature="e#2266#2495#0#PHP" expanded="false" />  
43 - <element signature="e#2500#4135#0#PHP" expanded="false" />  
44 - <element signature="e#4141#4381#0#PHP" expanded="false" />  
45 - <element signature="e#4386#4621#0#PHP" expanded="false" />  
46 - <element signature="e#4627#4974#0#PHP" expanded="false" />  
47 - <element signature="e#4979#5425#0#PHP" expanded="false" />  
48 - <element signature="e#5431#5691#0#PHP" expanded="false" />  
49 - <element signature="e#5696#5897#0#PHP" expanded="false" />  
50 - <element signature="e#5903#6165#0#PHP" expanded="false" />  
51 - <element signature="e#6170#6375#0#PHP" expanded="false" />  
52 - <element signature="e#6381#6860#0#PHP" expanded="false" />  
53 - <element signature="e#6865#9088#0#PHP" expanded="false" />  
54 - <element signature="e#9111#9642#0#PHP" expanded="false" />  
55 - <element signature="e#9648#9928#0#PHP" expanded="false" />  
56 - <element signature="e#9933#10325#0#PHP" expanded="false" />  
57 - <element signature="e#10331#10615#0#PHP" expanded="false" />  
58 - <element signature="e#10620#11565#0#PHP" expanded="false" />  
59 - <element signature="e#11571#11859#0#PHP" expanded="false" />  
60 - <element signature="e#11864#12803#0#PHP" expanded="false" />  
61 - <element signature="e#12809#13390#0#PHP" expanded="false" />  
62 - <element signature="e#13395#14945#0#PHP" expanded="false" />  
63 - <element signature="e#14951#15407#0#PHP" expanded="false" />  
64 - <element signature="e#15412#17480#0#PHP" expanded="false" />  
65 - <element signature="e#17503#17858#0#PHP" expanded="false" />  
66 - <element signature="e#17864#18605#0#PHP" expanded="false" />  
67 - <element signature="e#18610#20063#0#PHP" expanded="false" />  
68 - <element signature="e#20069#20530#0#PHP" expanded="false" />  
69 - <element signature="e#20535#23662#0#PHP" expanded="false" />  
70 - <element signature="e#23668#24277#0#PHP" expanded="false" />  
71 - <element signature="e#24282#25567#0#PHP" expanded="false" />  
72 - <element signature="e#25573#25930#0#PHP" expanded="false" />  
73 - <element signature="e#25935#26918#0#PHP" expanded="false" />  
74 - <element signature="e#26924#27276#0#PHP" expanded="false" />  
75 - <element signature="e#27281#28390#0#PHP" expanded="false" />  
76 - <element signature="e#28396#28751#0#PHP" expanded="false" />  
77 - <element signature="e#28756#30183#0#PHP" expanded="false" />  
78 - <element signature="e#30189#30613#0#PHP" expanded="false" />  
79 - <element signature="e#30618#31229#0#PHP" expanded="false" />  
80 - <element signature="e#31235#31731#0#PHP" expanded="false" />  
81 - <element signature="e#31736#35394#0#PHP" expanded="false" />  
82 - <element signature="e#32548#33675#0#PHP" expanded="false" />  
83 - <element signature="e#35400#35684#0#PHP" expanded="false" />  
84 - <element signature="e#35689#36368#0#PHP" expanded="false" />  
85 - <element signature="e#36389#36708#0#PHP" expanded="false" />  
86 - <element signature="e#36714#37122#0#PHP" expanded="false" />  
87 - <element signature="e#37128#37887#0#PHP" expanded="false" />  
88 - <element signature="e#37906#38770#0#PHP" expanded="false" />  
89 - <element signature="e#38796#39196#0#PHP" expanded="false" />  
90 - <element signature="e#39219#39792#0#PHP" expanded="false" />  
91 - <element signature="e#39815#40625#0#PHP" expanded="false" />  
92 - <element signature="e#40631#41230#0#PHP" expanded="false" />  
93 - <element signature="e#41235#42199#0#PHP" expanded="false" />  
94 - <element signature="e#42205#42872#0#PHP" expanded="false" />  
95 - <element signature="e#42877#43918#0#PHP" expanded="false" />  
96 - <element signature="e#43924#44587#0#PHP" expanded="false" />  
97 - <element signature="e#44592#45619#0#PHP" expanded="false" />  
98 - <element signature="e#45626#46057#0#PHP" expanded="false" />  
99 - <element signature="e#46062#46640#0#PHP" expanded="false" />  
100 - <element signature="e#46646#47075#0#PHP" expanded="false" />  
101 - <element signature="e#47080#47682#0#PHP" expanded="false" />  
102 - <element signature="e#47688#48115#0#PHP" expanded="false" />  
103 - <element signature="e#48120#48686#0#PHP" expanded="false" />  
104 - </folding>  
105 - </state>  
106 - </provider>  
107 - </entry>  
108 - </file>  
109 - <file leaf-file-name="SubscribeController.php" pinned="false" current-in-tab="false">  
110 - <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">  
111 - <provider selected="true" editor-type-id="text-editor">  
112 - <state relative-caret-position="525">  
113 - <caret line="103" column="0" lean-forward="true" selection-start-line="103" selection-start-column="0" selection-end-line="103" selection-end-column="0" />  
114 - <folding>  
115 - <element signature="e#305#577#0#PHP" expanded="false" />  
116 - <element signature="e#583#854#0#PHP" expanded="false" />  
117 - <element signature="e#859#1113#0#PHP" expanded="false" />  
118 - <element signature="e#1119#1594#0#PHP" expanded="false" />  
119 - <element signature="e#1599#2490#0#PHP" expanded="false" />  
120 - <element signature="e#2497#2911#0#PHP" expanded="false" />  
121 - <element signature="e#2916#3386#0#PHP" expanded="false" />  
122 - <element signature="e#3393#3889#0#PHP" expanded="false" />  
123 - <element signature="e#3894#4961#0#PHP" expanded="false" />  
124 - </folding>  
125 - </state>  
126 - </provider>  
127 - </entry>  
128 - </file>  
129 <file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="false"> 29 <file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="false">
130 <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php"> 30 <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
131 <provider selected="true" editor-type-id="text-editor"> 31 <provider selected="true" editor-type-id="text-editor">
132 - <state relative-caret-position="630">  
133 - <caret line="397" column="31" lean-forward="false" selection-start-line="397" selection-start-column="31" selection-end-line="397" selection-end-column="31" /> 32 + <state relative-caret-position="155">
  33 + <caret line="184" column="7" lean-forward="true" selection-start-line="184" selection-start-column="7" selection-end-line="184" selection-end-column="7" />
134 <folding> 34 <folding>
135 <element signature="e#411#604#0#PHP" expanded="false" /> 35 <element signature="e#411#604#0#PHP" expanded="false" />
136 <element signature="e#609#825#0#PHP" expanded="false" /> 36 <element signature="e#609#825#0#PHP" expanded="false" />
@@ -140,22 +40,22 @@ @@ -140,22 +40,22 @@
140 <element signature="e#2322#2530#0#PHP" expanded="false" /> 40 <element signature="e#2322#2530#0#PHP" expanded="false" />
141 <element signature="e#2536#3043#0#PHP" expanded="false" /> 41 <element signature="e#2536#3043#0#PHP" expanded="false" />
142 <element signature="e#3048#3566#0#PHP" expanded="false" /> 42 <element signature="e#3048#3566#0#PHP" expanded="false" />
143 - <element signature="e#3572#4084#0#PHP" expanded="false" />  
144 - <element signature="e#4089#4652#0#PHP" expanded="false" />  
145 - <element signature="e#4658#5248#0#PHP" expanded="false" />  
146 - <element signature="e#5253#6299#0#PHP" expanded="false" />  
147 - <element signature="e#6305#6623#0#PHP" expanded="false" />  
148 - <element signature="e#6628#7004#0#PHP" expanded="false" />  
149 - <element signature="e#7010#7365#0#PHP" expanded="false" />  
150 - <element signature="e#7370#7779#0#PHP" expanded="false" />  
151 - <element signature="e#7785#8170#0#PHP" expanded="false" />  
152 - <element signature="e#8175#8846#0#PHP" expanded="false" />  
153 - <element signature="e#8852#9298#0#PHP" expanded="false" />  
154 - <element signature="e#9303#10154#0#PHP" expanded="false" />  
155 - <element signature="e#10160#10430#0#PHP" expanded="false" />  
156 - <element signature="e#10435#10911#0#PHP" expanded="false" />  
157 - <element signature="e#10917#11547#0#PHP" expanded="false" />  
158 - <element signature="e#11552#13417#0#PHP" expanded="false" /> 43 + <element signature="e#3572#4018#0#PHP" expanded="false" />
  44 + <element signature="e#4023#4547#0#PHP" expanded="false" />
  45 + <element signature="e#4553#5143#0#PHP" expanded="false" />
  46 + <element signature="e#5148#6194#0#PHP" expanded="false" />
  47 + <element signature="e#6200#6518#0#PHP" expanded="false" />
  48 + <element signature="e#6523#6899#0#PHP" expanded="false" />
  49 + <element signature="e#6905#7260#0#PHP" expanded="false" />
  50 + <element signature="e#7265#7674#0#PHP" expanded="false" />
  51 + <element signature="e#7680#8065#0#PHP" expanded="false" />
  52 + <element signature="e#8070#8741#0#PHP" expanded="false" />
  53 + <element signature="e#8747#9193#0#PHP" expanded="false" />
  54 + <element signature="e#9198#10049#0#PHP" expanded="false" />
  55 + <element signature="e#10055#10325#0#PHP" expanded="false" />
  56 + <element signature="e#10330#10806#0#PHP" expanded="false" />
  57 + <element signature="e#10812#11442#0#PHP" expanded="false" />
  58 + <element signature="e#11447#13312#0#PHP" expanded="false" />
159 </folding> 59 </folding>
160 </state> 60 </state>
161 </provider> 61 </provider>
@@ -164,13 +64,16 @@ @@ -164,13 +64,16 @@
164 <file leaf-file-name="HomeController.php" pinned="false" current-in-tab="true"> 64 <file leaf-file-name="HomeController.php" pinned="false" current-in-tab="true">
165 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php"> 65 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
166 <provider selected="true" editor-type-id="text-editor"> 66 <provider selected="true" editor-type-id="text-editor">
167 - <state relative-caret-position="249">  
168 - <caret line="374" column="34" lean-forward="false" selection-start-line="374" selection-start-column="34" selection-end-line="374" selection-end-column="34" /> 67 + <state relative-caret-position="130">
  68 + <caret line="102" column="6" lean-forward="false" selection-start-line="102" selection-start-column="6" selection-end-line="102" selection-end-column="6" />
169 <folding> 69 <folding>
170 - <element signature="e#3168#3696#0#PHP" expanded="false" />  
171 - <element signature="e#3701#4697#0#PHP" expanded="false" />  
172 - <element signature="e#4703#5016#0#PHP" expanded="false" />  
173 - <element signature="e#5021#5396#0#PHP" expanded="false" /> 70 + <element signature="e#3070#3598#0#PHP" expanded="false" />
  71 + <element signature="e#3603#4599#0#PHP" expanded="false" />
  72 + <element signature="e#4605#4918#0#PHP" expanded="false" />
  73 + <element signature="e#4923#5298#0#PHP" expanded="false" />
  74 + <element signature="e#5304#5656#0#PHP" expanded="false" />
  75 + <element signature="e#9195#9745#0#PHP" expanded="false" />
  76 + <element signature="e#9750#11543#0#PHP" expanded="false" />
174 </folding> 77 </folding>
175 </state> 78 </state>
176 </provider> 79 </provider>
@@ -265,8 +168,8 @@ @@ -265,8 +168,8 @@
265 </component> 168 </component>
266 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 169 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
267 <component name="ProjectFrameBounds" extendedState="1"> 170 <component name="ProjectFrameBounds" extendedState="1">
268 - <option name="x" value="210" />  
269 - <option name="y" value="58" /> 171 + <option name="x" value="283" />
  172 + <option name="y" value="56" />
270 <option name="width" value="1618" /> 173 <option name="width" value="1618" />
271 <option name="height" value="1092" /> 174 <option name="height" value="1092" />
272 </component> 175 </component>
@@ -285,6 +188,7 @@ @@ -285,6 +188,7 @@
285 <foldersAlwaysOnTop value="true" /> 188 <foldersAlwaysOnTop value="true" />
286 </navigator> 189 </navigator>
287 <panes> 190 <panes>
  191 + <pane id="Scratches" />
288 <pane id="Scope" /> 192 <pane id="Scope" />
289 <pane id="ProjectPane"> 193 <pane id="ProjectPane">
290 <subPane> 194 <subPane>
@@ -311,11 +215,36 @@ @@ -311,11 +215,36 @@
311 <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" /> 215 <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
312 <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> 216 <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
313 </path> 217 </path>
  218 + <path>
  219 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  220 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  221 + <item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
  222 + </path>
  223 + <path>
  224 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  225 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  226 + <item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
  227 + <item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />
  228 + </path>
  229 + <path>
  230 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  231 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  232 + <item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
  233 + <item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />
  234 + <item name="qiniu" type="2a2b976b:PhpTreeStructureProvider$1" />
  235 + </path>
  236 + <path>
  237 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  238 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  239 + <item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
  240 + <item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />
  241 + <item name="qiniu" type="2a2b976b:PhpTreeStructureProvider$1" />
  242 + <item name="php-sdk" type="2a2b976b:PhpTreeStructureProvider$1" />
  243 + </path>
314 </expand> 244 </expand>
315 <select /> 245 <select />
316 </subPane> 246 </subPane>
317 </pane> 247 </pane>
318 - <pane id="Scratches" />  
319 </panes> 248 </panes>
320 </component> 249 </component>
321 <component name="PropertiesComponent"> 250 <component name="PropertiesComponent">
@@ -437,27 +366,31 @@ @@ -437,27 +366,31 @@
437 <workItem from="1576498945104" duration="2021000" /> 366 <workItem from="1576498945104" duration="2021000" />
438 <workItem from="1576501257741" duration="90000" /> 367 <workItem from="1576501257741" duration="90000" />
439 <workItem from="1576549607137" duration="1339000" /> 368 <workItem from="1576549607137" duration="1339000" />
440 - <workItem from="1576722212421" duration="195000" /> 369 + <workItem from="1576722212421" duration="408000" />
  370 + <workItem from="1576910540399" duration="190000" />
  371 + <workItem from="1576910858540" duration="1077000" />
  372 + <workItem from="1576913187617" duration="921000" />
  373 + <workItem from="1577063593250" duration="62000" />
441 </task> 374 </task>
442 <servers /> 375 <servers />
443 </component> 376 </component>
444 <component name="TimeTrackingManager"> 377 <component name="TimeTrackingManager">
445 - <option name="totallyTimeSpent" value="579577000" /> 378 + <option name="totallyTimeSpent" value="582040000" />
446 </component> 379 </component>
447 <component name="ToolWindowManager"> 380 <component name="ToolWindowManager">
448 - <frame x="210" y="58" width="1618" height="1092" extended-state="1" /> 381 + <frame x="283" y="56" width="1618" height="1092" extended-state="1" />
449 <editor active="true" /> 382 <editor active="true" />
450 <layout> 383 <layout>
451 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20667523" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 384 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2169448" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
452 <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" /> 385 <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" />
453 <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="7" side_tool="true" content_ui="tabs" /> 386 <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="7" side_tool="true" content_ui="tabs" />
454 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32982457" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 387 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32982457" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
455 - <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="2" side_tool="false" content_ui="tabs" />  
456 <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="7" side_tool="false" content_ui="tabs" /> 388 <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="7" side_tool="false" content_ui="tabs" />
  389 + <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="2" side_tool="false" content_ui="tabs" />
457 <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="1" side_tool="false" content_ui="tabs" /> 390 <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="1" side_tool="false" content_ui="tabs" />
458 <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25086308" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 391 <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25086308" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
459 - <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="3" side_tool="false" content_ui="tabs" />  
460 <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="2" side_tool="true" content_ui="tabs" /> 392 <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="2" side_tool="true" content_ui="tabs" />
  393 + <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="3" side_tool="false" content_ui="tabs" />
461 <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="4" side_tool="false" content_ui="tabs" /> 394 <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="4" side_tool="false" content_ui="tabs" />
462 <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="0" side_tool="false" content_ui="tabs" /> 395 <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="0" side_tool="false" content_ui="tabs" />
463 <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="0" side_tool="false" content_ui="tabs" /> 396 <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="0" side_tool="false" content_ui="tabs" />
@@ -494,25 +427,11 @@ @@ -494,25 +427,11 @@
494 </component> 427 </component>
495 <component name="XDebuggerManager"> 428 <component name="XDebuggerManager">
496 <breakpoint-manager> 429 <breakpoint-manager>
497 - <option name="time" value="18" /> 430 + <option name="time" value="19" />
498 </breakpoint-manager> 431 </breakpoint-manager>
499 <watches-manager /> 432 <watches-manager />
500 </component> 433 </component>
501 <component name="editorHistoryManager"> 434 <component name="editorHistoryManager">
502 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html">  
503 - <provider selected="true" editor-type-id="text-editor">  
504 - <state relative-caret-position="302">  
505 - <caret line="106" column="70" lean-forward="true" selection-start-line="106" selection-start-column="19" selection-end-line="106" selection-end-column="70" />  
506 - </state>  
507 - </provider>  
508 - </entry>  
509 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html">  
510 - <provider selected="true" editor-type-id="text-editor">  
511 - <state relative-caret-position="383">  
512 - <caret line="96" column="70" lean-forward="true" selection-start-line="96" selection-start-column="70" selection-end-line="96" selection-end-column="70" />  
513 - </state>  
514 - </provider>  
515 - </entry>  
516 <entry file="file://$PROJECT_DIR$/app/admin/controller/SubhomeController.php"> 435 <entry file="file://$PROJECT_DIR$/app/admin/controller/SubhomeController.php">
517 <provider selected="true" editor-type-id="text-editor"> 436 <provider selected="true" editor-type-id="text-editor">
518 <state relative-caret-position="325"> 437 <state relative-caret-position="325">
@@ -822,34 +741,10 @@ @@ -822,34 +741,10 @@
822 </state> 741 </state>
823 </provider> 742 </provider>
824 </entry> 743 </entry>
825 - <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">  
826 - <provider selected="true" editor-type-id="text-editor">  
827 - <state relative-caret-position="556">  
828 - <caret line="456" column="5" lean-forward="false" selection-start-line="456" selection-start-column="5" selection-end-line="456" selection-end-column="5" />  
829 - <folding>  
830 - <element signature="e#5324#5779#0#PHP" expanded="false" />  
831 - <element signature="e#5784#6508#0#PHP" expanded="false" />  
832 - <element signature="e#6514#6857#0#PHP" expanded="false" />  
833 - <element signature="e#6862#7343#0#PHP" expanded="false" />  
834 - <element signature="e#7349#7640#0#PHP" expanded="false" />  
835 - <element signature="e#7645#7996#0#PHP" expanded="false" />  
836 - <element signature="e#8002#8355#0#PHP" expanded="false" />  
837 - <element signature="e#8360#8765#0#PHP" expanded="false" />  
838 - <element signature="e#8771#9154#0#PHP" expanded="false" />  
839 - <element signature="e#9159#9826#0#PHP" expanded="false" />  
840 - <element signature="e#9832#10276#0#PHP" expanded="false" />  
841 - <element signature="e#10281#11128#0#PHP" expanded="false" />  
842 - <element signature="e#11134#11402#0#PHP" expanded="false" />  
843 - <element signature="e#11407#11879#0#PHP" expanded="false" />  
844 - <element signature="e#11885#12191#0#PHP" expanded="false" />  
845 - </folding>  
846 - </state>  
847 - </provider>  
848 - </entry>  
849 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 744 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
850 <provider selected="true" editor-type-id="text-editor"> 745 <provider selected="true" editor-type-id="text-editor">
851 - <state relative-caret-position="911">  
852 - <caret line="1143" column="14" lean-forward="true" selection-start-line="1143" selection-start-column="14" selection-end-line="1143" selection-end-column="14" /> 746 + <state relative-caret-position="2055">
  747 + <caret line="1143" column="14" lean-forward="false" selection-start-line="1143" selection-start-column="14" selection-end-line="1143" selection-end-column="14" />
853 <folding> 748 <folding>
854 <element signature="e#131#169#0#PHP" expanded="true" /> 749 <element signature="e#131#169#0#PHP" expanded="true" />
855 <element signature="e#366#791#0#PHP" expanded="false" /> 750 <element signature="e#366#791#0#PHP" expanded="false" />
@@ -925,7 +820,7 @@ @@ -925,7 +820,7 @@
925 <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php"> 820 <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
926 <provider selected="true" editor-type-id="text-editor"> 821 <provider selected="true" editor-type-id="text-editor">
927 <state relative-caret-position="525"> 822 <state relative-caret-position="525">
928 - <caret line="103" column="0" lean-forward="true" selection-start-line="103" selection-start-column="0" selection-end-line="103" selection-end-column="0" /> 823 + <caret line="103" column="0" lean-forward="false" selection-start-line="103" selection-start-column="0" selection-end-line="103" selection-end-column="0" />
929 <folding> 824 <folding>
930 <element signature="e#305#577#0#PHP" expanded="false" /> 825 <element signature="e#305#577#0#PHP" expanded="false" />
931 <element signature="e#583#854#0#PHP" expanded="false" /> 826 <element signature="e#583#854#0#PHP" expanded="false" />
@@ -940,10 +835,56 @@ @@ -940,10 +835,56 @@
940 </state> 835 </state>
941 </provider> 836 </provider>
942 </entry> 837 </entry>
  838 + <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
  839 + <provider selected="true" editor-type-id="text-editor">
  840 + <state relative-caret-position="4455">
  841 + <caret line="457" column="0" lean-forward="true" selection-start-line="457" selection-start-column="0" selection-end-line="457" selection-end-column="0" />
  842 + <folding>
  843 + <element signature="e#5324#5779#0#PHP" expanded="false" />
  844 + <element signature="e#5784#6508#0#PHP" expanded="false" />
  845 + <element signature="e#6514#6857#0#PHP" expanded="false" />
  846 + <element signature="e#6862#7343#0#PHP" expanded="false" />
  847 + <element signature="e#7349#7640#0#PHP" expanded="false" />
  848 + <element signature="e#7645#7996#0#PHP" expanded="false" />
  849 + <element signature="e#8002#8355#0#PHP" expanded="false" />
  850 + <element signature="e#8360#8765#0#PHP" expanded="false" />
  851 + <element signature="e#8771#9154#0#PHP" expanded="false" />
  852 + <element signature="e#9159#9826#0#PHP" expanded="false" />
  853 + <element signature="e#9832#10276#0#PHP" expanded="false" />
  854 + <element signature="e#10281#11128#0#PHP" expanded="false" />
  855 + <element signature="e#11134#11402#0#PHP" expanded="false" />
  856 + <element signature="e#11407#11879#0#PHP" expanded="false" />
  857 + <element signature="e#11885#12191#0#PHP" expanded="false" />
  858 + <element signature="e#12196#13839#0#PHP" expanded="false" />
  859 + </folding>
  860 + </state>
  861 + </provider>
  862 + </entry>
  863 + <entry file="file://$PROJECT_DIR$/simplewind/vendor/qiniu/php-sdk/README.md">
  864 + <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
  865 + <state split_layout="SPLIT">
  866 + <first_editor relative-caret-position="375">
  867 + <caret line="15" column="2" lean-forward="false" selection-start-line="15" selection-start-column="2" selection-end-line="15" selection-end-column="32" />
  868 + <folding />
  869 + </first_editor>
  870 + <second_editor />
  871 + </state>
  872 + </provider>
  873 + </entry>
  874 + <entry file="file://$PROJECT_DIR$/simplewind/cmf/lib/Storage.php">
  875 + <provider selected="true" editor-type-id="text-editor">
  876 + <state relative-caret-position="855">
  877 + <caret line="105" column="36" lean-forward="false" selection-start-line="105" selection-start-column="36" selection-end-line="105" selection-end-column="36" />
  878 + <folding>
  879 + <element signature="e#867#1785#0#PHP" expanded="false" />
  880 + </folding>
  881 + </state>
  882 + </provider>
  883 + </entry>
943 <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php"> 884 <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
944 <provider selected="true" editor-type-id="text-editor"> 885 <provider selected="true" editor-type-id="text-editor">
945 - <state relative-caret-position="630">  
946 - <caret line="397" column="31" lean-forward="false" selection-start-line="397" selection-start-column="31" selection-end-line="397" selection-end-column="31" /> 886 + <state relative-caret-position="155">
  887 + <caret line="184" column="7" lean-forward="true" selection-start-line="184" selection-start-column="7" selection-end-line="184" selection-end-column="7" />
947 <folding> 888 <folding>
948 <element signature="e#411#604#0#PHP" expanded="false" /> 889 <element signature="e#411#604#0#PHP" expanded="false" />
949 <element signature="e#609#825#0#PHP" expanded="false" /> 890 <element signature="e#609#825#0#PHP" expanded="false" />
@@ -953,35 +894,38 @@ @@ -953,35 +894,38 @@
953 <element signature="e#2322#2530#0#PHP" expanded="false" /> 894 <element signature="e#2322#2530#0#PHP" expanded="false" />
954 <element signature="e#2536#3043#0#PHP" expanded="false" /> 895 <element signature="e#2536#3043#0#PHP" expanded="false" />
955 <element signature="e#3048#3566#0#PHP" expanded="false" /> 896 <element signature="e#3048#3566#0#PHP" expanded="false" />
956 - <element signature="e#3572#4084#0#PHP" expanded="false" />  
957 - <element signature="e#4089#4652#0#PHP" expanded="false" />  
958 - <element signature="e#4658#5248#0#PHP" expanded="false" />  
959 - <element signature="e#5253#6299#0#PHP" expanded="false" />  
960 - <element signature="e#6305#6623#0#PHP" expanded="false" />  
961 - <element signature="e#6628#7004#0#PHP" expanded="false" />  
962 - <element signature="e#7010#7365#0#PHP" expanded="false" />  
963 - <element signature="e#7370#7779#0#PHP" expanded="false" />  
964 - <element signature="e#7785#8170#0#PHP" expanded="false" />  
965 - <element signature="e#8175#8846#0#PHP" expanded="false" />  
966 - <element signature="e#8852#9298#0#PHP" expanded="false" />  
967 - <element signature="e#9303#10154#0#PHP" expanded="false" />  
968 - <element signature="e#10160#10430#0#PHP" expanded="false" />  
969 - <element signature="e#10435#10911#0#PHP" expanded="false" />  
970 - <element signature="e#10917#11547#0#PHP" expanded="false" />  
971 - <element signature="e#11552#13417#0#PHP" expanded="false" /> 897 + <element signature="e#3572#4018#0#PHP" expanded="false" />
  898 + <element signature="e#4023#4547#0#PHP" expanded="false" />
  899 + <element signature="e#4553#5143#0#PHP" expanded="false" />
  900 + <element signature="e#5148#6194#0#PHP" expanded="false" />
  901 + <element signature="e#6200#6518#0#PHP" expanded="false" />
  902 + <element signature="e#6523#6899#0#PHP" expanded="false" />
  903 + <element signature="e#6905#7260#0#PHP" expanded="false" />
  904 + <element signature="e#7265#7674#0#PHP" expanded="false" />
  905 + <element signature="e#7680#8065#0#PHP" expanded="false" />
  906 + <element signature="e#8070#8741#0#PHP" expanded="false" />
  907 + <element signature="e#8747#9193#0#PHP" expanded="false" />
  908 + <element signature="e#9198#10049#0#PHP" expanded="false" />
  909 + <element signature="e#10055#10325#0#PHP" expanded="false" />
  910 + <element signature="e#10330#10806#0#PHP" expanded="false" />
  911 + <element signature="e#10812#11442#0#PHP" expanded="false" />
  912 + <element signature="e#11447#13312#0#PHP" expanded="false" />
972 </folding> 913 </folding>
973 </state> 914 </state>
974 </provider> 915 </provider>
975 </entry> 916 </entry>
976 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php"> 917 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
977 <provider selected="true" editor-type-id="text-editor"> 918 <provider selected="true" editor-type-id="text-editor">
978 - <state relative-caret-position="249">  
979 - <caret line="374" column="34" lean-forward="false" selection-start-line="374" selection-start-column="34" selection-end-line="374" selection-end-column="34" /> 919 + <state relative-caret-position="130">
  920 + <caret line="102" column="6" lean-forward="false" selection-start-line="102" selection-start-column="6" selection-end-line="102" selection-end-column="6" />
980 <folding> 921 <folding>
981 - <element signature="e#3168#3696#0#PHP" expanded="false" />  
982 - <element signature="e#3701#4697#0#PHP" expanded="false" />  
983 - <element signature="e#4703#5016#0#PHP" expanded="false" />  
984 - <element signature="e#5021#5396#0#PHP" expanded="false" /> 922 + <element signature="e#3070#3598#0#PHP" expanded="false" />
  923 + <element signature="e#3603#4599#0#PHP" expanded="false" />
  924 + <element signature="e#4605#4918#0#PHP" expanded="false" />
  925 + <element signature="e#4923#5298#0#PHP" expanded="false" />
  926 + <element signature="e#5304#5656#0#PHP" expanded="false" />
  927 + <element signature="e#9195#9745#0#PHP" expanded="false" />
  928 + <element signature="e#9750#11543#0#PHP" expanded="false" />
985 </folding> 929 </folding>
986 </state> 930 </state>
987 </provider> 931 </provider>
@@ -101,7 +101,6 @@ class HomeController extends RestBaseController @@ -101,7 +101,6 @@ class HomeController extends RestBaseController
101 * @url /index/Home/homeDetail 101 * @url /index/Home/homeDetail
102 * @method GET 102 * @method GET
103 * 103 *
104 - * @header name:XX-Token require:1 default: desc:token  
105 * 104 *
106 * @param name:id type:int require:1 other: desc:家政服务公司ID 105 * @param name:id type:int require:1 other: desc:家政服务公司ID
107 * 106 *
@@ -117,7 +116,6 @@ class HomeController extends RestBaseController @@ -117,7 +116,6 @@ class HomeController extends RestBaseController
117 */ 116 */
118 public function homeDetail() 117 public function homeDetail()
119 { 118 {
120 - $user_id = $this->getUserId();  
121 $id = $this->request->param('id'); 119 $id = $this->request->param('id');
122 if(empty($id)){ 120 if(empty($id)){
123 $this->error(['code'=>40001,'msg'=>'缺少必要参数']); 121 $this->error(['code'=>40001,'msg'=>'缺少必要参数']);
@@ -136,8 +136,6 @@ class ShopgoodsController extends RestBaseController @@ -136,8 +136,6 @@ class ShopgoodsController extends RestBaseController
136 * @url /index/Shopgoods/goodsDetail 136 * @url /index/Shopgoods/goodsDetail
137 * @method GET 137 * @method GET
138 * 138 *
139 - * @header name:XX-Token require:1 default: desc:token  
140 - *  
141 * @param name:id type:int require:0 other: desc:商品ID 139 * @param name:id type:int require:0 other: desc:商品ID
142 * 140 *
143 * @return id:商品ID 141 * @return id:商品ID
@@ -152,7 +150,6 @@ class ShopgoodsController extends RestBaseController @@ -152,7 +150,6 @@ class ShopgoodsController extends RestBaseController
152 * 150 *
153 */ 151 */
154 public function goodsDetail(){ 152 public function goodsDetail(){
155 - $user_id = $this->getUserId();  
156 $goods_id = $this->request->param('id',0,'intval'); 153 $goods_id = $this->request->param('id',0,'intval');
157 if(empty($goods_id)){ 154 if(empty($goods_id)){
158 $this -> error(['code'=>40005,'msg'=>'缺少必要参数']); 155 $this -> error(['code'=>40005,'msg'=>'缺少必要参数']);