fuwencai 9 місяців тому
батько
коміт
90b9b80ec7
5 змінених файлів з 15 додано та 15 видалено
  1. 1 1
      entity/db.go
  2. 1 1
      rpc/etc/activity.yaml
  3. 9 9
      rpc/init/db.go
  4. 3 3
      rpc/internal/config/config.go
  5. 1 1
      service/userGroupService.go

+ 1 - 1
entity/db.go

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

+ 1 - 1
rpc/etc/activity.yaml

@@ -73,7 +73,7 @@ clickhouse:
   dbName: information
   maxIdleConns: 5
   maxOpenConns: 5
-converlabTidb:
+convertlabTidb:
   address: 192.168.3.217:4000
   username: root
   password: '=PDT49#80Z!RVv52_z'

+ 9 - 9
rpc/init/db.go

@@ -103,17 +103,17 @@ func MysqlInit(C config.Config) {
 		}
 		entity.BaseMysql.Init()
 	}
-	if C.ConverlabTidb.Address != "" {
+	if C.ConvertlabTidb.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.ConvertlabTidb = &mysql.Mysql{
+			Address:      C.ConvertlabTidb.Address,
+			UserName:     C.ConvertlabTidb.Username,
+			PassWord:     C.ConvertlabTidb.Password,
+			DBName:       C.ConvertlabTidb.DbName,
+			MaxOpenConns: C.ConvertlabTidb.MaxOpenConns,
+			MaxIdleConns: C.ConvertlabTidb.MaxIdleConns,
 		}
-		entity.ConverLabTidb.Init()
+		entity.ConvertlabTidb.Init()
 	}
 }
 func ConnectClickhouse(C config.Config) error {

+ 3 - 3
rpc/internal/config/config.go

@@ -32,9 +32,9 @@ type Config struct {
 		ResourceCenterKey    string
 		EntManageApplication string
 	}
-	Mysql         Mysql
-	Clickhouse    DbStruct
-	ConverlabTidb DbStruct
+	Mysql          Mysql
+	Clickhouse     DbStruct
+	ConvertlabTidb DbStruct
 }
 
 type Redis struct {

+ 1 - 1
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.ConverLabTidb.SelectBySql(query, groupIdValue...)
+	rs := entity.ConvertlabTidb.SelectBySql(query, groupIdValue...)
 	return rs
 }