Merge remote-tracking branch 'origin/master'

base/BaseCore.py

@@ -482,6 +482,7 @@ class BaseCore:
             cursor = conn.cursor()
             cursor.execute(sql)
             data = cursor.fetchone()
+            conn.commit()
             data = list(data)
             cursor.close()
             conn.close()

base/RedisPPData.py

@@ -62,7 +62,7 @@ def NewsEnterprise():
     gw_query = "select SocialCode from EnterpriseInfo where Place = '2'"
     cursor.execute(gw_query)
     gw_result = cursor.fetchall()
-
+    cnx.commit()
     gw_social_list = [item[0] for item in gw_result]
     #todo:打印长度
     # print(len(gw_social_list))
@@ -96,6 +96,7 @@ def NoticeEnterprise():
     # 获取国内企业
     gn_query = "select SocialCode from EnterpriseInfo where Place = '1' and SecuritiesCode is not null "
     cursor.execute(gn_query)
+    cnx.commit()
     gn_result = cursor.fetchall()
     gn_social_list = [item[0] for item in gn_result]
     print('=======')
@@ -123,6 +124,7 @@ def BaseInfoEnterprise():
     gn_query = "select SocialCode from EnterpriseInfo where Place = '1'"
     cursor.execute(gn_query)
     gn_result = cursor.fetchall()
+    cnx.commit()
     gn_social_list = [item[0] for item in gn_result]
     print('=======')
     for item in gn_social_list:
@@ -149,6 +151,7 @@ def CorPerson():
     gn_query = "select SocialCode from EnterpriseInfo where Place = '1'"
     cursor.execute(gn_query)
     gn_result = cursor.fetchall()
+    cnx.commit()
     gn_social_list = [item[0] for item in gn_result]
     print('=======')
     for item in gn_social_list:
@@ -174,6 +177,7 @@ def FinanceFromEast():
     sql_sel = '''select social_credit_code from sys_base_enterprise_ipo where category = '1' '''
     cursor_.execute(sql_sel)
     finance = cursor_.fetchall()
+    cnx_.commit()
     finance_list = [item[0] for item in finance]
     print('=======')
     for item in finance_list:
@@ -198,6 +202,7 @@ def WeiXingetFromSql():
     selectSql = "SELECT info_source_code from info_source where site_uri like '%mp.weixin.qq.com%'"
     cursor_.execute(selectSql)
     results = cursor_.fetchall()
+    cnx_.commit()
     result_list = [item[0] for item in results]
     #放入redis
     for item in result_list:
@@ -225,6 +230,7 @@ def AnnualEnterprise():
     gn_query = "select SocialCode from EnterpriseInfo where Place = '1' and SecuritiesCode is not null"
     cursor.execute(gn_query)
     gn_result = cursor.fetchall()
+    cnx.commit()
     gn_social_list = [item[0] for item in gn_result]
     print('=======')
     for item in gn_social_list:
@@ -252,6 +258,7 @@ def AnnualEnterpriseXueQ():
     gn_query = "select SocialCode from EnterpriseInfo where Place = '1' and SecuritiesCode is not null and isIPO = 1 limit 10"
     cursor.execute(gn_query)
     gn_result = cursor.fetchall()
+    cnx.commit()
     gn_social_list = [item[0] for item in gn_result]
     print('=======')
     for item in gn_social_list:
@@ -280,6 +287,7 @@ def AnnualEnterpriseUS():
     #ZZSN22080900000025
     cursor.execute(us_query)
     us_result = cursor.fetchall()
+    cnx.commit()
     us_social_list = [item[0] for item in us_result]
     print('=======')
     for item in us_social_list:
@@ -318,6 +326,7 @@ def SEC_CIK():
     cik_query = "select cik from mgzqyjwyh_list where state=2"
     cursor.execute(cik_query)
     cik_result = cursor.fetchall()
+    cnx.commit()
     cik_list = [item[0] for item in cik_result]
     print('=====')
     for item in cik_list:
@@ -408,6 +417,7 @@ def NQEnterprise():
     nq_query = "SELECT social_credit_code FROM sys_base_enterprise_ipo WHERE securities_type='新三板' and listed='1'"
     cursor_.execute(nq_query)
     nq_result = cursor_.fetchall()
+    cnx_.commit()
     nq_social_list = [item[0] for item in nq_result]
 
     for item in nq_social_list:

comData/SEC_US/base_info_us.py

@@ -108,8 +108,8 @@ if __name__=='__main__':
             try:
                 producer = KafkaProducer(bootstrap_servers=['114.115.159.144:9092'], api_version=(2, 0, 2))
                 kafka_result = producer.send("regionInfo", json.dumps(com_dict, ensure_ascii=False).encode('utf8'))
-                print(kafka_result.get(timeout=10))
-                log.info(f'{cik}---{com_name}---基本信息采集成功')
+                log.info(kafka_result.get(timeout=10))
+                log.info(f'{cik}---{cname}---基本信息采集成功')
             except:
                 exception = 'kafka传输失败'
                 state = 0

comData/caiwushuju/BaseCore.py

@@ -436,6 +436,7 @@ class BaseCore:
         sql = f"SELECT * FROM EnterpriseInfo WHERE SocialCode = '{social_code}'"
         self.cursor.execute(sql)
         data = self.cursor.fetchone()
+        self.cnx.commit()
         return data
 
     # 更新企业采集次数
@@ -464,6 +465,7 @@ class BaseCore:
         # token = '67ec7402166df1da84ae83c4b95cefc0'  # 需要隔两个小时左右抓包修改
         self.cursor.execute(query)
         token = self.cursor.fetchone()[0]
+        self.cnx.commit()
         return token
 
     #检测语言