Skip to content

C
cybertron
Commit 572ceda7 authored by lixiaofang's avatar lixiaofang
Browse files
Options

add

parent b1f7d9f9
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 24 deletions
.idea/workspace.xml
View file @ 572ceda7
...@@ -42,14 +42,14 @@ ...@@ -42,14 +42,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="3694" /> <entry key="py" value="3776" />
<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="3694" /> <entry key="Python" value="3776" />
</counts> </counts>
</usages-collector> </usages-collector>
</session> </session>
...@@ -144,10 +144,11 @@ ...@@ -144,10 +144,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="-329"> <state relative-caret-position="208">
<caret line="59" column="27" lean-forward="true" selection-start-line="59" selection-start-column="27" selection-end-line="59" selection-end-column="27" /> <caret line="58" column="34" selection-start-line="58" selection-start-column="34" selection-end-line="58" selection-end-column="34" />
<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="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -499,7 +500,7 @@ ...@@ -499,7 +500,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.19618745" /> <window_info content_ui="combo" id="Project" order="2" sideWeight="0.7872763" visible="true" weight="0.07625099" />
<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" />
...@@ -509,7 +510,7 @@ ...@@ -509,7 +510,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.3295082" /> <window_info active="true" anchor="bottom" id="Terminal" order="8" visible="true" weight="0.5344262" />
<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" />
...@@ -879,16 +880,6 @@ ...@@ -879,16 +880,6 @@
<entry file="file://$PROJECT_DIR$/user_id.txt"> <entry file="file://$PROJECT_DIR$/user_id.txt">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/auto_user_id.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="30" column="18" selection-start-line="30" selection-start-column="18" selection-end-line="30" selection-end-column="18" />
<folding>
<element signature="e#1#15#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/user_session.txt"> <entry file="file://$PROJECT_DIR$/user_session.txt">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="386"> <state relative-caret-position="386">
...@@ -926,12 +917,23 @@ ...@@ -926,12 +917,23 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/auto_user_id.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="30" column="18" selection-start-line="30" selection-start-column="18" selection-end-line="30" selection-end-column="18" />
<folding>
<element signature="e#1#15#0" expanded="true" />
</folding>
</state>
</provider>
</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="-329"> <state relative-caret-position="208">
<caret line="59" column="27" lean-forward="true" selection-start-line="59" selection-start-column="27" selection-end-line="59" selection-end-column="27" /> <caret line="58" column="34" selection-start-line="58" selection-start-column="34" selection-end-line="58" selection-end-column="34" />
<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="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
......
offline_comment.py
View file @ 572ceda7
...@@ -49,15 +49,12 @@ def get_data(num1, num2): ...@@ -49,15 +49,12 @@ def get_data(num1, num2):
topic_id = list(data) topic_id = list(data)
logging.info("Database version : %s " % topic_id) logging.info("Database version : %s " % topic_id)
user_list = get_user_id()
if topic_id: if topic_id:
topic_id_list = [] topic_id_list = []
for i in topic_id: for i in topic_id:
cursor.execute( if i[1] and i[1] in user_list:
"SELECT user_id from user_extra where is_shadow = 1 and user_id = " + str(i[1]) + "")
data = cursor.fetchall()
user_id = list(data)
logging.info("Database version : %s " % user_id)
if user_id:
topic_id_list.append(i) topic_id_list.append(i)
logging.info("Database version : %s " % topic_id) logging.info("Database version : %s " % topic_id)
pc.close() pc.close()
...@@ -68,6 +65,21 @@ def get_data(num1, num2): ...@@ -68,6 +65,21 @@ def get_data(num1, num2):
return None return None
def get_user_id():
user_data = open("user_id.txt", "r")
user_list = []
for i in user_data.readlines():
user_list.append(i)
return user_list
if __name__ == "__main__": if __name__ == "__main__":
try: try:
...@@ -105,6 +117,7 @@ if __name__ == "__main__": ...@@ -105,6 +117,7 @@ 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