Merge branch 'feature/v1.2.6' of https://jygit.jydev.jianyu360.cn/moapp/message into dev/v1.2.6_zxl

etc/config.yaml

@@ -4,22 +4,19 @@ appid: 10000
 # 基础服务ETCD配置
 etcd:
   # 基础服务
+  messageKey: "message.rpc" #消息中台rpc
+  address:
+    - 192.168.3.206:2379
   baseserver:
     # 用户中台配置
     integral:
       key: integral.rpc
-      address:
-        - 192.168.3.206:2379
   # 剑鱼文库
   jydocs:
     userlib:
         key: jydocs.userlib.rpc
-        address:
-          - 192.168.3.206:2379
     stdlib:
       key: jydocs.stdlib.rpc
-      address:
-        - 192.168.3.206:2379
 #消息队列
 nsq:
   topic: jy_event

go.mod

@@ -3,30 +3,12 @@ module app.yhyue.com/moapp/message
 go 1.14
 
 require (
-	app.yhyue.com/moapp/jyPoints v1.1.1
-	app.yhyue.com/moapp/jy_docs v0.0.0-20210325090558-b5d95f6bdf53
-	app.yhyue.com/moapp/jybase v0.0.0-20220427020729-974c1a148186
-	github.com/coreos/go-semver v0.3.0 // indirect
-	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
-	github.com/dustin/go-humanize v1.0.0 // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
+	app.yhyue.com/moapp/MessageCenter v0.0.0-20230918064638-5cd2498053ae
+	app.yhyue.com/moapp/jyPoints v1.1.2-0.20231020023521-1a4b1bbf9736
+	app.yhyue.com/moapp/jy_docs v1.1.1-0.20231024064228-a0ce3483eaf1
+	app.yhyue.com/moapp/jybase v0.0.0-20230901064756-2fc66b18db40
 	github.com/gogf/gf/v2 v2.0.6
-	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
-	github.com/mattn/go-runewidth v0.0.13 // indirect
 	github.com/nsqio/go-nsq v1.1.0
-	github.com/prometheus/client_golang v1.11.1 // indirect
-	github.com/tal-tech/go-zero v1.1.5
-	go.opentelemetry.io/otel/sdk v1.3.0 // indirect
-	go.uber.org/atomic v1.9.0 // indirect
-	go.uber.org/multierr v1.8.0 // indirect
-	go.uber.org/zap v1.21.0 // indirect
-	golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
-	golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
-	golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 // indirect
-	google.golang.org/genproto v0.0.0-20220228195345-15d65a4533f7 // indirect
-	google.golang.org/grpc v1.45.0 // indirect
-	google.golang.org/protobuf v1.28.0 // indirect
+	github.com/zeromicro/go-zero v1.5.6
+	golang.org/x/net v0.17.0 // indirect
 )
-
-replace google.golang.org/grpc => google.golang.org/grpc v1.29.1

handler/activity/newUserAward.go

@@ -3,6 +3,7 @@ package activity
 import (
 	"app.yhyue.com/moapp/message/handler/award"
 	"app.yhyue.com/moapp/message/model"
+	"app.yhyue.com/moapp/message/rpc"
 	"github.com/gogf/gf/v2/os/gcfg"
 	"github.com/gogf/gf/v2/os/gctx"
 )
@@ -18,6 +19,7 @@ const (
 )
 
 func NewUserActivity(msg *model.Message) {
+	rpc.SendNewUserMsg(msg.E_userId)
 	_ = award.GivenPoints(msg.E_userId, award.Points{
 		Num:          gcfg.Instance().MustGet(gctx.New(), "newUserAward.points", nil).Int64(),
 		Type:         1002,
@@ -25,5 +27,4 @@ func NewUserActivity(msg *model.Message) {
 		Date:         msg.E_time,
 		Desc:         "新用户注册奖励",
 	})
-
 }

handler/award/points.go

@@ -1,9 +1,10 @@
 package award
 
 import (
+	"fmt"
+
 	"app.yhyue.com/moapp/jybase/go-logger/logger"
 	"app.yhyue.com/moapp/message/rpc"
-	"fmt"
 	"github.com/gogf/gf/v2/util/gconv"
 )
 
@@ -30,6 +31,8 @@ func GivenPoints(userId string, p Points) (err error) {
 			ActivityCode: p.ActivityCode,
 			Date:         p.Date,
 		})
+		//推送消息
+
 	} else {
 		logger.Error(fmt.Sprintf("%s Error\n userId:%s\ngivenPointsErr:%v\n", p.ActivityCode, userId, err))
 	}

rpc/integral.go

@@ -1,17 +1,18 @@
 package rpc
 
 import (
+	"fmt"
+	"log"
+	"time"
+
 	"app.yhyue.com/moapp/jyPoints/rpc/integral"
 	"app.yhyue.com/moapp/jyPoints/rpc/integralclient"
 	"app.yhyue.com/moapp/jybase/date"
 	"app.yhyue.com/moapp/jybase/go-logger/logger"
-	"fmt"
 	"github.com/gogf/gf/v2/os/gcfg"
 	"github.com/gogf/gf/v2/os/gctx"
-	"github.com/tal-tech/go-zero/core/discov"
-	"github.com/tal-tech/go-zero/zrpc"
-	"log"
-	"time"
+	"github.com/zeromicro/go-zero/core/discov"
+	"github.com/zeromicro/go-zero/zrpc"
 )
 
 var zrpcClient zrpc.Client
