|
|
|
|
@ -1,7 +1,16 @@
|
|
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
|
|
<project version="4">
|
|
|
|
|
<component name="ChangeListManager">
|
|
|
|
|
<list default="true" id="67467e55-57d9-41b3-ba6d-c3a7264859f8" name="Default Changelist" comment="" />
|
|
|
|
|
<list default="true" id="67467e55-57d9-41b3-ba6d-c3a7264859f8" name="Default Changelist" comment="">
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/data/ib_buffer_pool" beforeDir="false" afterPath="$PROJECT_DIR$/data/ib_buffer_pool" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/data/ib_logfile0" beforeDir="false" afterPath="$PROJECT_DIR$/data/ib_logfile0" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/data/ibdata1" beforeDir="false" afterPath="$PROJECT_DIR$/data/ibdata1" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/data/ibtmp1" beforeDir="false" afterPath="$PROJECT_DIR$/data/ibtmp1" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/docker-compose.yml" beforeDir="false" afterPath="$PROJECT_DIR$/docker-compose.yml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/nginx/conf/conf.d/default.conf" beforeDir="false" afterPath="$PROJECT_DIR$/nginx/conf/conf.d/default.conf" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/php/etc/php-fpm.d/www.conf" beforeDir="false" afterPath="$PROJECT_DIR$/php/etc/php-fpm.d/www.conf" afterDir="false" />
|
|
|
|
|
</list>
|
|
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
|
|
@ -9,30 +18,30 @@
|
|
|
|
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
|
|
|
|
</component>
|
|
|
|
|
<component name="FileEditorManager">
|
|
|
|
|
<leaf>
|
|
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/docker-compose.yml">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
<state relative-caret-position="210">
|
|
|
|
|
<caret line="14" column="6" selection-start-line="14" selection-start-column="6" selection-end-line="14" selection-end-column="6" />
|
|
|
|
|
<state relative-caret-position="45">
|
|
|
|
|
<caret line="3" column="24" selection-start-line="3" selection-start-column="24" selection-end-line="3" selection-end-column="24" />
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
|
</file>
|
|
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
|
|
<file pinned="false" current-in-tab="true">
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/nginx/conf/conf.d/default.conf">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
<state relative-caret-position="314">
|
|
|
|
|
<caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
|
|
|
|
|
<state relative-caret-position="325">
|
|
|
|
|
<caret line="33" column="56" selection-start-line="33" selection-start-column="56" selection-end-line="33" selection-end-column="56" />
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
|
</file>
|
|
|
|
|
<file pinned="false" current-in-tab="true">
|
|
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/php/etc/php-fpm.d/www.conf">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
<state relative-caret-position="281">
|
|
|
|
|
<caret line="150" selection-start-line="150" selection-end-line="150" />
|
|
|
|
|
<state relative-caret-position="306">
|
|
|
|
|
<caret line="150" column="10" selection-start-line="150" selection-start-column="10" selection-end-line="150" selection-end-column="10" />
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
|
@ -78,29 +87,44 @@
|
|
|
|
|
<find>listen =</find>
|
|
|
|
|
</findStrings>
|
|
|
|
|
</component>
|
|
|
|
|
<component name="Git.Settings">
|
|
|
|
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
|
|
|
</component>
|
|
|
|
|
<component name="IdeDocumentHistory">
|
|
|
|
|
<option name="CHANGED_PATHS">
|
|
|
|
|
<list>
|
|
|
|
|
<option value="$PROJECT_DIR$/wwwroot/index.html" />
|
|
|
|
|
<option value="$PROJECT_DIR$/php/Dockerfile" />
|
|
|
|
|
<option value="$PROJECT_DIR$/wwwroot/index.php" />
|
|
|
|
|
<option value="$PROJECT_DIR$/php/etc/php-fpm.d/www.conf" />
|
|
|
|
|
<option value="$PROJECT_DIR$/docker-compose.yml" />
|
|
|
|
|
<option value="$PROJECT_DIR$/nginx/conf/conf.d/default.conf" />
|
|
|
|
|
<option value="$PROJECT_DIR$/php/etc/php-fpm.d/www.conf" />
|
|
|
|
|
</list>
|
|
|
|
|
</option>
|
|
|
|
|
</component>
|
|
|
|
|
<component name="ProjectFrameBounds" fullScreen="true">
|
|
|
|
|
<option name="y" value="23" />
|
|
|
|
|
<option name="width" value="1280" />
|
|
|
|
|
<option name="height" value="800" />
|
|
|
|
|
<option name="height" value="709" />
|
|
|
|
|
</component>
|
|
|
|
|
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
|
|
|
|
<component name="ProjectView">
|
|
|
|
|
<navigator proportions="" version="1">
|
|
|
|
|
<foldersAlwaysOnTop value="true" />
|
|
|
|
|
</navigator>
|
|
|
|
|
<panes>
|
|
|
|
|
<pane id="ProjectPane" />
|
|
|
|
|
<pane id="Scope" />
|
|
|
|
|
<pane id="ProjectPane">
|
|
|
|
|
<subPane>
|
|
|
|
|
<expand>
|
|
|
|
|
<path>
|
|
|
|
|
<item name="docker" type="b2602c69:ProjectViewProjectNode" />
|
|
|
|
|
<item name="docker" type="462c0819:PsiDirectoryNode" />
|
|
|
|
|
</path>
|
|
|
|
|
</expand>
|
|
|
|
|
<select />
|
|
|
|
|
</subPane>
|
|
|
|
|
</pane>
|
|
|
|
|
</panes>
|
|
|
|
|
</component>
|
|
|
|
|
<component name="PropertiesComponent">
|
|
|
|
|
@ -132,18 +156,20 @@
|
|
|
|
|
<option name="number" value="Default" />
|
|
|
|
|
<option name="presentableId" value="Default" />
|
|
|
|
|
<updated>1548635626798</updated>
|
|
|
|
|
<workItem from="1548635628371" duration="17079000" />
|
|
|
|
|
<workItem from="1548635628371" duration="17241000" />
|
|
|
|
|
<workItem from="1548671830419" duration="481000" />
|
|
|
|
|
</task>
|
|
|
|
|
<servers />
|
|
|
|
|
</component>
|
|
|
|
|
<component name="TimeTrackingManager">
|
|
|
|
|
<option name="totallyTimeSpent" value="17079000" />
|
|
|
|
|
<option name="totallyTimeSpent" value="17722000" />
|
|
|
|
|
</component>
|
|
|
|
|
<component name="ToolWindowManager">
|
|
|
|
|
<frame x="0" y="0" width="1280" height="800" extended-state="0" />
|
|
|
|
|
<editor active="true" />
|
|
|
|
|
<layout>
|
|
|
|
|
<window_info id="Favorites" order="0" side_tool="true" />
|
|
|
|
|
<window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.24959612" />
|
|
|
|
|
<window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.2536349" />
|
|
|
|
|
<window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" />
|
|
|
|
|
<window_info anchor="bottom" id="Database Changes" order="1" />
|
|
|
|
|
<window_info anchor="bottom" id="Version Control" order="2" />
|
|
|
|
|
@ -156,11 +182,11 @@
|
|
|
|
|
<window_info anchor="bottom" id="Cvs" order="9" weight="0.25" />
|
|
|
|
|
<window_info anchor="bottom" id="Inspection" order="10" weight="0.4" />
|
|
|
|
|
<window_info anchor="bottom" id="TODO" order="11" />
|
|
|
|
|
<window_info anchor="bottom" id="Terminal" order="12" sideWeight="0.49919224" visible="true" weight="0.32876712" />
|
|
|
|
|
<window_info anchor="right" id="Database" />
|
|
|
|
|
<window_info active="true" anchor="bottom" id="Terminal" order="12" sideWeight="0.49919224" visible="true" weight="0.28767124" />
|
|
|
|
|
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
|
|
|
|
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
|
|
|
|
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
|
|
|
|
<window_info anchor="right" id="Database" order="3" />
|
|
|
|
|
</layout>
|
|
|
|
|
</component>
|
|
|
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
|
|
|
@ -174,26 +200,12 @@
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/nginx/conf/koi-utf">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
|
|
|
</entry>
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/nginx/conf/koi-win">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
|
|
|
</entry>
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/nginx/conf/fastcgi_params">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
|
|
|
</entry>
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/nginx/conf/mime.types">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
<state relative-caret-position="-960" />
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/nginx/conf/win-utf">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
|
|
|
</entry>
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/nginx/conf/uwsgi_params">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
|
|
|
</entry>
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/nginx/conf/koi-utf" />
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/nginx/conf/koi-win" />
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/nginx/conf/fastcgi_params" />
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/nginx/conf/mime.types" />
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/nginx/conf/win-utf" />
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/nginx/conf/uwsgi_params" />
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/wwwroot/index.php">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
<state relative-caret-position="15">
|
|
|
|
|
@ -201,14 +213,8 @@
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/php/conf/php-fpm.conf">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
|
|
|
</entry>
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/php/conf/php.ini">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
<state relative-caret-position="-1974" />
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/php/conf/php-fpm.conf" />
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/php/conf/php.ini" />
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/php/etc/php-fpm.conf">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
|
|
|
</entry>
|
|
|
|
|
@ -222,6 +228,13 @@
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/php/Dockerfile">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
<state relative-caret-position="45">
|
|
|
|
|
<caret line="3" selection-start-line="3" selection-end-line="3" />
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/nginx/Dockerfile">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
<state>
|
|
|
|
|
@ -236,31 +249,24 @@
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/php/Dockerfile">
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/php/etc/php-fpm.d/www.conf">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
<state relative-caret-position="45">
|
|
|
|
|
<caret line="3" selection-start-line="3" selection-end-line="3" />
|
|
|
|
|
<state relative-caret-position="306">
|
|
|
|
|
<caret line="150" column="10" selection-start-line="150" selection-start-column="10" selection-end-line="150" selection-end-column="10" />
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/docker-compose.yml">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
<state relative-caret-position="210">
|
|
|
|
|
<caret line="14" column="6" selection-start-line="14" selection-start-column="6" selection-end-line="14" selection-end-column="6" />
|
|
|
|
|
<state relative-caret-position="45">
|
|
|
|
|
<caret line="3" column="24" selection-start-line="3" selection-start-column="24" selection-end-line="3" selection-end-column="24" />
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/nginx/conf/conf.d/default.conf">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
<state relative-caret-position="314">
|
|
|
|
|
<caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" />
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/php/etc/php-fpm.d/www.conf">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
<state relative-caret-position="281">
|
|
|
|
|
<caret line="150" selection-start-line="150" selection-end-line="150" />
|
|
|
|
|
<state relative-caret-position="325">
|
|
|
|
|
<caret line="33" column="56" selection-start-line="33" selection-start-column="56" selection-end-line="33" selection-end-column="56" />
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
|
|