From 92a127e12893ee0fc984ed45644e8cc0afe5f675 Mon Sep 17 00:00:00 2001 From: ayflying Date: Thu, 6 Mar 2025 14:38:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E5=90=8D=E6=94=B9=E5=9B=9E=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/admin/v1/log.go | 2 +- api/callback/callback.go | 2 +- cmd/middleware.go | 2 +- cmd/update.go | 2 +- controller/callback/callback_new.go | 2 +- controller/callback/callback_v1_ip.go | 4 ++-- go.mod | 2 +- go.sum | 11 ++++++++--- internal/game/act/act.go | 4 ++-- internal/logic/gameAct/gameAct.go | 12 ++++++------ internal/logic/ip2region/ip2region.go | 2 +- internal/logic/logData/logData.go | 4 ++-- internal/logic/logic.go | 10 +++++----- internal/logic/systemCron/listener.go | 4 ++-- internal/logic/systemCron/systemCron.go | 4 ++-- internal/logic/systemLog/systemLog.go | 4 ++-- main.go | 8 ++++---- package/aycache/cache.go | 2 +- package/pay/google.go | 2 +- pgk/aycache/cache.go | 4 ++-- pgk/notice/notice.go | 4 ++-- pgk/pgk.go | 10 +++++----- pgk/rank/rank.go | 2 +- service/system_cron.go | 2 +- service/system_log.go | 2 +- 25 files changed, 56 insertions(+), 51 deletions(-) diff --git a/api/admin/v1/log.go b/api/admin/v1/log.go index e2938ab..043cbcb 100644 --- a/api/admin/v1/log.go +++ b/api/admin/v1/log.go @@ -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 { diff --git a/api/callback/callback.go b/api/callback/callback.go index 7d32105..a81cce6 100644 --- a/api/callback/callback.go +++ b/api/callback/callback.go @@ -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 { diff --git a/cmd/middleware.go b/cmd/middleware.go index 3b8afcc..b22ebb5 100644 --- a/cmd/middleware.go +++ b/cmd/middleware.go @@ -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) { diff --git a/cmd/update.go b/cmd/update.go index 716314c..47562c9 100644 --- a/cmd/update.go +++ b/cmd/update.go @@ -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" ) diff --git a/controller/callback/callback_new.go b/controller/callback/callback_new.go index a698c52..d66a294 100644 --- a/controller/callback/callback_new.go +++ b/controller/callback/callback_new.go @@ -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{} diff --git a/controller/callback/callback_v1_ip.go b/controller/callback/callback_v1_ip.go index a39dc4c..1655207 100644 --- a/controller/callback/callback_v1_ip.go +++ b/controller/callback/callback_v1_ip.go @@ -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) { diff --git a/go.mod b/go.mod index 097d42c..0d76243 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module new-gitlab.adesk.com/public_project/utility_go +module github.com/ayflying/utility_go go 1.23.0 diff --git a/go.sum b/go.sum index bf2798f..3aa2a60 100644 --- a/go.sum +++ b/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= diff --git a/internal/game/act/act.go b/internal/game/act/act.go index 682e385..62de129 100644 --- a/internal/game/act/act.go +++ b/internal/game/act/act.go @@ -2,11 +2,11 @@ package act import ( "fmt" + "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" "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" ) diff --git a/internal/logic/gameAct/gameAct.go b/internal/logic/gameAct/gameAct.go index cdde3be..d46a856 100644 --- a/internal/logic/gameAct/gameAct.go +++ b/internal/logic/gameAct/gameAct.go @@ -2,16 +2,16 @@ 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" + 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" diff --git a/internal/logic/ip2region/ip2region.go b/internal/logic/ip2region/ip2region.go index 8124429..e123336 100644 --- a/internal/logic/ip2region/ip2region.go +++ b/internal/logic/ip2region/ip2region.go @@ -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" ) diff --git a/internal/logic/logData/logData.go b/internal/logic/logData/logData.go index bb4c0f7..569ea06 100644 --- a/internal/logic/logData/logData.go +++ b/internal/logic/logData/logData.go @@ -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" ) diff --git a/internal/logic/logic.go b/internal/logic/logic.go index 555d698..0783aa0 100644 --- a/internal/logic/logic.go +++ b/internal/logic/logic.go @@ -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" ) diff --git a/internal/logic/systemCron/listener.go b/internal/logic/systemCron/listener.go index 6264085..034302e 100644 --- a/internal/logic/systemCron/listener.go +++ b/internal/logic/systemCron/listener.go @@ -3,10 +3,10 @@ package systemCron import ( "encoding/json" "fmt" + v1 "github.com/ayflying/utility_go/api/pgk/v1" + "github.com/ayflying/utility_go/pgk/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 { diff --git a/internal/logic/systemCron/systemCron.go b/internal/logic/systemCron/systemCron.go index 5646df1..de53fa1 100644 --- a/internal/logic/systemCron/systemCron.go +++ b/internal/logic/systemCron/systemCron.go @@ -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" ) diff --git a/internal/logic/systemLog/systemLog.go b/internal/logic/systemLog/systemLog.go index 40ac27e..1a83f32 100644 --- a/internal/logic/systemLog/systemLog.go +++ b/internal/logic/systemLog/systemLog.go @@ -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 { diff --git a/main.go b/main.go index 0b8a11a..00fb9a7 100644 --- a/main.go +++ b/main.go @@ -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 ( diff --git a/package/aycache/cache.go b/package/aycache/cache.go index b1c8fbd..f2e650f 100644 --- a/package/aycache/cache.go +++ b/package/aycache/cache.go @@ -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 { diff --git a/package/pay/google.go b/package/pay/google.go index 50a41d1..451ab5c 100644 --- a/package/pay/google.go +++ b/package/pay/google.go @@ -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 ( diff --git a/pgk/aycache/cache.go b/pgk/aycache/cache.go index ad15dbf..19a6505 100644 --- a/pgk/aycache/cache.go +++ b/pgk/aycache/cache.go @@ -1,9 +1,9 @@ package aycache import ( + "github.com/ayflying/utility_go/package/aycache/drive" + drive2 "github.com/ayflying/utility_go/pgk/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 { diff --git a/pgk/notice/notice.go b/pgk/notice/notice.go index 8599c12..58e18df 100644 --- a/pgk/notice/notice.go +++ b/pgk/notice/notice.go @@ -1,8 +1,8 @@ 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" + v1 "github.com/ayflying/utility_go/api/pgk/v1" + "github.com/ayflying/utility_go/pgk/notice/drive" ) type MessageV1 interface { diff --git a/pgk/pgk.go b/pgk/pgk.go index c4e2302..c372dc7 100644 --- a/pgk/pgk.go +++ b/pgk/pgk.go @@ -1,12 +1,12 @@ package pgk import ( + v1 "github.com/ayflying/utility_go/api/pgk/v1" + "github.com/ayflying/utility_go/pgk/aycache" + "github.com/ayflying/utility_go/pgk/notice" + "github.com/ayflying/utility_go/pgk/rank" + "github.com/ayflying/utility_go/pgk/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 () diff --git a/pgk/rank/rank.go b/pgk/rank/rank.go index e5630cc..0a95f02 100644 --- a/pgk/rank/rank.go +++ b/pgk/rank/rank.go @@ -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" diff --git a/service/system_cron.go b/service/system_cron.go index cceaf41..41ffb58 100644 --- a/service/system_cron.go +++ b/service/system_cron.go @@ -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 ( diff --git a/service/system_log.go b/service/system_log.go index f2b8e4d..02103c4 100644 --- a/service/system_log.go +++ b/service/system_log.go @@ -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 (