|
@@ -2,11 +2,9 @@
|
|
|
<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$/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="NEW" beforePath="" afterPath="$PROJECT_DIR$/crowd/conf/FEATURE_CONFIG.json" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/crowd/conf/OSS_CONFIG.json" />
|
|
|
<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" />
|
|
@@ -21,8 +19,18 @@
|
|
|
<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" />
|
|
|
+ <state relative-caret-position="-748">
|
|
|
+ <caret line="12" column="13" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="91" selection-end-column="0" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file leaf-file-name="crowd-private.iml" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/crowd-private.iml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="120">
|
|
|
+ <caret line="8" column="9" lean-forward="true" selection-start-line="8" selection-start-column="9" selection-end-line="8" selection-end-column="9" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
@@ -31,8 +39,8 @@
|
|
|
<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" />
|
|
|
+ <state relative-caret-position="240">
|
|
|
+ <caret line="16" column="15" lean-forward="true" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="15" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
@@ -41,8 +49,8 @@
|
|
|
<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" />
|
|
|
+ <state relative-caret-position="60">
|
|
|
+ <caret line="4" column="21" lean-forward="false" selection-start-line="4" selection-start-column="1" selection-end-line="4" selection-end-column="21" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
@@ -52,7 +60,7 @@
|
|
|
<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="0" lean-forward="true" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
|
|
|
+ <caret line="4" column="0" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
@@ -69,8 +77,8 @@
|
|
|
</component>
|
|
|
<component name="FindInProjectRecents">
|
|
|
<findStrings>
|
|
|
- <find>FILE_STORE_BASE_PATH</find>
|
|
|
<find>CROWD_PATH</find>
|
|
|
+ <find>FILE_STORE_BASE_PATH</find>
|
|
|
</findStrings>
|
|
|
</component>
|
|
|
<component name="Git.Settings">
|
|
@@ -92,6 +100,8 @@
|
|
|
<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" />
|
|
|
+ <option value="$PROJECT_DIR$/crowd/conf/FEATURE_CONFIG.json" />
|
|
|
+ <option value="$PROJECT_DIR$/crowd/conf/OSS_CONFIG.json" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
@@ -196,22 +206,6 @@
|
|
|
<path>
|
|
|
<item name="crowd-private" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="crowd-private" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="business" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="crowd-private" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="crowd-private" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="business" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="entity" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <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>
|
|
@@ -358,16 +352,15 @@
|
|
|
<workItem from="1610086639770" duration="1946000" />
|
|
|
<workItem from="1610264520879" duration="862000" />
|
|
|
<workItem from="1610343907658" duration="548000" />
|
|
|
- <workItem from="1618465186243" duration="478000" />
|
|
|
+ <workItem from="1618465186243" duration="1756000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="7226000" />
|
|
|
+ <option name="totallyTimeSpent" value="8504000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<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" />
|
|
|
<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" />
|
|
@@ -381,10 +374,11 @@
|
|
|
<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.26752505" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
|
|
+ <window_info id="Project" active="true" 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" />
|
|
|
+ <window_info id="Find" 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="1" 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="Ant Build" active="false" anchor="right" 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="UI 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" />
|
|
@@ -396,7 +390,6 @@
|
|
|
<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" />
|
|
|
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
|
|
<window_info id="Inspection" 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="5" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Find" 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="1" side_tool="false" content_ui="tabs" />
|
|
|
</layout>
|
|
|
</component>
|
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
@@ -486,13 +479,6 @@
|
|
|
</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$/business/load-crowd-images.sh">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="90">
|
|
@@ -516,34 +502,58 @@
|
|
|
</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="0" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/crowd-private.iml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="120">
|
|
|
+ <caret line="8" column="9" lean-forward="true" selection-start-line="8" selection-start-column="9" selection-end-line="8" selection-end-column="9" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
<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" />
|
|
|
+ <state relative-caret-position="-748">
|
|
|
+ <caret line="12" column="13" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="91" selection-end-column="0" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<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" />
|
|
|
+ <state relative-caret-position="60">
|
|
|
+ <caret line="4" column="21" lean-forward="false" selection-start-line="4" selection-start-column="1" selection-end-line="4" selection-end-column="21" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/crowd/deploy.sh">
|
|
|
+ <entry file="file://$PROJECT_DIR$/crowd/conf/FEATURE_CONFIG.json">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="60">
|
|
|
- <caret line="4" column="0" lean-forward="true" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
|
|
|
+ <state relative-caret-position="135">
|
|
|
+ <caret line="9" column="1" lean-forward="false" selection-start-line="9" selection-start-column="1" selection-end-line="9" selection-end-column="1" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/crowd/conf/OSS_CONFIG.json">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="165">
|
|
|
+ <caret line="11" column="1" lean-forward="true" selection-start-line="11" selection-start-column="1" selection-end-line="11" selection-end-column="1" />
|
|
|
<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" />
|
|
|
+ <state relative-caret-position="240">
|
|
|
+ <caret line="16" column="15" lean-forward="true" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="15" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|