Merge branch 'dev/v2.4.21_rjj' of jianyu/qmx_admin into feature/v2.4.21

src/config.json

@@ -216,6 +216,5 @@
     "password": "=PDT49#80Z!RVv52_z",
     "address": "192.168.3.217:4000",
     "dbName": "messagetest"
-  },
-  "msgTaskTime": "@every 300s"
+  }
 }

src/config/config.go

@@ -76,7 +76,6 @@ type SysConfig struct {
 	MsgUrl              map[string]interface{} `json:"msgUrl"`
 	SaveMsgChanPool     int                    `json:"saveMsgChanPool"`
 	MsgMysql            map[string]interface{} `json:"msgMysql"`
-	MsgTaskTime         string                 `json:"msgTaskTime"`
 }
 
 var SysConfigs SysConfig

src/customerService/newsController.go

@@ -199,7 +199,7 @@ func SendMessageApi(context *admin.Context) (interface{}, error) {
 }
 
 func GetMsgType(context *admin.Context) (interface{}, error) {
-	types := util.MessageDB.SelectBySql("SELECT msg_type,msg_name AS name,group_id FROM `message_class` WHERE background_send = 1 ")
+	types := util.MsgTidb.SelectBySql("SELECT msg_type,msg_name AS name,group_id FROM `message_class` WHERE background_send = 1 ")
 	if types != nil && len(*types) > 0 {
 		tp := []map[string]interface{}{}
 		for _, v := range *types {

src/public/message.go

@@ -286,7 +286,7 @@ func GetMegType() {
 	wxBlackPush := map[int]bool{}
 	blackClassMap := map[int]string{}
 	msgTypeToGroupIdMap := map[int]int{}
-	types := util.MessageDB.SelectBySql("SELECT g.switch,c.wxtmpl_Id,c.msg_type,g.group_id,g.name FROM message_class c INNER JOIN message_group g on c.group_id =g.group_id")
+	types := util.MsgTidb.SelectBySql("SELECT g.switch,c.wxtmpl_Id,c.msg_type,g.group_id,g.name FROM message_class c INNER JOIN message_group g on c.group_id =g.group_id")
 	if types != nil && len(*types) > 0 {
 		for _, v := range *types {
 			name := qutil.ObjToString(v["name"])

src/util/db.go

@@ -22,7 +22,6 @@ var AdminDB *mysql.Mysql
 var CusTiDb *mysql.Mysql
 var CbsDB *mysql.Mysql
 var BaseDB *mysql.Mysql
-var MessageDB *mysql.Mysql
 var ConvertlabDB *mysql.Mysql
 var MsgTidb *mysql.Mysql
 
@@ -130,15 +129,6 @@ func init() {
 		MaxIdleConns: util.IntAll(SysConfigs.BaseMysql["maxIdleConns"]),
 	}
 	BaseDB.Init()
-	MessageDB = &mysql.Mysql{
-		Address:      SysConfigs.MessageMysql["address"].(string),
-		UserName:     SysConfigs.MessageMysql["username"].(string),
-		PassWord:     SysConfigs.MessageMysql["password"].(string),
-		DBName:       SysConfigs.MessageMysql["dbName"].(string),
-		MaxOpenConns: util.IntAll(SysConfigs.MessageMysql["maxOpenConns"]),
-		MaxIdleConns: util.IntAll(SysConfigs.MessageMysql["maxIdleConns"]),
-	}
-	MessageDB.Init()
 
 	GlobalCommonDataDB = &mysql.Mysql{
 		Address:      SysConfigs.GlobalCommonData["address"].(string),