Skip to content

C
cybertron
Commit 12b9ca9c authored by lixiaofang's avatar lixiaofang
Browse files
Options

add

parent cdeb24fe
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 57 deletions
.idea/workspace.xml
View file @ 12b9ca9c
<?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="7b835479-ee84-40d6-9b97-0e9285d92119" name="Default Changelist" comment="" /> <list default="true" id="7b835479-ee84-40d6-9b97-0e9285d92119" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/index_contrast/user.py" beforeDir="false" afterPath="$PROJECT_DIR$/index_contrast/user.py" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
...@@ -12,26 +14,26 @@ ...@@ -12,26 +14,26 @@
<usages-collector id="statistics.file.extensions.open"> <usages-collector id="statistics.file.extensions.open">
<counts> <counts>
<entry key="README" value="1" /> <entry key="README" value="1" />
<entry key="py" value="30" /> <entry key="py" value="31" />
<entry key="txt" value="3" /> <entry key="txt" value="3" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.open"> <usages-collector id="statistics.file.types.open">
<counts> <counts>
<entry key="PLAIN_TEXT" value="4" /> <entry key="PLAIN_TEXT" value="4" />
<entry key="Python" value="30" /> <entry key="Python" value="31" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.extensions.edit"> <usages-collector id="statistics.file.extensions.edit">
<counts> <counts>
<entry key="dummy" value="1" /> <entry key="dummy" value="1" />
<entry key="py" value="1532" /> <entry key="py" value="1632" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.edit"> <usages-collector id="statistics.file.types.edit">
<counts> <counts>
<entry key="PLAIN_TEXT" value="1" /> <entry key="PLAIN_TEXT" value="1" />
<entry key="Python" value="1532" /> <entry key="Python" value="1632" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.lifecycle.project"> <usages-collector id="statistics.lifecycle.project">
...@@ -65,12 +67,13 @@ ...@@ -65,12 +67,13 @@
</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$/index_contrast/pictorial.py"> <entry file="file://$PROJECT_DIR$/index_contrast/pictorial.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="259"> <state relative-caret-position="93">
<caret line="316" column="98" lean-forward="true" selection-start-line="316" selection-start-column="65" selection-end-line="316" selection-end-column="98" /> <caret line="311" selection-start-line="311" selection-end-line="318" selection-end-column="5" />
<folding> <folding>
<element signature="e#382#16835#0" />
<element signature="e#530#960#0" /> <element signature="e#530#960#0" />
<element signature="e#1648#2194#0" /> <element signature="e#1648#2194#0" />
<element signature="e#2272#3153#0" /> <element signature="e#2272#3153#0" />
...@@ -84,11 +87,11 @@ ...@@ -84,11 +87,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/index_contrast/user.py"> <entry file="file://$PROJECT_DIR$/index_contrast/user.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="167"> <state relative-caret-position="384">
<caret line="193" column="48" lean-forward="true" selection-start-line="193" selection-start-column="48" selection-end-line="193" selection-end-column="48" /> <caret line="373" column="52" selection-start-line="373" selection-start-column="52" selection-end-line="373" selection-end-column="52" />
<folding> <folding>
<element signature="e#530#960#0" /> <element signature="e#530#960#0" />
<element signature="e#1676#2222#0" /> <element signature="e#1676#2222#0" />
...@@ -96,19 +99,32 @@ ...@@ -96,19 +99,32 @@
<element signature="e#3303#4052#0" /> <element signature="e#3303#4052#0" />
<element signature="e#4157#4658#0" /> <element signature="e#4157#4658#0" />
<element signature="e#4792#6126#0" /> <element signature="e#4792#6126#0" />
<element signature="e#6423#8415#0" />
<element signature="e#9522#10831#0" /> <element signature="e#9522#10831#0" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/index_contrast/topic.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3080">
<folding>
<element signature="e#384#17208#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/index_contrast/tag.py"> <entry file="file://$PROJECT_DIR$/index_contrast/tag.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304"> <state relative-caret-position="-72">
<caret line="49" column="29" selection-start-line="49" selection-start-column="29" selection-end-line="49" selection-end-column="29" /> <caret line="21" column="24" selection-start-line="21" selection-start-column="24" selection-end-line="21" selection-end-column="24" />
<folding> <folding>
<element signature="e#46#55#0" expanded="true" /> <element signature="e#46#55#0" expanded="true" />
<element signature="e#349#16802#0" />
<element signature="e#495#925#0" /> <element signature="e#495#925#0" />
<element signature="e#1613#2159#0" /> <element signature="e#1613#2159#0" />
<element signature="e#2237#3118#0" /> <element signature="e#2237#3118#0" />
...@@ -137,9 +153,11 @@ ...@@ -137,9 +153,11 @@
<find>existing</find> <find>existing</find>
<find>mv-alpha-pictorial-test-190716901</find> <find>mv-alpha-pictorial-test-190716901</find>
<find>mv-alpha-toipc-test-190712901</find> <find>mv-alpha-toipc-test-190712901</find>
<find>mv-alpha-pictorial-test-1907129011</find>
<find>mv-alpha-pictorial-test-190711901</find>
<find>mv-alpha-user-test-190711901</find> <find>mv-alpha-user-test-190711901</find>
<find>mv-alpha-tag-test-190711901</find> <find>mv-alpha-tag-test-190711901</find>
<find>mv-alpha-pictorial-test-1907129011</find> <find>tag</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
...@@ -158,9 +176,9 @@ ...@@ -158,9 +176,9 @@
<option value="$PROJECT_DIR$/reply_comment3.py" /> <option value="$PROJECT_DIR$/reply_comment3.py" />
<option value="$PROJECT_DIR$/reply_comment1.py" /> <option value="$PROJECT_DIR$/reply_comment1.py" />
<option value="$PROJECT_DIR$/answer_reply1.py" /> <option value="$PROJECT_DIR$/answer_reply1.py" />
<option value="$PROJECT_DIR$/index_contrast/user.py" />
<option value="$PROJECT_DIR$/index_contrast/tag.py" /> <option value="$PROJECT_DIR$/index_contrast/tag.py" />
<option value="$PROJECT_DIR$/index_contrast/pictorial.py" /> <option value="$PROJECT_DIR$/index_contrast/pictorial.py" />
<option value="$PROJECT_DIR$/index_contrast/user.py" />
</list> </list>
</option> </option>
</component> </component>
...@@ -253,7 +271,7 @@ ...@@ -253,7 +271,7 @@
<layout> <layout>
<window_info id="Structure" order="0" sideWeight="0.21188119" side_tool="true" weight="0.19112115" /> <window_info id="Structure" order="0" sideWeight="0.21188119" side_tool="true" weight="0.19112115" />
<window_info id="Favorites" order="1" side_tool="true" /> <window_info id="Favorites" order="1" side_tool="true" />
<window_info content_ui="combo" id="Project" order="2" sideWeight="0.7872763" visible="true" weight="0.14932486" /> <window_info active="true" content_ui="combo" id="Project" order="2" sideWeight="0.7872763" visible="true" weight="0.14932486" />
<window_info id="DB Browser" order="3" /> <window_info id="DB Browser" order="3" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" weight="0.3284974" /> <window_info anchor="bottom" id="Find" order="1" weight="0.3284974" />
...@@ -263,7 +281,7 @@ ...@@ -263,7 +281,7 @@
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" /> <window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" /> <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
<window_info active="true" anchor="bottom" id="Terminal" order="8" sideWeight="0.49960285" visible="true" weight="0.0" /> <window_info anchor="bottom" id="Terminal" order="8" sideWeight="0.49960285" visible="true" weight="0.0" />
<window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.50039715" side_tool="true" weight="0.32890365" /> <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.50039715" side_tool="true" weight="0.32890365" />
<window_info anchor="bottom" id="Python Console" order="10" /> <window_info anchor="bottom" id="Python Console" order="10" />
<window_info anchor="bottom" id="DB Execution Console" order="11" /> <window_info anchor="bottom" id="DB Execution Console" order="11" />
...@@ -532,9 +550,6 @@ ...@@ -532,9 +550,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/index_contrast/topic.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/auto_every_day.py"> <entry file="file://$PROJECT_DIR$/auto_every_day.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state>
...@@ -562,28 +577,31 @@ ...@@ -562,28 +577,31 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/index_contrast/user.py"> <entry file="file://$PROJECT_DIR$/index_contrast/pictorial.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="167"> <state relative-caret-position="93">
<caret line="193" column="48" lean-forward="true" selection-start-line="193" selection-start-column="48" selection-end-line="193" selection-end-column="48" /> <caret line="311" selection-start-line="311" selection-end-line="318" selection-end-column="5" />
<folding> <folding>
<element signature="e#382#16835#0" />
<element signature="e#530#960#0" /> <element signature="e#530#960#0" />
<element signature="e#1676#2222#0" /> <element signature="e#1648#2194#0" />
<element signature="e#2300#3181#0" /> <element signature="e#2272#3153#0" />
<element signature="e#3303#4052#0" /> <element signature="e#3275#4024#0" />
<element signature="e#4157#4658#0" /> <element signature="e#4129#4630#0" />
<element signature="e#4792#6126#0" /> <element signature="e#4762#6096#0" />
<element signature="e#9522#10831#0" /> <element signature="e#8486#9071#0" />
<element signature="e#9141#10450#0" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/index_contrast/tag.py"> <entry file="file://$PROJECT_DIR$/index_contrast/tag.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304"> <state relative-caret-position="-72">
<caret line="49" column="29" selection-start-line="49" selection-start-column="29" selection-end-line="49" selection-end-column="29" /> <caret line="21" column="24" selection-start-line="21" selection-start-column="24" selection-end-line="21" selection-end-column="24" />
<folding> <folding>
<element signature="e#46#55#0" expanded="true" /> <element signature="e#46#55#0" expanded="true" />
<element signature="e#349#16802#0" />
<element signature="e#495#925#0" /> <element signature="e#495#925#0" />
<element signature="e#1613#2159#0" /> <element signature="e#1613#2159#0" />
<element signature="e#2237#3118#0" /> <element signature="e#2237#3118#0" />
...@@ -596,19 +614,28 @@ ...@@ -596,19 +614,28 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/index_contrast/pictorial.py"> <entry file="file://$PROJECT_DIR$/index_contrast/topic.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3080">
<folding>
<element signature="e#384#17208#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index_contrast/user.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="259"> <state relative-caret-position="384">
<caret line="316" column="98" lean-forward="true" selection-start-line="316" selection-start-column="65" selection-end-line="316" selection-end-column="98" /> <caret line="373" column="52" selection-start-line="373" selection-start-column="52" selection-end-line="373" selection-end-column="52" />
<folding> <folding>
<element signature="e#530#960#0" /> <element signature="e#530#960#0" />
<element signature="e#1648#2194#0" /> <element signature="e#1676#2222#0" />
<element signature="e#2272#3153#0" /> <element signature="e#2300#3181#0" />
<element signature="e#3275#4024#0" /> <element signature="e#3303#4052#0" />
<element signature="e#4129#4630#0" /> <element signature="e#4157#4658#0" />
<element signature="e#4762#6096#0" /> <element signature="e#4792#6126#0" />
<element signature="e#8486#9071#0" /> <element signature="e#6423#8415#0" />
<element signature="e#9141#10450#0" /> <element signature="e#9522#10831#0" />
</folding> </folding>
</state> </state>
</provider> </provider>
......
index_contrast/user.py
View file @ 12b9ca9c
...@@ -367,10 +367,12 @@ for old_item in result_dict["hits"]: ...@@ -367,10 +367,12 @@ for old_item in result_dict["hits"]:
print(new_source["tag_list"]) print(new_source["tag_list"])
print("-----tag_list-----") print("-----tag_list-----")
if old_source["useful_tag_list"] != new_source["useful_tag_list"]: for i in old_source["useful_tag_list"]:
print(old_source["useful_tag_list"]) if i not in new_source["useful_tag_list"]:
print(new_source["useful_tag_list"]) print(i)
print("-----useful_tag_list-----") print(old_source["useful_tag_list"])
print(new_source["useful_tag_list"])
print("-----useful_tag_list-----")
if old_source["city_id"] != new_source["city_id"]: if old_source["city_id"] != new_source["city_id"]:
print(old_source["city_id"]) print(old_source["city_id"])
...@@ -397,25 +399,32 @@ for old_item in result_dict["hits"]: ...@@ -397,25 +399,32 @@ for old_item in result_dict["hits"]:
print(new_source["latest_topic_time_val"]) print(new_source["latest_topic_time_val"])
print("-----latest_topic_time_val-----") print("-----latest_topic_time_val-----")
if old_source["attention_user_id_list"] != new_source["attention_user_id_list"]: for item in old_source["attention_user_id_list"]:
print(old_source["attention_user_id_list"])
print(new_source["attention_user_id_list"]) if item not in new_source["attention_user_id_list"]:
print("-----attention_user_id_list-----") print(item)
print(old_source["attention_user_id_list"])
print(new_source["attention_user_id_list"])
print("-----attention_user_id_list-----")
if old_source["pick_user_id_list"] != new_source["pick_user_id_list"]: if old_source["pick_user_id_list"] != new_source["pick_user_id_list"]:
print(old_source["pick_user_id_list"]) print(old_source["pick_user_id_list"])
print(new_source["pick_user_id_list"]) print(new_source["pick_user_id_list"])
print("-----pick_user_id_list-----") print("-----pick_user_id_list-----")
if old_source["same_pictorial_user_id_list"] != new_source["same_pictorial_user_id_list"]: for item in old_source["same_pictorial_user_id_list"]:
print(old_source["same_pictorial_user_id_list"])
print(new_source["same_pictorial_user_id_list"]) if item not in new_source["same_pictorial_user_id_list"]:
print("-----same_pictorial_user_id_list-----") print(item)
print(old_source["same_pictorial_user_id_list"])
print(new_source["same_pictorial_user_id_list"])
print("-----same_pictorial_user_id_list-----")
if old_source["attention_pictorial_id_list"] != new_source["attention_pictorial_id_list"]: for item in old_source["attention_pictorial_id_list"]:
print(old_source["attention_pictorial_id_list"]) if item not in new_source["attention_pictorial_id_list"]:
print(new_source["attention_pictorial_id_list"]) print(old_source["attention_pictorial_id_list"])
print("-----attention_pictorial_id_list-----") print(new_source["attention_pictorial_id_list"])
print("-----attention_pictorial_id_list-----")
if old_source["create_time"] != new_source["create_time"]: if old_source["create_time"] != new_source["create_time"]:
print(old_source["create_time"]) print(old_source["create_time"])
......
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