Commit c3280c45 authored by lixiaofang's avatar lixiaofang

add

parent f9d86870
...@@ -2,8 +2,23 @@ ...@@ -2,8 +2,23 @@
<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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/auto_click.py" beforeDir="false" afterPath="$PROJECT_DIR$/auto_click.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/auto_click_n.py" beforeDir="false" afterPath="$PROJECT_DIR$/auto_click_n.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/auto_commnet.py" beforeDir="false" afterPath="$PROJECT_DIR$/auto_commnet.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/auto_commnet.py" beforeDir="false" afterPath="$PROJECT_DIR$/auto_commnet.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/auto_every_day.py" beforeDir="false" afterPath="$PROJECT_DIR$/auto_every_day.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/auto_follow.py" beforeDir="false" afterPath="$PROJECT_DIR$/auto_follow.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/auto_follow_new.py" beforeDir="false" afterPath="$PROJECT_DIR$/auto_follow_new.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/auto_follow_one.py" beforeDir="false" afterPath="$PROJECT_DIR$/auto_follow_one.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/auto_lunch_app.py" beforeDir="false" afterPath="$PROJECT_DIR$/auto_lunch_app.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/auto_request.py" beforeDir="false" afterPath="$PROJECT_DIR$/auto_request.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/auto_star_topic.py" beforeDir="false" afterPath="$PROJECT_DIR$/auto_star_topic.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/auto_star_urge.py" beforeDir="false" afterPath="$PROJECT_DIR$/auto_star_urge.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/auto_urge.py" beforeDir="false" afterPath="$PROJECT_DIR$/auto_urge.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/auto_urge_three.py" beforeDir="false" afterPath="$PROJECT_DIR$/auto_urge_three.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/auto_user_id.py" beforeDir="false" afterPath="$PROJECT_DIR$/auto_user_id.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/instant.py" beforeDir="false" afterPath="$PROJECT_DIR$/instant.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/instant.py" beforeDir="false" afterPath="$PROJECT_DIR$/instant.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/offline_comment.py" beforeDir="false" afterPath="$PROJECT_DIR$/offline_comment.py" afterDir="false" />
</list> </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" />
...@@ -15,27 +30,28 @@ ...@@ -15,27 +30,28 @@
<session id="2133079262"> <session id="2133079262">
<usages-collector id="statistics.lifecycle.project"> <usages-collector id="statistics.lifecycle.project">
<counts> <counts>
<entry key="project.closed" value="3" /> <entry key="project.closed" value="4" />
<entry key="project.open.time.0" value="1" /> <entry key="project.open.time.0" value="1" />
<entry key="project.open.time.2" value="3" /> <entry key="project.open.time.2" value="3" />
<entry key="project.open.time.5" value="1" /> <entry key="project.open.time.5" value="1" />
<entry key="project.opened" value="5" /> <entry key="project.open.time.7" value="1" />
<entry key="project.opened" value="6" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.extensions.open"> <usages-collector id="statistics.file.extensions.open">
<counts> <counts>
<entry key="batch_user_gen" value="2" /> <entry key="batch_user_gen" value="2" />
<entry key="comment" value="2" /> <entry key="comment" value="2" />
<entry key="guanshui" value="2" /> <entry key="guanshui" value="3" />
<entry key="py" value="147" /> <entry key="py" value="186" />
<entry key="txt" value="5" /> <entry key="txt" value="7" />
<entry key="xuqiu" value="2" /> <entry key="xuqiu" value="2" />
</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="13" /> <entry key="PLAIN_TEXT" value="16" />
<entry key="Python" value="147" /> <entry key="Python" value="186" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.extensions.edit"> <usages-collector id="statistics.file.extensions.edit">
...@@ -43,14 +59,14 @@ ...@@ -43,14 +59,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="4810" /> <entry key="py" value="5132" />
<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="4810" /> <entry key="Python" value="5132" />
</counts> </counts>
</usages-collector> </usages-collector>
</session> </session>
...@@ -117,161 +133,108 @@ ...@@ -117,161 +133,108 @@
</session> </session>
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.1"> <leaf>
<split-first> <file pinned="false" current-in-tab="true">
<leaf> <entry file="file://$PROJECT_DIR$/offline_comment.py">
<file pinned="false" current-in-tab="false"> <provider selected="true" editor-type-id="text-editor">
<entry file="file://$PROJECT_DIR$/auto_click.py"> <state relative-caret-position="1124">
<provider selected="true" editor-type-id="text-editor"> <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
<state relative-caret-position="330"> <folding>
<caret line="22" column="33" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" /> <element signature="e#0#15#0" expanded="true" />
<folding> <marker date="1555812702000" expanded="true" signature="1722:1723" ph="..." />
<element signature="e#0#11#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="false"> <entry file="file://$PROJECT_DIR$/instant.py">
<entry file="file://$PROJECT_DIR$/auto_lunch_app.py"> <provider selected="true" editor-type-id="text-editor">
<provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="-571">
<state relative-caret-position="359"> <caret line="26" selection-start-line="26" selection-end-line="26" />
<caret line="24" column="24" selection-start-line="24" selection-start-column="24" selection-end-line="24" selection-end-column="24" /> <folding>
<folding> <element signature="e#0#15#0" expanded="true" />
<element signature="e#0#15#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="false"> <entry file="file://$PROJECT_DIR$/auto_user_id.py">
<entry file="file://$PROJECT_DIR$/auto_follow_one.py"> <provider selected="true" editor-type-id="text-editor">
<provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="435">
<state relative-caret-position="548"> <caret line="29" selection-start-line="29" selection-end-line="29" />
<caret line="57" selection-start-line="57" selection-end-line="57" /> <folding>
<folding> <element signature="e#1#15#0" expanded="true" />
<element signature="e#0#15#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="false"> <entry file="file://$PROJECT_DIR$/auto_request.py">
<entry file="file://$PROJECT_DIR$/auto_follow.py"> <provider selected="true" editor-type-id="text-editor">
<provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="1177">
<state relative-caret-position="284"> <caret line="148" lean-forward="true" selection-start-line="148" selection-end-line="148" />
<caret line="26" column="33" selection-start-line="26" selection-start-column="33" selection-end-line="26" selection-end-column="33" /> <folding>
<folding> <element signature="e#0#15#0" expanded="true" />
<element signature="e#0#15#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="false"> <entry file="file://$PROJECT_DIR$/comment.txt">
<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 relative-caret-position="224">
<state relative-caret-position="426"> <caret line="1910" column="4" lean-forward="true" selection-start-line="1910" selection-start-column="4" selection-end-line="1910" selection-end-column="4" />
<caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" /> </state>
<folding> </provider>
<element signature="e#0#15#0" expanded="true" /> </entry>
</folding> </file>
</state> <file pinned="false" current-in-tab="false">
</provider> <entry file="file://$PROJECT_DIR$/auto_click.py">
</entry> <provider selected="true" editor-type-id="text-editor">
</file> <state relative-caret-position="105">
<file pinned="false" current-in-tab="false"> <caret line="7" column="35" selection-start-line="7" selection-start-column="35" selection-end-line="7" selection-end-column="35" />
<entry file="file://$PROJECT_DIR$/auto_follow_new.py"> </state>
<provider selected="true" editor-type-id="text-editor"> </provider>
<state relative-caret-position="1098"> </entry>
<caret line="76" column="29" selection-start-line="76" selection-start-column="29" selection-end-line="76" selection-end-column="29" /> </file>
<folding> <file pinned="false" current-in-tab="false">
<element signature="e#0#15#0" expanded="true" /> <entry file="file://$PROJECT_DIR$/auto_click_n.py">
</folding> <provider selected="true" editor-type-id="text-editor">
</state> <state relative-caret-position="43">
</provider> <caret line="8" column="36" selection-start-line="8" selection-start-column="36" selection-end-line="8" selection-end-column="36" />
</entry> </state>
</file> </provider>
<file pinned="false" current-in-tab="true"> </entry>
<entry file="file://$PROJECT_DIR$/auto_commnet.py"> </file>
<provider selected="true" editor-type-id="text-editor"> <file pinned="false" current-in-tab="false">
<state relative-caret-position="272"> <entry file="file://$PROJECT_DIR$/auto_at_once.py">
<caret line="27" column="20" lean-forward="true" selection-start-line="27" selection-start-column="20" selection-end-line="27" selection-end-column="20" /> <provider selected="true" editor-type-id="text-editor">
<folding> <state relative-caret-position="324">
<element signature="e#0#15#0" expanded="true" /> <caret line="25" column="30" lean-forward="true" selection-start-line="25" selection-start-column="30" selection-end-line="25" selection-end-column="30" />
</folding> <folding>
</state> <element signature="e#0#15#0" expanded="true" />
</provider> </folding>
</entry> </state>
</file> </provider>
<file pinned="false" current-in-tab="false"> </entry>
<entry file="file://$PROJECT_DIR$/auto_click_n.py"> </file>
<provider selected="true" editor-type-id="text-editor"> <file pinned="false" current-in-tab="false">
<state relative-caret-position="334"> <entry file="file://$PROJECT_DIR$/auto_commnet.py">
<caret line="33" column="19" lean-forward="true" selection-start-line="33" selection-start-column="19" selection-end-line="33" selection-end-column="19" /> <provider selected="true" editor-type-id="text-editor">
<folding> <state relative-caret-position="275">
<element signature="e#0#15#0" expanded="true" /> <caret line="25" column="27" lean-forward="true" selection-start-line="25" selection-start-column="27" selection-end-line="25" selection-end-column="27" />
</folding> <folding>
</state> <element signature="e#0#15#0" expanded="true" />
</provider> </folding>
</entry> </state>
</file> </provider>
<file pinned="false" current-in-tab="false"> </entry>
<entry file="file://$PROJECT_DIR$/auto_follow_majia.py"> </file>
<provider selected="true" editor-type-id="text-editor"> </leaf>
<state relative-caret-position="36">
<caret line="12" column="2" selection-start-line="12" selection-start-column="2" selection-end-line="12" selection-end-column="2" />
<folding>
<element signature="e#0#15#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/auto_at_once.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="18" column="86" selection-start-line="18" selection-start-column="86" selection-end-line="18" selection-end-column="86" />
<folding>
<element signature="e#0#15#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</split-first>
<split-second>
<leaf>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/offline_comment.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="80" column="30" lean-forward="true" selection-start-line="80" selection-start-column="30" selection-end-line="80" selection-end-column="30" />
<folding>
<element signature="e#0#15#0" expanded="true" />
<marker date="1555673023000" expanded="true" signature="1693:1694" ph="..." />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/instant.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="309">
<caret line="70" column="34" selection-start-line="70" selection-start-column="34" selection-end-line="70" selection-end-column="34" />
<folding>
<element signature="e#0#15#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</split-second>
</splitter>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES"> <option name="RECENT_TEMPLATES">
...@@ -334,30 +297,30 @@ ...@@ -334,30 +297,30 @@
<option value="$PROJECT_DIR$/tasks/auto_at_once.py" /> <option value="$PROJECT_DIR$/tasks/auto_at_once.py" />
<option value="$PROJECT_DIR$/_celery.py" /> <option value="$PROJECT_DIR$/_celery.py" />
<option value="$PROJECT_DIR$/comment.txt" /> <option value="$PROJECT_DIR$/comment.txt" />
<option value="$PROJECT_DIR$/auto_user_id.py" /> <option value="$PROJECT_DIR$/auto_follow_majia.py" />
<option value="$PROJECT_DIR$/auto_at_once.py" />
<option value="$PROJECT_DIR$/instant.py" />
<option value="$PROJECT_DIR$/offline_comment.py" />
<option value="$PROJECT_DIR$/auto_request.py" /> <option value="$PROJECT_DIR$/auto_request.py" />
<option value="$PROJECT_DIR$/auto_every_day.py" /> <option value="$PROJECT_DIR$/auto_follow.py" />
<option value="$PROJECT_DIR$/auto_urge.py" /> <option value="$PROJECT_DIR$/auto_commnet.py" />
<option value="$PROJECT_DIR$/auto_urge_three.py" /> <option value="$PROJECT_DIR$/auto_follow_new.py" />
<option value="$PROJECT_DIR$/auto_star_urge.py" />
<option value="$PROJECT_DIR$/auto_star_topic.py" />
<option value="$PROJECT_DIR$/auto_lunch_app.py" /> <option value="$PROJECT_DIR$/auto_lunch_app.py" />
<option value="$PROJECT_DIR$/auto_star_topic.py" />
<option value="$PROJECT_DIR$/auto_follow_one.py" /> <option value="$PROJECT_DIR$/auto_follow_one.py" />
<option value="$PROJECT_DIR$/auto_follow_new.py" /> <option value="$PROJECT_DIR$/auto_star_urge.py" />
<option value="$PROJECT_DIR$/auto_follow_majia.py" /> <option value="$PROJECT_DIR$/auto_urge.py" />
<option value="$PROJECT_DIR$/auto_at_once.py" /> <option value="$PROJECT_DIR$/auto_urge_three.py" />
<option value="$PROJECT_DIR$/auto_click_n.py" /> <option value="$PROJECT_DIR$/auto_click_n.py" />
<option value="$PROJECT_DIR$/auto_every_day.py" />
<option value="$PROJECT_DIR$/auto_click.py" /> <option value="$PROJECT_DIR$/auto_click.py" />
<option value="$PROJECT_DIR$/auto_follow.py" /> <option value="$PROJECT_DIR$/auto_user_id.py" />
<option value="$PROJECT_DIR$/auto_commnet.py" />
<option value="$PROJECT_DIR$/offline_comment.py" />
<option value="$PROJECT_DIR$/instant.py" />
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds">
<option name="y" value="23" /> <option name="y" value="23" />
<option name="width" value="1920" /> <option name="width" value="1280" />
<option name="height" value="724" /> <option name="height" value="724" />
</component> </component>
<component name="ProjectView"> <component name="ProjectView">
...@@ -568,11 +531,11 @@ ...@@ -568,11 +531,11 @@
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="23" width="1920" height="724" extended-state="0" /> <frame x="57" y="42" width="1280" height="724" extended-state="1" />
<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.11005793" /> <window_info active="true" content_ui="combo" id="Project" order="2" sideWeight="0.7872763" visible="true" weight="0.20889595" />
<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" />
...@@ -582,7 +545,7 @@ ...@@ -582,7 +545,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.454844" /> <window_info anchor="bottom" id="Terminal" order="8" visible="true" weight="0.0" />
<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" />
...@@ -593,7 +556,7 @@ ...@@ -593,7 +556,7 @@
<layout-to-restore> <layout-to-restore>
<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 active="true" content_ui="combo" id="Project" order="2" sideWeight="0.7872763" visible="true" weight="0.111637704" /> <window_info content_ui="combo" id="Project" order="2" sideWeight="0.7872763" visible="true" weight="0.1096108" />
<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" />
...@@ -603,7 +566,7 @@ ...@@ -603,7 +566,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 anchor="bottom" id="Terminal" order="8" visible="true" weight="0.0032786885" /> <window_info active="true" anchor="bottom" id="Terminal" order="8" visible="true" weight="0.0" />
<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" />
...@@ -690,30 +653,7 @@ ...@@ -690,30 +653,7 @@
<entry file="file://$PROJECT_DIR$/user_session" /> <entry file="file://$PROJECT_DIR$/user_session" />
<entry file="file://$PROJECT_DIR$/user_session.json" /> <entry file="file://$PROJECT_DIR$/user_session.json" />
<entry file="file://$PROJECT_DIR$/auto_click_ssss.py" /> <entry file="file://$PROJECT_DIR$/auto_click_ssss.py" />
<entry file="file://$PROJECT_DIR$/celery.py"> <entry file="file://$PROJECT_DIR$/celery.py" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="9" selection-start-line="9" selection-end-line="9" />
<folding>
<element signature="e#15#106#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/epp_scripts/test1.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="16" selection-start-line="16" selection-end-line="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/guanshui">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1500">
<caret line="100" selection-start-line="100" selection-end-line="100" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/log_settings.py"> <entry file="file://$PROJECT_DIR$/log_settings.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420"> <state relative-caret-position="420">
...@@ -721,9 +661,7 @@ ...@@ -721,9 +661,7 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/mysql_config.py"> <entry file="file://$PROJECT_DIR$/mysql_config.py" />
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/batch_user_gen"> <entry file="file://$PROJECT_DIR$/batch_user_gen">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="758"> <state relative-caret-position="758">
...@@ -741,178 +679,123 @@ ...@@ -741,178 +679,123 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/epp_scripts/test2.py"> <entry file="file://$PROJECT_DIR$/epp_scripts/test2.py" />
<provider selected="true" editor-type-id="text-editor"> <entry file="file://$PROJECT_DIR$/tasks/instant.py" />
<state relative-caret-position="300"> <entry file="file://$PROJECT_DIR$/epp_scripts/celery_task_router.py" />
<caret line="20" selection-start-line="20" selection-end-line="20" /> <entry file="file://$PROJECT_DIR$/epp_scripts/celery.py" />
</state> <entry file="file://$PROJECT_DIR$/epp_scripts/test1.py" />
</provider> <entry file="file://$PROJECT_DIR$/tasks/auto_at_once.py" />
</entry> <entry file="file://$PROJECT_DIR$/_celery.py" />
<entry file="file://$PROJECT_DIR$/tasks/instant.py"> <entry file="file://$PROJECT_DIR$/celeryconfig.py" />
<provider selected="true" editor-type-id="text-editor"> <entry file="file://$PROJECT_DIR$/user_id.txt">
<state relative-caret-position="15"> <provider selected="true" editor-type-id="text-editor" />
<caret line="1" selection-start-line="1" selection-end-line="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/epp_scripts/celery_task_router.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="9" column="31" selection-start-line="9" selection-start-column="31" selection-end-line="9" selection-end-column="31" />
<folding>
<element signature="e#90#162#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/epp_scripts/celery.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45">
<caret line="3" selection-start-line="3" selection-end-line="3" />
<folding>
<element signature="e#0#56#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/epp_scripts/test1.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" selection-start-line="1" selection-end-line="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tasks/auto_at_once.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="30" column="26" selection-start-line="30" selection-start-column="26" selection-end-line="30" selection-end-column="26" />
<folding>
<element signature="e#309#900#0" />
<element signature="e#934#1882#0" />
</folding>
</state>
</provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/_celery.py"> <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="285"> <state relative-caret-position="344">
<caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" /> <caret line="54" column="52" selection-start-line="54" selection-start-column="52" selection-end-line="54" selection-end-column="52" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/celeryconfig.py"> <entry file="file://$PROJECT_DIR$/auto_star_topic.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180"> <state relative-caret-position="205">
<caret line="12" column="34" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" /> <caret line="36" column="24" selection-start-line="36" selection-start-column="24" selection-end-line="36" selection-end-column="24" />
<folding> <folding>
<element signature="e#0#91#0" expanded="true" /> <element signature="e#0#15#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/comment.txt"> <entry file="file://$PROJECT_DIR$/auto_lunch_app.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="910">
<caret line="1932" column="5" selection-start-line="1932" selection-start-column="5" selection-end-line="1932" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/user_id.txt">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<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="1020"> <state relative-caret-position="135">
<caret line="68" column="33" selection-start-line="68" selection-end-line="69" /> <caret line="9" column="35" selection-start-line="9" selection-start-column="35" selection-end-line="9" selection-end-column="35" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/auto_user_id.py"> <entry file="file://$PROJECT_DIR$/auto_follow_one.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state relative-caret-position="256">
<caret lean-forward="true" /> <caret line="26" column="8" selection-start-line="26" selection-start-column="8" selection-end-line="26" selection-end-column="8" />
<folding> <folding>
<element signature="e#1#15#0" expanded="true" /> <element signature="e#0#15#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/auto_star_urge.py"> <entry file="file://$PROJECT_DIR$/auto_follow_new.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="788"> <state relative-caret-position="1031">
<caret line="60" selection-start-line="60" selection-end-line="60" /> <caret line="107" column="26" lean-forward="true" selection-start-line="107" selection-start-column="26" selection-end-line="107" selection-end-column="26" />
<folding> <folding>
<element signature="e#0#15#0" expanded="true" /> <element signature="e#0#15#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/auto_urge_three.py"> <entry file="file://$PROJECT_DIR$/auto_follow.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="828"> <state relative-caret-position="464">
<caret line="61" column="45" selection-start-line="61" selection-start-column="45" selection-end-line="61" selection-end-column="45" /> <caret line="37" lean-forward="true" selection-start-line="37" selection-end-line="37" />
<folding> <folding>
<element signature="e#0#15#0" expanded="true" /> <element signature="e#0#15#0" expanded="true" />
<marker date="1555731978000" expanded="true" signature="1181:1554" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/auto_urge.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 relative-caret-position="656"> <state relative-caret-position="391">
<caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" /> <caret line="37" column="97" selection-start-line="37" selection-start-column="97" selection-end-line="37" selection-end-column="97" />
<folding> <folding>
<element signature="e#0#15#0" expanded="true" /> <element signature="e#0#15#0" expanded="true" />
<marker date="1555731978000" expanded="true" signature="1117:1661" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/auto_request.py"> <entry file="file://$PROJECT_DIR$/auto_star_urge.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="310"> <state relative-caret-position="190">
<caret line="162" column="22" lean-forward="true" selection-start-line="162" selection-start-column="22" selection-end-line="162" selection-end-column="22" /> <caret line="18" column="11" selection-start-line="18" selection-start-column="11" selection-end-line="18" selection-end-column="11" />
<folding> <folding>
<element signature="e#0#15#0" expanded="true" /> <element signature="e#0#15#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/auto_star_topic.py"> <entry file="file://$PROJECT_DIR$/auto_urge.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315"> <state relative-caret-position="-5">
<caret line="21" column="33" lean-forward="true" selection-start-line="21" selection-start-column="33" selection-end-line="21" selection-end-column="33" /> <caret line="5" column="6" selection-start-line="5" selection-end-line="5" selection-end-column="6" />
<folding>
<element signature="e#0#15#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/auto_lunch_app.py"> <entry file="file://$PROJECT_DIR$/auto_follow_majia.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="359"> <state relative-caret-position="139">
<caret line="24" column="24" selection-start-line="24" selection-start-column="24" selection-end-line="24" selection-end-column="24" /> <caret line="12" column="2" selection-start-line="12" selection-start-column="2" selection-end-line="12" selection-end-column="2" />
<folding> <folding>
<element signature="e#0#15#0" expanded="true" /> <element signature="e#0#15#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/auto_follow_one.py"> <entry file="file://$PROJECT_DIR$/auto_urge_three.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="548"> <state relative-caret-position="258">
<caret line="57" selection-start-line="57" selection-end-line="57" /> <caret line="23" column="26" selection-start-line="23" selection-start-column="26" selection-end-line="23" selection-end-column="26" />
<folding> <folding>
<element signature="e#0#15#0" expanded="true" /> <element signature="e#0#15#0" expanded="true" />
<marker date="1555816682000" expanded="true" signature="1275:1648" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/auto_at_once.py"> <entry file="file://$PROJECT_DIR$/auto_at_once.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270"> <state relative-caret-position="324">
<caret line="18" column="86" selection-start-line="18" selection-start-column="86" selection-end-line="18" selection-end-column="86" /> <caret line="25" column="30" lean-forward="true" selection-start-line="25" selection-start-column="30" selection-end-line="25" selection-end-column="30" />
<folding> <folding>
<element signature="e#0#15#0" expanded="true" /> <element signature="e#0#15#0" expanded="true" />
</folding> </folding>
...@@ -921,91 +804,79 @@ ...@@ -921,91 +804,79 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/auto_click.py"> <entry file="file://$PROJECT_DIR$/auto_click.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330"> <state relative-caret-position="105">
<caret line="22" column="33" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" /> <caret line="7" column="35" selection-start-line="7" selection-start-column="35" selection-end-line="7" selection-end-column="35" />
<folding>
<element signature="e#0#11#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/auto_every_day.py"> <entry file="file://$PROJECT_DIR$/auto_click_n.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="426"> <state relative-caret-position="43">
<caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" /> <caret line="8" column="36" selection-start-line="8" selection-start-column="36" selection-end-line="8" selection-end-column="36" />
<folding>
<element signature="e#0#15#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/auto_follow.py"> <entry file="file://$PROJECT_DIR$/auto_commnet.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="284"> <state relative-caret-position="275">
<caret line="26" column="33" selection-start-line="26" selection-start-column="33" selection-end-line="26" selection-end-column="33" /> <caret line="25" column="27" lean-forward="true" selection-start-line="25" selection-start-column="27" selection-end-line="25" selection-end-column="27" />
<folding> <folding>
<element signature="e#0#15#0" expanded="true" /> <element signature="e#0#15#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/auto_follow_majia.py"> <entry file="file://$PROJECT_DIR$/auto_user_id.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="36"> <state relative-caret-position="435">
<caret line="12" column="2" selection-start-line="12" selection-start-column="2" selection-end-line="12" selection-end-column="2" /> <caret line="29" selection-start-line="29" selection-end-line="29" />
<folding> <folding>
<element signature="e#0#15#0" expanded="true" /> <element signature="e#1#15#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/auto_follow_new.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="1098"> <state relative-caret-position="1177">
<caret line="76" column="29" selection-start-line="76" selection-start-column="29" selection-end-line="76" selection-end-column="29" /> <caret line="148" lean-forward="true" selection-start-line="148" selection-end-line="148" />
<folding> <folding>
<element signature="e#0#15#0" expanded="true" /> <element signature="e#0#15#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/auto_click_n.py"> <entry file="file://$PROJECT_DIR$/instant.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="334"> <state relative-caret-position="-571">
<caret line="33" column="19" lean-forward="true" selection-start-line="33" selection-start-column="19" selection-end-line="33" selection-end-column="19" /> <caret line="26" selection-start-line="26" selection-end-line="26" />
<folding> <folding>
<element signature="e#0#15#0" expanded="true" /> <element signature="e#0#15#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/auto_commnet.py"> <entry file="file://$PROJECT_DIR$/guanshui">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272"> <state relative-caret-position="554">
<caret line="27" column="20" lean-forward="true" selection-start-line="27" selection-start-column="20" selection-end-line="27" selection-end-column="20" /> <caret line="100" selection-start-line="100" selection-end-line="100" />
<folding>
<element signature="e#0#15#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/offline_comment.py"> <entry file="file://$PROJECT_DIR$/comment.txt">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323"> <state relative-caret-position="224">
<caret line="80" column="30" lean-forward="true" selection-start-line="80" selection-start-column="30" selection-end-line="80" selection-end-column="30" /> <caret line="1910" column="4" lean-forward="true" selection-start-line="1910" selection-start-column="4" selection-end-line="1910" selection-end-column="4" />
<folding>
<element signature="e#0#15#0" expanded="true" />
<marker date="1555673023000" expanded="true" signature="1693:1694" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/instant.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="309"> <state relative-caret-position="1124">
<caret line="70" column="34" selection-start-line="70" selection-start-column="34" selection-end-line="70" selection-end-column="34" /> <caret line="100" lean-forward="true" selection-start-line="100" selection-end-line="100" />
<folding> <folding>
<element signature="e#0#15#0" expanded="true" /> <element signature="e#0#15#0" expanded="true" />
<marker date="1555812702000" expanded="true" signature="1722:1723" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
......
...@@ -4,25 +4,26 @@ import random ...@@ -4,25 +4,26 @@ import random
import traceback import traceback
from log_settings import * from log_settings import *
import logging import logging
from auto_request import login, click, time_convs, get_user_id from auto_request import login, click, time_convs
from auto_request import host, user, port, db, passwd from auto_request import host, user, db, passwd
def get_data(numtime): def get_data(numtime):
try: try:
pc = pymysql.connect(host=host, user=user, passwd=passwd, db=db, port=port) pc = pymysql.connect(host=host, user=user, passwd=passwd, db=db, port=3306)
cursor = pc.cursor() cursor = pc.cursor()
cursor.execute( cursor.execute(
"SELECT user_id , id FROM topic WHERE is_online=1 and create_time LIKE '%%%%%s%%%%'" % numtime) "SELECT user_id,id FROM topic WHERE is_online=1 and create_time LIKE '%%%%%s%%%%'" % numtime)
data = cursor.fetchall() data = cursor.fetchall()
topic_id = list(data) topic_id = list(data)
user_list = get_user_id()
topic_id_list = [] topic_id_list = []
if topic_id: for i in topic_id:
for i in topic_id: cursor.execute(
if int(i[0]) not in user_list: "select user_id from user_extra where user_id =" + str(i[0]) + " and is_shadow =0")
topic_id_list.append(i) data = cursor.fetchall()
user_id = list(data)
if user_id:
topic_id_list.append(i)
logging.info("Database version : %s " % topic_id_list) logging.info("Database version : %s " % topic_id_list)
pc.close() pc.close()
return topic_id_list return topic_id_list
......
...@@ -5,8 +5,8 @@ import pymysql ...@@ -5,8 +5,8 @@ import pymysql
import random import random
import traceback import traceback
import logging import logging
from auto_request import login, click, time_convs, get_user_id from auto_request import login, click, time_convs
from auto_request import host, user, port, db, passwd from auto_request import host, user, db, passwd
def get_data(numtime): def get_data(numtime):
...@@ -15,16 +15,17 @@ def get_data(numtime): ...@@ -15,16 +15,17 @@ def get_data(numtime):
cursor = pc.cursor() cursor = pc.cursor()
cursor.execute( cursor.execute(
"SELECT user_id,id FROM topic WHERE is_online=1 and create_time LIKE '%%%%%s%%%%' " % numtime) "SELECT user_id , id FROM topic WHERE is_online=1 and create_time LIKE '%%%%%s%%%%' " % numtime)
data = cursor.fetchall() data = cursor.fetchall()
topic_id = list(data) topic_id = list(data)
user_list = get_user_id()
topic_id_list = [] topic_id_list = []
if topic_id: for i in topic_id:
for i in topic_id: cursor.execute(
if int(i[0]) not in user_list: "select user_id from user_extra where user_id =" + str(i[0]) + " and is_shadow =0")
topic_id_list.append(i) data = cursor.fetchall()
user_id = list(data)
if user_id:
topic_id_list.append(i)
logging.info("Database version : %s " % topic_id_list) logging.info("Database version : %s " % topic_id_list)
pc.close() pc.close()
return topic_id_list return topic_id_list
......
...@@ -7,8 +7,8 @@ import traceback ...@@ -7,8 +7,8 @@ import traceback
import logging import logging
from log_settings import * from log_settings import *
from auto_request import login, time_convs, reply, get_comment, get_user_id from auto_request import login, time_convs, reply, get_comment
from auto_request import host, user, port, db, passwd from auto_request import host, user, db, passwd
def get_topic_id(numtime): def get_topic_id(numtime):
...@@ -16,19 +16,19 @@ def get_topic_id(numtime): ...@@ -16,19 +16,19 @@ def get_topic_id(numtime):
pc = pymysql.connect(host=host, user=user, passwd=passwd, db=db, port=3306) pc = pymysql.connect(host=host, user=user, passwd=passwd, db=db, port=3306)
cursor = pc.cursor() cursor = pc.cursor()
cursor.execute( cursor.execute(
"SELECT user_id,id FROM topic WHERE is_online=1 and create_time LIKE '%%%%%s%%%%' " % numtime "SELECT id,user_id FROM topic WHERE is_online=1 and create_time LIKE '%%%%%s%%%%' " % numtime
# "select id,user_id from topic where user_id = 241529801 or id = 241529809"
) )
data = cursor.fetchall() data = cursor.fetchall()
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()
topic_id_list = [] topic_id_list = []
if topic_id: for i in topic_id:
for i in topic_id: cursor.execute(
if int(i[0]) not in user_list: "select user_id from user_extra where user_id =" + str(i[1]) + " and is_shadow =0 ")
topic_id_list.append(i) data = cursor.fetchall()
user_id = list(data)
if user_id:
topic_id_list.append(i)
logging.info("Database version : %s " % topic_id_list) logging.info("Database version : %s " % topic_id_list)
pc.close() pc.close()
......
...@@ -24,17 +24,22 @@ def get_topic_new_user(numtime): ...@@ -24,17 +24,22 @@ def get_topic_new_user(numtime):
topic_data = list(topic_data) topic_data = list(topic_data)
new_user_data = list(new_user_data) new_user_data = list(new_user_data)
user_list = get_user_id()
topic_id_list = [] topic_id_list = []
if topic_data: for i in topic_data:
for i in topic_data: cursor.execute(
if int(i) in user_list: "select user_id from user_extra where user_id =" + str(i[0]) + " and is_shadow =0")
topic_id_list.append(i) data = cursor.fetchall()
user_id = list(data)
if new_user_data: if user_id:
for i in new_user_data: topic_id_list.append(i)
if i in user_list:
topic_id_list.append(i) for i in new_user_data:
cursor.execute(
"select user_id from user_extra where user_id =" + str(i[0]) + " and is_shadow =0")
data = cursor.fetchall()
user_id = list(data)
if user_id:
topic_id_list.append(i)
logging.info("Database version : %s " % topic_id_list) logging.info("Database version : %s " % topic_id_list)
pc.close() pc.close()
......
...@@ -6,27 +6,26 @@ import random ...@@ -6,27 +6,26 @@ import random
import traceback import traceback
from log_settings import * from log_settings import *
import logging import logging
from auto_request import login, time_convs, follow,get_user_id from auto_request import login, time_convs, follow
from auto_request import host, user, port, db, passwd from auto_request import host, user, port, db, passwd
def get_data(numtime): def get_data(numtime):
try: try:
pc = pymysql.connect(host=host, user=user, passwd=passwd, db=db, port=port) pc = pymysql.connect(host=host, user=user, passwd=passwd, db=db, port=3306)
cursor = pc.cursor() cursor = pc.cursor()
cursor.execute( cursor.execute(
"SELECT distinct(user_id) FROM topic WHERE is_online=1 and create_time LIKE '%%%%%s%%%%'" % numtime) "SELECT distinct(user_id) FROM topic WHERE is_online=1 and create_time LIKE '%%%%%s%%%%'" % numtime)
data = cursor.fetchall() data = cursor.fetchall()
user_id = list(data) user_id = list(data)
user_list = get_user_id()
topic_id_list = [] topic_id_list = []
if user_id: for i in user_id:
for i in user_id: cursor.execute(
if int(i[0]) not in user_list: "select user_id from user_extra where user_id =" + str(i[0]) + " and is_shadow =0")
topic_id_list.append(i) data = cursor.fetchall()
id = list(data)
if id:
topic_id_list.append(i)
logging.info("Database version : %s " % topic_id_list) logging.info("Database version : %s " % topic_id_list)
pc.close() pc.close()
return topic_id_list return topic_id_list
...@@ -62,10 +61,8 @@ if __name__ == "__main__": ...@@ -62,10 +61,8 @@ if __name__ == "__main__":
cookies = login() cookies = login()
if cookies is not None: if cookies is not None:
follow(cookies, id) follow(cookies, id)
time.sleep(300) time.sleep(300)
except: except:
logging.error("catch exception,main:%s" % traceback.format_exc()) logging.error("catch exception,main:%s" % traceback.format_exc())
...@@ -6,12 +6,12 @@ import random ...@@ -6,12 +6,12 @@ import random
import traceback import traceback
from log_settings import * from log_settings import *
import logging import logging
from auto_request import login, time_convs, follow, get_user_id from auto_request import login, time_convs, follow
from auto_request import host, user, port, db, passwd from auto_request import host, user, port, db, passwd
def get_commnet_id(numtime): def get_commnet_id(numtime):
pc = pymysql.connect(host=host, user=user, passwd=passwd, db=db, port=port) pc = pymysql.connect(host=host, user=user, passwd=passwd, db=db, port=3306)
cursor = pc.cursor() cursor = pc.cursor()
cursor.execute( cursor.execute(
...@@ -47,41 +47,62 @@ def get_commnet_id(numtime): ...@@ -47,41 +47,62 @@ def get_commnet_id(numtime):
data1_id = list(data_reply_topic) data1_id = list(data_reply_topic)
data2_id = list(data_group_follow) data2_id = list(data_group_follow)
data3_id = list(data_new_user) data3_id = list(data_new_user)
data_reply_reply = list(data_reply_reply) data_reply = list(data_reply_reply)
user_list = get_user_id()
user_id = []
topic_id_list = []
for i in data_id: for i in data_id:
if i[0] is not None: cursor.execute(
if int(i[0]) not in user_list: "select user_id from user_extra where user_id =" + str(i[0]) + " and is_shadow =0 ")
user_id.append(i) data = cursor.fetchall()
user_id = list(data)
if user_id:
topic_id_list.append(i)
for i in data1_id: for i in data1_id:
if i[0] is not None: cursor.execute(
if int(i[0]) not in user_list: "select user_id from user_extra where user_id =" + str(i[0]) + " and is_shadow =0 ")
user_id.append(i) data = cursor.fetchall()
user_id = list(data)
if user_id:
topic_id_list.append(i)
for i in data2_id: for i in data2_id:
if i[0] is not None: cursor.execute(
if int(i[0]) not in user_list: "select user_id from user_extra where user_id =" + str(i[0]) + " and is_shadow =0 ")
user_id.append(i) data = cursor.fetchall()
user_id = list(data)
if user_id:
topic_id_list.append(i)
for i in data3_id: for i in data3_id:
if i[0] is not None: cursor.execute(
if int(i[0]) not in user_list: "select user_id from user_extra where user_id =" + str(i[0]) + " and is_shadow =0 ")
user_id.append(i) data = cursor.fetchall()
user_id = list(data)
for i in data_reply_reply: if user_id:
if i[0] is not None: topic_id_list.append(i)
if int(i[0]) not in user_list:
user_id.append(i)
logging.info("Database version : %s " % user_id) for i in data1_id:
cursor.execute(
"select user_id from user_extra where user_id =" + str(i[0]) + " and is_shadow =0 ")
data = cursor.fetchall()
user_id = list(data)
if user_id:
topic_id_list.append(i)
for i in data_reply:
cursor.execute(
"select user_id from user_extra where user_id =" + str(i[0]) + " and is_shadow =0 ")
data = cursor.fetchall()
user_id = list(data)
if user_id:
topic_id_list.append(i)
logging.info("Database version : %s " % topic_id_list)
pc.close() pc.close()
return user_id return topic_id_list
if __name__ == "__main__": if __name__ == "__main__":
......
...@@ -6,13 +6,13 @@ import random ...@@ -6,13 +6,13 @@ import random
import traceback import traceback
from log_settings import * from log_settings import *
import logging import logging
from auto_request import login, time_conv, follow, get_cookies, get_user_id from auto_request import login, time_conv, follow, get_cookies
from auto_request import host, user, port, db, passwd from auto_request import host, user, db, passwd
def get_data(numtime): def get_data(numtime):
try: try:
pc = pymysql.connect(host=host, user=user, passwd=passwd, db=db, port=port) pc = pymysql.connect(host=host, user=user, passwd=passwd, db=db, port=3306)
cursor = pc.cursor() cursor = pc.cursor()
cursor.execute( cursor.execute(
"select distinct(user_id) from account_user_auth where user_id not in (select user_id from pv_maidian where page_name ='home' and partiton_date >= %s )", "select distinct(user_id) from account_user_auth where user_id not in (select user_id from pv_maidian where page_name ='home' and partiton_date >= %s )",
...@@ -20,12 +20,14 @@ def get_data(numtime): ...@@ -20,12 +20,14 @@ def get_data(numtime):
data = cursor.fetchall() data = cursor.fetchall()
user_id = list(data) user_id = list(data)
user_list = get_user_id()
topic_id_list = [] topic_id_list = []
if user_id: for i in user_id:
for i in user_id: cursor.execute(
if int(i) not in user_list: "select user_id from user_extra where user_id =" + str(i[0]) + " and is_shadow =0 ")
topic_id_list.append(i) data = cursor.fetchall()
user_id = list(data)
if user_id:
topic_id_list.append(i)
logging.info("Database version : %s " % topic_id_list) logging.info("Database version : %s " % topic_id_list)
pc.close() pc.close()
......
...@@ -6,24 +6,27 @@ import random ...@@ -6,24 +6,27 @@ import random
import traceback import traceback
from log_settings import * from log_settings import *
import logging import logging
from auto_request import login, time_convs, follow, get_user_id from auto_request import login, time_convs, follow
from auto_request import host, user, port, db, passwd from auto_request import host, user, db, passwd
def get_data(numtime): def get_data(numtime):
try: try:
pc = pymysql.connect(host=host, user=user, passwd=passwd, db=db, port=port) pc = pymysql.connect(host=host, user=user, passwd=passwd, db=db, port=3306)
cursor = pc.cursor() cursor = pc.cursor()
cursor.execute( cursor.execute(
"select distinct(user_id) from pv_maidian where page_name ='home' and partiton_date like '%%%%%s%%%%'" % numtime) "select distinct(user_id) from pv_maidian where page_name ='home' and partiton_date like '%%%%%s%%%%'" % numtime)
data = cursor.fetchall() data = cursor.fetchall()
user_id = list(data) user_id = list(data)
user_list = get_user_id()
topic_id_list = [] topic_id_list = []
if user_id: for i in user_id:
for i in user_id: cursor.execute(
if int(i) not in user_list: "select user_id from user_extra where user_id =" + str(i[0]) + " and is_shadow =0 ")
topic_id_list.append(i) data = cursor.fetchall()
user_id = list(data)
if user_id:
topic_id_list.append(i)
logging.pcinfo("Database version : %s " % topic_id_list) logging.pcinfo("Database version : %s " % topic_id_list)
pc.close() pc.close()
return topic_id_list return topic_id_list
......
...@@ -132,7 +132,6 @@ def time_conv(minutest): ...@@ -132,7 +132,6 @@ def time_conv(minutest):
try: try:
now = datetime.datetime.now() now = datetime.datetime.now()
yes_time = now - datetime.timedelta(minutes=minutest) yes_time = now - datetime.timedelta(minutes=minutest)
print(yes_time)
return yes_time return yes_time
except: except:
...@@ -144,7 +143,7 @@ def time_convs(numtime): ...@@ -144,7 +143,7 @@ def time_convs(numtime):
now = datetime.datetime.now() now = datetime.datetime.now()
yes_time = now - datetime.timedelta(days=numtime) yes_time = now - datetime.timedelta(days=numtime)
yes_time_str = yes_time.strftime('%Y-%m-%d') yes_time_str = yes_time.strftime('%Y-%m-%d')
return yes_time_str return yes_time
except: except:
return None return None
......
...@@ -6,26 +6,26 @@ import random ...@@ -6,26 +6,26 @@ import random
import traceback import traceback
from log_settings import * from log_settings import *
import logging import logging
from auto_request import login, time_conv, follow, click, get_user_id from auto_request import login, time_conv, follow, click
from auto_request import host, user, port, db, passwd from auto_request import host, user, db, passwd
def get_star_user_id(numtime): def get_star_user_id(numtime):
try: try:
pc = pymysql.connect(host=host, user=user, passwd=passwd, db=db, port=port) pc = pymysql.connect(host=host, user=user, passwd=passwd, db=db, port=3306)
cursor = pc.cursor() cursor = pc.cursor()
cursor.execute( cursor.execute(
"SELECT user_id,id FROM topic WHERE is_online=1 and (content_level =4 or content_level =5) and create_time LIKE '%%%%%s%%%%' " % numtime) "SELECT user_id,id FROM topic WHERE is_online=1 and (content_level =4 or content_level =5) and create_time LIKE '%%%%%s%%%%' " % numtime)
data = cursor.fetchall() data = cursor.fetchall()
user_id = list(data) user_id = list(data)
user_list = get_user_id()
topic_id_list = [] topic_id_list = []
if user_id: for i in user_id:
for i in user_id: cursor.execute(
if int(i[0]) not in user_list: "select user_id from user_extra where user_id =" + str(i[0]) + " and is_shadow =0 ")
topic_id_list.append(i) data = cursor.fetchall()
user_id = list(data)
if user_id:
topic_id_list.append(i)
logging.info("Database version : %s " % topic_id_list) logging.info("Database version : %s " % topic_id_list)
pc.close() pc.close()
return topic_id_list return topic_id_list
......
...@@ -7,26 +7,26 @@ import pandas as pd ...@@ -7,26 +7,26 @@ import pandas as pd
import traceback import traceback
from log_settings import * from log_settings import *
import logging import logging
from auto_request import login, time_conv, Urge, get_user_id from auto_request import login, time_conv, Urge
from auto_request import host, user, port, db, passwd from auto_request import host, user, db, passwd
def get_star_useid(numtime): def get_star_useid(numtime):
try: try:
pc = pymysql.connect(host=host, user=user, passwd=passwd, db=db, port=port) pc = pymysql.connect(host=host, user=user, passwd=passwd, db=db, port=3306)
cursor = pc.cursor() cursor = pc.cursor()
cursor.execute( cursor.execute(
"SELECT distinct(user_id) FROM topic WHERE is_online=1 and (content_level =4 or content_level =5) and create_time LIKE '%%%%%s%%%%'" % numtime) "SELECT distinct(user_id) FROM topic WHERE is_online=1 and (content_level =4 or content_level =5) and create_time LIKE '%%%%%s%%%%'" % numtime)
data = cursor.fetchall() data = cursor.fetchall()
user_id = list(data) user_id = list(data)
user_list = get_user_id()
topic_id_list = [] topic_id_list = []
if user_id: for i in user_id:
for i in user_id: cursor.execute(
if int(i) not in user_list: "select user_id from user_extra where user_id =" + str(i[0]) + " and is_shadow =0 ")
topic_id_list.append(i) data = cursor.fetchall()
user_id = list(data)
if user_id:
topic_id_list.append(i)
logging.info("Database version : %s " % topic_id_list) logging.info("Database version : %s " % topic_id_list)
pc.close() pc.close()
return topic_id_list return topic_id_list
...@@ -58,7 +58,6 @@ if __name__ == "__main__": ...@@ -58,7 +58,6 @@ if __name__ == "__main__":
cookies = login() cookies = login()
if cookies is not None: if cookies is not None:
Urge(cookies, id) Urge(cookies, id)
except: except:
......
...@@ -7,26 +7,28 @@ import pandas as pd ...@@ -7,26 +7,28 @@ import pandas as pd
import traceback import traceback
from log_settings import * from log_settings import *
import logging import logging
from auto_request import login, time_conv, Urge, get_user_id from auto_request import login, time_conv, Urge
from auto_request import host, user, port, db, passwd from auto_request import host, user, db, passwd
import threading import threading
def get_data(numtime): def get_data(numtime):
try: try:
pc = pymysql.connect(host=host, user=user, passwd=passwd, db=db, port=port) pc = pymysql.connect(host=host, user=user, passwd=passwd, db=db, port=3306)
cursor = pc.cursor() cursor = pc.cursor()
cursor.execute( cursor.execute(
"SELECT distinct(user_id) FROM topic WHERE is_online=1 and create_time LIKE '%%%%%s%%%%'" % numtime) "SELECT distinct(user_id) FROM topic WHERE is_online=1 and create_time LIKE '%%%%%s%%%%'" % numtime)
data = cursor.fetchall() data = cursor.fetchall()
user_id = list(data) user_id = list(data)
user_list = get_user_id()
topic_id_list = [] topic_id_list = []
if user_id: for i in user_id:
for i in user_id: cursor.execute(
if int(i) not in user_list: "select user_id from user_extra where user_id =" + str(i[0]) + " and is_shadow =0 ")
topic_id_list.append(i) data = cursor.fetchall()
user_id = list(data)
if user_id:
topic_id_list.append(i)
logging.info("Database version : %s " % topic_id_list) logging.info("Database version : %s " % topic_id_list)
pc.close() pc.close()
......
...@@ -8,26 +8,27 @@ from log_settings import * ...@@ -8,26 +8,27 @@ from log_settings import *
import logging import logging
import threading import threading
from auto_request import login, time_conv, Urge, get_user_id from auto_request import login, time_conv, Urge
from auto_request import host, user, port, db, passwd from auto_request import host, user, db, passwd
def get_data(numtime): def get_data(numtime):
try: try:
pc = pymysql.connect(host=host, user=user, passwd=passwd, db=db, port=port) pc = pymysql.connect(host=host, user=user, passwd=passwd, db=db, port=3306)
cursor = pc.cursor() cursor = pc.cursor()
cursor.execute( cursor.execute(
"select distinct(user_id) from account_user_auth where user_id not in (select user_id from pv_maidian where page_name ='home' and partiton_date >= %s)", "select distinct(user_id) from account_user_auth where user_id not in (select user_id from pv_maidian where page_name ='home' and partiton_date >= %s)",
(numtime)) (numtime))
data = cursor.fetchall() data = cursor.fetchall()
user_id = list(data) user_id = list(data)
user_list = get_user_id()
topic_id_list = [] topic_id_list = []
if user_id: for i in user_id:
for i in user_id: cursor.execute(
if int(i[1]) not in user_list: "select user_id from user_extra where user_id =" + str(i[0]) + " and is_shadow =0 ")
topic_id_list.append(i) data = cursor.fetchall()
user_id = list(data)
if user_id:
topic_id_list.append(i)
logging.info("Database version : %s " % topic_id_list) logging.info("Database version : %s " % topic_id_list)
pc.close() pc.close()
......
...@@ -35,3 +35,4 @@ for i in data: ...@@ -35,3 +35,4 @@ for i in data:
...@@ -43,7 +43,7 @@ if __name__ == "__main__": ...@@ -43,7 +43,7 @@ if __name__ == "__main__":
global exec_count global exec_count
exec_count += 1 exec_count += 1
if exec_count == 1: if exec_count == 2:
print("----1------") print("----1------")
sleep_time = random.randint(300, 540) sleep_time = random.randint(300, 540)
sleep_time = 30 sleep_time = 30
...@@ -76,7 +76,7 @@ if __name__ == "__main__": ...@@ -76,7 +76,7 @@ if __name__ == "__main__":
timer = threading.Timer(sleep_time, fun_timer) timer = threading.Timer(sleep_time, fun_timer)
timer.start() timer.start()
if exec_count == 2: if exec_count == 5:
print("----4------") print("----4------")
# sleep_time = random.randint(1000, 1900) # sleep_time = random.randint(1000, 1900)
......
...@@ -4,7 +4,7 @@ import random ...@@ -4,7 +4,7 @@ import random
from log_settings import * from log_settings import *
import traceback import traceback
import logging import logging
from auto_request import get_offline_comment,get_user_id from auto_request import get_offline_comment
from auto_request import host, user, db, passwd from auto_request import host, user, db, passwd
auto_reply_url = "http://47.93.162.11:8085/api/v1/reply/create_for_inner" auto_reply_url = "http://47.93.162.11:8085/api/v1/reply/create_for_inner"
...@@ -19,8 +19,6 @@ auto_reply_url = "http://47.93.162.11:8085/api/v1/reply/create_for_inner" ...@@ -19,8 +19,6 @@ auto_reply_url = "http://47.93.162.11:8085/api/v1/reply/create_for_inner"
# 注意需要禁止本帖作者评论 # 注意需要禁止本帖作者评论
def reply(id, content, user_id): def reply(id, content, user_id):
try: try:
post_dict = { post_dict = {
...@@ -42,20 +40,19 @@ def get_data(num1, num2): ...@@ -42,20 +40,19 @@ def get_data(num1, num2):
try: try:
pc = pymysql.connect(host=host, user=user, passwd=passwd, db=db, port=3306) pc = pymysql.connect(host=host, user=user, passwd=passwd, db=db, port=3306)
cursor = pc.cursor() cursor = pc.cursor()
print(num1)
print(num2)
print("--------")
cursor.execute( cursor.execute(
"SELECT id,user_id FROM topic WHERE is_online =1 and (id > " + str(num1) + " and id <= " + str( "SELECT id,user_id FROM topic WHERE is_online =1 and (id > " + str(num1) + " and id <= " + str(
num2) + ") and (content_level = 4 or content_level = 5) ") num2) + ") and (content_level = 4 or content_level = 5) ")
data = cursor.fetchall() data = cursor.fetchall()
topic_id = list(data) topic_id = list(data)
user_list = get_user_id()
topic_id_list = [] topic_id_list = []
if topic_id: for i in topic_id:
for i in topic_id: cursor.execute(
if int(i[1]) in user_list: "select user_id from user_extra where user_id =" + str(i[1]) + " and is_shadow =1")
topic_id_list.append(i) cursor.fetchall()
user_id = list(data)
if user_id:
topic_id_list.append(i)
pc.close() pc.close()
logging.info("get topic_id_list:%s" % topic_id_list) logging.info("get topic_id_list:%s" % topic_id_list)
return topic_id_list return topic_id_list
...@@ -68,7 +65,8 @@ if __name__ == "__main__": ...@@ -68,7 +65,8 @@ if __name__ == "__main__":
try: try:
time_list = [[0, 100000], [100000, 200000], [200000, 300000], [300000, 400000], [400000, 500000],[500000, 600000],[600000, 700000]] time_list = [[0, 100000], [100000, 200000], [200000, 300000], [300000, 400000], [400000, 500000],
[500000, 600000], [600000, 700000]]
user_data = open("user_id.txt", "r") user_data = open("user_id.txt", "r")
......
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