diff --git a/chaquo/src/main/python/app.py b/chaquo/src/main/python/app.py index 6f5d5f0b9..6e5db1fea 100644 --- a/chaquo/src/main/python/app.py +++ b/chaquo/src/main/python/app.py @@ -86,6 +86,10 @@ def localProxy(ru, param): return result +def destroy(ru): + ru.destroy() + + def run(): pass diff --git a/chaquo/src/main/python/base/spider.py b/chaquo/src/main/python/base/spider.py index fa98d6173..1944c942c 100644 --- a/chaquo/src/main/python/base/spider.py +++ b/chaquo/src/main/python/base/spider.py @@ -63,7 +63,6 @@ class Spider(metaclass=ABCMeta): def getName(self): pass - @abstractmethod def destroy(self): pass @@ -84,18 +83,18 @@ class Spider(metaclass=ABCMeta): clean = re.sub('[\U0001F600-\U0001F64F\U0001F300-\U0001F5FF\U0001F680-\U0001F6FF\U0001F1E0-\U0001F1FF]', '', src) return clean - def fetch(self, url, cookies=None, headers=None, timeout=5, verify=True, stream=False, allow_redirects = True): - rsp = requests.get(url, cookies=cookies, headers=headers, timeout=timeout, verify=verify, stream=stream, allow_redirects=allow_redirects) + def fetch(self, url, params=None, cookies=None, headers=None, timeout=5, verify=True, stream=False, allow_redirects = True): + rsp = requests.get(url, params=params, cookies=cookies, headers=headers, timeout=timeout, verify=verify, stream=stream, allow_redirects=allow_redirects) rsp.encoding = 'utf-8' return rsp - def post(self, url, data, cookies=None, headers=None, timeout=5, verify=True, stream=False, allow_redirects = True): - rsp = requests.post(url, data=data, cookies=cookies, headers=headers, timeout=timeout, verify=verify, stream=stream, allow_redirects=allow_redirects) + def post(self, url, params=None, data, cookies=None, headers=None, timeout=5, verify=True, stream=False, allow_redirects = True): + rsp = requests.post(url, params=params, data=data, cookies=cookies, headers=headers, timeout=timeout, verify=verify, stream=stream, allow_redirects=allow_redirects) rsp.encoding = 'utf-8' return rsp - def postJson(self, url, json, cookies=None, headers=None, timeout=5, verify=True, stream=False, allow_redirects = True): - rsp = requests.post(url, json=json, cookies=cookies, headers=headers, timeout=timeout, verify=verify, stream=stream, allow_redirects=allow_redirects) + def postJson(self, url, params=None, json, cookies=None, headers=None, timeout=5, verify=True, stream=False, allow_redirects = True): + rsp = requests.post(url, params=params, json=json, cookies=cookies, headers=headers, timeout=timeout, verify=verify, stream=stream, allow_redirects=allow_redirects) rsp.encoding = 'utf-8' return rsp