support concurrent request, but somewhere has bug in httpie util.

Author: caofanCPU

auto/ID.csv

@@ -1,20 +1,53 @@
-55746186
-55746186
-55746186
-55746186
-55746186
-55746186
-55746186
-55905267
-55905267
-55905267
-55894967
-55894967
-55894967
-55894967
-55894967
-56000896
-56000896
-56699543
-56699543
-56707106
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+
+
+
+
+
+
+
+

auto/batchHandler.py

@@ -1,12 +1,14 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+import datetime
 import json
 import ssl
-import sys
 import subprocess
+import sys
 import time
-import pandas as pd
+from concurrent.futures.thread import ThreadPoolExecutor
 
+import pandas as pd
 import requests
 
 # 屏蔽HTTPS证书校验, 忽略安全警告
@@ -18,22 +20,28 @@
 hot_reload = True
 cmd = "http"
 no_ca = "--verify=no"
-httpie_allow_view = {
-    "-v": "显示请求详细信息",
-    "-h": "显示请求头",
-    "-b": "显示请求Body",
-    "-d": "响应结果保存至TXT",
-    "": "默认"
-}
+httpie_allow_view = {"-v": "显示请求详细信息", "-h": "显示请求头", "-b": "显示请求Body", "-d": "响应结果保存至TXT", "": "默认"}
 httpie_view = None
+# 并发数
+max_concurrent = 64
+concurrent = 1
 try:
     if len(sys.argv) > 1:
         if httpie_allow_view.get(sys.argv[1]) is not None:
             httpie_view = sys.argv[1]
         else:
             print("输入参数有误, 仅支持如下参数: -v显示请求详细信息|-h显示请求头|-b显示请求Body|-d响应结果保存至TXT")
+    if len(sys.argv) > 2:
+        try:
+            input_concurrent = int(sys.argv[2])
+            if input_concurrent > 1:
+                concurrent = min(input_concurrent, max_concurrent)
+        except Exception as e:
+            print("并发数设置范围[1, {}], 默认1".format(max_concurrent))
+            print(e)
 except Exception as e:
     print(e)
+executor = ThreadPoolExecutor(max_workers=concurrent)
 
 
 def httpie_cmd(id):
@@ -55,11 +63,13 @@ def httpie_cmd(id):
         httpie_params.append(httpie_view)
     httpie_params.extend([method, url, headers, body])
     httpie = joiner.join(httpie_params)
-    print(httpie)
-    print("当前ID: ", id)
+    # print(httpie)
+    executeStartTime = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')
     # 延时执行
-    time.sleep(0.05)
+    # time.sleep(0.05)
     subprocess.call(httpie, shell=True)
+    executeEndTime = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')
+    return "当前[ID={}, [executeStartTime={}], [executeEndTime={}]".format(id, executeStartTime, executeEndTime)
 
 
 def load_request_headers(headers, hot_reload):
@@ -113,15 +123,16 @@ def auto_login():
         f.write(cookie)
     # JSON标准格式
     response_body = json.dumps(response.json(), ensure_ascii=False, indent=4)
-    print(response_body)
+    print("\n执行登录响应BODY结果: \n" + response_body)
     return cookie
 
 
 def main():
     # 首先登陆一次
     auto_login()
-    for id in load_data():
-        httpie_cmd(id)
+    ids = load_data()
+    for result in executor.map(httpie_cmd, ids):
+        print(result)
 
 
 if __name__ == '__main__':

auto/cookie.txt

@@ -1 +1 @@
-'Cookie:_r=ihJwwY0cYz49sr6PMLsFz0BZpRyQxkFQVg2iP9QJYR3xbG0Dl3LHiONXx0N5rlQd|HXj5A8Lr5cw=; Max-Age=2592000; Expires=Sat, 09-May-2020 08:53:08 GMT; Domain=testa.huitong.com; Path=/; HttpOnly, _a=HUQD4RRBySY9sr6PMLsFz0BZpRyQxkFQVg2iP9QJYR3xbG0Dl3LHiJTWI8zUke//55U6X+1Po33WN5X4+xDCD63RgLyKuIbo|C8IWYbAVYXA=; Max-Age=7200; Expires=Thu, 09-Apr-2020 10:53:08 GMT; Domain=emp.testa.huitong.com; Path=/; HttpOnly, _a=HUQD4RRBySY9sr6PMLsFz0BZpRyQxkFQVg2iP9QJYR3xbG0Dl3LHiJTWI8zUke//55U6X+1Po33WN5X4+xDCD63RgLyKuIbo|C8IWYbAVYXA=; Max-Age=7200; Expires=Thu, 09-Apr-2020 10:53:08 GMT; Domain=emp2.testa.huitong.com; Path=/; HttpOnly'
+'Cookie:_r=ihJwwY0cYz49sr6PMLsFz0BZpRyQxkFQfqtQSrOxQNgjrbvfiad33YRFMbWVOFY7|Bt4XvnwQD0g=; Max-Age=2592000; Expires=Sat, 16-May-2020 18:27:59 GMT; Domain=testa.huitong.com; Path=/; HttpOnly, _a=HUQD4RRBySY9sr6PMLsFz0BZpRyQxkFQfqtQSrOxQNgjrbvfiad33aJ+8ZAs65Qj55U6X+1Po31adyYgUMNqH1vXuurqEFhH|2huAgBlVNhQ=; Max-Age=7200; Expires=Thu, 16-Apr-2020 20:27:59 GMT; Domain=emp.testa.huitong.com; Path=/; HttpOnly, _a=HUQD4RRBySY9sr6PMLsFz0BZpRyQxkFQfqtQSrOxQNgjrbvfiad33aJ+8ZAs65Qj55U6X+1Po31adyYgUMNqH1vXuurqEFhH|2huAgBlVNhQ=; Max-Age=7200; Expires=Thu, 16-Apr-2020 20:27:59 GMT; Domain=emp2.testa.huitong.com; Path=/; HttpOnly'

auto/excuteUrl.json

@@ -1,5 +1,5 @@
 {
-  "url": "https://live.testa.huitong.com/api/v100/live/employee/upload/dibblingVideo/detail",
+  "url": "http://localhost:8127/ruok",
   "method": "POST",
   "headers" : [
       "Content-Type:application/json",