@@ -20,7 +21,7 @@ func init() {
 	var err error
 	zrpcClient, err = zrpc.NewClient(zrpc.RpcClientConf{
 		Etcd: discov.EtcdConf{
-			Hosts: gcfg.Instance().MustGet(gctx.New(), "etcd.baseserver.integral.address", nil).Strings(),
+			Hosts: gcfg.Instance().MustGet(gctx.New(), "etcd.address", nil).Strings(),
 			Key:   gcfg.Instance().MustGet(gctx.New(), "etcd.baseserver.integral.key", nil).String(),
 		},
 	})

rpc/jydocs.go

@@ -1,17 +1,18 @@
 package rpc
 
 import (
+	"context"
+	"fmt"
+	"log"
+
 	"app.yhyue.com/moapp/jy_docs/rpc/stdlib/stdlib"
 	"app.yhyue.com/moapp/jy_docs/rpc/stdlib/stdlibclient"
 	"app.yhyue.com/moapp/jy_docs/rpc/userlib/userlib"
 	"app.yhyue.com/moapp/jy_docs/rpc/userlib/userlibclient"
-	"context"
-	"fmt"
 	"github.com/gogf/gf/v2/os/gcfg"
 	"github.com/gogf/gf/v2/os/gctx"
-	"github.com/tal-tech/go-zero/core/discov"
-	"github.com/tal-tech/go-zero/zrpc"
-	"log"
+	"github.com/zeromicro/go-zero/core/discov"
+	"github.com/zeromicro/go-zero/zrpc"
 )
 
 var (
@@ -23,13 +24,13 @@ var (
 func init() {
 	jyUserDocLib = userlibclient.NewUserLib(zrpc.MustNewClient(zrpc.RpcClientConf{
 		Etcd: discov.EtcdConf{
-			Hosts: gcfg.Instance().MustGet(gctx.New(), "etcd.jydocs.userlib.address", nil).Strings(),
+			Hosts: gcfg.Instance().MustGet(gctx.New(), "etcd.address", nil).Strings(),
 			Key:   gcfg.Instance().MustGet(gctx.New(), "etcd.jydocs.userlib.key", nil).String(),
 		},
 	}))
 	jyStdDocStdlib = stdlibclient.NewStdlib(zrpc.MustNewClient(zrpc.RpcClientConf{
 		Etcd: discov.EtcdConf{
-			Hosts: gcfg.Instance().MustGet(gctx.New(), "etcd.jydocs.stdlib.address", nil).Strings(),
+			Hosts: gcfg.Instance().MustGet(gctx.New(), "etcd.address", nil).Strings(),
 			Key:   gcfg.Instance().MustGet(gctx.New(), "etcd.jydocs.stdlib.key", nil).String(),
 		},
 	}))

rpc/message.go

@@ -0,0 +1,54 @@
+package rpc
+
+import (
+	"fmt"
+	"log"
+
+	"app.yhyue.com/moapp/MessageCenter/rpc/messageclient"
+	"app.yhyue.com/moapp/MessageCenter/rpc/type/message"
+	"app.yhyue.com/moapp/jybase/go-logger/logger"
+	"github.com/gogf/gf/v2/os/gcfg"
+	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/zeromicro/go-zero/core/discov"
+	"github.com/zeromicro/go-zero/zrpc"
+)
+
+var messageClient zrpc.Client
+
+func init() {
+	var err error
+	messageClient, err = zrpc.NewClient(zrpc.RpcClientConf{
+		Etcd: discov.EtcdConf{
+			Hosts: gcfg.Instance().MustGet(gctx.New(), "etcd.address", nil).Strings(),
+			Key:   gcfg.Instance().MustGet(gctx.New(), "etcd.messageKey", nil).String(),
+		},
+	})
+	if err != nil {
+		log.Fatalln(err)
+	}
+}
+
+//新用户注册，发送增送剑鱼币消息
+func SendNewUserMsg(userId string) error {
+	req := &message.MultipleSaveMsgReq{
+		UserIds:    userId,
+		Title:      "做任务赚好礼",
+		Content:    "7天内完成新手任务，额外赠送超级订阅7天体验。获取更多采购项目信息，快速对接项目联系人！",
+		MsgType:    1,
+		Link:       "/home/work-bench/app/points/earn,/jy_mobile/points/earn,/jy_mobile/points/earn",
+		Appid:      "10000",
+		AppPushUrl: "/jy_mobile/points/earn",
+		WxPushUrl:  "/jy_mobile/points/earn",
+		IosPushUrl: "/jy_mobile/points/earn",
+	}
+	resp, err := messageclient.NewMessage(messageClient).MultipleSaveMsg(gctx.New(), req)
+	if err != nil {
+		return fmt.Errorf(fmt.Sprintf("%+v", req), "新用户注册发送增送剑鱼币消息 error", err)
+	}
+	if resp.Code == 1 {
+		logger.Info(fmt.Sprintf("%+v", req), "新用户注册已成功发送增送剑鱼币消息")
+		return nil
+	} else {
+		return fmt.Errorf(fmt.Sprintf("%+v", req), "新用户注册发送增送剑鱼币消息失败")
+	}
+}