|
@@ -993,14 +993,14 @@ class testView(View):
|
|
res['result']['domainName'] = 'https://www.zositechc.cn'
|
|
res['result']['domainName'] = 'https://www.zositechc.cn'
|
|
results_data.append(res['result'])
|
|
results_data.append(res['result'])
|
|
res1 = requests.post("http://www.dvema.com/testApi/getSerialNumberInfo",
|
|
res1 = requests.post("http://www.dvema.com/testApi/getSerialNumberInfo",
|
|
- data={'serialNumber': serial_number}, timeout=3)
|
|
|
|
|
|
+ data={'serialNumber': serial_number}, timeout=15)
|
|
results1 = json.loads(res1.text)
|
|
results1 = json.loads(res1.text)
|
|
results1['result']['server'] = 2
|
|
results1['result']['server'] = 2
|
|
results1['result']['serverName'] = '美国服'
|
|
results1['result']['serverName'] = '美国服'
|
|
results1['result']['domainName'] = 'https://www.dvema.com'
|
|
results1['result']['domainName'] = 'https://www.dvema.com'
|
|
results_data.append(results1['result'])
|
|
results_data.append(results1['result'])
|
|
res2 = requests.post("https://api.zositeche.com/testApi/getSerialNumberInfo",
|
|
res2 = requests.post("https://api.zositeche.com/testApi/getSerialNumberInfo",
|
|
- data={'serialNumber': serial_number}, timeout=5)
|
|
|
|
|
|
+ data={'serialNumber': serial_number}, timeout=15)
|
|
results2 = json.loads(res2.text)
|
|
results2 = json.loads(res2.text)
|
|
results2['result']['server'] = 3
|
|
results2['result']['server'] = 3
|
|
results2['result']['serverName'] = '欧洲服'
|
|
results2['result']['serverName'] = '欧洲服'
|
|
@@ -1032,6 +1032,6 @@ class testView(View):
|
|
LogModel.objects.create(**log)
|
|
LogModel.objects.create(**log)
|
|
return response.json(0, results_data)
|
|
return response.json(0, results_data)
|
|
except Exception as e:
|
|
except Exception as e:
|
|
- LOGGER.info('异常详情,errLine:{}, errMsg:{}'
|
|
|
|
|
|
+ LOGGER.info('扫码检测序列号异常详情,errLine:{}, errMsg:{}'
|
|
.format(e.__traceback__.tb_lineno, repr(e)))
|
|
.format(e.__traceback__.tb_lineno, repr(e)))
|
|
return response.json(500)
|
|
return response.json(500)
|