1. 命令行工具改为从剪切板读取内容，解决内容过长控制台不能输入问题

Boris-code · Boris-code · commit ca7415bb0f2b · 2022-02-10T22:57:47.000+08:00
2. 浏览器添加xhr_data函数
diff --git a/feapder/commands/cmdline.py b/feapder/commands/cmdline.py
@@ -43,3 +43,7 @@ def execute():
         shell.main()
     else:
         _print_commands()
+
+
+if __name__ == "__main__":
+    execute()
diff --git a/feapder/commands/create/create_cookies.py b/feapder/commands/create/create_cookies.py
@@ -9,29 +9,26 @@
 """
 
 import json
-import sys
+
+import pyperclip
 
 from feapder.utils.tools import get_cookies_from_str, print_pretty
 
 
 class CreateCookies:
     def get_data(self):
         """
-        @summary: 从控制台读取多行
+        @summary: 从剪切板中读取内容
         ---------
         ---------
         @result:
         """
-        print("请输入浏览器cookie (列表或字符串格式)")
-        data = []
-        while True:
-            line = sys.stdin.readline().strip()
-            if not line:
-                break
+        input("请复制浏览器cookie (列表或字符串格式), 复制后按任意键读取剪切板内容\n")
 
-            data.append(line)
+        text = pyperclip.paste()
+        print(text + "\n")
 
-        return "".join(data)
+        return text
 
     def create(self):
         data = self.get_data()
diff --git a/feapder/commands/create/create_json.py b/feapder/commands/create/create_json.py
@@ -8,7 +8,7 @@
 @email:  boris_liu@foxmail.com
 """
 
-import sys
+import pyperclip
 
 import feapder.utils.tools as tools
 
@@ -21,10 +21,14 @@ def get_data(self):
         ---------
         @result:
         """
-        print("请输入需要转换的内容： （xxx:xxx格式，支持多行）")
+        input("请复制需要转换的内容（xxx:xxx格式，支持多行），复制后按任意键读取剪切板内容\n")
+
+        text = pyperclip.paste()
+        print(text + "\n")
+
         data = []
-        while True:
-            line = sys.stdin.readline().strip().replace("\t", " " * 4)
+        for line in text.split("\n"):
+            line = line.strip().replace("\t", " " * 4)
             if not line:
                 break
 
@@ -49,4 +53,4 @@ def create(self, sort_keys=False):
             else:
                 json[result[0]] = result[1].strip()
 
-        print(tools.dumps_json(json, sort_keys=sort_keys))
+        print(tools.dumps_json(json, sort_keys=sort_keys))
diff --git a/feapder/commands/create/create_table.py b/feapder/commands/create/create_table.py
@@ -8,9 +8,10 @@
 @email:  boris_liu@foxmail.com
 """
 
-import sys
 import time
 
+import pyperclip
+
 import feapder.setting as setting
 import feapder.utils.tools as tools
 from feapder.db.mysqldb import MysqlDB
@@ -62,18 +63,15 @@ def get_data(self):
         ---------
         @result:
         """
-        data = ""
-        while True:
-            line = sys.stdin.readline().strip()
-            if not line:
-                break
-            data += line
+        input("请复制json格式数据, 复制后按任意键读取剪切板内容\n")
 
-        return tools.get_json(data)
+        text = pyperclip.paste()
+        print(text + "\n")
+
+        return tools.get_json(text)
 
     def create(self, table_name):
         # 输入表字段
-        print('请输入表数据 json格式 如 {"name":"张三"}\n等待输入：\n')
         data = self.get_data()
 
         if not isinstance(data, dict):
@@ -98,17 +96,21 @@ def create(self, table_name):
 
             comment = input("%s : %s  -> comment：" % (key, key_type))
 
-            other_key += "`{key}` {key_type} COMMENT '{comment}',\n                ".format(
-                key=key, key_type=key_type, comment=comment
+            other_key += (
+                "`{key}` {key_type} COMMENT '{comment}',\n                ".format(
+                    key=key, key_type=key_type, comment=comment
+                )
             )
 
         print("\n")
 
         while True:
             is_need_batch_date = input("是否添加batch_date 字段 （y/n）:")
             if is_need_batch_date == "y":
-                other_key += "`{key}` {key_type} COMMENT '{comment}',\n                ".format(
-                    key="batch_date", key_type="date", comment="批次时间"
+                other_key += (
+                    "`{key}` {key_type} COMMENT '{comment}',\n                ".format(
+                        key="batch_date", key_type="date", comment="批次时间"
+                    )
                 )
                 break
             elif is_need_batch_date == "n":
@@ -132,4 +134,5 @@ def create(self, table_name):
         )
         print(sql)
         self._db.execute(sql)
-        print("\n%s 创建成功" % table_name)
+        print("\n%s 创建成功" % table_name)
+        print("注意手动检查下字段类型，确保无误！！！")
diff --git a/feapder/requirements.txt b/feapder/requirements.txt
@@ -14,4 +14,5 @@ redis-py-cluster>=2.1.0
 cryptography>=3.3.2
 urllib3>=1.25.8
 loguru>=0.5.3
-influxdb>=5.3.1
+influxdb>=5.3.1
+pyperclip>=1.8.2
diff --git a/feapder/utils/webdriver.py b/feapder/utils/webdriver.py
@@ -12,7 +12,7 @@
 import os
 import queue
 import threading
-from typing import Optional
+from typing import Optional, Union
 
 from selenium import webdriver
 from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
@@ -343,10 +343,18 @@ def xhr_response(self, xhr_url_regex) -> Optional[XhrResponse]:
         response = XhrResponse(request, **data["response"])
         return response
 
+    def xhr_data(self, xhr_url_regex) -> Union[str, dict, None]:
+        response = self.xhr_response(xhr_url_regex)
+        if not response:
+            return None
+        return response.content
+
     def xhr_text(self, xhr_url_regex) -> Optional[str]:
         response = self.xhr_response(xhr_url_regex)
         if not response:
             return None
+        if isinstance(response.content, dict):
+            return json.dumps(response.content, ensure_ascii=False)
         return response.content
 
     def xhr_json(self, xhr_url_regex) -> Optional[dict]:
diff --git a/setup.py b/setup.py
@@ -50,6 +50,7 @@
     "urllib3>=1.25.8",
     "loguru>=0.5.3",
     "influxdb>=5.3.1",
+    "pyperclip>=1.8.2",
 ]
 
 memory_dedup_requires = ["bitarray>=1.5.3"]

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@`
`50`	`50`	`"urllib3>=1.25.8",`
`51`	`51`	`"loguru>=0.5.3",`
`52`	`52`	`"influxdb>=5.3.1",`
	`53`	`+ "pyperclip>=1.8.2",`
`53`	`54`	`]`
`54`	`55`
`55`	`56`	`memory_dedup_requires = ["bitarray>=1.5.3"]`