...
|
...
|
@@ -2,16 +2,8 @@ |
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/simpleboot3/index/user/login.html" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/ProjectController.php" afterPath="$PROJECT_DIR$/app/admin/controller/ProjectController.php" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/SubscribeController.php" afterPath="$PROJECT_DIR$/app/admin/controller/SubscribeController.php" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/config.php" afterPath="$PROJECT_DIR$/app/config.php" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/index/controller/ShopgoodsController.php" afterPath="$PROJECT_DIR$/app/index/controller/ShopgoodsController.php" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/index/controller/UserController.php" afterPath="$PROJECT_DIR$/app/index/controller/UserController.php" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/extra/wechat.php" afterPath="$PROJECT_DIR$/app/extra/wechat.php" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="TRACKING_ENABLED" value="true" />
|
...
|
...
|
@@ -33,31 +25,44 @@ |
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
<file leaf-file-name="SubscribeController.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/app/admin/controller/SubscribeController.php">
|
|
|
<file leaf-file-name="UserController.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/app/index/controller/UserController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="311">
|
|
|
<caret line="32" column="9" lean-forward="false" selection-start-line="32" selection-start-column="9" selection-end-line="32" selection-end-column="9" />
|
|
|
<state relative-caret-position="325">
|
|
|
<caret line="18" column="24" lean-forward="true" selection-start-line="18" selection-start-column="24" selection-end-line="18" selection-end-column="24" />
|
|
|
<folding>
|
|
|
<element signature="e#130#170#0#PHP" expanded="true" />
|
|
|
<element signature="e#739#805#0#PHP" expanded="false" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="WeChatBaseController.php" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/WeChatBaseController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="560">
|
|
|
<caret line="214" column="14" lean-forward="true" selection-start-line="214" selection-start-column="14" selection-end-line="214" selection-end-column="14" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="config.php" pinned="false" current-in-tab="true">
|
|
|
<file leaf-file-name="config.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/app/config.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="585">
|
|
|
<caret line="232" column="43" lean-forward="true" selection-start-line="232" selection-start-column="43" selection-end-line="232" selection-end-column="43" />
|
|
|
<state relative-caret-position="1235">
|
|
|
<caret line="237" column="51" lean-forward="false" selection-start-line="237" selection-start-column="19" selection-end-line="237" selection-end-column="51" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html">
|
|
|
<file leaf-file-name="wechat.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/app/extra/wechat.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="975">
|
|
|
<caret line="39" column="42" lean-forward="false" selection-start-line="39" selection-start-column="42" selection-end-line="39" selection-end-column="42" />
|
|
|
<state relative-caret-position="400">
|
|
|
<caret line="22" column="11" lean-forward="true" selection-start-line="22" selection-start-column="11" selection-end-line="22" selection-end-column="11" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
...
|
...
|
@@ -78,8 +83,6 @@ |
|
|
<component name="IdeDocumentHistory">
|
|
|
<option name="CHANGED_PATHS">
|
|
|
<list>
|
|
|
<option value="$PROJECT_DIR$/app/admin/controller/SeverController.php" />
|
|
|
<option value="$PROJECT_DIR$/app/admin/controller/HomeController.php" />
|
|
|
<option value="$USER_HOME$/Desktop/Index.php" />
|
|
|
<option value="$PROJECT_DIR$/app/admin/controller/FeeController.php" />
|
|
|
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/fee/index.html" />
|
...
|
...
|
@@ -129,6 +132,8 @@ |
|
|
<option value="$PROJECT_DIR$/app/admin/controller/SubscribeController.php" />
|
|
|
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html" />
|
|
|
<option value="$PROJECT_DIR$/app/config.php" />
|
|
|
<option value="$PROJECT_DIR$/app/extra/wechat.php" />
|
|
|
<option value="$PROJECT_DIR$/simplewind/cmf/controller/WeChatBaseController.php" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
...
|
...
|
@@ -146,9 +151,9 @@ |
|
|
<sorting>DEFINITION_ORDER</sorting>
|
|
|
</component>
|
|
|
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
|
|
|
<component name="ProjectFrameBounds" extendedState="1">
|
|
|
<option name="x" value="265" />
|
|
|
<option name="y" value="38" />
|
|
|
<component name="ProjectFrameBounds">
|
|
|
<option name="x" value="323" />
|
|
|
<option name="y" value="33" />
|
|
|
<option name="width" value="1678" />
|
|
|
<option name="height" value="1097" />
|
|
|
</component>
|
...
|
...
|
@@ -179,6 +184,11 @@ |
|
|
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="config" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
</path>
|
|
|
</expand>
|
|
|
<select />
|
|
|
</subPane>
|
...
|
...
|
@@ -251,15 +261,15 @@ |
|
|
<workItem from="1573450754427" duration="9613000" />
|
|
|
<workItem from="1573463816109" duration="4867000" />
|
|
|
<workItem from="1573517804403" duration="18784000" />
|
|
|
<workItem from="1573542205740" duration="500000" />
|
|
|
<workItem from="1573542205740" duration="1457000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
<option name="totallyTimeSpent" value="203127000" />
|
|
|
<option name="totallyTimeSpent" value="204084000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="265" y="38" width="1678" height="1097" extended-state="1" />
|
|
|
<frame x="323" y="33" width="1678" height="1097" extended-state="0" />
|
|
|
<editor active="true" />
|
|
|
<layout>
|
|
|
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19839308" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
...
|
...
|
@@ -313,13 +323,6 @@ |
|
|
<watches-manager />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
<entry file="file://$PROJECT_DIR$/app/portal/controller/TagController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="0">
|
|
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/portal/controller/SearchController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="0">
|
...
|
...
|
@@ -377,13 +380,6 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/extra/wechat.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="0">
|
|
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/install/controller/IndexController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="-150">
|
...
|
...
|
@@ -550,6 +546,7 @@ |
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="300">
|
|
|
<caret line="21" column="41" lean-forward="true" selection-start-line="21" selection-start-column="41" selection-end-line="21" selection-end-column="41" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -557,6 +554,7 @@ |
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="332">
|
|
|
<caret line="72" column="1" lean-forward="true" selection-start-line="72" selection-start-column="1" selection-end-line="72" selection-end-column="1" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -574,17 +572,18 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/WeChatBaseController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="-3000">
|
|
|
<caret line="18" column="6" lean-forward="false" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="6" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="300">
|
|
|
<caret line="26" column="12" lean-forward="true" selection-start-line="26" selection-start-column="12" selection-end-line="26" selection-end-column="12" />
|
|
|
<folding>
|
|
|
<element signature="e#391#495#0#PHP" expanded="false" />
|
|
|
<element signature="e#514#722#0#PHP" expanded="false" />
|
|
|
<element signature="e#739#1625#0#PHP" expanded="false" />
|
|
|
<element signature="e#1643#1843#0#PHP" expanded="false" />
|
|
|
<element signature="e#1861#2257#0#PHP" expanded="false" />
|
|
|
<element signature="e#2275#2663#0#PHP" expanded="false" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -595,13 +594,6 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/index/controller/UserController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="325">
|
|
|
<caret line="22" column="45" lean-forward="true" selection-start-line="22" selection-start-column="45" selection-end-line="22" selection-end-column="45" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/index/user/login.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="474">
|
...
|
...
|
@@ -649,26 +641,61 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/admin/controller/SubscribeController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="311">
|
|
|
<caret line="32" column="9" lean-forward="false" selection-start-line="32" selection-start-column="9" selection-end-line="32" selection-end-column="9" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="975">
|
|
|
<state relative-caret-position="110">
|
|
|
<caret line="39" column="42" lean-forward="false" selection-start-line="39" selection-start-column="42" selection-end-line="39" selection-end-column="42" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/admin/controller/SubscribeController.php">
|
|
|
<entry file="file://$PROJECT_DIR$/app/index/controller/UserController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="311">
|
|
|
<caret line="32" column="9" lean-forward="false" selection-start-line="32" selection-start-column="9" selection-end-line="32" selection-end-column="9" />
|
|
|
<state relative-caret-position="325">
|
|
|
<caret line="18" column="24" lean-forward="true" selection-start-line="18" selection-start-column="24" selection-end-line="18" selection-end-column="24" />
|
|
|
<folding>
|
|
|
<element signature="e#130#170#0#PHP" expanded="true" />
|
|
|
<element signature="e#739#805#0#PHP" expanded="false" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/config/doc.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="0">
|
|
|
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/extra/wechat.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="400">
|
|
|
<caret line="22" column="11" lean-forward="true" selection-start-line="22" selection-start-column="11" selection-end-line="22" selection-end-column="11" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/config.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="585">
|
|
|
<caret line="232" column="43" lean-forward="true" selection-start-line="232" selection-start-column="43" selection-end-line="232" selection-end-column="43" />
|
|
|
<state relative-caret-position="1235">
|
|
|
<caret line="237" column="51" lean-forward="false" selection-start-line="237" selection-start-column="19" selection-end-line="237" selection-end-column="51" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/WeChatBaseController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="560">
|
|
|
<caret line="214" column="14" lean-forward="true" selection-start-line="214" selection-start-column="14" selection-end-line="214" selection-end-column="14" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
...
|
...
|
|