fix

Pyspark_job/es_handle/es_update_with_info.py

@@ -11,7 +11,7 @@ from utils.DorisHelper import DorisHelper
 __es_ip__ = "192.168.10.217"
 __es_port__ = "9200"
 __es_user__ = "elastic"
-__es_passwd__ = "selection2021.+"
+__es_passwd__ = "Selection20251#+"
 __warehouse_dir__ = "hdfs://nameservice1:8020/home/big_data_selection"
 __metastore_uris__ = "thrift://hadoop16:9083"
 

Pyspark_job/es_handle/es_update_with_usr_mask.py

@@ -17,7 +17,7 @@ from utils.DorisHelper import DorisHelper
 __es_ip__ = "192.168.10.217"
 __es_port__ = "9200"
 __es_user__ = "elastic"
-__es_passwd__ = "selection2021.+"
+__es_passwd__ = "Selection20251#+"
 __warehouse_dir__ = "hdfs://nameservice1:8020/home/big_data_selection"
 __metastore_uris__ = "thrift://hadoop16:9083"
 

Pyspark_job/sqoop_export/export_dwt_asin_related_traffic.py

@@ -24,7 +24,8 @@ if __name__ == '__main__':
     export_cols = [
         'asin',
         'related_asin',
-        'related_type'
+        'related_type',
+        'related_time'
     ]
 
     if date_type == 'month':
@@ -41,8 +42,13 @@ if __name__ == '__main__':
 
     sql = f"""
         DROP TABLE IF EXISTS {export_tb};
-        CREATE TABLE {export_tb} (LIKE us_asin_related_template INCLUDING ALL);
-    
+        CREATE TABLE {export_tb} (
+          id serial8,
+          asin varchar(10) NOT NULL,
+          related_asin varchar(10)[] NOT NULL,
+          related_type int2[] NOT NULL,
+          related_time varchar(10) NOT NULL
+        );
         ALTER TABLE {export_tb} ALTER COLUMN related_asin TYPE text;
         ALTER TABLE {export_tb} ALTER COLUMN related_type TYPE text;
     """

Pyspark_job/utils/db_util.py

@@ -35,7 +35,7 @@ class DBUtil(object):
     __mysql_host__ = "rm-wz9yg9bsb2zf01ea4yo.mysql.rds.aliyuncs.com"
     __mysql_port__ = "3306"
     __mysql_username__ = "XP_Yswg2025"
-    __mysql_pwd__ = "Xp_Yswg2025@300"
+    __mysql_pwd__ = "XP2025@Yswg300"
 
     # pg连接参数正式库-h15
     __pgsql_host__ = "192.168.10.224"

Pyspark_job/utils/es_util.py

@@ -8,7 +8,7 @@ class EsUtils(object):
     __es_url_us_old_month__ = "http://120.79.147.190:9200"
     __es_url__ = "http://192.168.10.217:9200"
     __es_user__ = "elastic"
-    __es_passwd__ = "selection2021.+"
+    __es_passwd__ = "Selection20251#+"
     __basic_auth__ = "ZWxhc3RpYzpzZWxlY3Rpb24yMDIxLis="
     __basic_auth_test__ = "ZWxhc3RpYzpzZWxlY3Rpb24yMDIxLis="
     __es_port__ = '9200'

run_shell/sqoop_shell/templates.sh

@@ -12,8 +12,8 @@ get_db_info(){
 		db_url=mysql
 		host=rm-wz9yg9bsb2zf01ea4yo.mysql.rds.aliyuncs.com
 		port=3306
-		username=adv_yswg
-		password=HCL1zcUgQesaaXNLbL37O5KhpSAy0c
+		username=XP_Yswg2025
+		password=XP2025@Yswg300
 	elif [ $db_type == postgresql ]
 	then
 		db_url=postgresql