Merge remote-tracking branch 'origin/master'

# Conflicts:
#	celery_stats/celery_stats_monitor.py

celery_stats/celery_stats_monitor.py

@@ -8,7 +8,6 @@ import redis
 from send_msg_to_dingding.send_msg import send_msg_to_dingtalk
 import datetime, time
 
-
 token_dict = {
     'gaia-dbmw': {'secret': "SECba5212dadad3794b3da51c903c828f60ab8342897af2675f1f48fceb8858eb5c",
                   'access_token': "df546521ce46bfb35025ca266efc2d7e8d708d1c8ada9b15ae487786ad06ad12"},
@@ -18,27 +17,31 @@ token_dict = {
                    'access_token': "df546521ce46bfb35025ca266efc2d7e8d708d1c8ada9b15ae487786ad06ad12"},
     "graces-es6-tapir-diary": {'secret': "SECba5212dadad3794b3da51c903c828f60ab8342897af2675f1f48fceb8858eb5c",
                                'access_token': "df546521ce46bfb35025ca266efc2d7e8d708d1c8ada9b15ae487786ad06ad12"},
+    "graces-es6-tapir-message": {'secret': "SECba5212dadad3794b3da51c903c828f60ab8342897af2675f1f48fceb8858eb5c",
+                                 'access_token': "df546521ce46bfb35025ca266efc2d7e8d708d1c8ada9b15ae487786ad06ad12"},
     "graces-es6-tapir-service": {'secret': "SEC65d8ac5f9c92677cf0c98624810abc407cf433fd4f2713649dc41310b4658fb5",
                                  'access_token': "ca4ca402653c7fe6011c18ff5ac385b2b0f4ab6cab61c545f09f4d8830db6870"},
     "graces-es6-tapir-service_pre": {'secret': "SEC65d8ac5f9c92677cf0c98624810abc407cf433fd4f2713649dc41310b4658fb5",
-                                 'access_token': "ca4ca402653c7fe6011c18ff5ac385b2b0f4ab6cab61c545f09f4d8830db6870"},
+                                     'access_token': "ca4ca402653c7fe6011c18ff5ac385b2b0f4ab6cab61c545f09f4d8830db6870"},
     "graces-es6-tapir-doctor": {'secret': "SEC65d8ac5f9c92677cf0c98624810abc407cf433fd4f2713649dc41310b4658fb5",
-                                 'access_token': "ca4ca402653c7fe6011c18ff5ac385b2b0f4ab6cab61c545f09f4d8830db6870"},
+                                'access_token': "ca4ca402653c7fe6011c18ff5ac385b2b0f4ab6cab61c545f09f4d8830db6870"},
     "graces-es6-tapir-merchant": {'secret': "SEC62645fa89b9a7b910624be1e84bd8fc1a4d59ac79c45f258ab4cee3114fe40ca",
                                  'access_token': "55e2076c095f67939cda6c4e568dddf17fc07977195014696f225e4f66639715"},
     "mentha-tapir-answer": {'secret': "SECba5212dadad3794b3da51c903c828f60ab8342897af2675f1f48fceb8858eb5c",
                             'access_token': "df546521ce46bfb35025ca266efc2d7e8d708d1c8ada9b15ae487786ad06ad12"},
     "graces-tapir-card": {'secret': "SECa54a42411200fd7c642921c35b7d0fe5a71c93e7305091413292bb6cc6cb318c",
-                           'access_token': "9e5c7d5b6249ca1d968bbf7dc9dd9caf0f8ab4ea37b18337b33746cad5a7a5e6"},
+                          'access_token': "9e5c7d5b6249ca1d968bbf7dc9dd9caf0f8ab4ea37b18337b33746cad5a7a5e6"},
     "graces-es6-tapir-lbs": {'secret': "SECa54a42411200fd7c642921c35b7d0fe5a71c93e7305091413292bb6cc6cb318c",
-                           'access_token': "9e5c7d5b6249ca1d968bbf7dc9dd9caf0f8ab4ea37b18337b33746cad5a7a5e6"},
+                             'access_token': "9e5c7d5b6249ca1d968bbf7dc9dd9caf0f8ab4ea37b18337b33746cad5a7a5e6"},
+    "graces-es6-tapir-merchant": {'secret': "SECa54a42411200fd7c642921c35b7d0fe5a71c93e7305091413292bb6cc6cb318c",
+                                  'access_token': "9e5c7d5b6249ca1d968bbf7dc9dd9caf0f8ab4ea37b18337b33746cad5a7a5e6"},
     "mentha-tapir-tractate": {'secret': "SECba5212dadad3794b3da51c903c828f60ab8342897af2675f1f48fceb8858eb5c",
                               'access_token': "df546521ce46bfb35025ca266efc2d7e8d708d1c8ada9b15ae487786ad06ad12"},
 }
 
 # send_msg_to_dingtalk("123",secret=secret,access_token=access_token)
 
