diff --git a/go.mod b/go.mod index 0d76243..bde088e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/ayflying/utility_go -go 1.23.0 +go 1.24.0 require ( github.com/apolloconfig/agollo/v4 v4.4.0 @@ -79,6 +79,8 @@ require ( google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect google.golang.org/grpc v1.38.0 // indirect + gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect + gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df // indirect gopkg.in/ini.v1 v1.62.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 3aa2a60..2d287e0 100644 --- a/go.sum +++ b/go.sum @@ -696,10 +696,14 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk= +gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE= +gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw= gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU= gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/internal/game/act/act.go b/internal/game/act/act.go index 62de129..8aaeac4 100644 --- a/internal/game/act/act.go +++ b/internal/game/act/act.go @@ -2,7 +2,7 @@ package act import ( "fmt" - "github.com/ayflying/utility_go/package/aycache" + "github.com/ayflying/utility_go/pgk" "github.com/ayflying/utility_go/service" "github.com/gogf/gf/v2/container/gvar" "github.com/gogf/gf/v2/os/gctx" @@ -11,7 +11,7 @@ import ( ) var ( - Cache = aycache.New() + Cache = pgk.Cache("redis") ActIdListIsShow map[int]func(uid int64) bool RedDotList map[string]func(uid int64) int32 ) diff --git a/internal/logic/gameAct/gameAct.go b/internal/logic/gameAct/gameAct.go index d46a856..a7431cd 100644 --- a/internal/logic/gameAct/gameAct.go +++ b/internal/logic/gameAct/gameAct.go @@ -2,10 +2,10 @@ package gameAct import ( "fmt" - "github.com/ayflying/utility_go/internal/game/act" "github.com/ayflying/utility_go/internal/model/do" "github.com/ayflying/utility_go/internal/model/entity" "github.com/ayflying/utility_go/package/aycache" + "github.com/ayflying/utility_go/pgk" service2 "github.com/ayflying/utility_go/service" "github.com/ayflying/utility_go/tools" "github.com/gogf/gf/v2/container/gset" @@ -221,46 +221,10 @@ func (s *sGameAct) Save(actId int) (err error) { // 清空GetRedDot缓存 func (s *sGameAct) RefreshGetRedDotCache(uid int64) { - //cacheKey2 := fmt.Sprintf("gameAct:GetRedDot:%d", uid) - cacheKey := fmt.Sprintf("gameAct:GetRedDot:%s:%d", gtime.Now().Format("Ymd"), uid) - act.Cache.Remove(gctx.New(), cacheKey) + cacheKey := fmt.Sprintf("gameAct:GetRedDot:%s:%d", gtime.Now().Format("d"), uid) + _, err := pgk.Cache("redis").Remove(gctx.New(), cacheKey) + if err != nil { + g.Log().Error(ctx, err) + g.Dump(err) + } } - -// -//func (s *sGameAct) GetRedDot(uid int64) (res map[string]int32, err error) { -// cacheKey := fmt.Sprintf("gameAct:GetRedDot:%s:%d", gtime.Now().Format("Ymd"), uid) -// if get, _ := act.Cache.Get(ctx, cacheKey); !get.IsEmpty() { -// err = get.Scan(&res) -// return -// } -// -// res = make(map[string]int32) -// -// //res["notice_count"] = 0 -// //获取所有帖子红点 -// for _, v := range communityNotice.Types { -// res[fmt.Sprintf("notice_%d", v)], err = service.CommunityNotice().Ping(uid, noticeV1.NoticeType(v)) -// } -// -// //邮件红点 -// res["mail_count"], err = service.GameMail().RedDot(uid) -// -// //act1可领取数量 -// res["act1_count"], err = act1.New().RedDot(uid) -// -// //act2可领取数量 -// res["act2_count"], err = act2.New().RedDot(uid) -// -// //成就红点 -// res["act4_count"], err = act4.New().RedDot(uid) -// -// //广告点击 -// res["act6_count"], err = act6.New().RedDot(uid) -// -// for k, v := range act.RedDotList { -// res[k] = v(uid) -// } -// -// aycache.New().Set(ctx, cacheKey, res, time.Hour) -// return -//} diff --git a/pgk/aycache/drive/redis.go b/pgk/aycache/drive/redis.go index 8706895..d331367 100644 --- a/pgk/aycache/drive/redis.go +++ b/pgk/aycache/drive/redis.go @@ -1,8 +1,10 @@ package drive import ( + "github.com/gogf/gf/v2/database/gredis" "github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/os/gcache" + "github.com/gogf/gf/v2/os/gctx" ) var adapterRedisClient gcache.Adapter @@ -11,7 +13,13 @@ var adapterRedisCache = gcache.New() func NewAdapterRedis() gcache.Adapter { if adapterRedisClient == nil { - adapterRedisClient = gcache.NewAdapterRedis(g.Redis("default")) + _cfg, _ := g.Cfg().Get(gctx.New(), "redis.default") + var cfg *gredis.Config + _cfg.Scan(&cfg) + redisObj, _ := gredis.New(cfg) + //adapterRedisClient = gcache.NewAdapterRedis(g.Redis("default")) + adapterRedisClient = gcache.NewAdapterRedis(redisObj) + adapterRedisCache.SetAdapter(adapterRedisClient) } return adapterRedisCache diff --git a/pgk/notice/drive/dingtalk.go b/pgk/notice/drive/dingtalk.go index 0f5be71..b0d9256 100644 --- a/pgk/notice/drive/dingtalk.go +++ b/pgk/notice/drive/dingtalk.go @@ -6,17 +6,17 @@ import ( "github.com/gogf/gf/v2/os/gtime" ) -type Mod struct { +type DingTalkMod struct { DingTalkWebHook string } -func Load(webHook string) *Mod { - return &Mod{ +func DingTalkLoad(webHook string) *DingTalkMod { + return &DingTalkMod{ DingTalkWebHook: webHook, } } -func (m Mod) Send(value string) { +func (m DingTalkMod) Send(value string) { ctx := gctx.New() // 从配置中获取发送者名称 name, _ := g.Cfg().Get(ctx, "name") diff --git a/pgk/notice/drive/email.go b/pgk/notice/drive/email.go new file mode 100644 index 0000000..0870ca4 --- /dev/null +++ b/pgk/notice/drive/email.go @@ -0,0 +1,51 @@ +package drive + +import ( + "github.com/gogf/gf/v2/frame/g" + "github.com/gogf/gf/v2/os/gctx" + "gopkg.in/gomail.v2" +) + +type MailMod struct { + Host string `json:"host" dc:"邮件服务器地址"` + Port int `json:"port" dc:"邮件服务器端口"` + User string `json:"user" dc:"邮件服务器用户名"` + Pass string `json:"pass" dc:"邮件服务器密码"` + From string `json:"from" dc:"邮件发送者"` + To string `json:"to" dc:"邮件接收者"` + Subject string `json:"subject" dc:"邮件主题"` +} + +func MailLoad(Host string, port int, to string, subject string) *MailMod { + return &MailMod{ + Host: Host, + Port: port, + User: "root", + Pass: "root", + From: "root", + To: to, + Subject: subject, + } +} + +func (m MailMod) Send(value string) { + // 创建一个新的消息 + obj := gomail.NewMessage() + // 设置发件人 + obj.SetHeader("From", m.From) + // 设置收件人 + obj.SetHeader("To", m.To) + // 设置邮件主题 + obj.SetHeader("Subject", m.Subject) + // 设置邮件正文 + obj.SetBody("text/plain", value) + + // 创建 SMTP 拨号器,这里需要提供 SMTP 服务器地址、端口、发件人邮箱和密码 + d := gomail.NewDialer(m.Host, m.Port, m.User, m.Pass) + + // 发送邮件 + if err := d.DialAndSend(obj); err != nil { + g.Log().Error(gctx.New(), err) + } + return +} diff --git a/pgk/notice/notice.go b/pgk/notice/notice.go index 58e18df..a84fb2d 100644 --- a/pgk/notice/notice.go +++ b/pgk/notice/notice.go @@ -9,11 +9,12 @@ type MessageV1 interface { Send(value string) } -func New(typ v1.NoticeType, host string) MessageV1 { +func New(typ v1.NoticeType, host string, value ...interface{}) MessageV1 { switch typ { case v1.NoticeType_DINGTALK: - return drive.Load(host) - + return drive.DingTalkLoad(host) + case v1.NoticeType_EMAIL: + return drive.MailLoad(host, value[0].(int), value[1].(string), value[2].(string)) } return nil } diff --git a/main.go b/utility.go similarity index 100% rename from main.go rename to utility.go