From 74a746bc47766be6c24efa852fd0efcedf089491 Mon Sep 17 00:00:00 2001 From: ayflying Date: Fri, 28 Feb 2025 17:45:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/update.go | 2 +- internal/game/act/act.go | 2 +- internal/logic/gameAct/gameAct.go | 2 +- {aycache => package/aycache}/cache.go | 2 +- {aycache => package/aycache}/drive/elasticsearch.go | 0 {aycache => package/aycache}/file.go | 0 {aycache => package/aycache}/memory.go | 0 {aycache => package/aycache}/mencached.go | 0 {aycache => package/aycache}/redis.go | 0 {elasticsearch => package/elasticsearch}/elasticsearch.go | 0 {excel => package/excel}/download.go | 0 {excel => package/excel}/excel.go | 0 {excel => package/excel}/tools.go | 0 {pay => package/pay}/alipay.go | 0 {pay => package/pay}/apple.go | 0 {pay => package/pay}/apple/apple.go | 0 {pay => package/pay}/google.go | 6 +++--- {pay => package/pay}/playstore/InAppProduct_utils.go | 0 {pay => package/pay}/playstore/enums.go | 0 {pay => package/pay}/playstore/models.go | 0 {pay => package/pay}/playstore/notification.go | 0 {pay => package/pay}/playstore/playstore.go | 0 {pay => package/pay}/playstore/product.go | 0 {pay => package/pay}/playstore/subscription.go | 0 {pay => package/pay}/playstore/utils.go | 0 {pay => package/pay}/wechat.go | 0 {rand => package/rand}/rand.go | 0 {rank => package/rank}/rank.go | 0 {s3 => package/s3}/s3.go | 0 29 files changed, 7 insertions(+), 7 deletions(-) rename {aycache => package/aycache}/cache.go (92%) rename {aycache => package/aycache}/drive/elasticsearch.go (100%) rename {aycache => package/aycache}/file.go (100%) rename {aycache => package/aycache}/memory.go (100%) rename {aycache => package/aycache}/mencached.go (100%) rename {aycache => package/aycache}/redis.go (100%) rename {elasticsearch => package/elasticsearch}/elasticsearch.go (100%) rename {excel => package/excel}/download.go (100%) rename {excel => package/excel}/excel.go (100%) rename {excel => package/excel}/tools.go (100%) rename {pay => package/pay}/alipay.go (100%) rename {pay => package/pay}/apple.go (100%) rename {pay => package/pay}/apple/apple.go (100%) rename {pay => package/pay}/google.go (98%) rename {pay => package/pay}/playstore/InAppProduct_utils.go (100%) rename {pay => package/pay}/playstore/enums.go (100%) rename {pay => package/pay}/playstore/models.go (100%) rename {pay => package/pay}/playstore/notification.go (100%) rename {pay => package/pay}/playstore/playstore.go (100%) rename {pay => package/pay}/playstore/product.go (100%) rename {pay => package/pay}/playstore/subscription.go (100%) rename {pay => package/pay}/playstore/utils.go (100%) rename {pay => package/pay}/wechat.go (100%) rename {rand => package/rand}/rand.go (100%) rename {rank => package/rank}/rank.go (100%) rename {s3 => package/s3}/s3.go (100%) diff --git a/cmd/update.go b/cmd/update.go index ad80f83..47562c9 100644 --- a/cmd/update.go +++ b/cmd/update.go @@ -2,7 +2,7 @@ package cmd import ( "context" - "github.com/ayflying/utility_go/s3" + "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" diff --git a/internal/game/act/act.go b/internal/game/act/act.go index 983b248..62de129 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/aycache" + "github.com/ayflying/utility_go/package/aycache" "github.com/ayflying/utility_go/service" "github.com/gogf/gf/v2/container/gvar" "github.com/gogf/gf/v2/os/gctx" diff --git a/internal/logic/gameAct/gameAct.go b/internal/logic/gameAct/gameAct.go index acfaddc..d46a856 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/aycache" "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" service2 "github.com/ayflying/utility_go/service" "github.com/ayflying/utility_go/tools" "github.com/gogf/gf/v2/container/gset" diff --git a/aycache/cache.go b/package/aycache/cache.go similarity index 92% rename from aycache/cache.go rename to package/aycache/cache.go index 3d72e81..836a14e 100644 --- a/aycache/cache.go +++ b/package/aycache/cache.go @@ -1,7 +1,7 @@ package aycache import ( - "github.com/ayflying/utility_go/aycache/drive" + "github.com/ayflying/utility_go/package/aycache/drive" "github.com/gogf/gf/v2/os/gcache" ) diff --git a/aycache/drive/elasticsearch.go b/package/aycache/drive/elasticsearch.go similarity index 100% rename from aycache/drive/elasticsearch.go rename to package/aycache/drive/elasticsearch.go diff --git a/aycache/file.go b/package/aycache/file.go similarity index 100% rename from aycache/file.go rename to package/aycache/file.go diff --git a/aycache/memory.go b/package/aycache/memory.go similarity index 100% rename from aycache/memory.go rename to package/aycache/memory.go diff --git a/aycache/mencached.go b/package/aycache/mencached.go similarity index 100% rename from aycache/mencached.go rename to package/aycache/mencached.go diff --git a/aycache/redis.go b/package/aycache/redis.go similarity index 100% rename from aycache/redis.go rename to package/aycache/redis.go diff --git a/elasticsearch/elasticsearch.go b/package/elasticsearch/elasticsearch.go similarity index 100% rename from elasticsearch/elasticsearch.go rename to package/elasticsearch/elasticsearch.go diff --git a/excel/download.go b/package/excel/download.go similarity index 100% rename from excel/download.go rename to package/excel/download.go diff --git a/excel/excel.go b/package/excel/excel.go similarity index 100% rename from excel/excel.go rename to package/excel/excel.go diff --git a/excel/tools.go b/package/excel/tools.go similarity index 100% rename from excel/tools.go rename to package/excel/tools.go diff --git a/pay/alipay.go b/package/pay/alipay.go similarity index 100% rename from pay/alipay.go rename to package/pay/alipay.go diff --git a/pay/apple.go b/package/pay/apple.go similarity index 100% rename from pay/apple.go rename to package/pay/apple.go diff --git a/pay/apple/apple.go b/package/pay/apple/apple.go similarity index 100% rename from pay/apple/apple.go rename to package/pay/apple/apple.go diff --git a/pay/google.go b/package/pay/google.go similarity index 98% rename from pay/google.go rename to package/pay/google.go index 97f02cf..451ab5c 100644 --- a/pay/google.go +++ b/package/pay/google.go @@ -2,7 +2,7 @@ package pay import ( "context" - playstore2 "github.com/ayflying/utility_go/pay/playstore" + "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" @@ -16,14 +16,14 @@ var ( // GooglePay 是一个处理Google支付的结构体。 type GooglePay struct { - c *playstore2.Client + c *playstore.Client } // Init 初始化GooglePay客户端。 // data: 初始化客户端所需的配置数据。 func (p *GooglePay) Init(data []byte) { var err error - p.c, err = playstore2.New(data) + p.c, err = playstore.New(data) if err != nil { panic(err) // 如果初始化失败，则panic。 } diff --git a/pay/playstore/InAppProduct_utils.go b/package/pay/playstore/InAppProduct_utils.go similarity index 100% rename from pay/playstore/InAppProduct_utils.go rename to package/pay/playstore/InAppProduct_utils.go diff --git a/pay/playstore/enums.go b/package/pay/playstore/enums.go similarity index 100% rename from pay/playstore/enums.go rename to package/pay/playstore/enums.go diff --git a/pay/playstore/models.go b/package/pay/playstore/models.go similarity index 100% rename from pay/playstore/models.go rename to package/pay/playstore/models.go diff --git a/pay/playstore/notification.go b/package/pay/playstore/notification.go similarity index 100% rename from pay/playstore/notification.go rename to package/pay/playstore/notification.go diff --git a/pay/playstore/playstore.go b/package/pay/playstore/playstore.go similarity index 100% rename from pay/playstore/playstore.go rename to package/pay/playstore/playstore.go diff --git a/pay/playstore/product.go b/package/pay/playstore/product.go similarity index 100% rename from pay/playstore/product.go rename to package/pay/playstore/product.go diff --git a/pay/playstore/subscription.go b/package/pay/playstore/subscription.go similarity index 100% rename from pay/playstore/subscription.go rename to package/pay/playstore/subscription.go diff --git a/pay/playstore/utils.go b/package/pay/playstore/utils.go similarity index 100% rename from pay/playstore/utils.go rename to package/pay/playstore/utils.go diff --git a/pay/wechat.go b/package/pay/wechat.go similarity index 100% rename from pay/wechat.go rename to package/pay/wechat.go diff --git a/rand/rand.go b/package/rand/rand.go similarity index 100% rename from rand/rand.go rename to package/rand/rand.go diff --git a/rank/rank.go b/package/rank/rank.go similarity index 100% rename from rank/rank.go rename to package/rank/rank.go diff --git a/s3/s3.go b/package/s3/s3.go similarity index 100% rename from s3/s3.go rename to package/s3/s3.go