|
@@ -2,13 +2,11 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="41dc853c-f418-44c7-ba5d-2164f3f0373a" name="Default" comment="">
|
|
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/business/.env" />
|
|
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/business/docker-compose-crowd.yml" />
|
|
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/business/entity/README.md" />
|
|
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/business/load-crowd-images.sh" />
|
|
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/business/start-containers-multi.sh" />
|
|
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/business/stop-containers-multi.sh" />
|
|
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/shell/oss.sh" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/crowd/deploy.sh" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/crowd/nginx/nginx.conf" />
|
|
|
+ <change type="MOVED" beforePath="$PROJECT_DIR$/business/docker-compose-crowd.yml" afterPath="$PROJECT_DIR$/business/docker-compose-multi.yml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/business/load-crowd-images.sh" afterPath="$PROJECT_DIR$/business/load-crowd-images.sh" />
|
|
|
</list>
|
|
|
<ignored path="$PROJECT_DIR$/out/" />
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
@@ -20,11 +18,41 @@
|
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
- <file leaf-file-name="start-containers-multi.sh" pinned="false" current-in-tab="true">
|
|
|
- <entry file="file://$PROJECT_DIR$/business/start-containers-multi.sh">
|
|
|
+ <file leaf-file-name="nginx.conf" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/crowd/nginx/nginx.conf">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="195">
|
|
|
+ <caret line="13" column="1" lean-forward="false" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file leaf-file-name="docker-compose-multi.yml" pinned="false" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/business/docker-compose-multi.yml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="369">
|
|
|
+ <caret line="25" column="11" lean-forward="false" selection-start-line="25" selection-start-column="11" selection-end-line="25" selection-end-column="11" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file leaf-file-name=".env" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/business/.env">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="321">
|
|
|
+ <caret line="48" column="10" lean-forward="false" selection-start-line="48" selection-start-column="0" selection-end-line="48" selection-end-column="10" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file leaf-file-name="deploy.sh" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/crowd/deploy.sh">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="60">
|
|
|
- <caret line="4" column="48" lean-forward="false" selection-start-line="4" selection-start-column="48" selection-end-line="4" selection-end-column="48" />
|
|
|
+ <caret line="4" column="0" lean-forward="true" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
@@ -39,6 +67,12 @@
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
|
+ <component name="FindInProjectRecents">
|
|
|
+ <findStrings>
|
|
|
+ <find>FILE_STORE_BASE_PATH</find>
|
|
|
+ <find>CROWD_PATH</find>
|
|
|
+ </findStrings>
|
|
|
+ </component>
|
|
|
<component name="Git.Settings">
|
|
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
|
</component>
|
|
@@ -56,6 +90,8 @@
|
|
|
<option value="$PROJECT_DIR$/business/stop-containers-multi.sh" />
|
|
|
<option value="$PROJECT_DIR$/start-containers-multi.sh" />
|
|
|
<option value="$PROJECT_DIR$/business/load-crowd-images.sh" />
|
|
|
+ <option value="$PROJECT_DIR$/business/docker-compose-multi.yml" />
|
|
|
+ <option value="$PROJECT_DIR$/crowd/nginx/nginx.conf" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
@@ -89,7 +125,7 @@
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
|
|
|
- <component name="ProjectFrameBounds" extendedState="6" fullScreen="true">
|
|
|
+ <component name="ProjectFrameBounds" fullScreen="true">
|
|
|
<option name="y" value="23" />
|
|
|
<option name="width" value="1440" />
|
|
|
<option name="height" value="797" />
|
|
@@ -149,6 +185,7 @@
|
|
|
<foldersAlwaysOnTop value="true" />
|
|
|
</navigator>
|
|
|
<panes>
|
|
|
+ <pane id="AndroidView" />
|
|
|
<pane id="ProjectPane">
|
|
|
<subPane>
|
|
|
<expand>
|
|
@@ -170,6 +207,11 @@
|
|
|
<path>
|
|
|
<item name="crowd-private" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="crowd-private" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="crowd" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="crowd-private" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="crowd-private" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="shell" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
</expand>
|
|
@@ -179,7 +221,6 @@
|
|
|
<pane id="Scope" />
|
|
|
<pane id="Scratches" />
|
|
|
<pane id="PackagesPane" />
|
|
|
- <pane id="AndroidView" />
|
|
|
</panes>
|
|
|
</component>
|
|
|
<component name="PropertiesComponent">
|
|
@@ -190,16 +231,18 @@
|
|
|
<property name="nodejs_interpreter_path" value="/usr/local/bin/node" />
|
|
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
|
|
<property name="aspect.path.notification.shown" value="true" />
|
|
|
+ <property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
|
|
</component>
|
|
|
<component name="RecentsManager">
|
|
|
- <key name="MoveFile.RECENT_KEYS">
|
|
|
- <recent name="$PROJECT_DIR$/business" />
|
|
|
- </key>
|
|
|
<key name="CopyFile.RECENT_KEYS">
|
|
|
+ <recent name="$PROJECT_DIR$/crowd/nginx" />
|
|
|
+ <recent name="$PROJECT_DIR$/crowd" />
|
|
|
<recent name="$PROJECT_DIR$/business" />
|
|
|
<recent name="$PROJECT_DIR$" />
|
|
|
<recent name="$PROJECT_DIR$/shell" />
|
|
|
- <recent name="$PROJECT_DIR$/entity" />
|
|
|
+ </key>
|
|
|
+ <key name="MoveFile.RECENT_KEYS">
|
|
|
+ <recent name="$PROJECT_DIR$/business" />
|
|
|
</key>
|
|
|
</component>
|
|
|
<component name="RunDashboard">
|
|
@@ -312,15 +355,18 @@
|
|
|
<updated>1609748652281</updated>
|
|
|
<workItem from="1609748653778" duration="1478000" />
|
|
|
<workItem from="1609912656825" duration="1914000" />
|
|
|
- <workItem from="1610086639770" duration="216000" />
|
|
|
+ <workItem from="1610086639770" duration="1946000" />
|
|
|
+ <workItem from="1610264520879" duration="862000" />
|
|
|
+ <workItem from="1610343907658" duration="548000" />
|
|
|
+ <workItem from="1618465186243" duration="478000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="3608000" />
|
|
|
+ <option name="totallyTimeSpent" value="7226000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
- <frame x="0" y="0" width="1440" height="900" extended-state="6" />
|
|
|
+ <frame x="0" y="0" width="1440" height="900" extended-state="0" />
|
|
|
<editor active="true" />
|
|
|
<layout>
|
|
|
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
@@ -335,7 +381,7 @@
|
|
|
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32889965" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Capture Tool" 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="false" content_ui="tabs" />
|
|
|
<window_info id="Designer" 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="false" content_ui="tabs" />
|
|
|
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25679544" 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.26752505" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
|
|
<window_info id="Analysis" 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="EvoSuite" 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="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
@@ -367,7 +413,7 @@
|
|
|
<watches-manager />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
- <entry file="file://$PROJECT_DIR$/crowd-private.iml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/crowd/nginx/nginx.conf">
|
|
|
<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" />
|
|
@@ -375,7 +421,7 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/crowd-private.iml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/crowd/nginx/nginx.conf">
|
|
|
<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" />
|
|
@@ -383,6 +429,27 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/business/docker-compose-multi.yml">
|
|
|
+ <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$/crowd-private.iml">
|
|
|
+ <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$/crowd-private.iml">
|
|
|
+ <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$/pipeline.sh" />
|
|
|
<entry file="file://$PROJECT_DIR$/README.md">
|
|
|
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
|
|
@@ -402,20 +469,6 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/pipeline.sh" />
|
|
|
- <entry file="file://$PROJECT_DIR$/business/docker-compose-crowd.yml">
|
|
|
- <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$/business/.env">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-280">
|
|
|
- <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="44" selection-end-column="40" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/business/entity/README.md">
|
|
|
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
|
|
|
<state split_layout="SPLIT">
|
|
@@ -430,14 +483,27 @@
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="0">
|
|
|
<caret line="0" column="27" lean-forward="false" selection-start-line="0" selection-start-column="27" selection-end-line="0" selection-end-column="27" />
|
|
|
- <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/business/load-crowd-images.sh">
|
|
|
+ <entry file="file://$PROJECT_DIR$/crowd-private.iml">
|
|
|
<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$/business/load-crowd-images.sh">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="90">
|
|
|
+ <caret line="6" column="56" lean-forward="true" selection-start-line="6" selection-start-column="56" selection-end-line="6" selection-end-column="56" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/business/start-containers-multi.sh">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="60">
|
|
|
+ <caret line="4" column="48" lean-forward="false" selection-start-line="4" selection-start-column="48" selection-end-line="4" selection-end-column="48" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
@@ -450,18 +516,34 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/crowd-private.iml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/crowd/nginx/nginx.conf">
|
|
|
<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 relative-caret-position="195">
|
|
|
+ <caret line="13" column="1" lean-forward="false" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/business/start-containers-multi.sh">
|
|
|
+ <entry file="file://$PROJECT_DIR$/business/.env">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="321">
|
|
|
+ <caret line="48" column="10" lean-forward="false" selection-start-line="48" selection-start-column="0" selection-end-line="48" selection-end-column="10" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/crowd/deploy.sh">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="60">
|
|
|
- <caret line="4" column="48" lean-forward="false" selection-start-line="4" selection-start-column="48" selection-end-line="4" selection-end-column="48" />
|
|
|
+ <caret line="4" column="0" lean-forward="true" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/business/docker-compose-multi.yml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="369">
|
|
|
+ <caret line="25" column="11" lean-forward="false" selection-start-line="25" selection-start-column="11" selection-end-line="25" selection-end-column="11" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|