修改删除结构体方法，支持传递多个数据进行删除

.gitignore

@@ -0,0 +1 @@
+.idea/

.gitlab-ci.yml

@@ -0,0 +1,36 @@
+# This file is a template, and might need editing before it works on your project.
+# You can copy and paste this template into a new `.gitlab-ci.yml` file.
+# You should not add this template to an existing `.gitlab-ci.yml` file by using the `include:` keyword.
+#
+# To contribute improvements to CI/CD templates, please follow the Development guide at:
+# https://docs.gitlab.com/ee/development/cicd/templates.html
+# This specific template is located at:
+# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Go.gitlab-ci.yml
+
+image: golang:latest
+
+stages:
+  - test
+#  - build
+#  - deploy
+
+format:
+  stage: test
+  script:
+    - go fmt $(go list ./... | grep -v /vendor/)
+    - go vet $(go list ./... | grep -v /vendor/)
+    - go test -race $(go list ./... | grep -v /vendor/)
+
+#compile:
+#  stage: build
+#  script:
+#    - mkdir -p mybinaries
+#    - go build -o mybinaries main.go
+#  artifacts:
+#    paths:
+#      - build
+#
+#deploy:
+#  stage: deploy
+#  script: echo "Define your deployment script!"
+#  environment: production

.idea/.gitignore

@@ -1,8 +0,0 @@
-# 默认忽略的文件
-/shelf/
-/workspace.xml
-# 基于编辑器的 HTTP 客户端请求
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml

.idea/goframehelperCache.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="com.github.oldmegit.goframehelper.ui.goframehelperCache">
-    <option name="gf" value="true" />
-  </component>
-</project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/utility-go.iml" filepath="$PROJECT_DIR$/.idea/utility-go.iml" />
-    </modules>
-  </component>
-</project>

.idea/utility-go.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="Go" enabled="true" />
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

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

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=

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
 )

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
-//}

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

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")

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
+}

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
 }

tools/random.go

@@ -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
+}

tools/tools.go

@@ -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:]...)

utility.go

@@ -1,13 +1,15 @@
 package utility_go
 
 import (
-	"context"
-	v1 "github.com/ayflying/utility_go/api/system/v1"
 	_ "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"
-	"time"
 
 	"github.com/ayflying/utility_go/config"
 )