Skip to content

G
graces
Commit 4f265c27 authored by lixiaofang's avatar lixiaofang
Browse files
Options

修改配置

parent dbb6d5b5
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 64 deletions
.idea/workspace.xml
View file @ 4f265c27
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="f84a58a6-0272-4806-8e67-f793e01f4a55" name="Default Changelist" comment="" />
<list default="true" id="f84a58a6-0272-4806-8e67-f793e01f4a55" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/gaia/settings_local.py" beforeDir="false" afterPath="$PROJECT_DIR$/gaia/settings_local.py" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -18,24 +20,24 @@
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="py" value="189" />
<entry key="py" value="195" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="Python" value="189" />
<entry key="Python" value="195" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="json" value="5" />
<entry key="json" value="6" />
<entry key="py" value="6" />
<entry key="template" value="1" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="JSON" value="5" />
<entry key="JSON" value="6" />
<entry key="PLAIN_TEXT" value="1" />
<entry key="Python" value="6" />
</counts>
......@@ -44,19 +46,25 @@
</component>
<component name="FileEditorManager">
<leaf>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/gaia/settings_local.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="495">
<caret line="89" column="40" selection-start-line="89" selection-start-column="21" selection-end-line="89" selection-end-column="40" />
<state relative-caret-position="340">
<caret line="47" column="9" lean-forward="true" selection-start-line="47" selection-start-column="9" selection-end-line="47" selection-end-column="9" />
<folding>
<element signature="e#1031#1813#0" />
<element signature="e#3463#4696#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/trans2es/mapping/problem.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-415" />
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/gaia/settings.py.template">
<provider selected="true" editor-type-id="text-editor" />
......@@ -80,7 +88,7 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/trans2es/management/commands/trans2es_data2es_redis.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-102">
......@@ -106,7 +114,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/trans2es/type_info.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="328">
<state relative-caret-position="1976">
<caret line="469" column="28" selection-start-line="469" selection-start-column="18" selection-end-line="469" selection-end-column="28" />
</state>
</provider>
......@@ -115,8 +123,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/gaia/celery_task_router.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="495">
<caret line="37" column="18" selection-start-line="37" selection-start-column="9" selection-end-line="37" selection-end-column="18" />
<state relative-caret-position="223">
<caret line="37" column="15" selection-start-line="37" selection-start-column="15" selection-end-line="37" selection-end-column="15" />
</state>
</provider>
</entry>
......@@ -126,6 +134,7 @@
<component name="FindInProjectRecents">
<findStrings>
<find>/data/log</find>
<find>diary-portrait</find>
<find>data</find>
</findStrings>
</component>
......@@ -141,16 +150,16 @@
<option value="$PROJECT_DIR$/trans2es/mapping/sku.json" />
<option value="$PROJECT_DIR$/trans2es/mapping/sku_norms_disable.json" />
<option value="$PROJECT_DIR$/gaia/log_settings.py" />
<option value="$PROJECT_DIR$/gaia/settings_local.py" />
<option value="$PROJECT_DIR$/trans2es/management/commands/trans2es_data2es_redis.py" />
<option value="$PROJECT_DIR$/gaia/celery_task_router.py" />
<option value="$PROJECT_DIR$/gaia/settings_local.py" />
</list>
</option>
</component>
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="-323" />
<option name="y" value="-1080" />
<option name="width" value="1920" />
<option name="height" value="1080" />
<option name="y" value="23" />
<option name="width" value="1280" />
<option name="height" value="723" />
</component>
<component name="ProjectInspectionProfilesVisibleTreeState">
<entry key="Project Default">
......@@ -186,17 +195,6 @@
<item name="graces" type="462c0819:PsiDirectoryNode" />
<item name="gaia" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="graces" type="b2602c69:ProjectViewProjectNode" />
<item name="graces" type="462c0819:PsiDirectoryNode" />
<item name="trans2es" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="graces" type="b2602c69:ProjectViewProjectNode" />
<item name="graces" type="462c0819:PsiDirectoryNode" />
<item name="trans2es" type="462c0819:PsiDirectoryNode" />
<item name="mapping" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
......@@ -234,17 +232,17 @@
<servers />
</component>
<component name="ToolWindowManager">
<frame x="-323" y="-1080" width="1920" height="1080" extended-state="1" />
<frame x="0" y="23" width="1280" height="723" extended-state="1" />
<editor active="true" />
<layout>
<window_info id="DB Browser" weight="0.32964718" />
<window_info id="Favorites" side_tool="true" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.069510266" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.30976966" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="DB Execution Console" />
<window_info anchor="bottom" id="Version Control" />
<window_info anchor="bottom" id="Python Console" />
<window_info active="true" anchor="bottom" id="Terminal" visible="true" weight="0.69222796" />
<window_info anchor="bottom" id="Terminal" visible="true" weight="0.0" />
<window_info anchor="bottom" id="Event Log" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
......@@ -283,13 +281,6 @@
<option name="myLimit" value="2678400000" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/gaia/celery_task_router.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="495">
<caret line="37" column="18" selection-start-line="37" selection-start-column="9" selection-end-line="37" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/trans2es/mapping/sku_norms_disable.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="850">
......@@ -325,9 +316,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gaia/settings.py.template">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/gaia/settings_ci.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
......@@ -342,13 +330,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/trans2es/type_info.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="328">
<caret line="469" column="28" selection-start-line="469" selection-start-column="18" selection-end-line="469" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/injection/data_sync/tasks.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
......@@ -356,17 +337,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gaia/settings_local.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="495">
<caret line="89" column="40" selection-start-line="89" selection-start-column="21" selection-end-line="89" selection-end-column="40" />
<folding>
<element signature="e#1031#1813#0" />
<element signature="e#3463#4696#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/trans2es/management/commands/trans2es_data2es_redis.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-102">
......@@ -379,6 +349,38 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/trans2es/type_info.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1976">
<caret line="469" column="28" selection-start-line="469" selection-start-column="18" selection-end-line="469" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gaia/celery_task_router.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="223">
<caret line="37" column="15" selection-start-line="37" selection-start-column="15" selection-end-line="37" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gaia/settings.py.template">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/trans2es/mapping/problem.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-415" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gaia/settings_local.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
<caret line="47" column="9" lean-forward="true" selection-start-line="47" selection-start-column="9" selection-end-line="47" selection-end-column="9" />
<folding>
<element signature="e#3463#4696#0" />
</folding>
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
......
gaia/settings_local.py
View file @ 4f265c27
......@@ -131,18 +131,18 @@ IPHONE_USE_SANDBOX = True
# ============================================ES======================================================
# ====================================================================================================
ES_HOSTS = [
{'host': 'es6.paas-dev.env', 'port': 80}
{'host': 'es.paas-test.env', 'port': 80}
]
ES6_HOSTS = [
{'host': 'es6.paas-dev.env', 'port': 80}
{'host': 'es.paas-test.env', 'port': 80}
]
ES_V2_HOSTS = [
{'host': 'es6.paas-dev.env', 'port': 80}
{'host': 'es.paas-test.env', 'port': 80}
]
TALOS_ES_HOSTS = [
{'host': 'es6.paas-dev.env', 'port': 80}
{'host': 'es.paas-test.env', 'port': 80}
]
ES_INDEX_PREFIX = 'gm_test'
ES_READ_INDEX = 'gm_test_read'
......
gaia/settings_local.pyc
View file @ 4f265c27
No preview for this file type
trans2es/graph.pyc
View file @ 4f265c27
No preview for this file type
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment