add

eb2cfa9b · lixiaofang · 2e640f97 · eb2cfa9b · eb2cfa9b · eb2cfa9b
Commit eb2cfa9b authored Jun 28, 2019 by lixiaofang
8 changed files
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,12 +2,8 @@
 <project version="4">
  <component name="ChangeListManager">
    <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_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_urge1.py" beforeDir="false" afterPath="$PROJECT_DIR$/auto_urge1.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/auto_urge2.py" beforeDir="false" afterPath="$PROJECT_DIR$/auto_urge2.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$/test.py" beforeDir="false" afterPath="$PROJECT_DIR$/test.py" afterDir="false" />
    </list>
    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
    <option name="SHOW_DIALOG" value="false" />
@@ -37,7 +33,7 @@
          <entry key="batch_user_gen" value="11" />
          <entry key="comment" value="2" />
          <entry key="guanshui" value="6" />
-          <entry key="py" value="409" />
+          <entry key="py" value="411" />
          <entry key="txt" value="24" />
          <entry key="xuqiu" value="2" />
        </counts>
@@ -45,7 +41,7 @@
      <usages-collector id="statistics.file.types.open">
        <counts>
          <entry key="PLAIN_TEXT" value="46" />
-          <entry key="Python" value="409" />
+          <entry key="Python" value="411" />
        </counts>
      </usages-collector>
      <usages-collector id="statistics.file.extensions.edit">
@@ -53,7 +49,7 @@
          <entry key="comment" value="59" />
          <entry key="dummy" value="11" />
          <entry key="guanshui" value="2" />
-          <entry key="py" value="8428" />
+          <entry key="py" value="8452" />
          <entry key="txt" value="96" />
          <entry key="xuqiu" value="223" />
        </counts>
@@ -61,7 +57,7 @@
      <usages-collector id="statistics.file.types.edit">
        <counts>
          <entry key="PLAIN_TEXT" value="391" />
-          <entry key="Python" value="8428" />
+          <entry key="Python" value="8452" />
        </counts>
      </usages-collector>
    </session>
@@ -132,34 +128,34 @@
      <file pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/auto_user_id.py">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="300">
-              <caret line="24" column="51" selection-start-line="24" selection-start-column="51" selection-end-line="24" selection-end-column="51" />
+            <state relative-caret-position="265">
+              <caret line="27" column="18" lean-forward="true" selection-start-line="27" selection-start-column="18" selection-end-line="27" selection-end-column="18" />
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/batch_user_gen">
+        <entry file="file://$PROJECT_DIR$/test.py">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="533">
-              <caret line="282" column="19" lean-forward="true" selection-start-line="282" selection-start-column="19" selection-end-line="282" selection-end-column="19" />
+            <state relative-caret-position="460">
+              <caret line="54" column="22" selection-start-line="54" selection-start-column="22" selection-end-line="54" selection-end-column="22" />
+              <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_urge1.py">
+        <entry file="file://$PROJECT_DIR$/batch_user_gen">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="233">
-              <caret line="42" column="41" selection-start-line="42" selection-start-column="41" selection-end-line="42" selection-end-column="41" />
-              <folding>
-                <element signature="e#0#15#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="533">
+              <caret line="282" column="19" lean-forward="true" selection-start-line="282" selection-start-column="19" selection-end-line="282" selection-end-column="19" />
            </state>
          </provider>
        </entry>
      </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/auto_star_urge.py">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="415">
@@ -168,20 +164,23 @@
          </provider>
        </entry>
      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/auto_star_topic.py">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/auto_request.py">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-427">
-              <caret line="21" column="61" lean-forward="true" selection-start-line="21" selection-start-column="61" selection-end-line="21" selection-end-column="61" />
+            <state relative-caret-position="193">
+              <caret line="296" column="22" selection-start-line="296" selection-start-column="22" selection-end-line="296" selection-end-column="22" />
+              <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_urge2.py">
+        <entry file="file://$PROJECT_DIR$/auto_star_topic.py">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="205">
-              <caret line="42" selection-start-line="42" selection-end-line="61" selection-end-column="73" />
+            <state relative-caret-position="-427">
+              <caret line="21" column="61" lean-forward="true" selection-start-line="21" selection-start-column="61" selection-end-line="21" selection-end-column="61" />
            </state>
          </provider>
        </entry>
@@ -293,17 +292,17 @@
        <option value="$PROJECT_DIR$/auto_lunch_app.py" />
        <option value="$PROJECT_DIR$/auto_lunch_app2.py" />
        <option value="$PROJECT_DIR$/auto_click2.py" />
-        <option value="$PROJECT_DIR$/test.py" />
-        <option value="$PROJECT_DIR$/auto_user_id.py" />
        <option value="$PROJECT_DIR$/comment.txt" />
        <option value="$PROJECT_DIR$/guanshui" />
        <option value="$PROJECT_DIR$/one_by_one.py" />
-        <option value="$PROJECT_DIR$/auto_request.py" />
        <option value="$PROJECT_DIR$/auto_urge2.py" />
        <option value="$PROJECT_DIR$/auto_urge3.py" />
        <option value="$PROJECT_DIR$/auto_urge1.py" />
        <option value="$PROJECT_DIR$/auto_star_topic.py" />
        <option value="$PROJECT_DIR$/auto_star_urge.py" />
+        <option value="$PROJECT_DIR$/test.py" />
+        <option value="$PROJECT_DIR$/auto_user_id.py" />
+        <option value="$PROJECT_DIR$/auto_request.py" />
      </list>
    </option>
  </component>
@@ -525,7 +524,7 @@
    <layout>
      <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 active="true" content_ui="combo" id="Project" order="2" sideWeight="0.7872763" visible="true" weight="0.0" />
+      <window_info active="true" content_ui="combo" id="Project" order="2" sideWeight="0.7872763" visible="true" weight="0.19459888" />
      <window_info id="DB Browser" order="3" />
      <window_info anchor="bottom" id="Message" order="0" />
      <window_info anchor="bottom" id="Find" order="1" weight="0.3284974" />
@@ -782,16 +781,6 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/test.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="7" column="18" selection-start-line="7" selection-start-column="18" selection-end-line="7" selection-end-column="18" />
-          <folding>
-            <element signature="e#0#15#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/log_settings.py">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="15">
@@ -846,16 +835,6 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/auto_request.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-620">
-          <caret line="266" lean-forward="true" selection-start-line="266" selection-end-line="266" />
-          <folding>
-            <element signature="e#0#15#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/auto_urge2.py">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="205">
@@ -901,10 +880,17 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/auto_user_id.py">
+    <entry file="file://$PROJECT_DIR$/comment.txt">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="24" column="51" selection-start-line="24" selection-start-column="51" selection-end-line="24" selection-end-column="51" />
+        <state relative-caret-position="355">
+          <caret line="590" column="3" lean-forward="true" selection-start-line="590" selection-start-column="3" selection-end-line="590" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/auto_star_urge.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="415">
+          <caret line="47" column="39" lean-forward="true" selection-start-line="47" selection-start-column="39" selection-end-line="47" selection-end-column="39" />
        </state>
      </provider>
    </entry>
@@ -915,17 +901,30 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/comment.txt">
+    <entry file="file://$PROJECT_DIR$/test.py">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="355">
-          <caret line="590" column="3" lean-forward="true" selection-start-line="590" selection-start-column="3" selection-end-line="590" selection-end-column="3" />
+        <state relative-caret-position="460">
+          <caret line="54" column="22" selection-start-line="54" selection-start-column="22" selection-end-line="54" selection-end-column="22" />
+          <folding>
+            <element signature="e#0#15#0" expanded="true" />
+          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/auto_star_urge.py">
+    <entry file="file://$PROJECT_DIR$/auto_user_id.py">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="415">
-          <caret line="47" column="39" lean-forward="true" selection-start-line="47" selection-start-column="39" selection-end-line="47" selection-end-column="39" />
+        <state relative-caret-position="265">
+          <caret line="27" column="18" lean-forward="true" selection-start-line="27" selection-start-column="18" selection-end-line="27" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/auto_request.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="193">
+          <caret line="296" column="22" selection-start-line="296" selection-start-column="22" selection-end-line="296" selection-end-column="22" />
+          <folding>
+            <element signature="e#0#15#0" expanded="true" />
+          </folding>
        </state>
      </provider>
    </entry>

