...
|
...
|
@@ -3,7 +3,6 @@ |
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
|
|
|
<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" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
...
|
...
|
@@ -26,11 +25,11 @@ |
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
<file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="false">
|
|
|
<file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<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" />
|
|
|
<state relative-caret-position="406">
|
|
|
<caret line="185" column="29" lean-forward="false" selection-start-line="185" selection-start-column="29" selection-end-line="185" selection-end-column="29" />
|
|
|
<folding>
|
|
|
<element signature="e#411#604#0#PHP" expanded="false" />
|
|
|
<element signature="e#609#825#0#PHP" expanded="false" />
|
...
|
...
|
@@ -43,37 +42,19 @@ |
|
|
<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>
|
|
|
</file>
|
|
|
<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="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#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" />
|
|
|
<element signature="e#5148#6155#0#PHP" expanded="false" />
|
|
|
<element signature="e#6161#6479#0#PHP" expanded="false" />
|
|
|
<element signature="e#6484#6860#0#PHP" expanded="false" />
|
|
|
<element signature="e#6866#7221#0#PHP" expanded="false" />
|
|
|
<element signature="e#7226#7635#0#PHP" expanded="false" />
|
|
|
<element signature="e#7641#8026#0#PHP" expanded="false" />
|
|
|
<element signature="e#8031#8702#0#PHP" expanded="false" />
|
|
|
<element signature="e#8708#9154#0#PHP" expanded="false" />
|
|
|
<element signature="e#9159#10010#0#PHP" expanded="false" />
|
|
|
<element signature="e#10016#10286#0#PHP" expanded="false" />
|
|
|
<element signature="e#10291#10767#0#PHP" expanded="false" />
|
|
|
<element signature="e#10773#11403#0#PHP" expanded="false" />
|
|
|
<element signature="e#11408#13273#0#PHP" expanded="false" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
...
|
...
|
@@ -148,8 +129,8 @@ |
|
|
<option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />
|
|
|
<option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
|
|
|
<option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />
|
|
|
<option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
|
|
|
<option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
|
|
|
<option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
...
|
...
|
@@ -188,8 +169,6 @@ |
|
|
<foldersAlwaysOnTop value="true" />
|
|
|
</navigator>
|
|
|
<panes>
|
|
|
<pane id="Scratches" />
|
|
|
<pane id="Scope" />
|
|
|
<pane id="ProjectPane">
|
|
|
<subPane>
|
|
|
<expand>
|
...
|
...
|
@@ -245,6 +224,8 @@ |
|
|
<select />
|
|
|
</subPane>
|
|
|
</pane>
|
|
|
<pane id="Scope" />
|
|
|
<pane id="Scratches" />
|
|
|
</panes>
|
|
|
</component>
|
|
|
<component name="PropertiesComponent">
|
...
|
...
|
@@ -370,27 +351,28 @@ |
|
|
<workItem from="1576910540399" duration="190000" />
|
|
|
<workItem from="1576910858540" duration="1077000" />
|
|
|
<workItem from="1576913187617" duration="921000" />
|
|
|
<workItem from="1577063593250" duration="62000" />
|
|
|
<workItem from="1577063593250" duration="115000" />
|
|
|
<workItem from="1577063832311" duration="26000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
<option name="totallyTimeSpent" value="582040000" />
|
|
|
<option name="totallyTimeSpent" value="582119000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<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.2169448" 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.2195122" 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="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="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="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="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="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="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" />
|
...
|
...
|
@@ -881,10 +863,26 @@ |
|
|
</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="655">
|
|
|
<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#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>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<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" />
|
|
|
<state relative-caret-position="406">
|
|
|
<caret line="185" column="29" lean-forward="false" selection-start-line="185" selection-start-column="29" selection-end-line="185" selection-end-column="29" />
|
|
|
<folding>
|
|
|
<element signature="e#411#604#0#PHP" expanded="false" />
|
|
|
<element signature="e#609#825#0#PHP" expanded="false" />
|
...
|
...
|
@@ -897,35 +895,19 @@ |
|
|
<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="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#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" />
|
|
|
<element signature="e#5148#6155#0#PHP" expanded="false" />
|
|
|
<element signature="e#6161#6479#0#PHP" expanded="false" />
|
|
|
<element signature="e#6484#6860#0#PHP" expanded="false" />
|
|
|
<element signature="e#6866#7221#0#PHP" expanded="false" />
|
|
|
<element signature="e#7226#7635#0#PHP" expanded="false" />
|
|
|
<element signature="e#7641#8026#0#PHP" expanded="false" />
|
|
|
<element signature="e#8031#8702#0#PHP" expanded="false" />
|
|
|
<element signature="e#8708#9154#0#PHP" expanded="false" />
|
|
|
<element signature="e#9159#10010#0#PHP" expanded="false" />
|
|
|
<element signature="e#10016#10286#0#PHP" expanded="false" />
|
|
|
<element signature="e#10291#10767#0#PHP" expanded="false" />
|
|
|
<element signature="e#10773#11403#0#PHP" expanded="false" />
|
|
|
<element signature="e#11408#13273#0#PHP" expanded="false" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
...
|
...
|
|