فهرست منبع

配置获取修改

Jianghan 8 ماه پیش
والد
کامیت
ba03fdf10e
3فایلهای تغییر یافته به همراه47 افزوده شده و 31 حذف شده
  1. 23 14
      handler/activity/newUserAward.go
  2. 22 14
      handler/activity/task.go
  3. 2 3
      handler/handler.go

+ 23 - 14
handler/activity/newUserAward.go

@@ -3,6 +3,7 @@ package activity
 import (
 	"app.yhyue.com/moapp/jybase/go-logger/logger"
 	"github.com/gogf/gf/v2/os/gtime"
+	"log"
 	"strconv"
 	"time"
 
@@ -27,6 +28,9 @@ const (
 )
 
 func NewUserActivity(msg *model.Message) {
+	log.Println(gcfg.Instance().MustGet(gctx.New(), "newRegister.message.title").String())
+	log.Println(gcfg.Instance().MustGet(gctx.New(), "newRegister.message.content").String())
+	log.Println(gcfg.Instance().MustGet(gctx.New(), "newRegister.message.msgType").String())
 	go func() {
 		wxUrl := "/front/sess/" + Se.EncodeString(msg.E_userId+",_id,identityKeep,") + "__" + Se.EncodeString(PushConfig.Messages.NewUser.MobileUrl)
 		appUrl := "/jyapp/free/sess/" + Se.EncodeString(msg.E_userId+",_id,"+strconv.Itoa(int(time.Now().Unix()))+",") + "__" + Se.EncodeString(PushConfig.Messages.NewUser.MobileUrl)
@@ -44,20 +48,25 @@ func NewUserActivity(msg *model.Message) {
 		if err != nil {
 			logger.Info("SendMsg Fail ", err)
 		}
-		err = rpc.SendMsg("新用户注册", &message.MultipleSaveMsgReq{
-			UserIds: msg.E_userId,
-			Title:   gcfg.Instance().MustGet(gctx.New(), "newRegister.message.title", "").String(),
-			Content: gcfg.Instance().MustGet(gctx.New(), "newRegister.message.content", "").String(),
-			MsgType: gcfg.Instance().MustGet(gctx.New(), "newRegister.message.msgType", "").Int64(),
-			Appid:   gcfg.Instance().MustGet(gctx.New(), "newRegister.message.appid", "").String(),
-			Link: gcfg.Instance().MustGet(gctx.New(), "newRegister.message.pcUrl", "").String() + "," +
-				gcfg.Instance().MustGet(gctx.New(), "newRegister.message.mobileUrl", "").String() + "," +
-				gcfg.Instance().MustGet(gctx.New(), "newRegister.message.mobileUrl", "").String() + "," +
-				gcfg.Instance().MustGet(gctx.New(), "newRegister.message.mobileUrl", "").String(),
-			AppPushUrl: gcfg.Instance().MustGet(gctx.New(), "newRegister.message.mobileUrl", "").String(),
-			WxPushUrl:  gcfg.Instance().MustGet(gctx.New(), "newRegister.message.wxUrl", "").String(),
-			IosPushUrl: gcfg.Instance().MustGet(gctx.New(), "newRegister.message.mobileUrl", "").String(),
-		})
+		mtype := gcfg.Instance().MustGet(gctx.New(), "newRegister.message.msgType").Int64()
+		if mtype == 0 {
+			logger.Info("SendMsg Fail 获取配置文件失败")
+		} else {
+			err = rpc.SendMsg("新用户注册", &message.MultipleSaveMsgReq{
+				UserIds: msg.E_userId,
+				Title:   gcfg.Instance().MustGet(gctx.New(), "newRegister.message.title", "").String(),
+				Content: gcfg.Instance().MustGet(gctx.New(), "newRegister.message.content", "").String(),
+				MsgType: mtype,
+				Appid:   gcfg.Instance().MustGet(gctx.New(), "newRegister.message.appid", "").String(),
+				Link: gcfg.Instance().MustGet(gctx.New(), "newRegister.message.pcUrl", "").String() + "," +
+					gcfg.Instance().MustGet(gctx.New(), "newRegister.message.mobileUrl", "").String() + "," +
+					gcfg.Instance().MustGet(gctx.New(), "newRegister.message.mobileUrl", "").String() + "," +
+					gcfg.Instance().MustGet(gctx.New(), "newRegister.message.mobileUrl", "").String(),
+				AppPushUrl: gcfg.Instance().MustGet(gctx.New(), "newRegister.message.mobileUrl", "").String(),
+				WxPushUrl:  gcfg.Instance().MustGet(gctx.New(), "newRegister.message.wxUrl", "").String(),
+				IosPushUrl: gcfg.Instance().MustGet(gctx.New(), "newRegister.message.mobileUrl", "").String(),
+			})
+		}
 		if err != nil {
 			logger.Info("SendMsg Fail ", err)
 		}

+ 22 - 14
handler/activity/task.go

@@ -54,20 +54,28 @@ func Task(msg *model.Message) {
 			Date:         msg.E_time,
 			Desc:         "2024年新用户注册赠送7天超级订阅",
 		})
-		SendMsg("新绑定手机号用户", &message.MultipleSaveMsgReq{
-			UserIds: msg.E_userId,
-			Title:   gcfg.Instance().MustGet(gctx.New(), "newRegister.message.title", "").String(),
-			Content: gcfg.Instance().MustGet(gctx.New(), "newRegister.message.content", "").String(),
-			MsgType: gcfg.Instance().MustGet(gctx.New(), "newRegister.message.msgType", "").Int64(),
-			Appid:   gcfg.Instance().MustGet(gctx.New(), "newRegister.message.appid", "").String(),
-			Link: gcfg.Instance().MustGet(gctx.New(), "newRegister.message.pcUrl", "").String() + "," +
-				gcfg.Instance().MustGet(gctx.New(), "newRegister.message.mobileUrl", "").String() + "," +
-				gcfg.Instance().MustGet(gctx.New(), "newRegister.message.wxUrl", "").String() + "," +
-				gcfg.Instance().MustGet(gctx.New(), "newRegister.message.mobileUrl", "").String(),
-			AppPushUrl: gcfg.Instance().MustGet(gctx.New(), "newRegister.message.mobileUrl", "").String(),
-			WxPushUrl:  gcfg.Instance().MustGet(gctx.New(), "newRegister.message.wxUrl", "").String(),
-			IosPushUrl: gcfg.Instance().MustGet(gctx.New(), "newRegister.message.mobileUrl", "").String(),
-		})
+		mtype := gcfg.Instance().MustGet(gctx.New(), "newRegister.message.msgType").Int64()
+		if mtype == 0 {
+			logger.Info("SendMsg Fail 获取配置文件失败")
+		} else {
+			err := SendMsg("新绑定手机号用户", &message.MultipleSaveMsgReq{
+				UserIds: msg.E_userId,
+				Title:   gcfg.Instance().MustGet(gctx.New(), "newRegister.message.title", "").String(),
+				Content: gcfg.Instance().MustGet(gctx.New(), "newRegister.message.content", "").String(),
+				MsgType: mtype,
+				Appid:   gcfg.Instance().MustGet(gctx.New(), "newRegister.message.appid", "").String(),
+				Link: gcfg.Instance().MustGet(gctx.New(), "newRegister.message.pcUrl", "").String() + "," +
+					gcfg.Instance().MustGet(gctx.New(), "newRegister.message.mobileUrl", "").String() + "," +
+					gcfg.Instance().MustGet(gctx.New(), "newRegister.message.wxUrl", "").String() + "," +
+					gcfg.Instance().MustGet(gctx.New(), "newRegister.message.mobileUrl", "").String(),
+				AppPushUrl: gcfg.Instance().MustGet(gctx.New(), "newRegister.message.mobileUrl", "").String(),
+				WxPushUrl:  gcfg.Instance().MustGet(gctx.New(), "newRegister.message.wxUrl", "").String(),
+				IosPushUrl: gcfg.Instance().MustGet(gctx.New(), "newRegister.message.mobileUrl", "").String(),
+			})
+			if err != nil {
+				logger.Info("SendMsg Fail ", err)
+			}
+		}
 	}
 	//判断用户是否有任务
 	data, ok := db.Mgo.FindById("user", msg.E_userId, `{"l_registedate":1}`)

+ 2 - 3
handler/handler.go

@@ -15,7 +15,7 @@ import (
 )
 
 var (
-	funcMap = map[string]func(msg *model.Message){
+	FuncMap = map[string]func(msg *model.Message){
 		//新用户注册活动
 		"jyapp_wx_register":    activity.NewUserActivity,
 		"jyapp_phone_register": activity.NewUserActivity,
@@ -39,7 +39,6 @@ var (
 type Handler struct {
 }
 
-//
 func (h *Handler) HandleMessage(m *nsq.Message) error {
 	defer common.Catch()
 	if len(m.Body) == 0 {
@@ -60,7 +59,7 @@ func (h *Handler) HandleMessage(m *nsq.Message) error {
 		logger.Info("缺少参数e_time", fmt.Sprintf("%+v", msg))
 		return nil
 	}
-	f, f_ok := funcMap[msg.E_code]
+	f, f_ok := FuncMap[msg.E_code]
 	if f_ok {
 		f(msg)
 	} else {