feat:配置调整

entity/db.go

@@ -14,4 +14,5 @@ var SaveEngine *xorm.Engine
 var Mongo mongodb.MongodbSim
 var MainMysql *mysql.Mysql
 var BaseMysql *mysql.Mysql
+var ConverLabTidb *mysql.Mysql
 var ClickhouseConn driver.Conn

rpc/etc/activity.yaml

@@ -72,4 +72,11 @@ clickhouse:
   password: pwdTopJy123
   dbName: information
   maxIdleConns: 5
+  maxOpenConns: 5
+converlabTidb:
+  address: 192.168.3.217:4000
+  username: root
+  password: '=PDT49#80Z!RVv52_z'
+  dbName: convertlabsync
+  maxIdleConns: 5
   maxOpenConns: 5

rpc/init/db.go

@@ -103,7 +103,18 @@ func MysqlInit(C config.Config) {
 		}
 		entity.BaseMysql.Init()
 	}
-	//mongo初始化
+	if C.ConverlabTidb.Address != "" {
+		logx.Info("--初始化 ConverlabTidb tidb--")
+		entity.ConverLabTidb = &mysql.Mysql{
+			Address:      C.ConverlabTidb.Address,
+			UserName:     C.ConverlabTidb.Username,
+			PassWord:     C.ConverlabTidb.Password,
+			DBName:       C.ConverlabTidb.DbName,
+			MaxOpenConns: C.ConverlabTidb.MaxOpenConns,
+			MaxIdleConns: C.ConverlabTidb.MaxIdleConns,
+		}
+		entity.ConverLabTidb.Init()
+	}
 }
 func ConnectClickhouse(C config.Config) error {
 	var (

rpc/internal/config/config.go

@@ -32,8 +32,9 @@ type Config struct {
 		ResourceCenterKey    string
 		EntManageApplication string
 	}
-	Mysql      Mysql
-	Clickhouse Clickhouse
+	Mysql         Mysql
+	Clickhouse    DbStruct
+	ConverlabTidb DbStruct
 }
 
 type Redis struct {
@@ -69,7 +70,7 @@ type MysqlStruct struct {
 	MaxIdleConns int    `json:"maxIdleConns"`
 }
 
-type Clickhouse struct {
+type DbStruct struct {
 	Username     string `json:"username"`
 	Password     string `json:"password"`
 	Address      string `json:"address"`

service/userGroupService.go

@@ -70,7 +70,7 @@ func (u *UserIdConstructor) getGroupTags() *[]map[string]interface{} {
 	}
 	where = fmt.Sprintf("where ugt.group_id in (%s)", strings.Join(groupIdFilter, ","))
 	query := fmt.Sprintf(`SELECT ugt.group_id,ug.tag_operator,ugt.tag_id,ugt.logical_operator FROM convertlabsync.user_group_tag ugt left join user_group ug  on (ugt.group_id=ug.id) %s`, where)
-	rs := entity.BaseMysql.SelectBySql(query, groupIdValue...)
+	rs := entity.ConverLabTidb.SelectBySql(query, groupIdValue...)
 	return rs
 }