From 933f431cff147538956742a5aa143081ca7b6290 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=AE=97=E5=91=BD=E7=B8=96=E5=AD=90?=
 <30351807+smxiazi@users.noreply.github.com>
Date: Thu, 13 Jan 2022 16:32:38 +0800
Subject: [PATCH] Add files via upload

---
 server.py     |  9 ++++++---
 xp_CAPTCHA.py | 13 +++++++++++--
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/server.py b/server.py
index bab0de0..d3422e2 100644
--- a/server.py
+++ b/server.py
@@ -1,12 +1,12 @@
 #!/usr/bin/env python
 # -*- conding:utf-8 -*-
 from http.server import HTTPServer, BaseHTTPRequestHandler
-import muggle_ocr
 import re,time,base64,os
 
 host = ('0.0.0.0', 8899)
 count = 50 #保存多少个验证码及结果
 
+
 class Resquest(BaseHTTPRequestHandler):
     def handler(self):
         print("data:", self.rfile.readline().decode())
@@ -33,7 +33,6 @@ def do_POST(self):
             if self.path != '/base64':
                 self.send_error(404, "Page not Found!")
                 return
-
             img_name = time.time()
             req_datas = self.rfile.read(int(self.headers['content-length']))
             req_datas = req_datas.decode()
@@ -82,9 +81,13 @@ def do_POST(self):
         self.wfile.write(text.encode('utf-8'))
 
 if __name__ == '__main__':
+    print('正在加载中请稍后……')
+    import muggle_ocr
     os.makedirs('temp', exist_ok=True)
     with open('temp/log.txt', 'w') as f:
         pass
     server = HTTPServer(host, Resquest)
     print("Starting server, listen at: %s:%s" % host)
-    server.serve_forever()
+    print('加载完成！请访问：http://127.0.0.1:%s' % host[1])
+    print('github:https://github.com/smxiazi/NEW_xp_CAPTCHA\n\n')
+    server.serve_forever()
\ No newline at end of file
diff --git a/xp_CAPTCHA.py b/xp_CAPTCHA.py
index 3591f1b..c21a28f 100644
--- a/xp_CAPTCHA.py
+++ b/xp_CAPTCHA.py
@@ -52,8 +52,17 @@ def hasMorePayloads(self):
         print xp_CAPTCHA_url
         headers = {"User-Agent": "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36","Cookie":self.cookie}
         request = urllib2.Request(xp_CAPTCHA_url,headers=headers)
-        CAPTCHA = urllib2.urlopen(request) #��ȡͼƬ
-        CAPTCHA_base64 = base64.b64encode(CAPTCHA.read()) #��ͼƬbase64����
+        CAPTCHA = urllib2.urlopen(request).read() #��ȡͼƬ
+
+        #�ж���֤�����ݰ��Ƿ�Ϊjson��ʽ
+        if '"' in CAPTCHA:
+            CAPTCHA = CAPTCHA.split('"')
+            CAPTCHA.sort(key=lambda i: len(i), reverse=True)  # �����ַ�����������
+            CAPTCHA = CAPTCHA[0].split(',')
+            CAPTCHA.sort(key=lambda i: len(i), reverse=True)  # �����ַ�����������
+            CAPTCHA_base64 = CAPTCHA[0]
+        else:
+            CAPTCHA_base64 = base64.b64encode(CAPTCHA) #��ͼƬbase64����
 
         request = urllib2.Request('http://%s:%s/base64'%host, 'base64='+CAPTCHA_base64)
         response = urllib2.urlopen(request).read()