Merge remote-tracking branch 'origin/dev/v1.1.48_wjh' into dev/v1.1.48_wjh

jyBXSubscribe/rpc/init/db.go

@@ -109,6 +109,11 @@ func MysqlInit(mm *entity.Mysql) {
 		}
 		GlobalCommonData.Init()
 	}
+	if mm.JyCk.Address != "" {
+		logx.Info("--初始化 jy clickhouse--")
+		CkJy = mysql.NewInit(mysql.CLICKHOUSE, fmt.Sprintf("clickhouse://%s:%s@%s/%s", mm.JyCk.UserName, mm.JyCk.Password, mm.JyCk.Address, mm.JyCk.DbName),
+			mm.JyCk.MaxOpenConns, mm.JyCk.MaxIdleConns)
+	}
 	P.BidCodeMapping.Init(BaseServiceMysql)
 }
 

jyBXSubscribe/rpc/init/init.go

@@ -26,7 +26,6 @@ func InitC() {
 	RedisInit(&DB.Redis)
 	//初始es
 	EsInit(&DB.Es)
-	CkInit(&DB.Mysql)
 	Middleground = middleground.NewMiddleground(C.CodeServiceConf.Etcd.Hosts).
 		RegUserCenter(C.UserCenterKey).
 		RegPowerCheckCenter(C.PowerCheckCenterKey).