郭盛 / scrap · 提交

转到一个项目

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

删除token

内嵌 并排对比
正在显示 3 个修改的文件 包含 143 行增加 和 204 行删除
... ... @@ -5,8 +5,6 @@
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/HomeController.php" afterPath="$PROJECT_DIR$/api/index/controller/HomeController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" afterPath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/SubscribeController.php" afterPath="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -28,109 +26,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="UserController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="911">
<caret line="1143" column="14" lean-forward="true" selection-start-line="1143" selection-start-column="14" selection-end-line="1143" selection-end-column="14" />
<folding>
<element signature="e#131#169#0#PHP" expanded="true" />
<element signature="e#366#791#0#PHP" expanded="false" />
<element signature="e#796#1608#0#PHP" expanded="false" />
<element signature="e#1614#1872#0#PHP" expanded="false" />
<element signature="e#1877#2260#0#PHP" expanded="false" />
<element signature="e#2266#2495#0#PHP" expanded="false" />
<element signature="e#2500#4135#0#PHP" expanded="false" />
<element signature="e#4141#4381#0#PHP" expanded="false" />
<element signature="e#4386#4621#0#PHP" expanded="false" />
<element signature="e#4627#4974#0#PHP" expanded="false" />
<element signature="e#4979#5425#0#PHP" expanded="false" />
<element signature="e#5431#5691#0#PHP" expanded="false" />
<element signature="e#5696#5897#0#PHP" expanded="false" />
<element signature="e#5903#6165#0#PHP" expanded="false" />
<element signature="e#6170#6375#0#PHP" expanded="false" />
<element signature="e#6381#6860#0#PHP" expanded="false" />
<element signature="e#6865#9088#0#PHP" expanded="false" />
<element signature="e#9111#9642#0#PHP" expanded="false" />
<element signature="e#9648#9928#0#PHP" expanded="false" />
<element signature="e#9933#10325#0#PHP" expanded="false" />
<element signature="e#10331#10615#0#PHP" expanded="false" />
<element signature="e#10620#11565#0#PHP" expanded="false" />
<element signature="e#11571#11859#0#PHP" expanded="false" />
<element signature="e#11864#12803#0#PHP" expanded="false" />
<element signature="e#12809#13390#0#PHP" expanded="false" />
<element signature="e#13395#14945#0#PHP" expanded="false" />
<element signature="e#14951#15407#0#PHP" expanded="false" />
<element signature="e#15412#17480#0#PHP" expanded="false" />
<element signature="e#17503#17858#0#PHP" expanded="false" />
<element signature="e#17864#18605#0#PHP" expanded="false" />
<element signature="e#18610#20063#0#PHP" expanded="false" />
<element signature="e#20069#20530#0#PHP" expanded="false" />
<element signature="e#20535#23662#0#PHP" expanded="false" />
<element signature="e#23668#24277#0#PHP" expanded="false" />
<element signature="e#24282#25567#0#PHP" expanded="false" />
<element signature="e#25573#25930#0#PHP" expanded="false" />
<element signature="e#25935#26918#0#PHP" expanded="false" />
<element signature="e#26924#27276#0#PHP" expanded="false" />
<element signature="e#27281#28390#0#PHP" expanded="false" />
<element signature="e#28396#28751#0#PHP" expanded="false" />
<element signature="e#28756#30183#0#PHP" expanded="false" />
<element signature="e#30189#30613#0#PHP" expanded="false" />
<element signature="e#30618#31229#0#PHP" expanded="false" />
<element signature="e#31235#31731#0#PHP" expanded="false" />
<element signature="e#31736#35394#0#PHP" expanded="false" />
<element signature="e#32548#33675#0#PHP" expanded="false" />
<element signature="e#35400#35684#0#PHP" expanded="false" />
<element signature="e#35689#36368#0#PHP" expanded="false" />
<element signature="e#36389#36708#0#PHP" expanded="false" />
<element signature="e#36714#37122#0#PHP" expanded="false" />
<element signature="e#37128#37887#0#PHP" expanded="false" />
<element signature="e#37906#38770#0#PHP" expanded="false" />
<element signature="e#38796#39196#0#PHP" expanded="false" />
<element signature="e#39219#39792#0#PHP" expanded="false" />
<element signature="e#39815#40625#0#PHP" expanded="false" />
<element signature="e#40631#41230#0#PHP" expanded="false" />
<element signature="e#41235#42199#0#PHP" expanded="false" />
<element signature="e#42205#42872#0#PHP" expanded="false" />
<element signature="e#42877#43918#0#PHP" expanded="false" />
<element signature="e#43924#44587#0#PHP" expanded="false" />
<element signature="e#44592#45619#0#PHP" expanded="false" />
<element signature="e#45626#46057#0#PHP" expanded="false" />
<element signature="e#46062#46640#0#PHP" expanded="false" />
<element signature="e#46646#47075#0#PHP" expanded="false" />
<element signature="e#47080#47682#0#PHP" expanded="false" />
<element signature="e#47688#48115#0#PHP" expanded="false" />
<element signature="e#48120#48686#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="SubscribeController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
<caret line="103" column="0" lean-forward="true" selection-start-line="103" selection-start-column="0" selection-end-line="103" selection-end-column="0" />
<folding>
<element signature="e#305#577#0#PHP" expanded="false" />
<element signature="e#583#854#0#PHP" expanded="false" />
<element signature="e#859#1113#0#PHP" expanded="false" />
<element signature="e#1119#1594#0#PHP" expanded="false" />
<element signature="e#1599#2490#0#PHP" expanded="false" />
<element signature="e#2497#2911#0#PHP" expanded="false" />
<element signature="e#2916#3386#0#PHP" expanded="false" />
<element signature="e#3393#3889#0#PHP" expanded="false" />
<element signature="e#3894#4961#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="630">
<caret line="397" column="31" lean-forward="false" selection-start-line="397" selection-start-column="31" selection-end-line="397" selection-end-column="31" />
<state relative-caret-position="155">
<caret line="184" column="7" lean-forward="true" selection-start-line="184" selection-start-column="7" selection-end-line="184" selection-end-column="7" />
<folding>
<element signature="e#411#604#0#PHP" expanded="false" />
<element signature="e#609#825#0#PHP" expanded="false" />
... ... @@ -140,22 +40,22 @@
<element signature="e#2322#2530#0#PHP" expanded="false" />
<element signature="e#2536#3043#0#PHP" expanded="false" />
<element signature="e#3048#3566#0#PHP" expanded="false" />
<element signature="e#3572#4084#0#PHP" expanded="false" />
<element signature="e#4089#4652#0#PHP" expanded="false" />
<element signature="e#4658#5248#0#PHP" expanded="false" />
<element signature="e#5253#6299#0#PHP" expanded="false" />
<element signature="e#6305#6623#0#PHP" expanded="false" />
<element signature="e#6628#7004#0#PHP" expanded="false" />
<element signature="e#7010#7365#0#PHP" expanded="false" />
<element signature="e#7370#7779#0#PHP" expanded="false" />
<element signature="e#7785#8170#0#PHP" expanded="false" />
<element signature="e#8175#8846#0#PHP" expanded="false" />
<element signature="e#8852#9298#0#PHP" expanded="false" />
<element signature="e#9303#10154#0#PHP" expanded="false" />
<element signature="e#10160#10430#0#PHP" expanded="false" />
<element signature="e#10435#10911#0#PHP" expanded="false" />
<element signature="e#10917#11547#0#PHP" expanded="false" />
<element signature="e#11552#13417#0#PHP" expanded="false" />
<element signature="e#3572#4018#0#PHP" expanded="false" />
<element signature="e#4023#4547#0#PHP" expanded="false" />
<element signature="e#4553#5143#0#PHP" expanded="false" />
<element signature="e#5148#6194#0#PHP" expanded="false" />
<element signature="e#6200#6518#0#PHP" expanded="false" />
<element signature="e#6523#6899#0#PHP" expanded="false" />
<element signature="e#6905#7260#0#PHP" expanded="false" />
<element signature="e#7265#7674#0#PHP" expanded="false" />
<element signature="e#7680#8065#0#PHP" expanded="false" />
<element signature="e#8070#8741#0#PHP" expanded="false" />
<element signature="e#8747#9193#0#PHP" expanded="false" />
<element signature="e#9198#10049#0#PHP" expanded="false" />
<element signature="e#10055#10325#0#PHP" expanded="false" />
<element signature="e#10330#10806#0#PHP" expanded="false" />
<element signature="e#10812#11442#0#PHP" expanded="false" />
<element signature="e#11447#13312#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -164,13 +64,16 @@
<file leaf-file-name="HomeController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="249">
<caret line="374" column="34" lean-forward="false" selection-start-line="374" selection-start-column="34" selection-end-line="374" selection-end-column="34" />
<state relative-caret-position="130">
<caret line="102" column="6" lean-forward="false" selection-start-line="102" selection-start-column="6" selection-end-line="102" selection-end-column="6" />
<folding>
<element signature="e#3168#3696#0#PHP" expanded="false" />
<element signature="e#3701#4697#0#PHP" expanded="false" />
<element signature="e#4703#5016#0#PHP" expanded="false" />
<element signature="e#5021#5396#0#PHP" expanded="false" />
<element signature="e#3070#3598#0#PHP" expanded="false" />
<element signature="e#3603#4599#0#PHP" expanded="false" />
<element signature="e#4605#4918#0#PHP" expanded="false" />
<element signature="e#4923#5298#0#PHP" expanded="false" />
<element signature="e#5304#5656#0#PHP" expanded="false" />
<element signature="e#9195#9745#0#PHP" expanded="false" />
<element signature="e#9750#11543#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -265,8 +168,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="210" />
<option name="y" value="58" />
<option name="x" value="283" />
<option name="y" value="56" />
<option name="width" value="1618" />
<option name="height" value="1092" />
</component>
... ... @@ -285,6 +188,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scratches" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
... ... @@ -311,11 +215,36 @@
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="qiniu" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="qiniu" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="php-sdk" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
... ... @@ -437,27 +366,31 @@
<workItem from="1576498945104" duration="2021000" />
<workItem from="1576501257741" duration="90000" />
<workItem from="1576549607137" duration="1339000" />
<workItem from="1576722212421" duration="195000" />
<workItem from="1576722212421" duration="408000" />
<workItem from="1576910540399" duration="190000" />
<workItem from="1576910858540" duration="1077000" />
<workItem from="1576913187617" duration="921000" />
<workItem from="1577063593250" duration="62000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="579577000" />
<option name="totallyTimeSpent" value="582040000" />
</component>
<component name="ToolWindowManager">
<frame x="210" y="58" width="1618" height="1092" extended-state="1" />
<frame x="283" y="56" width="1618" height="1092" extended-state="1" />
<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.20667523" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2169448" sideWeight="0.5" order="0" 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.33" sideWeight="0.5" order="6" 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="7" 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.32982457" sideWeight="0.5" order="3" 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="2" 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="7" 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="2" 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="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25086308" sideWeight="0.5" order="7" 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="3" 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="2" 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="3" 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="4" 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="0" 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="0" side_tool="false" content_ui="tabs" />
... ... @@ -494,25 +427,11 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<option name="time" value="18" />
<option name="time" value="19" />
</breakpoint-manager>
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="302">
<caret line="106" column="70" lean-forward="true" selection-start-line="106" selection-start-column="19" selection-end-line="106" selection-end-column="70" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="383">
<caret line="96" column="70" lean-forward="true" selection-start-line="96" selection-start-column="70" selection-end-line="96" selection-end-column="70" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/SubhomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
... ... @@ -822,34 +741,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="556">
<caret line="456" column="5" lean-forward="false" selection-start-line="456" selection-start-column="5" selection-end-line="456" selection-end-column="5" />
<folding>
<element signature="e#5324#5779#0#PHP" expanded="false" />
<element signature="e#5784#6508#0#PHP" expanded="false" />
<element signature="e#6514#6857#0#PHP" expanded="false" />
<element signature="e#6862#7343#0#PHP" expanded="false" />
<element signature="e#7349#7640#0#PHP" expanded="false" />
<element signature="e#7645#7996#0#PHP" expanded="false" />
<element signature="e#8002#8355#0#PHP" expanded="false" />
<element signature="e#8360#8765#0#PHP" expanded="false" />
<element signature="e#8771#9154#0#PHP" expanded="false" />
<element signature="e#9159#9826#0#PHP" expanded="false" />
<element signature="e#9832#10276#0#PHP" expanded="false" />
<element signature="e#10281#11128#0#PHP" expanded="false" />
<element signature="e#11134#11402#0#PHP" expanded="false" />
<element signature="e#11407#11879#0#PHP" expanded="false" />
<element signature="e#11885#12191#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="911">
<caret line="1143" column="14" lean-forward="true" selection-start-line="1143" selection-start-column="14" selection-end-line="1143" selection-end-column="14" />
<state relative-caret-position="2055">
<caret line="1143" column="14" lean-forward="false" selection-start-line="1143" selection-start-column="14" selection-end-line="1143" selection-end-column="14" />
<folding>
<element signature="e#131#169#0#PHP" expanded="true" />
<element signature="e#366#791#0#PHP" expanded="false" />
... ... @@ -925,7 +820,7 @@
<entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
<caret line="103" column="0" lean-forward="true" selection-start-line="103" selection-start-column="0" selection-end-line="103" selection-end-column="0" />
<caret line="103" column="0" lean-forward="false" selection-start-line="103" selection-start-column="0" selection-end-line="103" selection-end-column="0" />
<folding>
<element signature="e#305#577#0#PHP" expanded="false" />
<element signature="e#583#854#0#PHP" expanded="false" />
... ... @@ -940,10 +835,56 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4455">
<caret line="457" column="0" lean-forward="true" selection-start-line="457" selection-start-column="0" selection-end-line="457" selection-end-column="0" />
<folding>
<element signature="e#5324#5779#0#PHP" expanded="false" />
<element signature="e#5784#6508#0#PHP" expanded="false" />
<element signature="e#6514#6857#0#PHP" expanded="false" />
<element signature="e#6862#7343#0#PHP" expanded="false" />
<element signature="e#7349#7640#0#PHP" expanded="false" />
<element signature="e#7645#7996#0#PHP" expanded="false" />
<element signature="e#8002#8355#0#PHP" expanded="false" />
<element signature="e#8360#8765#0#PHP" expanded="false" />
<element signature="e#8771#9154#0#PHP" expanded="false" />
<element signature="e#9159#9826#0#PHP" expanded="false" />
<element signature="e#9832#10276#0#PHP" expanded="false" />
<element signature="e#10281#11128#0#PHP" expanded="false" />
<element signature="e#11134#11402#0#PHP" expanded="false" />
<element signature="e#11407#11879#0#PHP" expanded="false" />
<element signature="e#11885#12191#0#PHP" expanded="false" />
<element signature="e#12196#13839#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/vendor/qiniu/php-sdk/README.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="375">
<caret line="15" column="2" lean-forward="false" selection-start-line="15" selection-start-column="2" selection-end-line="15" selection-end-column="32" />
<folding />
</first_editor>
<second_editor />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/lib/Storage.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="855">
<caret line="105" column="36" lean-forward="false" selection-start-line="105" selection-start-column="36" selection-end-line="105" selection-end-column="36" />
<folding>
<element signature="e#867#1785#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="630">
<caret line="397" column="31" lean-forward="false" selection-start-line="397" selection-start-column="31" selection-end-line="397" selection-end-column="31" />
<state relative-caret-position="155">
<caret line="184" column="7" lean-forward="true" selection-start-line="184" selection-start-column="7" selection-end-line="184" selection-end-column="7" />
<folding>
<element signature="e#411#604#0#PHP" expanded="false" />
<element signature="e#609#825#0#PHP" expanded="false" />
... ... @@ -953,35 +894,38 @@
<element signature="e#2322#2530#0#PHP" expanded="false" />
<element signature="e#2536#3043#0#PHP" expanded="false" />
<element signature="e#3048#3566#0#PHP" expanded="false" />
<element signature="e#3572#4084#0#PHP" expanded="false" />
<element signature="e#4089#4652#0#PHP" expanded="false" />
<element signature="e#4658#5248#0#PHP" expanded="false" />
<element signature="e#5253#6299#0#PHP" expanded="false" />
<element signature="e#6305#6623#0#PHP" expanded="false" />
<element signature="e#6628#7004#0#PHP" expanded="false" />
<element signature="e#7010#7365#0#PHP" expanded="false" />
<element signature="e#7370#7779#0#PHP" expanded="false" />
<element signature="e#7785#8170#0#PHP" expanded="false" />
<element signature="e#8175#8846#0#PHP" expanded="false" />
<element signature="e#8852#9298#0#PHP" expanded="false" />
<element signature="e#9303#10154#0#PHP" expanded="false" />
<element signature="e#10160#10430#0#PHP" expanded="false" />
<element signature="e#10435#10911#0#PHP" expanded="false" />
<element signature="e#10917#11547#0#PHP" expanded="false" />
<element signature="e#11552#13417#0#PHP" expanded="false" />
<element signature="e#3572#4018#0#PHP" expanded="false" />
<element signature="e#4023#4547#0#PHP" expanded="false" />
<element signature="e#4553#5143#0#PHP" expanded="false" />
<element signature="e#5148#6194#0#PHP" expanded="false" />
<element signature="e#6200#6518#0#PHP" expanded="false" />
<element signature="e#6523#6899#0#PHP" expanded="false" />
<element signature="e#6905#7260#0#PHP" expanded="false" />
<element signature="e#7265#7674#0#PHP" expanded="false" />
<element signature="e#7680#8065#0#PHP" expanded="false" />
<element signature="e#8070#8741#0#PHP" expanded="false" />
<element signature="e#8747#9193#0#PHP" expanded="false" />
<element signature="e#9198#10049#0#PHP" expanded="false" />
<element signature="e#10055#10325#0#PHP" expanded="false" />
<element signature="e#10330#10806#0#PHP" expanded="false" />
<element signature="e#10812#11442#0#PHP" expanded="false" />
<element signature="e#11447#13312#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="249">
<caret line="374" column="34" lean-forward="false" selection-start-line="374" selection-start-column="34" selection-end-line="374" selection-end-column="34" />
<state relative-caret-position="130">
<caret line="102" column="6" lean-forward="false" selection-start-line="102" selection-start-column="6" selection-end-line="102" selection-end-column="6" />
<folding>
<element signature="e#3168#3696#0#PHP" expanded="false" />
<element signature="e#3701#4697#0#PHP" expanded="false" />
<element signature="e#4703#5016#0#PHP" expanded="false" />
<element signature="e#5021#5396#0#PHP" expanded="false" />
<element signature="e#3070#3598#0#PHP" expanded="false" />
<element signature="e#3603#4599#0#PHP" expanded="false" />
<element signature="e#4605#4918#0#PHP" expanded="false" />
<element signature="e#4923#5298#0#PHP" expanded="false" />
<element signature="e#5304#5656#0#PHP" expanded="false" />
<element signature="e#9195#9745#0#PHP" expanded="false" />
<element signature="e#9750#11543#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -101,7 +101,6 @@ class HomeController extends RestBaseController
* @url /index/Home/homeDetail
* @method GET
*
* @header name:XX-Token require:1 default: desc:token
*
* @param name:id type:int require:1 other: desc:家政服务公司ID
*
... ... @@ -117,7 +116,6 @@ class HomeController extends RestBaseController
*/
public function homeDetail()
{
$user_id = $this->getUserId();
$id = $this->request->param('id');
if(empty($id)){
$this->error(['code'=>40001,'msg'=>'缺少必要参数']);
... ...
... ... @@ -136,8 +136,6 @@ class ShopgoodsController extends RestBaseController
* @url /index/Shopgoods/goodsDetail
* @method GET
*
* @header name:XX-Token require:1 default: desc:token
*
* @param name:id type:int require:0 other: desc:商品ID
*
* @return id:商品ID
... ... @@ -152,7 +150,6 @@ class ShopgoodsController extends RestBaseController
*
*/
public function goodsDetail(){
$user_id = $this->getUserId();
$goods_id = $this->request->param('id',0,'intval');
if(empty($goods_id)){
$this -> error(['code'=>40005,'msg'=>'缺少必要参数']);
... ...