--- a/auto_request.py
+++ b/auto_request.py
@@ -83,7 +83,7 @@ def get_majia():

 def get_cookies(user_id):
    try:
-        with open("/srv/apps/cybertron/user_session.txt", 'r') as f:
+        with open("/data/log/cybertron/app/user_session.txt", 'r') as f:
            try:
                data = f.readlines()
            except:
@@ -294,7 +294,7 @@ def get_offline_comment():
 #         return None

 def get_user_id():
-    user_data = open("user_id.txt", "r")
+    user_data = open("/data/log/cybertron/app/user_id.txt", "r")
    user_list = []

    for i in user_data.readlines():

--- a/auto_user_id.py
+++ b/auto_user_id.py
@@ -34,7 +34,7 @@ def get_data():

 data = get_data()
 print(data)
-file = open("user_id.txt", "w")
+file = open("/data/log/cybertron/app/user_id.txt", "w")

 if data:
    for i in data:

--- a/offline_click.py
+++ b/offline_click.py
@@ -110,7 +110,7 @@ if __name__ == "__main__":
                     46629374, 46629385, 46629416, 46629419, 46629424, 46629683, 46629740, 46629782, 46629804, 46629820,
                     46629877, 46630485]

-        user_data = open("/srv/apps/cybertron/user_id.txt", "r")
+        user_data = open("/data/log/cybertron/app/user_id.txt", "r")
        user_list = []
        for i in user_data.readlines():
            user_list.append(i)

--- a/offline_comment.py
+++ b/offline_comment.py
@@ -66,7 +66,7 @@ if __name__ == "__main__":
                     46629205, 46629207, 46629211, 46629227, 46629230, 46629232, 46629252, 46629274, 46629304,
                     46629305, 46629309, 46629313, 46629338, 46629419, 46630746
                     ]
-        user_data = open("/srv/apps/cybertron/user_id.txt", "r")
+        user_data = open("/data/log/cybertron/app/user_id.txt", "r")
        user_list = []
        for i in user_data.readlines():
            user_list.append(i)

--- a/one_by_one.py
+++ b/one_by_one.py
@@ -59,7 +59,7 @@ if __name__ == "__main__":

        now = datetime.datetime.now()
        yes_time = now - datetime.timedelta(minutes=5)
-        user_data = open("/srv/apps/cybertron/user_id.txt", "r")
+        user_data = open("/data/log/cybertron/app/user_id.txt", "r")
        user_list = []
        for i in user_data.readlines():
            user_list.append(i)

--- a/one_by_one_comment.py
+++ b/one_by_one_comment.py
@@ -58,7 +58,7 @@ if __name__ == "__main__":
        now = datetime.datetime.now()
        yes_time = now - datetime.timedelta(days=6)
        yes_time_str = yes_time.strftime('%Y-%m-%d')
-        user_data = open("/srv/apps/cybertron/user_id.txt", "r")
+        user_data = open("/data/log/cybertron/app/user_id.txt", "r")
        user_list = []
        for i in user_data.readlines():
            user_list.append(i)

--- a/test.py
+++ b/test.py
@@ -48,7 +48,7 @@ def get_cook():

 dicts = get_cook()

-with open("user_session.txt", 'w') as f:
+with open("/data/log/cybertron/app/user_session.txt", 'w') as f:
    for key, value in dicts.items():
        f.write(key)
        f.write(",")