Skip to content

V
vest
Commit 36405b3e authored by lixiaofang's avatar lixiaofang
Browse files
Options

依赖

parent 502321d3
Hide whitespace changes
Inline Side-by-side
Showing with 220 additions and 265 deletions
.idea/workspace.xml
View file @ 36405b3e
...@@ -2,17 +2,9 @@ ...@@ -2,17 +2,9 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="8a5543fd-f32d-4426-b921-0848e1e04eaf" name="Default Changelist" comment=""> <list default="true" id="8a5543fd-f32d-4426-b921-0848e1e04eaf" 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$/click/views/auto_click.py" beforeDir="false" afterPath="$PROJECT_DIR$/click/views/auto_click.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/comment/views/auto_comment.py" beforeDir="false" afterPath="$PROJECT_DIR$/comment/views/auto_comment.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/follow/views/auto_follow.py" beforeDir="false" afterPath="$PROJECT_DIR$/follow/views/auto_follow.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/moment/views/consum.py" beforeDir="false" afterPath="$PROJECT_DIR$/moment/views/consum.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/moment/views/consum.py" beforeDir="false" afterPath="$PROJECT_DIR$/moment/views/consum.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/moment/views/irrigation.py" beforeDir="false" afterPath="$PROJECT_DIR$/moment/views/irrigation.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/moment/views/process_time.py" beforeDir="false" afterPath="$PROJECT_DIR$/moment/views/process_time.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/moment/views/process_time.py" beforeDir="false" afterPath="$PROJECT_DIR$/moment/views/process_time.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/moment/views/save_data.py" beforeDir="false" afterPath="$PROJECT_DIR$/moment/views/save_data.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/requirements.txt" beforeDir="false" afterPath="$PROJECT_DIR$/requirements.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/moment/views/vest_ids.txt" beforeDir="false" afterPath="$PROJECT_DIR$/moment/views/vest_ids.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vest/settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/vest/settings.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vest/settings_local.py" beforeDir="false" afterPath="$PROJECT_DIR$/vest/settings_local.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" />
...@@ -33,161 +25,156 @@ ...@@ -33,161 +25,156 @@
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.extensions.open"> <usages-collector id="statistics.file.extensions.open">
<counts> <counts>
<entry key="py" value="145" /> <entry key="py" value="153" />
<entry key="txt" value="9" /> <entry key="txt" value="11" />
<entry key="vest_ids" value="1" /> <entry key="vest_ids" value="1" />
<entry key="xml" value="2" /> <entry key="xml" 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="10" /> <entry key="PLAIN_TEXT" value="12" />
<entry key="Python" value="145" /> <entry key="Python" value="153" />
<entry key="XML" value="2" /> <entry key="XML" value="2" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.extensions.edit"> <usages-collector id="statistics.file.extensions.edit">
<counts> <counts>
<entry key="dummy" value="41" /> <entry key="dummy" value="41" />
<entry key="py" value="8814" /> <entry key="py" value="8837" />
<entry key="txt" value="82" /> <entry key="txt" value="84" />
<entry key="xml" value="10" /> <entry key="xml" value="10" />
</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="123" /> <entry key="PLAIN_TEXT" value="125" />
<entry key="Python" value="8814" /> <entry key="Python" value="8837" />
<entry key="XML" value="10" /> <entry key="XML" value="10" />
</counts> </counts>
</usages-collector> </usages-collector>
</session> </session>
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.8917431"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<split-first> <file pinned="false" current-in-tab="false">
<splitter split-orientation="horizontal" split-proportion="0.487989"> <entry file="file://$PROJECT_DIR$/moment/views/consum.py">
<split-first> <provider selected="true" editor-type-id="text-editor">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <state relative-caret-position="1469">
<file pinned="false" current-in-tab="true"> <caret line="98" column="89" lean-forward="true" selection-start-line="98" selection-start-column="89" selection-end-line="98" selection-end-column="89" />
<entry file="file://$PROJECT_DIR$/moment/views/consum.py"> <folding>
<provider selected="true" editor-type-id="text-editor"> <element signature="e#46#57#0" expanded="true" />
<state relative-caret-position="270"> </folding>
<caret line="18" column="42" selection-start-line="18" selection-start-column="36" selection-end-line="18" selection-end-column="42" /> </state>
<folding> </provider>
<element signature="e#46#57#0" expanded="true" /> </entry>
</folding> </file>
</state> <file pinned="false" current-in-tab="false">
</provider> <entry file="file://$PROJECT_DIR$/follow/views/auto_follow.py">
</entry> <provider selected="true" editor-type-id="text-editor">
</file> <state relative-caret-position="513">
</leaf> <caret line="54" column="70" selection-start-line="54" selection-start-column="45" selection-end-line="54" selection-end-column="70" />
</split-first> <folding>
<split-second> <element signature="e#24#39#0" expanded="true" />
<leaf> </folding>
<file pinned="false" current-in-tab="false"> </state>
<entry file="file://$PROJECT_DIR$/click/views/click_fun.py"> </provider>
<provider selected="true" editor-type-id="text-editor"> </entry>
<state relative-caret-position="135"> </file>
<caret line="9" column="15" selection-start-line="9" selection-start-column="15" selection-end-line="9" selection-end-column="15" /> <file pinned="false" current-in-tab="true">
<folding> <entry file="file://$PROJECT_DIR$/moment/views/irrigation.py">
<element signature="e#0#36#0" expanded="true" /> <provider selected="true" editor-type-id="text-editor">
</folding> <state relative-caret-position="142">
</state> <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
</provider> <folding>
</entry> <element signature="e#46#57#0" expanded="true" />
</file> </folding>
<file pinned="false" current-in-tab="false"> </state>
<entry file="file://$PROJECT_DIR$/comment/views/comment_fun.py"> </provider>
<provider selected="true" editor-type-id="text-editor"> </entry>
<state relative-caret-position="90"> </file>
<caret line="6" column="11" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="11" /> <file pinned="false" current-in-tab="false">
<folding> <entry file="file://$PROJECT_DIR$/vest/wsgi.py">
<element signature="e#0#36#0" expanded="true" /> <provider selected="true" editor-type-id="text-editor">
</folding> <state relative-caret-position="210">
</state> <caret line="16" selection-start-line="16" selection-end-line="16" />
</provider> </state>
</entry> </provider>
</file> </entry>
<file pinned="false" current-in-tab="true"> </file>
<entry file="file://$PROJECT_DIR$/follow/views/follow_fun.py"> <file pinned="false" current-in-tab="false">
<provider selected="true" editor-type-id="text-editor"> <entry file="file://$PROJECT_DIR$/requirements.txt">
<state relative-caret-position="90"> <provider selected="true" editor-type-id="text-editor">
<caret line="6" column="10" selection-start-line="6" selection-start-column="10" selection-end-line="6" selection-end-column="10" /> <state relative-caret-position="266">
<folding> <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
<element signature="e#0#36#0" expanded="true" /> </state>
</folding> </provider>
</state> </entry>
</provider> </file>
</entry> <file pinned="false" current-in-tab="false">
</file> <entry file="file://$PROJECT_DIR$/comment/views/comment_fun.py">
</leaf> <provider selected="true" editor-type-id="text-editor">
</split-second> <state relative-caret-position="90">
</splitter> <caret line="6" column="11" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="11" />
</split-first> <folding>
<split-second> <element signature="e#0#36#0" expanded="true" />
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> </folding>
<file pinned="false" current-in-tab="false"> </state>
<entry file="file://$PROJECT_DIR$/follow/views/auto_follow.py"> </provider>
<provider selected="true" editor-type-id="text-editor"> </entry>
<state relative-caret-position="84"> </file>
<caret line="54" column="70" selection-start-line="54" selection-start-column="45" selection-end-line="54" selection-end-column="70" /> <file pinned="false" current-in-tab="false">
<folding> <entry file="file://$PROJECT_DIR$/moment/views/process_time.py">
<element signature="e#24#39#0" expanded="true" /> <provider selected="true" editor-type-id="text-editor">
</folding> <state relative-caret-position="2714">
</state> <caret line="231" column="45" lean-forward="true" selection-start-line="231" selection-start-column="45" selection-end-line="231" selection-end-column="45" />
</provider> <folding>
</entry> <element signature="e#24#39#0" expanded="true" />
</file> <element signature="e#694#1154#0" />
<file pinned="false" current-in-tab="false"> <element signature="e#1343#1415#0" />
<entry file="file://$PROJECT_DIR$/moment/views/irrigation.py"> <marker date="1577101179000" expanded="true" signature="10304:10309" ph="..." />
<provider selected="true" editor-type-id="text-editor"> </folding>
<state relative-caret-position="103"> </state>
<caret line="13" column="34" selection-start-line="13" selection-start-column="7" selection-end-line="13" selection-end-column="34" /> </provider>
<folding> </entry>
<element signature="e#46#57#0" expanded="true" /> </file>
</folding> <file pinned="false" current-in-tab="false">
</state> <entry file="file://$PROJECT_DIR$/moment/views/save_data.py">
</provider> <provider selected="true" editor-type-id="text-editor">
</entry> <state relative-caret-position="279">
</file> <caret line="300" column="41" lean-forward="true" selection-start-line="300" selection-start-column="41" selection-end-line="300" selection-end-column="41" />
<file pinned="false" current-in-tab="true"> <folding>
<entry file="file://$PROJECT_DIR$/comment/views/auto_comment.py"> <element signature="e#46#58#0" expanded="true" />
<provider selected="true" editor-type-id="text-editor"> </folding>
<state relative-caret-position="58"> </state>
<caret line="74" column="38" selection-start-line="74" selection-start-column="38" selection-end-line="74" selection-end-column="38" /> </provider>
<folding> </entry>
<element signature="e#24#39#0" expanded="true" /> </file>
</folding> <file pinned="false" current-in-tab="false">
</state> <entry file="file://$PROJECT_DIR$/click/views/auto_click.py">
</provider> <provider selected="true" editor-type-id="text-editor">
</entry> <state relative-caret-position="320">
</file> <caret line="58" column="54" lean-forward="true" selection-start-line="58" selection-start-column="54" selection-end-line="58" selection-end-column="54" />
<file pinned="false" current-in-tab="false"> <folding>
<entry file="file://$PROJECT_DIR$/moment/views/process_time.py"> <element signature="e#24#39#0" expanded="true" />
<provider selected="true" editor-type-id="text-editor"> </folding>
<state relative-caret-position="85"> </state>
<caret line="284" column="16" selection-start-line="284" selection-start-column="16" selection-end-line="284" selection-end-column="16" /> </provider>
<folding> </entry>
<element signature="e#24#39#0" expanded="true" /> </file>
<marker date="1577095366000" expanded="true" signature="10304:10309" ph="..." /> <file pinned="false" current-in-tab="false">
</folding> <entry file="file://$PROJECT_DIR$/follow/views/follow_fun.py">
</state> <provider selected="true" editor-type-id="text-editor">
</provider> <state relative-caret-position="60">
</entry> <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
</file> <folding>
<file pinned="false" current-in-tab="false"> <element signature="e#0#36#0" expanded="true" />
<entry file="file://$PROJECT_DIR$/click/views/auto_click.py"> </folding>
<provider selected="true" editor-type-id="text-editor"> </state>
<state relative-caret-position="-615"> </provider>
<caret line="2" selection-start-line="2" selection-end-line="2" selection-end-column="14" /> </entry>
</state> </file>
</provider> </leaf>
</entry>
</file>
</leaf>
</split-second>
</splitter>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES"> <option name="RECENT_TEMPLATES">
...@@ -247,7 +234,6 @@ ...@@ -247,7 +234,6 @@
<option value="$PROJECT_DIR$/click/__init__.py" /> <option value="$PROJECT_DIR$/click/__init__.py" />
<option value="$PROJECT_DIR$/libs/cache.py" /> <option value="$PROJECT_DIR$/libs/cache.py" />
<option value="$PROJECT_DIR$/moment/views/test.py" /> <option value="$PROJECT_DIR$/moment/views/test.py" />
<option value="$PROJECT_DIR$/requirements.txt" />
<option value="$PROJECT_DIR$/moment/views/vest_ids.txt" /> <option value="$PROJECT_DIR$/moment/views/vest_ids.txt" />
<option value="$PROJECT_DIR$/trans2es/management/commands/trans2es_data2es_redis.py" /> <option value="$PROJECT_DIR$/trans2es/management/commands/trans2es_data2es_redis.py" />
<option value="$PROJECT_DIR$/follow/views/auto_follow.py" /> <option value="$PROJECT_DIR$/follow/views/auto_follow.py" />
...@@ -256,22 +242,22 @@ ...@@ -256,22 +242,22 @@
<option value="$PROJECT_DIR$/vest/settings.py" /> <option value="$PROJECT_DIR$/vest/settings.py" />
<option value="$PROJECT_DIR$/moment/views/get_keyword.py" /> <option value="$PROJECT_DIR$/moment/views/get_keyword.py" />
<option value="$PROJECT_DIR$/moment/views/save_data.py" /> <option value="$PROJECT_DIR$/moment/views/save_data.py" />
<option value="$PROJECT_DIR$/moment/views/process_time.py" />
<option value="$PROJECT_DIR$/moment/views/irrigation.py" />
<option value="$PROJECT_DIR$/comment/views/comment.py" /> <option value="$PROJECT_DIR$/comment/views/comment.py" />
<option value="$PROJECT_DIR$/comment/views/auto_comment.py" /> <option value="$PROJECT_DIR$/comment/views/auto_comment.py" />
<option value="$PROJECT_DIR$/click/views/click_fun.py" /> <option value="$PROJECT_DIR$/click/views/click_fun.py" />
<option value="$PROJECT_DIR$/comment/views/comment_fun.py" /> <option value="$PROJECT_DIR$/comment/views/comment_fun.py" />
<option value="$PROJECT_DIR$/moment/views/consum.py" /> <option value="$PROJECT_DIR$/moment/views/irrigation.py" />
<option value="$PROJECT_DIR$/follow/views/follow_fun.py" /> <option value="$PROJECT_DIR$/follow/views/follow_fun.py" />
<option value="$PROJECT_DIR$/moment/views/consum.py" />
<option value="$PROJECT_DIR$/moment/views/process_time.py" />
<option value="$PROJECT_DIR$/requirements.txt" />
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectFrameBounds" extendedState="6"> <component name="ProjectFrameBounds">
<option name="x" value="-323" /> <option name="y" value="23" />
<option name="y" value="-1080" /> <option name="width" value="1280" />
<option name="width" value="1920" /> <option name="height" value="723" />
<option name="height" value="1080" />
</component> </component>
<component name="ProjectInspectionProfilesVisibleTreeState"> <component name="ProjectInspectionProfilesVisibleTreeState">
<entry key="Project Default"> <entry key="Project Default">
...@@ -306,33 +292,6 @@ ...@@ -306,33 +292,6 @@
<item name="vest" type="b2602c69:ProjectViewProjectNode" /> <item name="vest" type="b2602c69:ProjectViewProjectNode" />
<item name="vest" type="462c0819:PsiDirectoryNode" /> <item name="vest" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="vest" type="b2602c69:ProjectViewProjectNode" />
<item name="vest" type="462c0819:PsiDirectoryNode" />
<item name="follow" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="vest" type="b2602c69:ProjectViewProjectNode" />
<item name="vest" type="462c0819:PsiDirectoryNode" />
<item name="follow" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="vest" type="b2602c69:ProjectViewProjectNode" />
<item name="vest" type="462c0819:PsiDirectoryNode" />
<item name="moment" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="vest" type="b2602c69:ProjectViewProjectNode" />
<item name="vest" type="462c0819:PsiDirectoryNode" />
<item name="moment" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="vest" type="b2602c69:ProjectViewProjectNode" />
<item name="vest" type="462c0819:PsiDirectoryNode" />
<item name="vest" type="462c0819:PsiDirectoryNode" />
</path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
...@@ -444,22 +403,22 @@ ...@@ -444,22 +403,22 @@
</todo-panel> </todo-panel>
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-323" y="-1080" width="1920" height="1080" extended-state="6" /> <frame x="0" y="23" width="1280" height="723" extended-state="0" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info id="Favorites" order="0" side_tool="true" /> <window_info id="Favorites" order="0" side_tool="true" />
<window_info id="DB Browser" order="1" weight="0.24065298" /> <window_info id="DB Browser" order="1" weight="0.24065298" />
<window_info active="true" content_ui="combo" id="Project" order="2" visible="true" weight="0.13902053" /> <window_info content_ui="combo" id="Project" order="2" visible="true" weight="0.15488483" />
<window_info id="Structure" order="3" side_tool="true" weight="0.25" /> <window_info id="Structure" order="3" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Version Control" order="0" show_stripe_button="false" /> <window_info anchor="bottom" id="Version Control" order="0" show_stripe_button="false" />
<window_info anchor="bottom" id="Terminal" order="1" weight="0.32953367" /> <window_info active="true" anchor="bottom" id="Terminal" order="1" visible="true" weight="0.39144737" />
<window_info anchor="bottom" id="Event Log" order="2" side_tool="true" /> <window_info anchor="bottom" id="Event Log" order="2" side_tool="true" />
<window_info anchor="bottom" id="Python Console" order="3" weight="0.4473684" /> <window_info anchor="bottom" id="Python Console" order="3" weight="0.44663212" />
<window_info anchor="bottom" id="DB Execution Console" order="4" /> <window_info anchor="bottom" id="DB Execution Console" order="4" />
<window_info anchor="bottom" id="Message" order="5" /> <window_info anchor="bottom" id="Message" order="5" />
<window_info anchor="bottom" id="Find" order="6" weight="0.32953367" /> <window_info anchor="bottom" id="Find" order="6" weight="0.32953367" />
<window_info anchor="bottom" id="Run" order="7" weight="0.0" /> <window_info anchor="bottom" id="Run" order="7" weight="0.32894737" />
<window_info anchor="bottom" id="Debug" order="8" visible="true" weight="0.0" /> <window_info anchor="bottom" id="Debug" order="8" weight="0.32894737" />
<window_info anchor="bottom" id="Cvs" order="9" weight="0.25" /> <window_info anchor="bottom" id="Cvs" order="9" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="10" weight="0.4" /> <window_info anchor="bottom" id="Inspection" order="10" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="11" weight="0.33367875" /> <window_info anchor="bottom" id="TODO" order="11" weight="0.33367875" />
...@@ -585,13 +544,6 @@ ...@@ -585,13 +544,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/vest/wsgi.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="16" selection-start-line="16" selection-end-line="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/vest/urls.py"> <entry file="file://$PROJECT_DIR$/vest/urls.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150"> <state relative-caret-position="150">
...@@ -605,15 +557,6 @@ ...@@ -605,15 +557,6 @@
<entry file="file://$PROJECT_DIR$/click/tests.py"> <entry file="file://$PROJECT_DIR$/click/tests.py">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/libs/rpc.py">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#0#32#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/moment/__init__.py"> <entry file="file://$PROJECT_DIR$/moment/__init__.py">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
...@@ -690,13 +633,6 @@ ...@@ -690,13 +633,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/requirements.txt">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="22" column="11" selection-start-line="22" selection-start-column="11" selection-end-line="22" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/trans2es/management/commands/trans2es_data2es_redis.py"> <entry file="file://$PROJECT_DIR$/trans2es/management/commands/trans2es_data2es_redis.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165"> <state relative-caret-position="165">
...@@ -731,116 +667,133 @@ ...@@ -731,116 +667,133 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/moment/views/save_data.py"> <entry file="file://$USER_HOME$/gaia_env/lib/python2.7/site-packages/helios/rpc/internal/default_invoker.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="301">
<caret line="300" column="41" lean-forward="true" selection-start-line="300" selection-start-column="41" selection-end-line="300" selection-end-column="41" /> <caret line="161" column="4" selection-start-line="161" selection-start-column="4" selection-end-line="161" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/libs/rpc.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" column="27" selection-start-line="1" selection-start-column="27" selection-end-line="1" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/click/views/click_fun.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="9" column="15" selection-start-line="9" selection-start-column="15" selection-end-line="9" selection-end-column="15" />
<folding> <folding>
<element signature="e#46#58#0" expanded="true" /> <element signature="e#0#36#0" expanded="true" />
<element signature="e#379#4138#0" />
<element signature="e#4156#8381#0" />
<element signature="e#8397#12715#0" />
<element signature="e#12735#17280#0" />
<element signature="e#17302#21924#0" />
<element signature="e#21943#26980#0" />
<element signature="e#26997#31878#0" />
<element signature="e#31899#38046#0" />
<element signature="e#38068#41671#0" />
<element signature="e#41671#43888#0" />
<element signature="e#43120#44354#0" />
<element signature="e#44374#46220#0" />
<element signature="e#45523#48676#0" />
<element signature="e#44364#46755#0" />
<element signature="e#46771#49272#0" />
<element signature="e#49296#52934#0" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/follow/views/auto_follow.py"> <entry file="file://$PROJECT_DIR$/comment/views/comment_fun.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="84"> <state relative-caret-position="90">
<caret line="54" column="70" selection-start-line="54" selection-start-column="45" selection-end-line="54" selection-end-column="70" /> <caret line="6" column="11" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="11" />
<folding> <folding>
<element signature="e#24#39#0" expanded="true" /> <element signature="e#0#36#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/moment/views/irrigation.py"> <entry file="file://$PROJECT_DIR$/comment/views/auto_comment.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="103"> <state relative-caret-position="389">
<caret line="13" column="34" selection-start-line="13" selection-start-column="7" selection-end-line="13" selection-end-column="34" /> <caret line="66" column="50" selection-start-line="66" selection-start-column="50" selection-end-line="66" selection-end-column="50" />
<folding> <folding>
<element signature="e#46#57#0" expanded="true" /> <element signature="e#24#39#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/click/views/auto_click.py"> <entry file="file://$PROJECT_DIR$/click/views/auto_click.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-615"> <state relative-caret-position="320">
<caret line="2" selection-start-line="2" selection-end-line="2" selection-end-column="14" /> <caret line="58" column="54" lean-forward="true" selection-start-line="58" selection-start-column="54" selection-end-line="58" selection-end-column="54" />
<folding>
<element signature="e#24#39#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/moment/views/process_time.py"> <entry file="file://$PROJECT_DIR$/follow/views/follow_fun.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85"> <state relative-caret-position="60">
<caret line="284" column="16" selection-start-line="284" selection-start-column="16" selection-end-line="284" selection-end-column="16" /> <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
<folding> <folding>
<element signature="e#24#39#0" expanded="true" /> <element signature="e#0#36#0" expanded="true" />
<marker date="1577095366000" expanded="true" signature="10304:10309" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/comment/views/auto_comment.py"> <entry file="file://$PROJECT_DIR$/moment/views/save_data.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="58"> <state relative-caret-position="279">
<caret line="74" column="38" selection-start-line="74" selection-start-column="38" selection-end-line="74" selection-end-column="38" /> <caret line="300" column="41" lean-forward="true" selection-start-line="300" selection-start-column="41" selection-end-line="300" selection-end-column="41" />
<folding> <folding>
<element signature="e#24#39#0" expanded="true" /> <element signature="e#46#58#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/click/views/click_fun.py"> <entry file="file://$PROJECT_DIR$/requirements.txt">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135"> <state relative-caret-position="266">
<caret line="9" column="15" selection-start-line="9" selection-start-column="15" selection-end-line="9" selection-end-column="15" /> <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/moment/views/process_time.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2714">
<caret line="231" column="45" lean-forward="true" selection-start-line="231" selection-start-column="45" selection-end-line="231" selection-end-column="45" />
<folding> <folding>
<element signature="e#0#36#0" expanded="true" /> <element signature="e#24#39#0" expanded="true" />
<element signature="e#694#1154#0" />
<element signature="e#1343#1415#0" />
<marker date="1577101179000" expanded="true" signature="10304:10309" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/comment/views/comment_fun.py"> <entry file="file://$PROJECT_DIR$/vest/wsgi.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90"> <state relative-caret-position="210">
<caret line="6" column="11" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="11" /> <caret line="16" selection-start-line="16" selection-end-line="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/follow/views/auto_follow.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="513">
<caret line="54" column="70" selection-start-line="54" selection-start-column="45" selection-end-line="54" selection-end-column="70" />
<folding> <folding>
<element signature="e#0#36#0" expanded="true" /> <element signature="e#24#39#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/moment/views/consum.py"> <entry file="file://$PROJECT_DIR$/moment/views/consum.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="1469">
<caret line="18" column="42" selection-start-line="18" selection-start-column="36" selection-end-line="18" selection-end-column="42" /> <caret line="98" column="89" lean-forward="true" selection-start-line="98" selection-start-column="89" selection-end-line="98" selection-end-column="89" />
<folding> <folding>
<element signature="e#46#57#0" expanded="true" /> <element signature="e#46#57#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/follow/views/follow_fun.py"> <entry file="file://$PROJECT_DIR$/moment/views/irrigation.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90"> <state relative-caret-position="142">
<caret line="6" column="10" selection-start-line="6" selection-start-column="10" selection-end-line="6" selection-end-column="10" /> <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
<folding> <folding>
<element signature="e#0#36#0" expanded="true" /> <element signature="e#46#57#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
......
moment/views/consum.py
View file @ 36405b3e
...@@ -44,13 +44,13 @@ def kafka_consum(topic_name=None): ...@@ -44,13 +44,13 @@ def kafka_consum(topic_name=None):
logging.info("get push_time_date:%s" % push_time_date) logging.info("get push_time_date:%s" % push_time_date)
# 判断如果当前的push_time 和当前的创建时间一样 需要给push_time下发真的push时间 # 判断如果当前的push_time 和当前的创建时间一样 需要给push_time下发真的push时间
if current_push_time == create_time: if current_push_time == create_time:
if action_type == "comment": if card_info['action_type'] == "comment":
auto_comment_user(card_info, after_day=True) auto_comment_user(card_info, after_day=True)
elif action_type == "click": elif card_info['action_type'] == "click":
auto_click_user(card_info, after_day=True) auto_click_user(card_info, after_day=True)
elif action_type == "follow": elif card_info['action_type'] == "follow":
auto_follow_user(card_info, after_day=True) auto_follow_user(card_info, after_day=True)
else: else:
......
moment/views/process_time.py
View file @ 36405b3e
...@@ -29,7 +29,7 @@ def randomDate(create_time, frmt='%Y-%m-%d %H:%M:%S', action_type=None): ...@@ -29,7 +29,7 @@ def randomDate(create_time, frmt='%Y-%m-%d %H:%M:%S', action_type=None):
action_num = random.randint(1, 3) action_num = random.randint(1, 3)
if action_type == "comment": if action_type == "comment":
action_num = random.randint(1, 1) action_num = random.randint(0, 1)
start = str(create_time + datetime.timedelta(hours=2)) start = str(create_time + datetime.timedelta(hours=2))
end = str(create_time + datetime.timedelta(hours=4)) end = str(create_time + datetime.timedelta(hours=4))
......
requirements.txt
View file @ 36405b3e
...@@ -20,4 +20,6 @@ git+ssh://git@git.wanmeizhensuo.com/backend/helios.git@v0.7.2 ...@@ -20,4 +20,6 @@ git+ssh://git@git.wanmeizhensuo.com/backend/helios.git@v0.7.2
virtualenv==15.1.0 virtualenv==15.1.0
gevent==1.2.1 gevent==1.2.1
git+ssh://git@git.wanmeizhensuo.com/backend/gm-rpcd.git@v0.2.2 git+ssh://git@git.wanmeizhensuo.com/backend/gm-rpcd.git@v0.2.2
jieba==0.39 jieba==0.39
\ No newline at end of file gunicorn==19.7.1
wheel==0.24.0
\ No newline at end of file
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