mysql账号更新

BaseDataMaintenance/dataSource/setttings.py

@@ -14,7 +14,7 @@ mysql_port = 3306
 # mysql_user = "bxkc_read"
 # mysql_pass = "bxkc_20RE18AD"
 mysql_user = "bxkc"
-mysql_pass = "M$7UdmVToY*N@ITU"
+mysql_pass = "x$nWk2ED5w=Lu2Yz"
 mysql_db = "bxkc"
 
 test_mysql_host = "192.168.2.170"

BaseDataMaintenance/maxcompute/documentMerge.py

@@ -2397,7 +2397,7 @@ def check_zhaozhong_page_time_merge(zhao_biao_page_time,zhong_biao_page_time,zha
         if getLength(bidopen_to_merge)>0 and bidopen_to_merge>zhong_biao_page_time_to_merge:
             zhong_biao_page_time_to_merge = bidopen_to_merge
 
-    if (getLength(zhong_biao_page_time)>0 and getLength(zhao_biao_page_time_to_merge)>0 and zhong_biao_page_time<zhao_biao_page_time_to_merge) or (len(zhong_biao_page_time_to_merge)>0 and len(zhao_biao_page_time)>0 and zhong_biao_page_time_to_merge<zhao_biao_page_time):
+    if (getLength(zhong_biao_page_time)>0 and getLength(zhao_biao_page_time_to_merge)>0 and zhong_biao_page_time<zhao_biao_page_time_to_merge) or (getLength(zhong_biao_page_time_to_merge)>0 and getLength(zhao_biao_page_time)>0 and zhong_biao_page_time_to_merge<zhao_biao_page_time):
         if b_log:
             log("check zhaobiao zhongbiao page_time failed %s=%s===%s=%s"%(str(zhao_biao_page_time),str(zhong_biao_page_time),str(zhao_biao_page_time_to_merge),str(zhong_biao_page_time_to_merge)))
         return -1