merg

entity/entity.go

@@ -9,8 +9,11 @@ import (
 )
 
 const (
-	NewOther            = "newother"
-	PowerCacheDb        = "other"
+	NewOther     = "newother"
+	PowerCacheDb = "other"
+	NewOther     = "newother"
+	PowerCacheDb = "other"
+
 	EntnicheInfo        = "entniche_info"
 	EntnicheUser        = "entniche_user"
 	EntnichePower       = "entniche_power"
@@ -45,6 +48,15 @@ type SubvipBuySet struct {
 	BuyerclassCount int   `json:"buyerclasscount"` //行业数
 }
 
+type MysqlDb struct {
+	Address      string //数据库地址:端口
+	UserName     string //用户名
+	PassWord     string //密码
+	DBName       string //数据库名
+	MaxOpenConns int    //用于设置最大打开的连接数，默认值为0表示不限制。
+	MaxIdleConns int    //用于设置闲置的连接数。
+}
+
 var (
 	JyMysql             *mysql.Mysql
 	Mgo                 *mongodb.MongodbSim
@@ -52,7 +64,7 @@ var (
 	PowerCheckCenterRpc powercheck.PowerCheck
 )
 
-func InitMysql(n *mysql.Mysql) {
+func InitMysql(n *MysqlDb) {
 	JyMysql = &mysql.Mysql{
 		Address:      n.Address,
 		UserName:     n.UserName,

rpc/internal/config/config.go

@@ -1,7 +1,7 @@
 package config
 
 import (
-	"app.yhyue.com/moapp/jybase/mysql"
+	"bp.jydev.jianyu360.cn/BaseService/entManageApplication/entity"
 	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/zrpc"
 )
@@ -12,7 +12,7 @@ type Config struct {
 	PowerCheckRpc zrpc.RpcClientConf
 	Logx          logx.LogConf
 	Mysql         struct {
-		JianYu *mysql.Mysql
+		JianYu *entity.MysqlDb
 	}
 	Mongo struct {
 		Qfw struct {