feat:更新

rpc/manager/init/init.go

@@ -5,13 +5,10 @@ import (
 	"app.yhyue.com/moapp/jyInfo/rpc/manager/internal/config"
 	"app.yhyue.com/moapp/jyInfo/rpc/model"
 	"flag"
-	"fmt"
-	"github.com/zeromicro/go-zero/core/conf"
-	"github.com/zeromicro/go-zero/core/logx"
-	"log"
-
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/jinzhu/gorm"
+	"github.com/zeromicro/go-zero/core/conf"
+	"github.com/zeromicro/go-zero/core/logx"
 )
 
 var configF = flag.String("ff", "etc/manager.yaml", "the config file")
@@ -31,24 +28,11 @@ func init() {
 	conf.MustLoad(*configF, &C)
 	//初始化msyql
 	mm := C.MysqlMain
-	data_source := fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8&parseTime=True&loc=Local",
-		mm.UserName,
-		mm.PassWord,
-		mm.Address,
-		mm.DbName,
-	)
-	DB, err = gorm.Open("mysql", data_source)
-	if err != nil {
-		panic(err)
-	}
-	DB.DB().SetMaxOpenConns(mm.MaxOpenConns) // 最大连接数
-	DB.DB().SetMaxIdleConns(mm.MaxIdleConns) // 最大空闲数
-	log.Println("初始化 mysql")
+	model.InitMysql(&mm)
 
 	//初始redis
 	rm := C.Redis
 	model.InitRedis(&rm)
-	model.InitMysql(&mm)
 	//初始NSQ
 	nm := C.Nsq
 	model.InitNsqConfig(&nm)

rpc/manager/internal/logic/infoonekeyactionlogic.go

@@ -73,8 +73,10 @@ func (l *InfoOneKeyActionLogic) InfoOneKeyAction(in *manager.OneKeyActionReq) (*
 					upData := make(map[string]interface{})
 					upData["publish_time"] = time.Now().Format("2006-01-02 15:04:05")
 					upData["published"] = 2
-					//entNameKye := fmt.Sprintf("userEntName_%s_%s_%d", mc.InterfaceToStr(res["user_id"]), in.MsgId, in.MsgType)
-					//entName := redis.GetStr("other", entNameKye)
+					entName := in.EntName
+					if res["ent_name"] != nil && mc.InterfaceToStr(res["ent_name"]) != "" {
+						entName = mc.InterfaceToStr(res["ent_name"])
+					}
 					supInfo := make(map[string]interface{})
 					supInfo["id"] = msgId
 					supInfo["title"] = res["title"]
@@ -88,7 +90,7 @@ func (l *InfoOneKeyActionLogic) InfoOneKeyAction(in *manager.OneKeyActionReq) (*
 						validityTime = validity.Unix()
 					}
 					supInfo["validity_time"] = validityTime
-					if ok := es.SaveSupplyInfo(in.EntName, supInfo); ok {
+					if ok := es.SaveSupplyInfo(entName, supInfo); ok {
 						if !model.Mysql.Update(tname, query, map[string]interface{}{
 							"published": 1,
 							"is_del":    1,