|
@@ -155,7 +155,7 @@ class SerialNumberView(View):
|
|
|
url1 = 'http://test.zositechc.cn/company/createSerial'
|
|
|
url2 = 'https://www.zositechc.cn/company/createSerial'
|
|
|
url3 = 'http://www.dvema.com/company/createSerial'
|
|
|
- # url4 = 'http://www.zositeche.com/company/createSerial'
|
|
|
+ url4 = 'http://api.zositeche.com/company/createSerial'
|
|
|
requests_data = {'id': id, 'quantity': quantity}
|
|
|
|
|
|
res1 = requests.post(url=url1, data=requests_data, timeout=2 * 60)
|
|
@@ -185,14 +185,14 @@ class SerialNumberView(View):
|
|
|
fail_reason = '美国服务器生成序列号发生异常'
|
|
|
return self.failResponse(company.name, quantity, fail_reason, Log, response)
|
|
|
|
|
|
- # res4 = requests.post(url=url4, data=requests_data, timeout=2 * 60)
|
|
|
- # if res4.status_code != 200:
|
|
|
- # fail_reason = '请求欧洲服务器生成序列号响应状态码异常'
|
|
|
- # return self.failResponse(company.name, quantity, fail_reason, Log, response)
|
|
|
- # res4 = res4.json()
|
|
|
- # if res4['code'] != 0:
|
|
|
- # fail_reason = '欧洲服务器生成序列号发生异常'
|
|
|
- # return self.failResponse(company.name, quantity, fail_reason, Log, response)
|
|
|
+ res4 = requests.post(url=url4, data=requests_data, timeout=2 * 60)
|
|
|
+ if res4.status_code != 200:
|
|
|
+ fail_reason = '请求欧洲服务器生成序列号响应状态码异常'
|
|
|
+ return self.failResponse(company.name, quantity, fail_reason, Log, response)
|
|
|
+ res4 = res4.json()
|
|
|
+ if res4['code'] != 0:
|
|
|
+ fail_reason = '欧洲服务器生成序列号发生异常'
|
|
|
+ return self.failResponse(company.name, quantity, fail_reason, Log, response)
|
|
|
|
|
|
return response.json(0)
|
|
|
|
|
@@ -258,7 +258,7 @@ class SerialNumberView(View):
|
|
|
url1 = 'http://test.zositechc.cn/serialNumber/create'
|
|
|
url2 = 'https://www.zositechc.cn/serialNumber/create'
|
|
|
url3 = 'http://www.dvema.com/serialNumber/create'
|
|
|
- # url4 = 'http://www.zositeche.com/company/createSerial'
|
|
|
+ url4 = 'http://api.zositeche.com/company/createSerial'
|
|
|
requests_data = {'quantity': quantity}
|
|
|
|
|
|
res1 = requests.post(url=url1, data=requests_data, timeout=2 * 60)
|
|
@@ -287,14 +287,16 @@ class SerialNumberView(View):
|
|
|
if res3['result_code'] != 0:
|
|
|
fail_reason = '美国服务器生成序列号发生异常'
|
|
|
return self.generateFail(quantity, fail_reason, Log, response)
|
|
|
- # res4 = requests.post(url=url4, data=requests_data, timeout=2 * 60)
|
|
|
- # if res4.status_code != 200:
|
|
|
- # fail_reason = '请求欧洲服务器生成序列号响应状态码异常'
|
|
|
- # return self.generateFail(quantity, fail_reason, Log, response)
|
|
|
- # res4 = res4.json()
|
|
|
- # if res4['code'] != 0:
|
|
|
- # fail_reason = '欧洲服务器生成序列号发生异常'
|
|
|
- # return self.generateFail(quantity, fail_reason, Log, response)
|
|
|
+
|
|
|
+ res4 = requests.post(url=url4, data=requests_data, timeout=2 * 60)
|
|
|
+ if res4.status_code != 200:
|
|
|
+ fail_reason = '请求欧洲服务器生成序列号响应状态码异常'
|
|
|
+ return self.generateFail(quantity, fail_reason, Log, response)
|
|
|
+ res4 = res4.json()
|
|
|
+ if res4['code'] != 0:
|
|
|
+ fail_reason = '欧洲服务器生成序列号发生异常'
|
|
|
+ return self.generateFail(quantity, fail_reason, Log, response)
|
|
|
+
|
|
|
return response.json(0)
|
|
|
|
|
|
except Exception as e:
|