-
+#
 redis_old_gaia = redis.StrictRedis.from_url("redis://:ReDis!GmTx*0aN11@172.16.40.166:6379/9", decode_responses=True)
 redis_old_mimas = redis.StrictRedis.from_url("redis://:ReDis!GmTx*0aN3@172.16.40.145:6379/5", decode_responses=True)
 redis_new_gaia = redis.StrictRedis.from_url("redis://:ReDis!GmTx*0aN19@172.16.50.166:6379", decode_responses=True)
@@ -79,37 +82,51 @@ def len_list_and_send_msg(redis_clint, key_name, rules, per_sec=10):
     # print(key_name,res)
     str_res = rules.parse(key_name, res, per_sec=per_sec)
     if str_res:
-        if key_name in ["graces-tapir-card","graces-es6-tapir-lbs"]:
+        if key_name in ["graces-tapir-card", "graces-es6-tapir-lbs", "graces-es6-tapir-merchant"]:
             send_msg_to_dingtalk(str_res, mobiles=["19566173658"], secret=token_dict[key_name]['secret'],
                                  access_token=token_dict[key_name]['access_token'],isAtAll=True)
         else:
-            send_msg_to_dingtalk(str_res,mobiles=["13552564745","17813268931"], secret=token_dict[key_name]['secret'],
+            send_msg_to_dingtalk(str_res, mobiles=["13552564745", "17813268931"], secret=token_dict[key_name]['secret'],
                                  access_token=token_dict[key_name]['access_token'],isAtAll=True)
 
 
 if __name__ == "__main__":
     rules = Parse_data()
     # 队列名和队列redis地址
-    redis_clicnt_dct = {
+    thirty_redis_clicnt_dct = {
         "gaia-dbmw": redis_old_gaia,
-        "tapir-gaia-service": redis_old_gaia,
-        "mimas-dbmw": redis_old_mimas,
         "graces-es6-tapir-diary": redis_new_gaia,
+        "mentha-tapir-answer": redis_new_mimas,
+        "mentha-tapir-tractate": redis_new_mimas,
+        "mimas-dbmw": redis_old_mimas,
+        "graces-es6-tapir-message": redis_new_gaia,
+    }
+    redis_clicnt_dct = {
+        "tapir-gaia-service": redis_old_gaia,
         "graces-es6-tapir-service": redis_new_gaia,
         "graces-es6-tapir-service_pre": redis_new_gaia,
         "graces-es6-tapir-doctor": redis_new_gaia,
-        "graces-es6-tapir-merchant": redis_new_gaia,
-        "mentha-tapir-answer": redis_new_mimas,
-        "graces-tapir-card":redis_new_gaia,
+        "graces-tapir-card": redis_new_gaia,
         "graces-es6-tapir-lbs": redis_new_gaia,
-        "mentha-tapir-tractate": redis_new_mimas,
+        "graces-es6-tapir-merchant": redis_new_gaia,
     }
     per_sec = 60
+    per_sec = 60 * 5
+    thirty_per_sec = 60 * 30
     last_time = time.time()
+    num = 0
     while True:
         now = time.time()
         if now - last_time >= per_sec:
             for redis_clint_key in redis_clicnt_dct:
                 len_list_and_send_msg(redis_clicnt_dct[redis_clint_key], redis_clint_key, rules, per_sec)
-            last_time =  now
+            last_time = now
+            num += 1
+
+        if num == 6:
+            for redis_clint_key in thirty_redis_clicnt_dct:
+                len_list_and_send_msg(thirty_redis_clicnt_dct[redis_clint_key], redis_clint_key, rules, thirty_per_sec)
+            last_time = now
+            num = 0
+
         time.sleep(1)

new_user_analysis/new_user_has_protratit_rate.py

@@ -29,7 +29,7 @@ from meta_base_code.utils.func_from_redis_get_portrait import *
 def con_sql(sql):
     # 从数据库的表里获取数据
 
-    db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+    db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                          db='doris_olap')
     cursor = db.cursor()
     cursor.execute(sql)
@@ -214,7 +214,7 @@ WHERE spam_pv.device_id IS NULL
         )
         print(instert_sql)
         # cursor.execute("set names 'UTF8'")
