Skip to content

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

add

parent 42c7c31d
Show whitespace changes
Inline Side-by-side
Showing with 38 additions and 38 deletions
.idea/workspace.xml
View file @ df36c9ae
<?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$/auto_request.py" beforeDir="false" afterPath="$PROJECT_DIR$/auto_request.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" />
...@@ -13,64 +11,61 @@ ...@@ -13,64 +11,61 @@
<session id="-334786743"> <session id="-334786743">
<usages-collector id="statistics.file.extensions.open"> <usages-collector id="statistics.file.extensions.open">
<counts> <counts>
<entry key="py" value="6" /> <entry key="py" value="8" />
<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="3" /> <entry key="PLAIN_TEXT" value="3" />
<entry key="Python" value="6" /> <entry key="Python" value="8" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.extensions.edit"> <usages-collector id="statistics.file.extensions.edit">
<counts> <counts>
<entry key="py" value="718" /> <entry key="py" value="720" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.edit"> <usages-collector id="statistics.file.types.edit">
<counts> <counts>
<entry key="Python" value="718" /> <entry key="Python" value="720" />
</counts> </counts>
</usages-collector> </usages-collector>
</session> </session>
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/auto_request.py"> <entry file="file://$PROJECT_DIR$/auto_request.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183"> <state relative-caret-position="114">
<caret line="308" column="53" selection-start-line="308" selection-start-column="46" selection-end-line="308" selection-end-column="53" /> <caret line="386" lean-forward="true" selection-start-line="386" selection-end-line="386" />
<folding> <folding>
<element signature="e#0#15#0" expanded="true" /> <element signature="e#0#15#0" expanded="true" />
<element signature="e#7772#8468#0" /> <element signature="e#7772#8468#0" />
<marker date="1562828703000" expanded="true" signature="10072:10077" ph="..." /> <marker date="1562828997000" expanded="true" signature="9392:9397" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/answer_reply.py"> <entry file="file://$PROJECT_DIR$/reply_comment1.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="382"> <state relative-caret-position="225">
<caret line="66" column="22" lean-forward="true" selection-start-line="66" selection-start-column="22" selection-end-line="66" selection-end-column="22" /> <caret line="15" column="23" lean-forward="true" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="23" />
<folding> <folding>
<element signature="e#1#15#0" expanded="true" /> <element signature="e#0#16#0" expanded="true" />
</folding> </folding>
</state> </state>
</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$/reply_comment1.py"> <entry file="file://$PROJECT_DIR$/answer_reply.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225"> <state relative-caret-position="109">
<caret line="15" column="23" lean-forward="true" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="23" /> <caret line="47" column="50" selection-start-line="47" selection-start-column="22" selection-end-line="47" selection-end-column="50" />
<folding>
<element signature="e#0#16#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -120,6 +115,11 @@ ...@@ -120,6 +115,11 @@
</list> </list>
</option> </option>
</component> </component>
<component name="FindInProjectRecents">
<findStrings>
<find>/da</find>
</findStrings>
</component>
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component> </component>
...@@ -217,7 +217,7 @@ ...@@ -217,7 +217,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.0" /> <window_info active="true" content_ui="combo" id="Project" order="2" sideWeight="0.7872763" visible="true" weight="0.079428114" />
<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" />
...@@ -227,7 +227,7 @@ ...@@ -227,7 +227,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" />
...@@ -429,16 +429,6 @@ ...@@ -429,16 +429,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/answer_reply.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="382">
<caret line="66" column="22" lean-forward="true" selection-start-line="66" selection-start-column="22" selection-end-line="66" selection-end-column="22" />
<folding>
<element signature="e#1#15#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/reply_comment1.py"> <entry file="file://$PROJECT_DIR$/reply_comment1.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225"> <state relative-caret-position="225">
...@@ -451,15 +441,22 @@ ...@@ -451,15 +441,22 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/auto_request.py"> <entry file="file://$PROJECT_DIR$/auto_request.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183"> <state relative-caret-position="114">
<caret line="308" column="53" selection-start-line="308" selection-start-column="46" selection-end-line="308" selection-end-column="53" /> <caret line="386" lean-forward="true" selection-start-line="386" selection-end-line="386" />
<folding> <folding>
<element signature="e#0#15#0" expanded="true" /> <element signature="e#0#15#0" expanded="true" />
<element signature="e#7772#8468#0" /> <element signature="e#7772#8468#0" />
<marker date="1562828703000" expanded="true" signature="10072:10077" ph="..." /> <marker date="1562828997000" expanded="true" signature="9392:9397" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/answer_reply.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="109">
<caret line="47" column="50" selection-start-line="47" selection-start-column="22" selection-end-line="47" selection-end-column="50" />
</state>
</provider>
</entry>
</component> </component>
</project> </project>
\ No newline at end of file
answer_reply.py
View file @ df36c9ae
...@@ -62,7 +62,6 @@ if __name__ == "__main__": ...@@ -62,7 +62,6 @@ if __name__ == "__main__":
{"id": reply_id, "reply_user_id": reply_user_id, "answer": comment2, "topic_id": i[1]}) {"id": reply_id, "reply_user_id": reply_user_id, "answer": comment2, "topic_id": i[1]})
redis_client = set_reply_to_redis() redis_client = set_reply_to_redis()
have_reply = redis_client.get(redis_key1) have_reply = redis_client.get(redis_key1)
if have_reply: if have_reply:
redis_client.set(redis_key2, reply_data_comment) redis_client.set(redis_key2, reply_data_comment)
......
reply_comment1.py
View file @ df36c9ae
...@@ -13,14 +13,17 @@ if __name__ == "__main__": ...@@ -13,14 +13,17 @@ if __name__ == "__main__":
redis_client = set_reply_to_redis() redis_client = set_reply_to_redis()
have_reply1 = redis_client.get(redis_key1) have_reply1 = redis_client.get(redis_key1)
logging.info("get========have_replys1:%s"%have_reply1)
if have_reply1: if have_reply1:
result = json.loads(str(have_reply1, encoding="utf-8")) result = json.loads(str(have_reply1, encoding="utf-8"))
logging.info("get------have_replys1:%s" % have_reply1)
for item in result: for item in result:
cook = login() cook = login()
reply2(cook, item["topic_id"], item["answer"], item["id"]) reply2(cook, item["topic_id"], item["answer"], item["id"])
else: else:
have_reply2 = redis_client.get(redis_key2) have_reply2 = redis_client.get(redis_key2)
result = json.loads(str(have_reply2, encoding="utf-8")) result = json.loads(str(have_reply2, encoding="utf-8"))
logging.info("get---_++++---have_replys1:%s" % have_reply1)
for item in result: for item in result:
cook = login() cook = login()
reply2(cook, item["topic_id"], item["answer"], item["id"]) reply2(cook, item["topic_id"], item["answer"], item["id"])
......
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