Merge remote-tracking branch 'origin/master'

comData/Tyc/getTycId.py

@@ -21,45 +21,29 @@ headers = {
         'Connection': 'keep-alive',
         'Content-Length': '32',
         'Content-Type': 'application/json',
-        'Host': 'capi.tianyancha.com',
-        'Origin': 'https://www.tianyancha.com',
-        'Referer': 'https://www.tianyancha.com/',
-        'Sec-Fetch-Dest': 'empty',
-        'Sec-Fetch-Mode': 'cors',
-        'Sec-Fetch-Site': 'same-site',
         'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36',
-        'X-AUTH-TOKEN': 'eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxODcwMzc1MjYwMCIsImlhdCI6MTcwMjcxMjg4MywiZXhwIjoxNzA1MzA0ODgzfQ.mVTR6Wz7W_IBjf4rLYhKacG9CRxGTzIGKmlqrR9jN-_t0Z4vUYVYwOTMzo7vT9IClJELruhl4d31KBHX0bZ1NQ',
-        'X-TYCID': '6f6298905d3011ee96146793e725899d',
-        'sec-ch-ua': '"Google Chrome";v="117", "Not;A=Brand";v="8", "Chromium";v="117"',
-        'sec-ch-ua-mobile': '?0',
-        'sec-ch-ua-platform': '"Windows"',
         'version': 'TYC-Web'
 }
-# headers = {
-#     'X-TYCID':'30c1289042f511ee9182cd1e1bcaa517',
-#     # 'X-AUTH-TOKEN': 'eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxMzU5MjQ4MTgzOSIsImlhdCI6MTY5MjkzMzIxMiwiZXhwIjoxNjk1NTI1MjEyfQ.BKxDem8fpgeDHrIgm3qCoF76ueHtQSG1DggiTl4FAaoNKt4gem6NTX1XYndPXqVj9TXfl-8yp2kKE3jY66dyig',
-#     'version':'TYC-Web',
-#     'Content-Type':'application/json;charset=UTF-8'
-# }
+
 # cnx = pymysql.connect(host='114.116.44.11', user='caiji', password='f7s0&7qqtK', db='dbScore', charset='utf8mb4')
 # cursor= cnx.cursor()
 cnx_ = baseCore.cnx
 cursor_ = baseCore.cursor
 taskType = '天眼查企业id/天眼查'
 #根据信用代码获取天眼查id 企业名字等信息
-def getTycIdByXYDM(com_name):
+def getTycIdByXYDM(com_name, s):
     retData={'state':False,'tycData':None,'reput':True}
     url=f"https://capi.tianyancha.com/cloud-tempest/search/suggest/v3?_={baseCore.getNowTime(3)}"
     ip = baseCore.get_proxy()
-    paramJsonData = {'keyword':com_name}
+    paramJsonData = {'keyword': com_name}
     try:
         # headers['User-Agent'] = baseCore.getRandomUserAgent()
         # headers['X-AUTH-TOKEN'] = baseCore.GetTYCToken()
         # response = requests.post(url,json=paramJsonData,headers=headers,verify=False, proxies=ip)
-        response = requests.post(url,json=paramJsonData,headers=headers,verify=False)
+        response = s.post(url, json=paramJsonData, headers=headers)
         time.sleep(random.randint(3, 5))
         retJsonData =json.loads(response.content.decode('utf-8'))
-        if retJsonData['data'] and retJsonData['state']== 'ok':
+        if retJsonData['data'] and retJsonData['state'] == 'ok':
             pass
         else:
             log.error(f"---{com_name}-未查询到该企业---")