Skip to content

P
physical
Commit a89420b5 authored by lixiaofang's avatar lixiaofang
Browse files
Options

add

parent ed442962
Show whitespace changes
Inline Side-by-side
Showing with 36 additions and 42 deletions
.idea/workspace.xml
View file @ a89420b5
<?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="d7dd36ca-85ef-4a59-9db5-8b1ee4993a4e" name="Default Changelist" comment=""> <list default="true" id="d7dd36ca-85ef-4a59-9db5-8b1ee4993a4e" name="Default Changelist" comment="" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/trans2es/mapping/user.json" beforeDir="false" afterPath="$PROJECT_DIR$/trans2es/mapping/user.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/trans2es/utils/user_transfer.py" beforeDir="false" afterPath="$PROJECT_DIR$/trans2es/utils/user_transfer.py" 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" />
...@@ -79,13 +75,13 @@ ...@@ -79,13 +75,13 @@
<usages-collector id="statistics.file.extensions.edit"> <usages-collector id="statistics.file.extensions.edit">
<counts> <counts>
<entry key="json" value="56" /> <entry key="json" value="56" />
<entry key="py" value="514" /> <entry key="py" value="515" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.edit"> <usages-collector id="statistics.file.types.edit">
<counts> <counts>
<entry key="JSON" value="56" /> <entry key="JSON" value="56" />
<entry key="Python" value="514" /> <entry key="Python" value="515" />
</counts> </counts>
</usages-collector> </usages-collector>
</session> </session>
...@@ -95,7 +91,7 @@ ...@@ -95,7 +91,7 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/trans2es/models/pictorial.py"> <entry file="file://$PROJECT_DIR$/trans2es/models/pictorial.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275"> <state relative-caret-position="548">
<caret line="65" selection-start-line="65" selection-end-line="65" /> <caret line="65" selection-start-line="65" selection-end-line="65" />
<folding> <folding>
<element signature="e#0#28#0" expanded="true" /> <element signature="e#0#28#0" expanded="true" />
...@@ -104,20 +100,11 @@ ...@@ -104,20 +100,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/trans2es/utils/group_transfer.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="138">
<caret line="14" column="25" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/trans2es/models/user.py"> <entry file="file://$PROJECT_DIR$/trans2es/models/user.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="364"> <state relative-caret-position="570">
<caret line="93" column="8" selection-start-line="93" selection-start-column="8" selection-end-line="93" selection-end-column="8" /> <caret line="138" column="19" selection-start-line="138" selection-start-column="19" selection-end-line="138" selection-end-column="19" />
<folding> <folding>
<element signature="e#47#79#0" expanded="true" /> <element signature="e#47#79#0" expanded="true" />
<element signature="e#1396#1736#0" /> <element signature="e#1396#1736#0" />
...@@ -134,8 +121,11 @@ ...@@ -134,8 +121,11 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/trans2es/models/topic.py"> <entry file="file://$PROJECT_DIR$/trans2es/models/topic.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="239"> <state relative-caret-position="-1328">
<caret line="18" column="23" selection-start-line="18" selection-start-column="23" selection-end-line="18" selection-end-column="23" /> <caret line="18" column="23" selection-start-line="18" selection-start-column="23" selection-end-line="18" selection-end-column="23" />
<folding>
<element signature="e#6938#8707#0" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -152,8 +142,8 @@ ...@@ -152,8 +142,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/trans2es/utils/user_transfer.py"> <entry file="file://$PROJECT_DIR$/trans2es/utils/user_transfer.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="666"> <state relative-caret-position="644">
<caret line="91" selection-start-line="91" selection-end-line="91" /> <caret line="76" selection-start-line="76" selection-end-line="76" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -161,8 +151,8 @@ ...@@ -161,8 +151,8 @@
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/trans2es/models/group.py"> <entry file="file://$PROJECT_DIR$/trans2es/models/group.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="570"> <state relative-caret-position="483">
<caret line="38" selection-start-line="38" selection-end-line="38" /> <caret line="50" column="21" lean-forward="true" selection-start-line="50" selection-start-column="21" selection-end-line="50" selection-end-column="21" />
<folding> <folding>
<element signature="e#47#79#0" expanded="true" /> <element signature="e#47#79#0" expanded="true" />
</folding> </folding>
...@@ -333,7 +323,6 @@ ...@@ -333,7 +323,6 @@
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-309" y="-1080" width="1920" height="1080" extended-state="6" /> <frame x="-309" y="-1080" width="1920" height="1080" extended-state="6" />
<editor active="true" />
<layout> <layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18114798" /> <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18114798" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
...@@ -348,7 +337,7 @@ ...@@ -348,7 +337,7 @@
<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 anchor="bottom" id="DB Execution Console" order="8" /> <window_info anchor="bottom" id="DB Execution Console" order="8" />
<window_info active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.0" /> <window_info active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.32953367" />
<window_info anchor="bottom" id="Python Console" order="10" /> <window_info anchor="bottom" id="Python Console" order="10" />
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" /> <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
...@@ -536,14 +525,14 @@ ...@@ -536,14 +525,14 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/trans2es/utils/group_transfer.py"> <entry file="file://$PROJECT_DIR$/trans2es/utils/group_transfer.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="138"> <state relative-caret-position="150">
<caret line="14" column="25" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" /> <caret line="14" column="25" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/trans2es/models/pictorial.py"> <entry file="file://$PROJECT_DIR$/trans2es/models/pictorial.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275"> <state relative-caret-position="548">
<caret line="65" selection-start-line="65" selection-end-line="65" /> <caret line="65" selection-start-line="65" selection-end-line="65" />
<folding> <folding>
<element signature="e#0#28#0" expanded="true" /> <element signature="e#0#28#0" expanded="true" />
...@@ -551,17 +540,10 @@ ...@@ -551,17 +540,10 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/trans2es/models/topic.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="239">
<caret line="18" column="23" selection-start-line="18" selection-start-column="23" selection-end-line="18" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/trans2es/models/user.py"> <entry file="file://$PROJECT_DIR$/trans2es/models/user.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="364"> <state relative-caret-position="570">
<caret line="93" column="8" selection-start-line="93" selection-start-column="8" selection-end-line="93" selection-end-column="8" /> <caret line="138" column="19" selection-start-line="138" selection-start-column="19" selection-end-line="138" selection-end-column="19" />
<folding> <folding>
<element signature="e#47#79#0" expanded="true" /> <element signature="e#47#79#0" expanded="true" />
<element signature="e#1396#1736#0" /> <element signature="e#1396#1736#0" />
...@@ -574,10 +556,13 @@ ...@@ -574,10 +556,13 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/trans2es/utils/user_transfer.py"> <entry file="file://$PROJECT_DIR$/trans2es/models/topic.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="666"> <state relative-caret-position="-1328">
<caret line="91" selection-start-line="91" selection-end-line="91" /> <caret line="18" column="23" selection-start-line="18" selection-start-column="23" selection-end-line="18" selection-end-column="23" />
<folding>
<element signature="e#6938#8707#0" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -588,10 +573,17 @@ ...@@ -588,10 +573,17 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/trans2es/utils/user_transfer.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="644">
<caret line="76" selection-start-line="76" selection-end-line="76" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/trans2es/models/group.py"> <entry file="file://$PROJECT_DIR$/trans2es/models/group.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="570"> <state relative-caret-position="483">
<caret line="38" selection-start-line="38" selection-end-line="38" /> <caret line="50" column="21" lean-forward="true" selection-start-line="50" selection-start-column="21" selection-end-line="50" selection-end-column="21" />
<folding> <folding>
<element signature="e#47#79#0" expanded="true" /> <element signature="e#47#79#0" expanded="true" />
</folding> </folding>
......
trans2es/models/user.py
View file @ a89420b5
...@@ -95,6 +95,7 @@ class User(models.Model): ...@@ -95,6 +95,7 @@ class User(models.Model):
try: try:
attention_pictorial_id_list = list() attention_pictorial_id_list = list()
query_results = PictorialFollow.objects.using(settings.SLAVE_DB_NAME).filter(is_online=True, user_id=self.user_id) query_results = PictorialFollow.objects.using(settings.SLAVE_DB_NAME).filter(is_online=True, user_id=self.user_id)
logging.info("get PictorialFollow:%s"%query_results)
for item in query_results: for item in query_results:
item_dict = { item_dict = {
"pictorial_id": item.pictorial_id, "pictorial_id": item.pictorial_id,
...@@ -147,6 +148,7 @@ class User(models.Model): ...@@ -147,6 +148,7 @@ class User(models.Model):
break break
if len(same_pictorial_user_id_list)>=100: if len(same_pictorial_user_id_list)>=100:
break break
logging.info("get same_pictorial_user_id_list:%s"%same_pictorial_user_id_list)
same_pictorial_detail_list = list() same_pictorial_detail_list = list()
......
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