...
|
...
|
@@ -2,6 +2,8 @@ |
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="73de7205-e736-4b59-941a-a54ab4506a41" name="Default" comment="">
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/tou.png" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/OtherController.php" afterPath="$PROJECT_DIR$/api/index/controller/OtherController.php" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
...
|
...
|
@@ -16,8 +18,8 @@ |
|
|
<file leaf-file-name="OtherController.php" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="284">
|
|
|
<caret line="326" column="50" lean-forward="false" selection-start-line="326" selection-start-column="50" selection-end-line="326" selection-end-column="50" />
|
|
|
<state relative-caret-position="257">
|
|
|
<caret line="328" column="62" lean-forward="true" selection-start-line="328" selection-start-column="62" selection-end-line="328" selection-end-column="62" />
|
|
|
<folding>
|
|
|
<element signature="e#129#158#0#PHP" expanded="true" />
|
|
|
<element signature="e#344#512#0#PHP" expanded="false" />
|
...
|
...
|
@@ -36,12 +38,11 @@ |
|
|
<element signature="e#6020#6946#0#PHP" expanded="false" />
|
|
|
<element signature="e#6952#7256#0#PHP" expanded="false" />
|
|
|
<element signature="e#7261#7650#0#PHP" expanded="false" />
|
|
|
<element signature="e#10525#11316#0#PHP" expanded="false" />
|
|
|
<element signature="e#11336#12200#0#PHP" expanded="false" />
|
|
|
<element signature="e#12227#12627#0#PHP" expanded="false" />
|
|
|
<element signature="e#12651#13224#0#PHP" expanded="false" />
|
|
|
<element signature="e#13247#14057#0#PHP" expanded="false" />
|
|
|
<element signature="e#14064#15117#0#PHP" expanded="false" />
|
|
|
<element signature="e#10737#11528#0#PHP" expanded="false" />
|
|
|
<element signature="e#11548#12412#0#PHP" expanded="false" />
|
|
|
<element signature="e#12439#12839#0#PHP" expanded="false" />
|
|
|
<element signature="e#12863#13436#0#PHP" expanded="false" />
|
|
|
<element signature="e#13459#14269#0#PHP" expanded="false" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
...
|
...
|
@@ -127,8 +128,8 @@ |
|
|
</component>
|
|
|
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
|
|
|
<component name="ProjectFrameBounds">
|
|
|
<option name="x" value="61" />
|
|
|
<option name="y" value="77" />
|
|
|
<option name="x" value="-60" />
|
|
|
<option name="y" value="86" />
|
|
|
<option name="width" value="1868" />
|
|
|
<option name="height" value="1019" />
|
|
|
</component>
|
...
|
...
|
@@ -253,15 +254,15 @@ |
|
|
<workItem from="1569486627319" duration="2740000" />
|
|
|
<workItem from="1569494185536" duration="1054000" />
|
|
|
<workItem from="1569544728303" duration="25104000" />
|
|
|
<workItem from="1569716359574" duration="27168000" />
|
|
|
<workItem from="1569716359574" duration="28303000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
<option name="totallyTimeSpent" value="426159000" />
|
|
|
<option name="totallyTimeSpent" value="427294000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="61" y="77" width="1868" height="1019" extended-state="0" />
|
|
|
<frame x="-60" y="86" width="1868" height="1019" 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.18086283" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
...
|
...
|
@@ -296,7 +297,6 @@ |
|
|
<watches-manager />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
<entry file="file://$PROJECT_DIR$/api/index/controller/CommonController.php" />
|
|
|
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/statistic/index.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="126">
|
...
|
...
|
@@ -520,11 +520,6 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/public/bg.png">
|
|
|
<provider selected="true" editor-type-id="images">
|
|
|
<state />
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/api/index/controller/ResourceController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="224">
|
...
|
...
|
@@ -698,10 +693,20 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/public/bg.png">
|
|
|
<provider selected="true" editor-type-id="images">
|
|
|
<state />
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/public/tou.png">
|
|
|
<provider selected="true" editor-type-id="images">
|
|
|
<state />
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="284">
|
|
|
<caret line="326" column="50" lean-forward="false" selection-start-line="326" selection-start-column="50" selection-end-line="326" selection-end-column="50" />
|
|
|
<state relative-caret-position="257">
|
|
|
<caret line="328" column="62" lean-forward="true" selection-start-line="328" selection-start-column="62" selection-end-line="328" selection-end-column="62" />
|
|
|
<folding>
|
|
|
<element signature="e#129#158#0#PHP" expanded="true" />
|
|
|
<element signature="e#344#512#0#PHP" expanded="false" />
|
...
|
...
|
@@ -720,12 +725,11 @@ |
|
|
<element signature="e#6020#6946#0#PHP" expanded="false" />
|
|
|
<element signature="e#6952#7256#0#PHP" expanded="false" />
|
|
|
<element signature="e#7261#7650#0#PHP" expanded="false" />
|
|
|
<element signature="e#10525#11316#0#PHP" expanded="false" />
|
|
|
<element signature="e#11336#12200#0#PHP" expanded="false" />
|
|
|
<element signature="e#12227#12627#0#PHP" expanded="false" />
|
|
|
<element signature="e#12651#13224#0#PHP" expanded="false" />
|
|
|
<element signature="e#13247#14057#0#PHP" expanded="false" />
|
|
|
<element signature="e#14064#15117#0#PHP" expanded="false" />
|
|
|
<element signature="e#10737#11528#0#PHP" expanded="false" />
|
|
|
<element signature="e#11548#12412#0#PHP" expanded="false" />
|
|
|
<element signature="e#12439#12839#0#PHP" expanded="false" />
|
|
|
<element signature="e#12863#13436#0#PHP" expanded="false" />
|
|
|
<element signature="e#13459#14269#0#PHP" expanded="false" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
...
|
...
|
|