-        db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+        db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                              db='doris_olap')
         cursor = db.cursor()
         res = cursor.execute(instert_sql)
@@ -268,7 +268,7 @@ WHERE spam_pv.device_id IS NULL
         )
         print(instert_sql)
         # cursor.execute("set names 'UTF8'")
-        db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+        db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                              db='doris_olap')
         cursor = db.cursor()
         res = cursor.execute(instert_sql)

new_user_analysis/new_user_project_protratit.py

@@ -326,7 +326,7 @@ WHERE spam_pv.device_id IS NULL
         )
         print(instert_sql)
         # cursor.execute("set names 'UTF8'")
-        db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+        db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                              db='doris_olap')
         cursor = db.cursor()
         res = cursor.execute(instert_sql)

new_user_analysis/user_behavior_path.py

@@ -29,7 +29,7 @@ from pyspark.sql import SparkSession, DataFrame
 def con_sql(sql):
     # 从数据库的表里获取数据
 
-    db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+    db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                          db='doris_olap')
     cursor = db.cursor()
     cursor.execute(sql)
@@ -980,7 +980,7 @@ on t1.device_id = t2.cl_id""".format(partition_date=today_str)
         )
         print(instert_sql)
         # cursor.execute("set names 'UTF8'")
-        db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+        db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                              db='doris_olap')
         cursor = db.cursor()
         res = cursor.execute(instert_sql)

output/meigou_huidu_huisu.py

@@ -28,7 +28,7 @@ from pyspark.sql import SparkSession, DataFrame
 def con_sql(sql):
     # 从数据库的表里获取数据
 
-    db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+    db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                          db='doris_olap')
     cursor = db.cursor()
     cursor.execute(sql)

output/out_put_diary_0923.py

@@ -70,7 +70,7 @@ task_days = 2
 def con_sql(sql):
     # 从数据库的表里获取数据
 
-    db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+    db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                          db='doris_olap')
     cursor = db.cursor()
     cursor.execute(sql)

output/out_put_user_post_each_strategy.py

@@ -64,7 +64,7 @@ from meta_base_code.utils.func_from_es_get_article import get_es_article_num, ge
 def con_sql(sql):
     # 从数据库的表里获取数据
 
-    db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+    db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                          db='doris_olap')
     cursor = db.cursor()
     cursor.execute(sql)

output/output_article_distribution_0917.py

@@ -67,7 +67,7 @@ task_days = 2
 def con_sql(sql):
     # 从数据库的表里获取数据
 
-    db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+    db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                          db='doris_olap')
     cursor = db.cursor()
     cursor.execute(sql)

task/advertisement_strategy_d.py

@@ -23,7 +23,7 @@ from pyspark.sql import SparkSession, DataFrame
 from pyspark.sql.functions import lit
 import pytispark.pytispark as pti
 
-db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                      db='doris_olap')
 cursor = db.cursor()
 
@@ -31,7 +31,7 @@ cursor = db.cursor()
 def con_sql(sql):
     # 从数据库的表里获取数据
 
-    db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+    db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                          db='doris_olap')
     cursor = db.cursor()
     cursor.execute(sql)

task/conent_detail_page_grayscale_ctr.py

@@ -26,7 +26,7 @@ from pyspark.sql import SparkSession, DataFrame
 def con_sql(sql):
     # 从数据库的表里获取数据
 
-    db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+    db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                          db='doris_olap')
     cursor = db.cursor()
     cursor.execute(sql)
@@ -87,7 +87,7 @@ device_df = spark.sql(sql)
 device_df.show(1, False)
 sql_res = device_df.collect()
 print("-----------------------------------------------------------------------------")
-db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                      db='doris_olap')
 cursor = db.cursor()
 for res in sql_res:

task/core_indicators_monitoring.py

@@ -541,7 +541,7 @@ FROM
     sql_res = device_df.collect()
 
     for res in sql_res:
-        db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+        db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                              db='doris_olap')
         cursor = db.cursor()
         print(res)

task/daily_search_word_count.py

@@ -197,7 +197,7 @@ for t in range(0, task_days):
         partition_date = str(now + datetime.timedelta(days=-1))
         tag_names_list_week.append((word, nums, uv,partition_date))
 
-    db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+    db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                          db='doris_olap')
     cursor = db.cursor()
     insert_sql = "replace into daily_search_word_count(word, nums, uv,pid,partition_day) VALUES(%s,%s,%s,%s,%s)"

task/daily_search_word_count_fix.py

@@ -213,7 +213,7 @@ for t in range(0, task_days):
         partition_date = str(now + datetime.timedelta(days=-1))
         tag_names_list_week.append((word, nums, uv, partition_date))
 
-    db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+    db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                          db='doris_olap')
     cursor = db.cursor()
     insert_sql = "replace into daily_search_word_count_fix(word, nums, uv,pid,partition_day) VALUES(%s,%s,%s,%s,%s)"

task/daily_search_word_count_last_two_year.py

@@ -304,7 +304,7 @@ for t in range(1, task_days):
         # pid = hashlib.md5((today_str + keywords).encode("utf8")).hexdigest()
         tag_names_list_week.append((key_count, keywords, today_str, is_delete, servise_num, pv, is_tag))
 
-    db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+    db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                          db='doris_olap')
     # db = pymysql.connect(host='bj-cdb-6slgqwlc.sql.tencentcdb.com', port=62120, user='work', passwd='Gengmei1',
     #                      db='doris_prod')

task/ecommerce_income_report.py

@@ -35,7 +35,7 @@ from pyspark.sql import SparkSession, DataFrame
 def con_sql(sql):
     # 从数据库的表里获取数据
 
-    db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+    db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                          db='doris_olap')
     cursor = db.cursor()
     cursor.execute(sql)
@@ -422,7 +422,7 @@ group by partition_day
     cpc_item_pricing = cpc_proportion_expend_recharge_amount/cpc_click_num
     cpc_flow_rat = cpc_click_num / welfare_pv
     # tol_proportion_expend_amount
-    db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+    db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                          db='doris_olap')
     cursor = db.cursor()
     partition_date = yesterday_str

task/high_quality_diary_analysis.py

@@ -46,7 +46,7 @@ from meta_base_code.utils.func_from_es_get_article import get_es_article_num, ge
 def con_sql(sql):
     # 从数据库的表里获取数据
 
-    db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+    db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                          db='doris_olap')
     cursor = db.cursor()
     cursor.execute(sql)

task/home_feed_recommend_strategy_d.py

@@ -20,7 +20,7 @@ from pyspark.sql import SparkSession, DataFrame
 # from pyspark.sql.functions import lit
 # import pytispark.pytispark as pti
 
-db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                      db='doris_olap')
 cursor = db.cursor()
 
@@ -28,7 +28,7 @@ cursor = db.cursor()
 def con_sql(sql):
     # 从数据库的表里获取数据
 
-    db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+    db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                          db='doris_olap')
     cursor = db.cursor()
     cursor.execute(sql)

task/meigou_data.py

@@ -28,7 +28,7 @@ from pyspark.sql import SparkSession, DataFrame
 def con_sql(sql):
     # 从数据库的表里获取数据
 
-    db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+    db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                          db='doris_olap')
     cursor = db.cursor()
     cursor.execute(sql)
@@ -195,7 +195,7 @@ order by 1
         pid = hashlib.md5(
             (partition_date + device_os_type + active_type + grey_type).encode("utf8")).hexdigest()
 
-        db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+        db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                              db='doris_olap')
         cursor = db.cursor()
         commit_sql = """replace into meigou_data(partition_date,device_os_type,active_type,grey_type,clickpv_div_exposurepv,

task/portary_article_distribution.py

@@ -31,7 +31,7 @@ from pyspark.sql import SparkSession, DataFrame
 def con_sql(sql):
     # 从数据库的表里获取数据
 
-    db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+    db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                          db='doris_olap')
     cursor = db.cursor()
     cursor.execute(sql)
