Commit 20dec0c0 authored by lixiaofang's avatar lixiaofang

add

parent 16f8cb97
<?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="fd1f0b61-1139-44e5-87e7-f8b86ff52376" name="Default Changelist" comment=""> <list default="true" id="fd1f0b61-1139-44e5-87e7-f8b86ff52376" name="Default Changelist" comment="" />
<change beforePath="$PROJECT_DIR$/offline_comment.py" beforeDir="false" afterPath="$PROJECT_DIR$/offline_comment.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" />
...@@ -42,14 +40,14 @@ ...@@ -42,14 +40,14 @@
<entry key="comment" value="59" /> <entry key="comment" value="59" />
<entry key="dummy" value="6" /> <entry key="dummy" value="6" />
<entry key="guanshui" value="2" /> <entry key="guanshui" value="2" />
<entry key="py" value="3776" /> <entry key="py" value="3802" />
<entry key="xuqiu" value="223" /> <entry key="xuqiu" value="223" />
</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="290" /> <entry key="PLAIN_TEXT" value="290" />
<entry key="Python" value="3776" /> <entry key="Python" value="3802" />
</counts> </counts>
</usages-collector> </usages-collector>
</session> </session>
...@@ -144,11 +142,11 @@ ...@@ -144,11 +142,11 @@
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/offline_comment.py"> <entry file="file://$PROJECT_DIR$/offline_comment.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="208"> <state relative-caret-position="87">
<caret line="58" column="34" selection-start-line="58" selection-start-column="34" selection-end-line="58" selection-end-column="34" /> <caret line="53" column="22" selection-start-line="53" selection-start-column="22" selection-end-line="53" selection-end-column="35" />
<folding> <folding>
<element signature="e#0#15#0" expanded="true" /> <element signature="e#0#15#0" expanded="true" />
<marker date="1555665003000" expanded="true" signature="1773:1926" ph="..." /> <marker date="1555665196000" expanded="true" signature="1855:2008" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -497,6 +495,7 @@ ...@@ -497,6 +495,7 @@
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="23" width="1280" height="725" extended-state="0" /> <frame x="0" y="23" width="1280" height="725" extended-state="0" />
<editor active="true" />
<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" />
...@@ -510,7 +509,7 @@ ...@@ -510,7 +509,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" visible="true" weight="0.5344262" /> <window_info active="true" anchor="bottom" id="Terminal" order="8" visible="true" weight="0.3295082" />
<window_info anchor="bottom" id="Event Log" order="9" side_tool="true" /> <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
<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" />
...@@ -929,11 +928,11 @@ ...@@ -929,11 +928,11 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/offline_comment.py"> <entry file="file://$PROJECT_DIR$/offline_comment.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="208"> <state relative-caret-position="87">
<caret line="58" column="34" selection-start-line="58" selection-start-column="34" selection-end-line="58" selection-end-column="34" /> <caret line="53" column="22" selection-start-line="53" selection-start-column="22" selection-end-line="53" selection-end-column="35" />
<folding> <folding>
<element signature="e#0#15#0" expanded="true" /> <element signature="e#0#15#0" expanded="true" />
<marker date="1555665003000" expanded="true" signature="1773:1926" ph="..." /> <marker date="1555665196000" expanded="true" signature="1855:2008" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
......
...@@ -51,25 +51,25 @@ def get_data(num1, num2): ...@@ -51,25 +51,25 @@ def get_data(num1, num2):
user_list = get_user_id() user_list = get_user_id()
logging.info("get user_list:%s"%user_list) # logging.info("get user_list:%s"%user_list)
topic_id_list = []
if topic_id: if topic_id:
topic_id_list = []
for i in topic_id: for i in topic_id:
if i[1] and i[1] in user_list: print(i[1])
print("========")
if i[1] in user_list:
topic_id_list.append(i) topic_id_list.append(i)
print(i) print(i)
logging.info("Database version : %s " % topic_id)
pc.close() pc.close()
logging.info("topic_id_list:%s"%topic_id_list) print(topic_id_list)
return topic_id_list return topic_id_list
except: except:
logging.error("catch exception,get_data:%s" % traceback.format_exc()) logging.error("catch exception,get_data:%s" % traceback.format_exc())
return None return None
def get_user_id(): def get_user_id():
user_data = open("user_id.txt", "r") user_data = open("user_id.txt", "r")
user_list = [] user_list = []
...@@ -77,11 +77,9 @@ def get_user_id(): ...@@ -77,11 +77,9 @@ def get_user_id():
for i in user_data.readlines(): for i in user_data.readlines():
user_list.append(i) user_list.append(i)
return user_list return user_list
if __name__ == "__main__": if __name__ == "__main__":
try: try:
...@@ -119,7 +117,6 @@ if __name__ == "__main__": ...@@ -119,7 +117,6 @@ if __name__ == "__main__":
user_id = user_list[num] user_id = user_list[num]
if user_id != id[1]: if user_id != id[1]:
comment_list = get_offline_comment() comment_list = get_offline_comment()
comment = comment_list[i] comment = comment_list[i]
......
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