包名改回来

This commit is contained in:
ayflying
2025-03-06 14:38:03 +08:00
parent f654e0feda
commit 92a127e128
25 changed files with 56 additions and 51 deletions

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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) {

View File

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

View File

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

View File

@@ -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) {

2
go.mod
View File

@@ -1,4 +1,4 @@
module new-gitlab.adesk.com/public_project/utility_go
module github.com/ayflying/utility_go
go 1.23.0

11
go.sum
View File

@@ -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=

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -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 {

View File

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

View File

@@ -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 {

View File

@@ -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 (

View File

@@ -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 {

View File

@@ -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 (

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 ()

View File

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

View File

@@ -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 (

View File

@@ -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 (