@@ -190,7 +190,7 @@ for redis_count,res in enumerate(user_portrait_scan):
                 )
                 # print(instert_sql)
                 # cursor.execute("set names 'UTF8'")
-                db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+                db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                                      db='doris_olap')
                 cursor = db.cursor()
                 res = cursor.execute(instert_sql)
@@ -215,7 +215,7 @@ for page_type in range(3):
         )
         # print(instert_sql)
         # cursor.execute("set names 'UTF8'")
-        db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+        db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                              db='doris_olap')
         cursor = db.cursor()
         res = cursor.execute(instert_sql)

task/recommend_strategy_d.py

@@ -22,7 +22,7 @@ from pyspark.sql import SparkSession, DataFrame
 # from pyspark.sql.functions import lit
 # import pytispark.pytispark as pti
 
-db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                      db='doris_olap')
 cursor = db.cursor()
 
@@ -30,7 +30,7 @@ cursor = db.cursor()
 def con_sql(sql):
     # 从数据库的表里获取数据
 
-    db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+    db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                          db='doris_olap')
     cursor = db.cursor()
     cursor.execute(sql)

task/recommend_strategy_fix.py

@@ -22,14 +22,14 @@ from pyspark.sql import SparkSession, DataFrame
 # from pyspark.sql.functions import lit
 # import pytispark.pytispark as pti
 
