Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5fbe4d5dcf | ||
|
|
4963780a32 | ||
|
|
70ebaae3d2 | ||
|
|
9cd286fd92 | ||
|
|
f8ec441241 | ||
|
|
92a127e128 |
@@ -1,8 +1,8 @@
|
||||
package v1
|
||||
|
||||
import (
|
||||
"github.com/ayflying/utility_go/internal/model/entity"
|
||||
"github.com/gogf/gf/v2/frame/g"
|
||||
"new-gitlab.adesk.com/public_project/utility_go/internal/model/entity"
|
||||
)
|
||||
|
||||
type SystemLog struct {
|
||||
|
||||
@@ -7,7 +7,7 @@ package callback
|
||||
import (
|
||||
"context"
|
||||
|
||||
"new-gitlab.adesk.com/public_project/utility_go/api/callback/v1"
|
||||
"github.com/ayflying/utility_go/api/callback/v1"
|
||||
)
|
||||
|
||||
type ICallbackV1 interface {
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package cmd
|
||||
|
||||
import (
|
||||
"github.com/ayflying/utility_go/service"
|
||||
"github.com/gogf/gf/v2/errors/gcode"
|
||||
"github.com/gogf/gf/v2/errors/gerror"
|
||||
"github.com/gogf/gf/v2/frame/g"
|
||||
"github.com/gogf/gf/v2/net/ghttp"
|
||||
"github.com/gogf/gf/v2/text/gstr"
|
||||
"new-gitlab.adesk.com/public_project/utility_go/service"
|
||||
)
|
||||
|
||||
//func MiddlewareAnonymous(r *ghttp.Request) {
|
||||
|
||||
@@ -2,12 +2,12 @@ package cmd
|
||||
|
||||
import (
|
||||
"context"
|
||||
"github.com/ayflying/utility_go/package/s3"
|
||||
"github.com/gogf/gf/v2/frame/g"
|
||||
"github.com/gogf/gf/v2/net/ghttp"
|
||||
"github.com/gogf/gf/v2/os/gcfg"
|
||||
"github.com/gogf/gf/v2/os/gcmd"
|
||||
"github.com/gogf/gf/v2/os/gctx"
|
||||
"new-gitlab.adesk.com/public_project/utility_go/package/s3"
|
||||
"os"
|
||||
"time"
|
||||
)
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
package callback
|
||||
|
||||
import (
|
||||
"new-gitlab.adesk.com/public_project/utility_go/api/callback"
|
||||
"github.com/ayflying/utility_go/api/callback"
|
||||
)
|
||||
|
||||
type ControllerV1 struct{}
|
||||
|
||||
@@ -2,9 +2,9 @@ package callback
|
||||
|
||||
import (
|
||||
"context"
|
||||
"new-gitlab.adesk.com/public_project/utility_go/service"
|
||||
"github.com/ayflying/utility_go/service"
|
||||
|
||||
"new-gitlab.adesk.com/public_project/utility_go/api/callback/v1"
|
||||
"github.com/ayflying/utility_go/api/callback/v1"
|
||||
)
|
||||
|
||||
func (c *ControllerV1) Ip(ctx context.Context, req *v1.IpReq) (res *v1.IpRes, err error) {
|
||||
|
||||
6
go.mod
6
go.mod
@@ -1,6 +1,6 @@
|
||||
module new-gitlab.adesk.com/public_project/utility_go
|
||||
module github.com/ayflying/utility_go
|
||||
|
||||
go 1.23.0
|
||||
go 1.24.0
|
||||
|
||||
require (
|
||||
github.com/apolloconfig/agollo/v4 v4.4.0
|
||||
@@ -18,6 +18,7 @@ require (
|
||||
golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602
|
||||
google.golang.org/api v0.44.0
|
||||
google.golang.org/protobuf v1.26.0
|
||||
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
|
||||
)
|
||||
|
||||
require (
|
||||
@@ -79,6 +80,7 @@ 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/ini.v1 v1.62.0 // indirect
|
||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
|
||||
15
go.sum
15
go.sum
@@ -89,6 +89,8 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
|
||||
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
|
||||
github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
|
||||
github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
|
||||
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
|
||||
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
|
||||
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
|
||||
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
|
||||
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
|
||||
@@ -236,11 +238,13 @@ github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa02
|
||||
github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY=
|
||||
github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8=
|
||||
github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
|
||||
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
|
||||
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
|
||||
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
|
||||
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
|
||||
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
||||
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
|
||||
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
||||
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
||||
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
|
||||
github.com/lionsoul2014/ip2region/binding/golang v0.0.0-20241220152942-06eb5c6e8230 h1:B0oaMTAQKDZd8cwYT0qsAI7+c3KbFeBNA8GhgoBMXWw=
|
||||
github.com/lionsoul2014/ip2region/binding/golang v0.0.0-20241220152942-06eb5c6e8230/go.mod h1:C5LA5UO2ZXJrLaPLYtE1wUJMiyd/nwWaCO5cw/2pSHs=
|
||||
github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
|
||||
@@ -296,6 +300,8 @@ github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
|
||||
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
|
||||
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
|
||||
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
|
||||
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
|
||||
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
|
||||
github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU=
|
||||
github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
|
||||
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
|
||||
@@ -306,7 +312,6 @@ github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIK
|
||||
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
|
||||
github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY=
|
||||
github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
|
||||
github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng=
|
||||
github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
|
||||
github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y=
|
||||
github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
|
||||
@@ -691,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=
|
||||
|
||||
@@ -2,16 +2,16 @@ package act
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"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"
|
||||
"github.com/gogf/gf/v2/os/gtime"
|
||||
"new-gitlab.adesk.com/public_project/utility_go/package/aycache"
|
||||
"new-gitlab.adesk.com/public_project/utility_go/service"
|
||||
"time"
|
||||
)
|
||||
|
||||
var (
|
||||
Cache = aycache.New()
|
||||
Cache = pgk.Cache("redis")
|
||||
ActIdListIsShow map[int]func(uid int64) bool
|
||||
RedDotList map[string]func(uid int64) int32
|
||||
)
|
||||
|
||||
@@ -2,16 +2,17 @@ package gameAct
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"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"
|
||||
"github.com/ayflying/utility_go/pkg"
|
||||
service2 "github.com/ayflying/utility_go/service"
|
||||
"github.com/ayflying/utility_go/tools"
|
||||
"github.com/gogf/gf/v2/container/gset"
|
||||
"github.com/gogf/gf/v2/frame/g"
|
||||
"github.com/gogf/gf/v2/os/gctx"
|
||||
"github.com/gogf/gf/v2/os/gtime"
|
||||
"new-gitlab.adesk.com/public_project/utility_go/internal/game/act"
|
||||
"new-gitlab.adesk.com/public_project/utility_go/internal/model/do"
|
||||
"new-gitlab.adesk.com/public_project/utility_go/internal/model/entity"
|
||||
"new-gitlab.adesk.com/public_project/utility_go/package/aycache"
|
||||
service2 "new-gitlab.adesk.com/public_project/utility_go/service"
|
||||
"new-gitlab.adesk.com/public_project/utility_go/tools"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
@@ -70,8 +71,8 @@ func (s *sGameAct) Info(uid int64, actId int) (data *g.Var, err error) {
|
||||
// 将查询到的活动信息保存到Redis缓存中
|
||||
_, err = g.Redis().Set(ctx, keyCache, data)
|
||||
|
||||
var ActUidUpdateTimeCacheKey = fmt.Sprintf("act:update:%d", uid)
|
||||
aycache.New("redis").Set(ctx, ActUidUpdateTimeCacheKey, uid, time.Hour*24*3)
|
||||
var CacheKey = fmt.Sprintf("act:update:%d", uid)
|
||||
pkg.Cache("redis").Set(ctx, CacheKey, uid, time.Hour*24*3)
|
||||
|
||||
return
|
||||
}
|
||||
@@ -148,9 +149,9 @@ func (s *sGameAct) Save(actId int) (err error) {
|
||||
continue
|
||||
}
|
||||
|
||||
var ActUidUpdateTimeCacheKey = fmt.Sprintf("act:update:%d", uid)
|
||||
var CacheKey = fmt.Sprintf("act:update:%d", uid)
|
||||
//如果有活跃,跳过持久化
|
||||
if getBool, _ := aycache.New("redis").Contains(ctx, ActUidUpdateTimeCacheKey); getBool {
|
||||
if getBool, _ := aycache.New("redis").Contains(ctx, CacheKey); getBool {
|
||||
continue
|
||||
}
|
||||
|
||||
@@ -221,46 +222,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
|
||||
//}
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package ip2region
|
||||
|
||||
import (
|
||||
"github.com/ayflying/utility_go/service"
|
||||
"github.com/gogf/gf/v2/frame/g"
|
||||
"github.com/gogf/gf/v2/os/gctx"
|
||||
"github.com/gogf/gf/v2/os/gfile"
|
||||
"github.com/lionsoul2014/ip2region/binding/golang/xdb"
|
||||
"net"
|
||||
"new-gitlab.adesk.com/public_project/utility_go/service"
|
||||
"strings"
|
||||
)
|
||||
|
||||
|
||||
@@ -2,10 +2,10 @@ package logData
|
||||
|
||||
import (
|
||||
"context"
|
||||
"github.com/ayflying/utility_go/service"
|
||||
"github.com/ayflying/utility_go/tools"
|
||||
"github.com/gogf/gf/v2/frame/g"
|
||||
"github.com/gogf/gf/v2/os/gctx"
|
||||
"new-gitlab.adesk.com/public_project/utility_go/service"
|
||||
"new-gitlab.adesk.com/public_project/utility_go/tools"
|
||||
"time"
|
||||
)
|
||||
|
||||
|
||||
@@ -5,9 +5,9 @@
|
||||
package logic
|
||||
|
||||
import (
|
||||
_ "new-gitlab.adesk.com/public_project/utility_go/internal/logic/gameAct"
|
||||
_ "new-gitlab.adesk.com/public_project/utility_go/internal/logic/ip2region"
|
||||
_ "new-gitlab.adesk.com/public_project/utility_go/internal/logic/logData"
|
||||
_ "new-gitlab.adesk.com/public_project/utility_go/internal/logic/systemCron"
|
||||
_ "new-gitlab.adesk.com/public_project/utility_go/internal/logic/systemLog"
|
||||
_ "github.com/ayflying/utility_go/internal/logic/gameAct"
|
||||
_ "github.com/ayflying/utility_go/internal/logic/ip2region"
|
||||
_ "github.com/ayflying/utility_go/internal/logic/logData"
|
||||
_ "github.com/ayflying/utility_go/internal/logic/systemCron"
|
||||
_ "github.com/ayflying/utility_go/internal/logic/systemLog"
|
||||
)
|
||||
|
||||
@@ -3,10 +3,10 @@ package systemCron
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
v1 "github.com/ayflying/utility_go/api/pgk/v1"
|
||||
"github.com/ayflying/utility_go/pkg/notice"
|
||||
"github.com/gogf/gf/v2/frame/g"
|
||||
"github.com/gogf/gf/v2/net/gclient"
|
||||
v1 "new-gitlab.adesk.com/public_project/utility_go/api/pgk/v1"
|
||||
"new-gitlab.adesk.com/public_project/utility_go/pgk/notice"
|
||||
)
|
||||
|
||||
type Status struct {
|
||||
|
||||
@@ -2,12 +2,12 @@ package systemCron
|
||||
|
||||
import (
|
||||
"context"
|
||||
"github.com/ayflying/utility_go/api/system/v1"
|
||||
"github.com/ayflying/utility_go/service"
|
||||
"github.com/gogf/gf/v2/frame/g"
|
||||
"github.com/gogf/gf/v2/os/gcron"
|
||||
"github.com/gogf/gf/v2/os/gctx"
|
||||
"github.com/gogf/gf/v2/os/gtimer"
|
||||
"new-gitlab.adesk.com/public_project/utility_go/api/system/v1"
|
||||
"new-gitlab.adesk.com/public_project/utility_go/service"
|
||||
"sync"
|
||||
"time"
|
||||
)
|
||||
|
||||
@@ -2,10 +2,10 @@ package systemLog
|
||||
|
||||
import (
|
||||
"context"
|
||||
v1 "github.com/ayflying/utility_go/api/admin/v1"
|
||||
"github.com/ayflying/utility_go/service"
|
||||
"github.com/gogf/gf/v2/frame/g"
|
||||
"github.com/gogf/gf/v2/os/gctx"
|
||||
v1 "new-gitlab.adesk.com/public_project/utility_go/api/admin/v1"
|
||||
"new-gitlab.adesk.com/public_project/utility_go/service"
|
||||
)
|
||||
|
||||
type sSystemLog struct {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package aycache
|
||||
|
||||
import (
|
||||
"github.com/ayflying/utility_go/package/aycache/drive"
|
||||
"github.com/gogf/gf/v2/os/gcache"
|
||||
"new-gitlab.adesk.com/public_project/utility_go/package/aycache/drive"
|
||||
)
|
||||
|
||||
type Mod struct {
|
||||
|
||||
@@ -2,12 +2,12 @@ package pay
|
||||
|
||||
import (
|
||||
"context"
|
||||
"github.com/ayflying/utility_go/package/pay/playstore"
|
||||
"github.com/gogf/gf/v2/errors/gerror"
|
||||
"github.com/gogf/gf/v2/os/gctx"
|
||||
"github.com/gogf/gf/v2/text/gstr"
|
||||
"github.com/gogf/gf/v2/util/gconv"
|
||||
"google.golang.org/api/androidpublisher/v3"
|
||||
"new-gitlab.adesk.com/public_project/utility_go/package/pay/playstore"
|
||||
)
|
||||
|
||||
var (
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
package drive
|
||||
|
||||
import (
|
||||
"github.com/gogf/gf/v2/frame/g"
|
||||
"github.com/gogf/gf/v2/os/gcache"
|
||||
)
|
||||
|
||||
var adapterRedisClient gcache.Adapter
|
||||
var adapterRedisCache = gcache.New()
|
||||
|
||||
func NewAdapterRedis() gcache.Adapter {
|
||||
|
||||
if adapterRedisClient == nil {
|
||||
adapterRedisClient = gcache.NewAdapterRedis(g.Redis("default"))
|
||||
adapterRedisCache.SetAdapter(adapterRedisClient)
|
||||
}
|
||||
return adapterRedisCache
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
package notice
|
||||
|
||||
import (
|
||||
v1 "new-gitlab.adesk.com/public_project/utility_go/api/pgk/v1"
|
||||
"new-gitlab.adesk.com/public_project/utility_go/pgk/notice/drive"
|
||||
)
|
||||
|
||||
type MessageV1 interface {
|
||||
Send(value string)
|
||||
}
|
||||
|
||||
func New(typ v1.NoticeType, host string) MessageV1 {
|
||||
switch typ {
|
||||
case v1.NoticeType_DINGTALK:
|
||||
return drive.Load(host)
|
||||
|
||||
}
|
||||
return nil
|
||||
}
|
||||
14
pgk/pgk.go
14
pgk/pgk.go
@@ -1,30 +1,34 @@
|
||||
package pgk
|
||||
|
||||
import (
|
||||
v1 "github.com/ayflying/utility_go/api/pgk/v1"
|
||||
"github.com/ayflying/utility_go/pkg/aycache"
|
||||
"github.com/ayflying/utility_go/pkg/notice"
|
||||
"github.com/ayflying/utility_go/pkg/rank"
|
||||
"github.com/ayflying/utility_go/pkg/s3"
|
||||
"github.com/gogf/gf/v2/os/gcache"
|
||||
v1 "new-gitlab.adesk.com/public_project/utility_go/api/pgk/v1"
|
||||
"new-gitlab.adesk.com/public_project/utility_go/pgk/aycache"
|
||||
"new-gitlab.adesk.com/public_project/utility_go/pgk/notice"
|
||||
"new-gitlab.adesk.com/public_project/utility_go/pgk/rank"
|
||||
"new-gitlab.adesk.com/public_project/utility_go/pgk/s3"
|
||||
)
|
||||
|
||||
var ()
|
||||
|
||||
// 统一调用
|
||||
// Deprecated: 请使用 pkg.Notice() 方法替代。
|
||||
func Notice(typ v1.NoticeType, host string) notice.MessageV1 {
|
||||
return notice.New(typ, host)
|
||||
}
|
||||
|
||||
// 统一调用cache
|
||||
// Deprecated: 请使用 pkg.Cache() 方法替代。
|
||||
func Cache(_name ...string) gcache.Adapter {
|
||||
return aycache.New(_name...)
|
||||
}
|
||||
|
||||
// Deprecated: 请使用 pkg.S3() 方法替代。
|
||||
func S3(_name ...string) *s3.Mod {
|
||||
return s3.New(_name...)
|
||||
}
|
||||
|
||||
// Deprecated: 请使用 pkg.Rank() 方法替代。
|
||||
func Rank() *rank.Mod {
|
||||
return rank.New()
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ package rank
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
v1 "new-gitlab.adesk.com/public_project/utility_go/api/pgk/v1"
|
||||
v1 "github.com/ayflying/utility_go/api/pgk/v1"
|
||||
"time"
|
||||
|
||||
"github.com/gogf/gf/v2/database/gredis"
|
||||
@@ -46,6 +46,8 @@ func (s *Mod) Load() {
|
||||
// 返回值:
|
||||
//
|
||||
// *F64CountRank: 返回一个指向新创建的F64CountRank实例的指针
|
||||
|
||||
// Deprecated: pgk.Rnak().CreateF64CountRank("赛季")
|
||||
func (s *Mod) CreateF64CountRank(name string) *F64CountRank {
|
||||
// 初始化F64CountRank实例的name和updateTs字段
|
||||
// name字段用于标识排行榜的名称,格式为"rank:<name>:score"
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package aycache
|
||||
|
||||
import (
|
||||
"github.com/ayflying/utility_go/package/aycache/drive"
|
||||
drive2 "github.com/ayflying/utility_go/pkg/aycache/drive"
|
||||
"github.com/gogf/gf/v2/os/gcache"
|
||||
"new-gitlab.adesk.com/public_project/utility_go/package/aycache/drive"
|
||||
drive2 "new-gitlab.adesk.com/public_project/utility_go/pgk/aycache/drive"
|
||||
)
|
||||
|
||||
type Mod struct {
|
||||
26
pkg/aycache/drive/redis.go
Normal file
26
pkg/aycache/drive/redis.go
Normal file
@@ -0,0 +1,26 @@
|
||||
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
|
||||
var adapterRedisCache = gcache.New()
|
||||
|
||||
func NewAdapterRedis() gcache.Adapter {
|
||||
|
||||
if adapterRedisClient == nil {
|
||||
_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
|
||||
}
|
||||
@@ -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")
|
||||
51
pkg/notice/drive/email.go
Normal file
51
pkg/notice/drive/email.go
Normal file
@@ -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
|
||||
}
|
||||
20
pkg/notice/notice.go
Normal file
20
pkg/notice/notice.go
Normal file
@@ -0,0 +1,20 @@
|
||||
package notice
|
||||
|
||||
import (
|
||||
v1 "github.com/ayflying/utility_go/api/pgk/v1"
|
||||
"github.com/ayflying/utility_go/pkg/notice/drive"
|
||||
)
|
||||
|
||||
type MessageV1 interface {
|
||||
Send(value string)
|
||||
}
|
||||
|
||||
func New(typ v1.NoticeType, host string, value ...interface{}) MessageV1 {
|
||||
switch typ {
|
||||
case v1.NoticeType_DINGTALK:
|
||||
return drive.DingTalkLoad(host)
|
||||
case v1.NoticeType_EMAIL:
|
||||
return drive.MailLoad(host, value[0].(int), value[1].(string), value[2].(string))
|
||||
}
|
||||
return nil
|
||||
}
|
||||
30
pkg/pkg.go
Normal file
30
pkg/pkg.go
Normal file
@@ -0,0 +1,30 @@
|
||||
package pkg
|
||||
|
||||
import (
|
||||
v1 "github.com/ayflying/utility_go/api/pgk/v1"
|
||||
"github.com/ayflying/utility_go/pkg/aycache"
|
||||
"github.com/ayflying/utility_go/pkg/notice"
|
||||
"github.com/ayflying/utility_go/pkg/rank"
|
||||
"github.com/ayflying/utility_go/pkg/s3"
|
||||
"github.com/gogf/gf/v2/os/gcache"
|
||||
)
|
||||
|
||||
var ()
|
||||
|
||||
// 统一调用
|
||||
func Notice(typ v1.NoticeType, host string) notice.MessageV1 {
|
||||
return notice.New(typ, host)
|
||||
}
|
||||
|
||||
// 统一调用cache
|
||||
func Cache(_name ...string) gcache.Adapter {
|
||||
return aycache.New(_name...)
|
||||
}
|
||||
|
||||
func S3(_name ...string) *s3.Mod {
|
||||
return s3.New(_name...)
|
||||
}
|
||||
|
||||
func Rank() *rank.Mod {
|
||||
return rank.New()
|
||||
}
|
||||
394
pkg/rank/rank.go
Normal file
394
pkg/rank/rank.go
Normal file
@@ -0,0 +1,394 @@
|
||||
package rank
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
v1 "github.com/ayflying/utility_go/api/pgk/v1"
|
||||
"time"
|
||||
|
||||
"github.com/gogf/gf/v2/database/gredis"
|
||||
"github.com/gogf/gf/v2/frame/g"
|
||||
"github.com/gogf/gf/v2/os/gctx"
|
||||
)
|
||||
|
||||
var (
|
||||
ctx = gctx.New()
|
||||
)
|
||||
|
||||
type Mod struct {
|
||||
}
|
||||
|
||||
type F64CountRank struct {
|
||||
name string // 排行榜名
|
||||
updateTs string // 更新时间key
|
||||
}
|
||||
|
||||
//
|
||||
//type RankData struct {
|
||||
// Id int64
|
||||
// Score int64
|
||||
// Rank int32
|
||||
// UpdateTs int64
|
||||
//}
|
||||
|
||||
func New() *Mod {
|
||||
return &Mod{}
|
||||
}
|
||||
|
||||
func (s *Mod) Load() {
|
||||
|
||||
}
|
||||
|
||||
// CreateF64CountRank 创建一个排行榜实例
|
||||
// 参数:
|
||||
//
|
||||
// name: 排行榜的名称,通常代表一个赛季
|
||||
//
|
||||
// 返回值:
|
||||
//
|
||||
// *F64CountRank: 返回一个指向新创建的F64CountRank实例的指针
|
||||
func (s *Mod) CreateF64CountRank(name string) *F64CountRank {
|
||||
// 初始化F64CountRank实例的name和updateTs字段
|
||||
// name字段用于标识排行榜的名称,格式为"rank:<name>:score"
|
||||
// updateTs字段用于标识排行榜的更新时间,格式为"rank:<name>:updateTs"
|
||||
return &F64CountRank{
|
||||
name: fmt.Sprintf("rank:%s:score", name),
|
||||
updateTs: fmt.Sprintf("rank:%s:updateTs", name),
|
||||
}
|
||||
}
|
||||
|
||||
// IncrScore 对指定ID的分数进行增加,并返回增加后的当前分数。
|
||||
// 该方法首先更新成员的更新时间戳,然后增加成员的分数。
|
||||
//
|
||||
// 参数:
|
||||
//
|
||||
// id - 要操作的成员ID。
|
||||
// score - 要增加的分数。
|
||||
//
|
||||
// 返回值:
|
||||
//
|
||||
// curScore - 增加分数后的当前分数。
|
||||
// err - 操作过程中可能发生的错误。
|
||||
//
|
||||
// IncrScore 先改redis再改cache
|
||||
//
|
||||
// @Description:
|
||||
// @receiver r
|
||||
// @param id
|
||||
// @param score
|
||||
// @return curScore
|
||||
// @return err
|
||||
func (r *F64CountRank) IncrScore(id int64, score int64) (curScore float64, err error) {
|
||||
// 记录当前时间戳,用于更新成员的最新活动时间。
|
||||
now := time.Now().UnixMilli()
|
||||
|
||||
// 将成员的更新时间戳加入到Redis的有序集合中,确保成员的排序依据是最新的活动时间。
|
||||
_, err = g.Redis().ZAdd(ctx, r.updateTs, &gredis.ZAddOption{}, gredis.ZAddMember{
|
||||
Score: float64(now),
|
||||
Member: id,
|
||||
})
|
||||
|
||||
// 增加成员的分数,并返回增加后的当前分数。
|
||||
curScore, err = g.Redis().ZIncrBy(ctx, r.name, float64(score), id)
|
||||
|
||||
//如果分数小于0,则删除
|
||||
if curScore <= 0 {
|
||||
err = r.DelScore(id)
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
// todo暂时未使用
|
||||
func (r *F64CountRank) GetCount() {
|
||||
count, _ := g.Redis().ZCard(ctx, r.name)
|
||||
if count > 9999 {
|
||||
//删除超过9999的数据
|
||||
g.Redis().ZRemRangeByRank(ctx, r.name, 0, -9999)
|
||||
}
|
||||
}
|
||||
|
||||
// Delete 删除当前排行榜
|
||||
// 该方法通过删除Redis中与排行榜相关的键来清除排行榜信息
|
||||
func (r *F64CountRank) Delete() {
|
||||
// 删除排行榜数据键
|
||||
_, err := g.Redis().Del(ctx, r.name)
|
||||
if err != nil {
|
||||
// 如果删除失败,记录错误日志
|
||||
g.Log().Error(ctx, "排行榜删除失败:%v", err)
|
||||
}
|
||||
// 删除排行榜更新时间键
|
||||
_, err = g.Redis().Del(ctx, r.updateTs)
|
||||
if err != nil {
|
||||
// 如果删除失败,记录错误日志
|
||||
g.Log().Error(ctx, "排行榜删除失败:%v", err)
|
||||
}
|
||||
}
|
||||
|
||||
// DelScore 删除当前分数
|
||||
//
|
||||
// 该方法从更新时间有序集合和排名有序集合中移除指定的id。
|
||||
// 这通常用于从排行榜中删除一个条目,同时确保其在更新时间集合中的对应记录也被清除。
|
||||
//
|
||||
// @Description: 从更新时间和排名集合中移除指定id
|
||||
// @receiver r 接收者为F64CountRank类型的实例
|
||||
// @param id 要从集合中移除的条目的ID
|
||||
// @return err 可能发生的错误,如果操作成功,err为nil
|
||||
func (r *F64CountRank) DelScore(id int64) (err error) {
|
||||
// 从更新时间集合中移除id
|
||||
_, err = g.Redis().ZRem(ctx, r.updateTs, id)
|
||||
// 从排名集合中移除id
|
||||
_, err = g.Redis().ZRem(ctx, r.name, id)
|
||||
return
|
||||
}
|
||||
|
||||
// DelByRank 根据排名范围删除元素。
|
||||
// 该方法使用了Redis的有序集合数据结构,通过ZRange和ZRemRangeByRank命令来实现。
|
||||
// 参数start和stop定义了要删除的排名范围,从start到stop(包括start和stop)。
|
||||
// 返回可能的错误。
|
||||
func (r *F64CountRank) DelByRank(start int64, stop int64) (err error) {
|
||||
// 初始化一个空的int64切片,用于存储指定排名范围内的元素。
|
||||
var members []int64
|
||||
|
||||
// 使用Redis的ZRange命令获取指定排名范围内的元素。
|
||||
// 选项Rev设置为true,表示按照分数从高到低的顺序返回元素。
|
||||
get, err := g.Redis().ZRange(ctx, r.name, start, stop,
|
||||
gredis.ZRangeOption{
|
||||
Rev: true,
|
||||
})
|
||||
|
||||
// 使用Scan方法将获取到的元素扫描到members切片中。
|
||||
err = get.Scan(&members)
|
||||
// 如果扫描过程中出现错误,直接返回错误。
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
// 遍历members切片,对于每个元素,使用ZRem命令从更新时间集合中删除对应的成员。
|
||||
for _, member := range members {
|
||||
_, err = g.Redis().ZRem(ctx, r.updateTs, member)
|
||||
// 忽略ZRem操作的错误,因为即使元素不存在,ZRem也不会返回错误。
|
||||
}
|
||||
|
||||
// 使用ZRemRangeByRank命令从有序集合中删除指定排名范围内的元素。
|
||||
_, err = g.Redis().ZRemRangeByRank(ctx, r.name, start, stop)
|
||||
// 返回可能的错误。
|
||||
return
|
||||
}
|
||||
|
||||
// updateScore 更新给定ID的分数值。
|
||||
//
|
||||
// 参数:
|
||||
//
|
||||
// id - 需要更新分数的实体ID。
|
||||
// score - 新的分数值。
|
||||
//
|
||||
// 返回值:
|
||||
//
|
||||
// error - 更新过程中可能出现的错误。
|
||||
//
|
||||
// 该方法首先记录当前时间作为更新时间戳,然后将新的分数值添加到排名系统中。
|
||||
// 使用Redis的ZAdd方法来确保操作的原子性和一致性。
|
||||
// UpdateScore 更新分数
|
||||
//
|
||||
// @Description:
|
||||
// @receiver r
|
||||
// @param id
|
||||
// @param score
|
||||
// @return err
|
||||
func (r *F64CountRank) UpdateScore(id int64, score int64) (err error) {
|
||||
// 获取当前时间戳,以毫秒为单位。
|
||||
now := time.Now().UnixMilli()
|
||||
|
||||
// 向更新时间戳的有序集合中添加新的成员和分数,成员为id,分数为当前时间戳。
|
||||
_, err = g.Redis().ZAdd(ctx, r.updateTs, &gredis.ZAddOption{}, gredis.ZAddMember{
|
||||
Score: float64(now),
|
||||
Member: id,
|
||||
})
|
||||
|
||||
// 向排名的有序集合中添加新的成员和分数,成员为id,分数为传入的score。
|
||||
_, err = g.Redis().ZAdd(ctx, r.name, &gredis.ZAddOption{}, gredis.ZAddMember{
|
||||
Score: float64(score),
|
||||
Member: id,
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
//// GetRankInfosV1 获取0~count跳记录
|
||||
//func (r *F64CountRank) getRankInfosV1(offset, count int) (list []*RankInfo, err error) {
|
||||
// /*
|
||||
// 找到maxRank的玩家的分数
|
||||
// 根据分数拿到所有分数大于等于minScore玩家
|
||||
// 将这些玩家进行排序
|
||||
// 返回maxRank条目
|
||||
// */
|
||||
// var (
|
||||
// minScore int64 // 最低分
|
||||
// maxScore int64
|
||||
// //zl []redis2.Z
|
||||
// zl []gredis.ZAddMember
|
||||
// length int
|
||||
// )
|
||||
// // 拉取所有玩家的更新时间戳
|
||||
// zl, err = g.Redis().ZRemRangeByScore(ctx,r.updateTs, strconv.Itoa(0), strconv.Itoa(-1))//ZRemRangeByScore(ctx, r.updateTs, strconv.Itoa(0), strconv.Itoa(-1))
|
||||
// //zl, err = rdbV1.ZRangeWithScores(ctx, r.updateTs, 0, -1).Result()
|
||||
// if err != nil {
|
||||
// g.Log().Errorf(ctx, "redis err:%v", err)
|
||||
// return
|
||||
// }
|
||||
// if len(zl) == 0 {
|
||||
// //logs.Infof("empty list")
|
||||
// return
|
||||
// }
|
||||
// tsl := make(map[int64]int64, len(zl))
|
||||
// for _, z := range zl {
|
||||
// id := gconv.Int64(z.Member) //pgk.InterfaceToNumber[uint64](z.Member)
|
||||
// tsl[id] = int64(z.Score)
|
||||
// }
|
||||
//
|
||||
// // 找到maxRank的玩家的分数
|
||||
// zl, err = rdbV1.ZRevRangeByScoreWithScores(ctx, r.name, &redis2.ZRangeBy{
|
||||
// Min: "0",
|
||||
// Max: strconv.Itoa(math.MaxInt),
|
||||
// Offset: 0,
|
||||
// Count: int64(count),
|
||||
// }).Result()
|
||||
// if err != nil {
|
||||
// g.Log().Errorf(ctx, "redis err:%v", err)
|
||||
// return
|
||||
// }
|
||||
// if len(zl) == 0 {
|
||||
// g.Log().Info(ctx, "empty list")
|
||||
// return
|
||||
// }
|
||||
// minScore = int64(zl[len(zl)-1].Score)
|
||||
// maxScore = int64(zl[0].Score)
|
||||
// // 根据分数拿到所有分数大于等于minScore玩家
|
||||
// zl, err = rdbV1.ZRevRangeByScoreWithScores(ctx, r.name, &redis2.ZRangeBy{
|
||||
// Min: fmt.Sprintf("%v", minScore),
|
||||
// Max: fmt.Sprintf("%v", maxScore),
|
||||
// }).Result()
|
||||
// if err != nil {
|
||||
// g.Log().Errorf(ctx, "redis err:%v", err)
|
||||
// return
|
||||
// }
|
||||
// if len(zl) == 0 {
|
||||
// g.Log().Info(ctx, "empty list")
|
||||
// return
|
||||
// }
|
||||
// //如果开始已经大于等于总长度,就返回空
|
||||
// if offset >= len(zl) {
|
||||
// return
|
||||
// }
|
||||
// list = make([]*RankInfo, len(zl))
|
||||
// for i, z := range zl {
|
||||
// id := gconv.Int64(z.Member)
|
||||
// list[i] = &RankInfo{
|
||||
// Id: id,
|
||||
// Score: int64(z.Score),
|
||||
// UpdateTs: tsl[id],
|
||||
// }
|
||||
// }
|
||||
// // 将这些玩家进行排序
|
||||
// sort.Slice(list, func(i, j int) bool {
|
||||
// if list[i].Score != list[j].Score {
|
||||
// return list[i].Score > list[j].Score
|
||||
// } else {
|
||||
// return list[i].UpdateTs < list[j].UpdateTs
|
||||
// }
|
||||
// })
|
||||
// length = len(list)
|
||||
// if length > count {
|
||||
// length = count
|
||||
// }
|
||||
// for i := range list {
|
||||
// info := list[i]
|
||||
// info.Rank = i + 1
|
||||
// }
|
||||
//
|
||||
// list = list[offset:length]
|
||||
// return
|
||||
//}
|
||||
|
||||
// GetRankInfosNotTs 获取0~count跳记录 不根据更新时间来
|
||||
// 该方法使用ZRange命令从Redis中获取指定范围的排名信息,不考虑更新时间
|
||||
// 参数:
|
||||
//
|
||||
// offset - 获取记录的起始偏移量
|
||||
// count - 获取记录的数量
|
||||
//
|
||||
// 返回值:
|
||||
//
|
||||
// list - 排名信息列表
|
||||
// err - 错误信息,如果执行过程中遇到错误
|
||||
func (r *F64CountRank) GetRankInfosNotTs(offset, count int) (list []*v1.RankData, err error) {
|
||||
// 初始化存储成员ID的切片
|
||||
var members []int64
|
||||
|
||||
// 使用Redis的ZRange命令获取指定范围的成员ID
|
||||
// 参数Rev设为true以从高分到低分获取成员
|
||||
get, err := g.Redis().ZRange(ctx, r.name, int64(offset), int64(count),
|
||||
gredis.ZRangeOption{
|
||||
Rev: true,
|
||||
}) //.ScanSlice(&members)
|
||||
|
||||
// 将获取的结果扫描到members切片中
|
||||
err = get.Scan(&members)
|
||||
// 如果发生错误,记录日志并返回
|
||||
if err != nil {
|
||||
//logs.Withf("redis err:%v", err)
|
||||
return
|
||||
}
|
||||
|
||||
// 根据获取的成员ID数量初始化排名信息列表
|
||||
list = make([]*v1.RankData, len(members))
|
||||
for i := range members {
|
||||
// 获取当前成员ID
|
||||
id := members[i]
|
||||
// 使用成员ID获取排名信息,不考虑更新时间
|
||||
list[i] = r.GetIdRankNotTs(id)
|
||||
}
|
||||
// 返回排名信息列表和可能的错误
|
||||
return
|
||||
}
|
||||
|
||||
// GetIdRankNotTs 获取指定id的当前排名
|
||||
// 该方法从Redis的有序集合中查询指定id的分数和排名信息,不考虑时间戳
|
||||
// 参数:
|
||||
//
|
||||
// id - 需要查询排名的id
|
||||
//
|
||||
// 返回值:
|
||||
//
|
||||
// rankInfo - 包含id的分数和排名信息的指针,如果没有找到,则返回nil
|
||||
func (r *F64CountRank) GetIdRankNotTs(id int64) (rankInfo *v1.RankData) {
|
||||
// 初始化rankInfo结构体,设置id,其他字段将通过查询填充
|
||||
rankInfo = &v1.RankData{Id: id}
|
||||
|
||||
// 查询有序集合中指定id的分数
|
||||
score, err := g.Redis().ZScore(ctx, r.name, id)
|
||||
if err != nil {
|
||||
// 如果发生错误,直接返回,rankInfo为初始化状态,Id已设置,其他字段为零值
|
||||
return
|
||||
}
|
||||
|
||||
// 将分数转换为int64类型并更新rankInfo
|
||||
rankInfo.Score = int64(score)
|
||||
|
||||
// 如果分数为0,直接返回,表示该id的分数为0,没有进一步查询排名的必要
|
||||
if score == 0 {
|
||||
return
|
||||
}
|
||||
|
||||
// 查询有序集合中指定id的排名
|
||||
rank, err := g.Redis().ZRevRank(ctx, r.name, id)
|
||||
if err != nil {
|
||||
// 如果发生错误,直接返回,rankInfo中仅分数有效,排名信息未更新
|
||||
return
|
||||
}
|
||||
|
||||
// 更新rankInfo中的排名信息,排名从0开始,所以需要加1以符合人类的计数习惯
|
||||
rankInfo.Rank = int32(rank) + 1
|
||||
|
||||
// 返回包含完整排名信息的rankInfo指针
|
||||
return rankInfo
|
||||
}
|
||||
@@ -6,8 +6,8 @@
|
||||
package service
|
||||
|
||||
import (
|
||||
v1 "github.com/ayflying/utility_go/api/system/v1"
|
||||
"github.com/gogf/gf/v2/net/gclient"
|
||||
v1 "new-gitlab.adesk.com/public_project/utility_go/api/system/v1"
|
||||
)
|
||||
|
||||
type (
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
package service
|
||||
|
||||
import (
|
||||
v1 "github.com/ayflying/utility_go/api/admin/v1"
|
||||
"github.com/gogf/gf/v2/frame/g"
|
||||
v1 "new-gitlab.adesk.com/public_project/utility_go/api/admin/v1"
|
||||
)
|
||||
|
||||
type (
|
||||
|
||||
52
tools/random.go
Normal file
52
tools/random.go
Normal file
@@ -0,0 +1,52 @@
|
||||
package tools
|
||||
|
||||
import (
|
||||
"math/rand"
|
||||
"time"
|
||||
)
|
||||
|
||||
var (
|
||||
Rand *randMod
|
||||
)
|
||||
|
||||
type randMod struct {
|
||||
}
|
||||
|
||||
// RandomAll 按权重随机选取 N 个不重复的元素
|
||||
func (m *randMod) RandomAll(data map[int]int, n int) []int {
|
||||
if n > len(data) {
|
||||
return nil
|
||||
}
|
||||
rand.Seed(time.Now().UnixNano())
|
||||
// 复制权重映射,避免修改原始数据
|
||||
remainingWeights := make(map[int]int)
|
||||
for k, v := range data {
|
||||
remainingWeights[k] = v
|
||||
}
|
||||
result := make([]int, 0, n)
|
||||
|
||||
for i := 0; i < n; i++ {
|
||||
totalWeight := 0
|
||||
// 计算剩余元素的总权重
|
||||
for _, weight := range remainingWeights {
|
||||
totalWeight += weight
|
||||
}
|
||||
if totalWeight == 0 {
|
||||
break
|
||||
}
|
||||
// 生成一个 0 到总权重之间的随机数
|
||||
randomNum := rand.Intn(totalWeight)
|
||||
currentWeight := 0
|
||||
for key, weight := range remainingWeights {
|
||||
currentWeight += weight
|
||||
if randomNum < currentWeight {
|
||||
// 将选中的元素添加到结果切片中
|
||||
result = append(result, key)
|
||||
// 从剩余权重映射中移除选中的元素
|
||||
delete(remainingWeights, key)
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
return result
|
||||
}
|
||||
@@ -124,11 +124,11 @@ func (m *tools) Items2Map(items [][]int64) (list map[int64]int64) {
|
||||
// 该函数通过遍历切片,从后向前检查每个元素,如果找到与指定值相等的元素,则将其从切片中移除。
|
||||
// 这种从后向前的遍历方法可以避免因移除元素而导致的数组重新排列带来的额外计算。
|
||||
// RemoveSlice 删除切片中的某个值
|
||||
func RemoveSlice[t Number](slice []t, value t) []t {
|
||||
func RemoveSlice[t Number](slice []t, value ...t) []t {
|
||||
// 从后向前遍历切片
|
||||
for i := len(slice) - 1; i >= 0; i-- {
|
||||
// 检查当前元素是否等于需要移除的值
|
||||
if slice[i] == value {
|
||||
if InArray(slice[i], value) {
|
||||
// 如果相等,移除该元素
|
||||
// 使用append和切片操作符来实现移除操作,将i之前和i之后的元素合并到一起
|
||||
slice = append(slice[:i], slice[i+1:]...)
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
package utility_go
|
||||
|
||||
import (
|
||||
_ "new-gitlab.adesk.com/public_project/utility_go/internal/logic"
|
||||
_ "github.com/ayflying/utility_go/internal/logic"
|
||||
|
||||
"context"
|
||||
"time"
|
||||
|
||||
v1 "github.com/ayflying/utility_go/api/system/v1"
|
||||
"github.com/ayflying/utility_go/service"
|
||||
"github.com/gogf/gf/v2/os/gctx"
|
||||
"github.com/gogf/gf/v2/os/gtimer"
|
||||
v1 "new-gitlab.adesk.com/public_project/utility_go/api/system/v1"
|
||||
"new-gitlab.adesk.com/public_project/utility_go/service"
|
||||
|
||||
"new-gitlab.adesk.com/public_project/utility_go/config"
|
||||
"github.com/ayflying/utility_go/config"
|
||||
)
|
||||
|
||||
var (
|
||||
Reference in New Issue
Block a user