clean some api

Author: yanyongyu

api.py

@@ -5,14 +5,14 @@
 """
 
 __author__ = "yanyongyu"
-__all__ = ["cxmooc_tool", "poxiaobbs", "forestpolice", "bankroft",
-           "jiuaidaikan", "wangke120"]
+__all__ = ["cxmooc_tool", "poxiaobbs", "forestpolice", "jiuaidaikan",
+           "wangke120", "xuanxiu365"]
 
 import sys
 import json
 import logging
 import asyncio
-from hashlib import md5
+# from hashlib import md5
 
 import requests
 from lxml import etree
@@ -179,74 +179,74 @@ async def forestpolice(sess: requests.Session,
     raise StopIteration
 
 
-async def bankroft(sess: requests.Session,
-                   *args: list) -> list:
-    """
-    该接口只有当题目完整时可用！
-    并且有频率限制！
-    """
-    # 输入参数处理
-    if not isinstance(sess, requests.Session):
-        args = list(args)
-        args.insert(0, sess)
-        args = tuple(args)
-        sess = requests.Session()
-
-    # 接口
-    string_enc = "-b?M#JvMg2y3$JMk"
-    url = "http://123.207.19.72/api/query?"
-
-    # 接口参数
-    index = yield
-    payload = {}
-    for i in range(len(args)):
-        if index and i < index:
-            continue
-        md = md5()
-        md.update((args[i]+string_enc).encode())
-
-        payload['title'] = args[i]
-        payload['enc'] = md.hexdigest()
-
-        # post请求
-        logging.info("Get bankroft api. Question %d" % i)
-        try:
-            res = sess.get(url, params=payload, verify=False, timeout=5)
-            res.raise_for_status()
-        except requests.exceptions.RequestException as e:
-            logging.info("Request Exception appeared: %s" % e)
-            answer = []
-            answer.append({'topic': str(e),
-                           'correct': ''})
-            index = yield answer
-            continue
-
-        # 处理结果
-        logging.info("Processing result")
-        answer = []
-        json_text = res.json()
-        if json_text['code'] == 100:
-            temp = {}
-            temp['topic'] = args[i]
-            temp['correct'] = json_text['data']
-            answer.append(temp)
-        elif json_text['code'] == 101:
-            temp = {}
-            temp['topic'] = "题目输入不完整！bankroft接口需要除题目类型外完整题目"
-            temp['correct'] = ""
-            answer.append(temp)
-        else:
-            temp = {}
-            temp['topic'] = "bankroft接口查询次数已达上限！"
-            temp['correct'] = ""
-            answer.append(temp)
-
-        logging.info("Yield question %s: %s" % (i+1, answer))
-        index = yield answer
-
-        await asyncio.sleep(0.5)
-
-    raise StopIteration
+#async def bankroft(sess: requests.Session,
+#                   *args: list) -> list:
+#    """
+#    该接口只有当题目完整时可用！
+#    并且有频率限制！
+#    """
+#    # 输入参数处理
+#    if not isinstance(sess, requests.Session):
+#        args = list(args)
+#        args.insert(0, sess)
+#        args = tuple(args)
+#        sess = requests.Session()
+#
+#    # 接口
+#    string_enc = "-b?M#JvMg2y3$JMk"
+#    url = "http://123.207.19.72/api/query?"
+#
+#    # 接口参数
+#    index = yield
+#    payload = {}
+#    for i in range(len(args)):
+#        if index and i < index:
+#            continue
+#        md = md5()
+#        md.update((args[i]+string_enc).encode())
+#
+#        payload['title'] = args[i]
+#        payload['enc'] = md.hexdigest()
+#
+#        # post请求
+#        logging.info("Get bankroft api. Question %d" % i)
+#        try:
+#            res = sess.get(url, params=payload, verify=False, timeout=5)
+#            res.raise_for_status()
+#        except requests.exceptions.RequestException as e:
+#            logging.info("Request Exception appeared: %s" % e)
+#            answer = []
+#            answer.append({'topic': str(e),
+#                           'correct': ''})
+#            index = yield answer
+#            continue
+#
+#        # 处理结果
+#        logging.info("Processing result")
+#        answer = []
+#        json_text = res.json()
+#        if json_text['code'] == 100:
+#            temp = {}
+#            temp['topic'] = args[i]
+#            temp['correct'] = json_text['data']
+#            answer.append(temp)
+#        elif json_text['code'] == 101:
+#            temp = {}
+#            temp['topic'] = "题目输入不完整！bankroft接口需要除题目类型外完整题目"
+#            temp['correct'] = ""
+#            answer.append(temp)
+#        else:
+#            temp = {}
+#            temp['topic'] = "bankroft接口查询次数已达上限！"
+#            temp['correct'] = ""
+#            answer.append(temp)
+#
+#        logging.info("Yield question %s: %s" % (i+1, answer))
+#        index = yield answer
+#
+#        await asyncio.sleep(0.5)
+#
+#    raise StopIteration
 
 
 async def jiuaidaikan(sess: requests.Session,
@@ -273,8 +273,6 @@ async def jiuaidaikan(sess: requests.Session,
         res.raise_for_status()
         selector = etree.HTML(res.text)
         viewstate = selector.xpath('//*[@id="__VIEWSTATE"]/@value')
-        viewstategenerator = selector.xpath(
-                '//*[@id="__VIEWSTATEGENERATOR"]/@value')
         eventvalidation = selector.xpath(
                 '//*[@id="__EVENTVALIDATION"]/@value')
     except requests.exceptions.RequestException as e:
@@ -291,7 +289,6 @@ async def jiuaidaikan(sess: requests.Session,
 
     data = {}
     data['__VIEWSTATE'] = viewstate
-    data['__VIEWSTATEGENERATOR'] = viewstategenerator
     data['__EVENTVALIDATION'] = eventvalidation
     data['ctl00$ContentPlaceHolder1$gen'] = '查询'
     for i in range(len(args)):
@@ -379,8 +376,61 @@ async def wangke120(sess: requests.Session,
     raise StopIteration
 
 
-async def fm210(sess: requests.Session,
-                *args: list) -> list:
+#async def fm210(sess: requests.Session,
+#                *args: list) -> list:
+#    # 输入参数处理
+#    if not isinstance(sess, requests.Session):
+#        args = list(args)
+#        args.insert(0, sess)
+#        args = tuple(args)
+#        sess = requests.Session()
+#
+#    # 接口
+#    url = "http://api.fm210.cn/wangke/cx.php?"
+#
+#    # 接口参数
+#    index = yield
+#    payload = {}
+#    for i in range(len(args)):
+#        if index and i < index:
+#            continue
+#        payload['w'] = args[i]
+#
+#        # post请求
+#        logging.info("Post to fm120. Question %d" % i)
+#        try:
+#            res = sess.get(url, params=payload, verify=False, timeout=5)
+#            res.raise_for_status()
+#        except requests.exceptions.RequestException as e:
+#            logging.info("Request Exception appeared: %s" % e)
+#            answer = []
+#            answer.append({'topic': str(e),
+#                           'correct': ''})
+#            index = yield answer
+#            continue
+#
+#        # 处理结果
+#        logging.info("Processing result")
+#        answer = []
+#        temp = {}
+#        try:
+#            temp['topic'] = res.text.split('\n')[1]
+#            temp['correct'] = res.text.split('\n')[3]
+#            if temp['correct'] != '':
+#                answer.append(temp)
+#        except IndexError:
+#            pass
+#
+#        logging.info("Yield question %s: %s" % (i+1, answer))
+#        index = yield answer
+#
+#        await asyncio.sleep(0.5)
+#
+#    raise StopIteration
+
+
+async def xuanxiu365(sess: requests.Session,
+                     *args: list) -> list:
     # 输入参数处理
     if not isinstance(sess, requests.Session):
         args = list(args)
@@ -389,20 +439,23 @@ async def fm210(sess: requests.Session,
         sess = requests.Session()
 
     # 接口
-    url = "http://api.fm210.cn/wangke/cx.php?"
+    url = "http://tiku.xuanxiu365.com/admin/admin/api.html"
+    header = {}
+    header['X-Requested-With'] = "XMLHttpRequest"
 
     # 接口参数
     index = yield
     payload = {}
     for i in range(len(args)):
         if index and i < index:
             continue
-        payload['w'] = args[i]
+        payload['search'] = args[i]
 
         # post请求
-        logging.info("Post to fm120. Question %d" % i)
+        logging.info("Post to xuanxiu365. Question %d" % i)
         try:
-            res = sess.get(url, params=payload, verify=False, timeout=5)
+            res = sess.get(url, params=payload, headers=header,
+                           verify=False, timeout=5)
             res.raise_for_status()
         except requests.exceptions.RequestException as e:
             logging.info("Request Exception appeared: %s" % e)
@@ -414,16 +467,13 @@ async def fm210(sess: requests.Session,
 
         # 处理结果
         logging.info("Processing result")
+        res = res.json()
         answer = []
-        temp = {}
-        try:
-            temp['topic'] = res.text.split('\n')[1]
-            temp['correct'] = res.text.split('\n')[3]
-            if temp['correct'] != '':
-                answer.append(temp)
-        except IndexError:
-            pass
-
+        if res['data']:
+            temp = {}
+            temp['topic'] = res['data']['title']
+            temp['correct'] = res['data']['content']
+            answer.append(temp)
         logging.info("Yield question %s: %s" % (i+1, answer))
         index = yield answer
 
@@ -432,6 +482,59 @@ async def fm210(sess: requests.Session,
     raise StopIteration
 
 
+#async def www150s(sess: requests.Session,
+#                  *args: list) -> list:
+#    # 输入参数处理
+#    if not isinstance(sess, requests.Session):
+#        args = list(args)
+#        args.insert(0, sess)
+#        args = tuple(args)
+#        sess = requests.Session()
+#
+#    # 接口
+#    url = "http://www.150s.cn/SearchServlet"
+#    header = {}
+#    header['X-Requested-With'] = "XMLHttpRequest"
+#
+#    # 接口参数
+#    index = yield
+#    payload = {}
+#    for i in range(len(args)):
+#        if index and i < index:
+#            continue
+#        payload['text'] = args[i]
+#
+#        # post请求
+#        logging.info("Post to www150s. Question %d" % i)
+#        try:
+#            res = sess.get(url, params=payload, headers=header,
+#                           verify=False, timeout=5)
+#            res.raise_for_status()
+#        except requests.exceptions.RequestException as e:
+#            logging.info("Request Exception appeared: %s" % e)
+#            answer = []
+#            answer.append({'topic': str(e),
+#                           'correct': ''})
+#            index = yield answer
+#            continue
+#
+#        # 处理结果
+#        logging.info("Processing result")
+#        res = res.json()
+#        answer = []
+#        temp = {}
+#        temp['topic'] = res['title']
+#        temp['correct'] = res['answer']
+#        if temp['topic'] != "查无此题，请您换一道题查询！":
+#            answer.append(temp)
+#        logging.info("Yield question %s: %s" % (i+1, answer))
+#        index = yield answer
+#
+#        await asyncio.sleep(0.5)
+#
+#    raise StopIteration
+
+
 async def cmd():
     # 获取所有api
     api_list = {}

app.py

@@ -5,7 +5,7 @@
 """
 
 __author__ = "yanyongyu"
-__version__ = "1.5.3"
+__version__ = "1.5.4"
 
 import asyncio
 import logging