-db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                      db='doris_olap')
 cursor = db.cursor()
 
 
 def con_sql(sql):
     # 从数据库的表里获取数据
-    db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+    db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                          db='doris_olap')
     cursor = db.cursor()
     cursor.execute(sql)

task/search_answer_ctr.py

@@ -28,7 +28,7 @@ from pyspark.sql import SparkSession, DataFrame
 def con_sql(sql):
     # 从数据库的表里获取数据
 
-    db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+    db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                          db='doris_olap')
     cursor = db.cursor()
     cursor.execute(sql)
@@ -205,7 +205,7 @@ for t in range(0, task_days):
         )
         print(instert_sql)
         # cursor.execute("set names 'UTF8'")
-        db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+        db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                              db='doris_olap')
         cursor = db.cursor()
         res = cursor.execute(instert_sql)

task/search_diary_ctr.py

@@ -28,7 +28,7 @@ from pyspark.sql import SparkSession, DataFrame
 def con_sql(sql):
     # 从数据库的表里获取数据
 
-    db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+    db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                          db='doris_olap')
     cursor = db.cursor()
     cursor.execute(sql)
@@ -198,7 +198,7 @@ group by t1.partition_date,device_os_type,active_type,channel
         print(instert_sql_diary)
         print(instert_sql_qa)
         # cursor.execute("set names 'UTF8'")
-        db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+        db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                              db='doris_olap')
         cursor = db.cursor()
         res = cursor.execute(instert_sql_diary)

task/search_meigou_ctr.py

@@ -28,7 +28,7 @@ from pyspark.sql import SparkSession, DataFrame
 def con_sql(sql):
     # 从数据库的表里获取数据
 
-    db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+    db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                          db='doris_olap')
     cursor = db.cursor()
     cursor.execute(sql)
@@ -207,7 +207,7 @@ for t in range(0, task_days):
         )
         print(instert_sql)
         # cursor.execute("set names 'UTF8'")
-        db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+        db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                              db='doris_olap')
         cursor = db.cursor()
         res = cursor.execute(instert_sql)

task/search_strategy_d.py

@@ -24,7 +24,7 @@ from pyspark.sql import SparkSession, DataFrame
 # from pyspark.sql.functions import lit
 # import pytispark.pytispark as pti
 
-db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                      db='doris_olap')
 cursor = db.cursor()
 

task/search_tractate_ctr.py

@@ -28,7 +28,7 @@ from pyspark.sql import SparkSession, DataFrame
 def con_sql(sql):
     # 从数据库的表里获取数据
 
