提交 38cc7957 编写于 作者: H hjdhnx

日志不打印非图片的base64编码

上级 eab86a61
......@@ -97,8 +97,10 @@ def getParmas(key=None,value=''):
return args
def get_img(request, img_type='file', img_name='image'):
img_base64 = ''
if img_type == 'b64':
img = base64.b64decode(request.get_data()) #
img_base64 = request.get_data()
img = base64.b64decode(img_base64) #
try: # json str of multiple images
dic = json.loads(img)
img = base64.b64decode(dic.get(img_name).encode())
......@@ -107,10 +109,9 @@ def get_img(request, img_type='file', img_name='image'):
elif img_type == 'drpy':
img_base64 = getParmas('img')
img = base64.b64decode(img_base64)
logger.info(f'drpy验证码图片:{img_base64}')
else:
img = request.files.get(img_name).read()
return img
return img,img_base64
def set_ret(result, ret_type='text'):
......@@ -131,13 +132,15 @@ def set_ret(result, ret_type='text'):
@app.route('/<opt>/<img_type>/<ret_type>', methods=['POST'])
def ocr(opt, img_type='file', ret_type='text'):
try:
img = get_img(request, img_type)
img,img_base64 = get_img(request, img_type)
if opt == 'ocr':
result = server.classification(img)
elif opt == 'det':
result = server.detection(img)
else:
raise f"<opt={opt}> is invalid"
if img_type == 'drpy':
logger.info(f'drpy验证码图片:{img_base64}')
logger.info(f'{img_type}类型的图片识别结果:{result}')
return set_ret(result, ret_type)
except Exception as e:
......@@ -148,8 +151,8 @@ def ocr(opt, img_type='file', ret_type='text'):
@app.route('/slide/<algo_type>/<img_type>/<ret_type>', methods=['POST'])
def slide(algo_type='compare', img_type='file', ret_type='text'):
try:
target_img = get_img(request, img_type, 'target_img')
bg_img = get_img(request, img_type, 'bg_img')
target_img,_ = get_img(request, img_type, 'target_img')
bg_img,_ = get_img(request, img_type, 'bg_img')
result = server.slide(target_img, bg_img, algo_type)
return set_ret(result, ret_type)
except Exception as e:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册