Commit 36dd08e1 authored by lixiaofang's avatar lixiaofang

修改es版本

parent 6915d611
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ProjectRootManager" version="2" project-jdk-name="Python 2.7 (gaia_env)" project-jdk-type="Python SDK" /> <component name="ProjectRootManager" version="2" project-jdk-name="Python 2.7 (gaia_env)" project-jdk-type="Python SDK" />
<component name="PyCharmProfessionalAdvertiser">
<option name="shown" value="true" />
</component>
</project> </project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="d124fa2a-32cc-4b9e-a06a-0fa9d00e5734" name="Default Changelist" comment="" /> <list default="true" id="d124fa2a-32cc-4b9e-a06a-0fa9d00e5734" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -19,11 +21,23 @@ ...@@ -19,11 +21,23 @@
<usages-collector id="statistics.file.extensions.open"> <usages-collector id="statistics.file.extensions.open">
<counts> <counts>
<entry key="json" value="5" /> <entry key="json" value="5" />
<entry key="py" value="1" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.open"> <usages-collector id="statistics.file.types.open">
<counts> <counts>
<entry key="JSON" value="5" /> <entry key="JSON" value="5" />
<entry key="Python" value="1" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="py" value="10" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="Python" value="10" />
</counts> </counts>
</usages-collector> </usages-collector>
</session> </session>
...@@ -66,11 +80,23 @@ ...@@ -66,11 +80,23 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/trans2es/mapping/sku_norms_disable.json"> <entry file="file://$PROJECT_DIR$/trans2es/mapping/sku_norms_disable.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1485"> <state relative-caret-position="210">
<caret line="99" column="1" selection-start-line="99" selection-start-column="1" selection-end-line="99" selection-end-column="1" /> <caret line="14" column="54" selection-start-line="14" selection-start-column="54" selection-end-line="14" selection-end-column="54" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/gaia/log_settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="13" column="11" selection-start-line="13" selection-start-column="11" selection-end-line="13" selection-end-column="11" />
<folding>
<element signature="e#277#23413#0" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -82,12 +108,13 @@ ...@@ -82,12 +108,13 @@
<find>&quot;type&quot;:&quot;string&quot;</find> <find>&quot;type&quot;:&quot;string&quot;</find>
<find>&quot;not_analyzed&quot;</find> <find>&quot;not_analyzed&quot;</find>
<find>index</find> <find>index</find>
<find>&quot;index&quot;: &quot;not_analyzed&quot;</find>
<find>&quot;type&quot;: &quot;string&quot;</find> <find>&quot;type&quot;: &quot;string&quot;</find>
<find>/data/lo</find>
<find>&quot;index&quot;: &quot;not_analyzed&quot;</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>&quot;analyzer&quot;:&quot;keyword&quot;</replace>
<replace>&quot;type&quot;:&quot;text&quot;</replace> <replace>&quot;type&quot;:&quot;text&quot;</replace>
<replace>&quot;analyzer&quot;:&quot;keyword&quot;</replace>
</replaceStrings> </replaceStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
...@@ -101,10 +128,11 @@ ...@@ -101,10 +128,11 @@
<option value="$PROJECT_DIR$/trans2es/mapping/service_norms_disable.json" /> <option value="$PROJECT_DIR$/trans2es/mapping/service_norms_disable.json" />
<option value="$PROJECT_DIR$/trans2es/mapping/sku.json" /> <option value="$PROJECT_DIR$/trans2es/mapping/sku.json" />
<option value="$PROJECT_DIR$/trans2es/mapping/sku_norms_disable.json" /> <option value="$PROJECT_DIR$/trans2es/mapping/sku_norms_disable.json" />
<option value="$PROJECT_DIR$/gaia/log_settings.py" />
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectFrameBounds" extendedState="1"> <component name="ProjectFrameBounds">
<option name="x" value="-323" /> <option name="x" value="-323" />
<option name="y" value="-1080" /> <option name="y" value="-1080" />
<option name="width" value="1920" /> <option name="width" value="1920" />
...@@ -187,7 +215,8 @@ ...@@ -187,7 +215,8 @@
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-323" y="-1080" width="1920" height="1080" extended-state="1" /> <frame x="-323" y="-1080" width="1920" height="1080" extended-state="0" />
<editor active="true" />
<layout> <layout>
<window_info id="DB Browser" /> <window_info id="DB Browser" />
<window_info id="Favorites" side_tool="true" /> <window_info id="Favorites" side_tool="true" />
...@@ -196,7 +225,7 @@ ...@@ -196,7 +225,7 @@
<window_info anchor="bottom" id="DB Execution Console" /> <window_info anchor="bottom" id="DB Execution Console" />
<window_info anchor="bottom" id="Version Control" show_stripe_button="false" /> <window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
<window_info anchor="bottom" id="Python Console" /> <window_info anchor="bottom" id="Python Console" />
<window_info active="true" anchor="bottom" id="Terminal" visible="true" weight="0.59274614" /> <window_info active="true" anchor="bottom" id="Terminal" visible="true" weight="0.018652849" />
<window_info anchor="bottom" id="Event Log" side_tool="true" /> <window_info anchor="bottom" id="Event Log" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" /> <window_info anchor="bottom" id="Find" order="1" />
...@@ -244,8 +273,18 @@ ...@@ -244,8 +273,18 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/trans2es/mapping/sku_norms_disable.json"> <entry file="file://$PROJECT_DIR$/trans2es/mapping/sku_norms_disable.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1485"> <state relative-caret-position="210">
<caret line="99" column="1" selection-start-line="99" selection-start-column="1" selection-end-line="99" selection-end-column="1" /> <caret line="14" column="54" selection-start-line="14" selection-start-column="54" selection-end-line="14" selection-end-column="54" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gaia/log_settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="13" column="11" selection-start-line="13" selection-start-column="11" selection-end-line="13" selection-end-column="11" />
<folding>
<element signature="e#277#23413#0" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
......
...@@ -12,7 +12,7 @@ djorm-pgarray==1.2 ...@@ -12,7 +12,7 @@ djorm-pgarray==1.2
jpush==3.3.0 jpush==3.3.0
apns==2.0.1 apns==2.0.1
gunicorn==19.6.0 gunicorn==19.6.0
elasticsearch==2.3.0 elasticsearch==6.3.1
pycrypto==2.6.1 pycrypto==2.6.1
cached-property==1.2.0 cached-property==1.2.0
raven==5.25.0 raven==5.25.0
......
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