-    db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+    db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                          db='doris_olap')
     cursor = db.cursor()
     cursor.execute(sql)
@@ -204,7 +204,7 @@ for t in range(0, task_days):
         )
         print(instert_sql)
         # cursor.execute("set names 'UTF8'")
-        db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+        db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                              db='doris_olap')
         cursor = db.cursor()
         res = cursor.execute(instert_sql)

task/spark_temp.py

@@ -35,7 +35,7 @@ from meta_base_code.utils.func_from_redis_get_portrait import *
 def con_sql(sql):
     # 从数据库的表里获取数据
 
-    db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+    db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                          db='doris_olap')
     cursor = db.cursor()
     cursor.execute(sql)

task/spark_test.py

@@ -32,7 +32,7 @@ def con_sql(sql):
 
     # db = pymysql.connect(host='172.16.40.158', port=4000, user='st_user', passwd='aqpuBLYzEV7tML5RPsN1pntUzFy',
     #                      db='jerry_prod')
-    db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+    db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                          db='doris_olap')
     cursor = db.cursor()
     cursor.execute(sql)
@@ -206,7 +206,7 @@ SELECT *  FROM online.bl_hdfs_maidian_updates
 #       )
 #       print(instert_sql)
 #       # cursor.execute("set names 'UTF8'")
-#       db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+#       db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
 #                            db='doris_olap')
 #       cursor = db.cursor()
 #       res = cursor.execute(instert_sql)

task/tractate_analysis_in_7000.py

@@ -44,7 +44,7 @@ from meta_base_code.utils.func_from_es_get_article import get_es_article_num, ge
 def con_sql(sql):
     # 从数据库的表里获取数据
 
-    db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+    db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                          db='doris_olap')
     cursor = db.cursor()
     cursor.execute(sql)

utils/func_from_es_get_article.py

@@ -19,7 +19,7 @@ es = Elasticsearch([
 
 def con_sql_jerry_prod(sql):
     # 从数据库的表里获取数据
-    db = pymysql.connect(host='172.16.50.175', port=3306, user='doris', passwd='o5gbA27hXHHm',
+    db = pymysql.connect(host='172.16.30.136', port=3306, user='doris_olap', passwd='bA27hXasdfswuolap',
                          db='doris_olap')
     cursor = db.cursor()
     cursor.execute(sql)

utils/func_from_redis_get_portrait.py

@@ -8,7 +8,7 @@ import json
 import redis
 
 redis_client = redis.StrictRedis.from_url("redis://:ReDis!GmTx*0aN6@172.16.40.133:6379", decode_responses=True)
-redis_client2 = redis.StrictRedis.from_url("redis://:ReDis!GmTx*0aN9@172.16.40.173:6379", decode_responses=True)
+redis_client2 = redis.StrictRedis.from_url("redis://:XfkMCCdWDIU%ls$h@172.16.50.145:6379", decode_responses=True)
 redis_client3 = redis.StrictRedis.from_url("redis://:ReDis!GmTx*0aN12@172.16.40.164:6379", decode_responses=True)
 redis_client4 = redis.StrictRedis.from_url("redis://:XfkMCCdWDIU%ls$h@172.16.50.145:6379", decode_responses=True)
 

utils/portary_div_exposure.py

@@ -13,7 +13,7 @@ from meta_base_code.utils.func_get_pv_card_id import get_card_id
 import pandas as pd
 
 redis_client = redis.StrictRedis.from_url("redis://:ReDis!GmTx*0aN6@172.16.40.133:6379", decode_responses=True)
-redis_client2 = redis.StrictRedis.from_url("redis://:ReDis!GmTx*0aN9@172.16.40.173:6379", decode_responses=True)
+redis_client2 = redis.StrictRedis.from_url("redis://:XfkMCCdWDIU%ls$h@172.16.50.145:6379", decode_responses=True)
 redis_client3 = redis.StrictRedis.from_url("redis://:ReDis!GmTx*0aN12@172.16.40.164:6379", decode_responses=True)
 redis_client4 = redis.StrictRedis.from_url("redis://:XfkMCCdWDIU%ls$h@172.16.50.145:6379", decode_responses=True)