Compare commits

..

6 Commits

Author SHA1 Message Date
ayflying
f654e0feda 更新 2025-03-06 11:53:18 +08:00
ayflying
d44810e174 更新包名 2025-03-06 11:50:17 +08:00
ayflying
843cdc94d4 修改ci 2025-03-06 11:36:17 +08:00
ayflying
dd1d6ce2a6 增加ci文件 2025-03-06 11:16:41 +08:00
ayflying
1df0172acc 忽略目录 2025-03-05 17:27:54 +08:00
ayflying
1a3d79a605 去掉多余文件 2025-03-05 17:22:03 +08:00
31 changed files with 89 additions and 87 deletions

1
.gitignore vendored Normal file
View File

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

36
.gitlab-ci.yml Normal file
View File

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

8
.idea/.gitignore generated vendored
View File

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

View File

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

8
.idea/modules.xml generated
View File

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

9
.idea/utility-go.iml generated
View File

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

6
.idea/vcs.xml generated
View File

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

View File

@@ -1,8 +1,8 @@
package v1 package v1
import ( import (
"github.com/ayflying/utility_go/internal/model/entity"
"github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/frame/g"
"new-gitlab.adesk.com/public_project/utility_go/internal/model/entity"
) )
type SystemLog struct { type SystemLog struct {

View File

@@ -7,7 +7,7 @@ package callback
import ( import (
"context" "context"
"github.com/ayflying/utility_go/api/callback/v1" "new-gitlab.adesk.com/public_project/utility_go/api/callback/v1"
) )
type ICallbackV1 interface { type ICallbackV1 interface {

View File

@@ -1,12 +1,12 @@
package cmd package cmd
import ( import (
"github.com/ayflying/utility_go/service"
"github.com/gogf/gf/v2/errors/gcode" "github.com/gogf/gf/v2/errors/gcode"
"github.com/gogf/gf/v2/errors/gerror" "github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/net/ghttp" "github.com/gogf/gf/v2/net/ghttp"
"github.com/gogf/gf/v2/text/gstr" "github.com/gogf/gf/v2/text/gstr"
"new-gitlab.adesk.com/public_project/utility_go/service"
) )
//func MiddlewareAnonymous(r *ghttp.Request) { //func MiddlewareAnonymous(r *ghttp.Request) {

View File

@@ -2,12 +2,12 @@ package cmd
import ( import (
"context" "context"
"github.com/ayflying/utility_go/package/s3"
"github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/net/ghttp" "github.com/gogf/gf/v2/net/ghttp"
"github.com/gogf/gf/v2/os/gcfg" "github.com/gogf/gf/v2/os/gcfg"
"github.com/gogf/gf/v2/os/gcmd" "github.com/gogf/gf/v2/os/gcmd"
"github.com/gogf/gf/v2/os/gctx" "github.com/gogf/gf/v2/os/gctx"
"new-gitlab.adesk.com/public_project/utility_go/package/s3"
"os" "os"
"time" "time"
) )

View File

@@ -5,7 +5,7 @@
package callback package callback
import ( import (
"github.com/ayflying/utility_go/api/callback" "new-gitlab.adesk.com/public_project/utility_go/api/callback"
) )
type ControllerV1 struct{} type ControllerV1 struct{}

View File

@@ -2,9 +2,9 @@ package callback
import ( import (
"context" "context"
"github.com/ayflying/utility_go/service" "new-gitlab.adesk.com/public_project/utility_go/service"
"github.com/ayflying/utility_go/api/callback/v1" "new-gitlab.adesk.com/public_project/utility_go/api/callback/v1"
) )
func (c *ControllerV1) Ip(ctx context.Context, req *v1.IpReq) (res *v1.IpRes, err error) { 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 github.com/ayflying/utility_go module new-gitlab.adesk.com/public_project/utility_go
go 1.23.0 go 1.23.0

View File

@@ -2,11 +2,11 @@ package act
import ( import (
"fmt" "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/container/gvar"
"github.com/gogf/gf/v2/os/gctx" "github.com/gogf/gf/v2/os/gctx"
"github.com/gogf/gf/v2/os/gtime" "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" "time"
) )

View File

@@ -2,16 +2,16 @@ package gameAct
import ( import (
"fmt" "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/container/gset"
"github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/os/gctx" "github.com/gogf/gf/v2/os/gctx"
"github.com/gogf/gf/v2/os/gtime" "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" "strconv"
"strings" "strings"
"time" "time"

View File

@@ -1,12 +1,12 @@
package ip2region package ip2region
import ( import (
"github.com/ayflying/utility_go/service"
"github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/os/gctx" "github.com/gogf/gf/v2/os/gctx"
"github.com/gogf/gf/v2/os/gfile" "github.com/gogf/gf/v2/os/gfile"
"github.com/lionsoul2014/ip2region/binding/golang/xdb" "github.com/lionsoul2014/ip2region/binding/golang/xdb"
"net" "net"
"new-gitlab.adesk.com/public_project/utility_go/service"
"strings" "strings"
) )

View File

@@ -2,10 +2,10 @@ package logData
import ( import (
"context" "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/frame/g"
"github.com/gogf/gf/v2/os/gctx" "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" "time"
) )

View File

@@ -5,9 +5,9 @@
package logic package logic
import ( import (
_ "github.com/ayflying/utility_go/internal/logic/gameAct" _ "new-gitlab.adesk.com/public_project/utility_go/internal/logic/gameAct"
_ "github.com/ayflying/utility_go/internal/logic/ip2region" _ "new-gitlab.adesk.com/public_project/utility_go/internal/logic/ip2region"
_ "github.com/ayflying/utility_go/internal/logic/logData" _ "new-gitlab.adesk.com/public_project/utility_go/internal/logic/logData"
_ "github.com/ayflying/utility_go/internal/logic/systemCron" _ "new-gitlab.adesk.com/public_project/utility_go/internal/logic/systemCron"
_ "github.com/ayflying/utility_go/internal/logic/systemLog" _ "new-gitlab.adesk.com/public_project/utility_go/internal/logic/systemLog"
) )

View File

@@ -3,10 +3,10 @@ package systemCron
import ( import (
"encoding/json" "encoding/json"
"fmt" "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/frame/g"
"github.com/gogf/gf/v2/net/gclient" "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 { type Status struct {

View File

@@ -2,12 +2,12 @@ package systemCron
import ( import (
"context" "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/frame/g"
"github.com/gogf/gf/v2/os/gcron" "github.com/gogf/gf/v2/os/gcron"
"github.com/gogf/gf/v2/os/gctx" "github.com/gogf/gf/v2/os/gctx"
"github.com/gogf/gf/v2/os/gtimer" "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" "sync"
"time" "time"
) )

View File

@@ -2,10 +2,10 @@ package systemLog
import ( import (
"context" "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/frame/g"
"github.com/gogf/gf/v2/os/gctx" "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 { type sSystemLog struct {

14
main.go
View File

@@ -1,15 +1,17 @@
package utility_go package utility_go
import ( import (
_ "new-gitlab.adesk.com/public_project/utility_go/internal/logic"
"context" "context"
v1 "github.com/ayflying/utility_go/api/system/v1"
_ "github.com/ayflying/utility_go/internal/logic"
"github.com/ayflying/utility_go/service"
"github.com/gogf/gf/v2/os/gctx"
"github.com/gogf/gf/v2/os/gtimer"
"time" "time"
"github.com/ayflying/utility_go/config" "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"
) )
var ( var (

View File

@@ -1,8 +1,8 @@
package aycache package aycache
import ( import (
"github.com/ayflying/utility_go/package/aycache/drive"
"github.com/gogf/gf/v2/os/gcache" "github.com/gogf/gf/v2/os/gcache"
"new-gitlab.adesk.com/public_project/utility_go/package/aycache/drive"
) )
type Mod struct { type Mod struct {

View File

@@ -2,12 +2,12 @@ package pay
import ( import (
"context" "context"
"github.com/ayflying/utility_go/package/pay/playstore"
"github.com/gogf/gf/v2/errors/gerror" "github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/os/gctx" "github.com/gogf/gf/v2/os/gctx"
"github.com/gogf/gf/v2/text/gstr" "github.com/gogf/gf/v2/text/gstr"
"github.com/gogf/gf/v2/util/gconv" "github.com/gogf/gf/v2/util/gconv"
"google.golang.org/api/androidpublisher/v3" "google.golang.org/api/androidpublisher/v3"
"new-gitlab.adesk.com/public_project/utility_go/package/pay/playstore"
) )
var ( var (

View File

@@ -1,9 +1,9 @@
package aycache package aycache
import ( 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" "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 { type Mod struct {

View File

@@ -1,8 +1,8 @@
package notice package notice
import ( import (
v1 "github.com/ayflying/utility_go/api/pgk/v1" v1 "new-gitlab.adesk.com/public_project/utility_go/api/pgk/v1"
"github.com/ayflying/utility_go/pgk/notice/drive" "new-gitlab.adesk.com/public_project/utility_go/pgk/notice/drive"
) )
type MessageV1 interface { type MessageV1 interface {

View File

@@ -1,12 +1,12 @@
package pgk package pgk
import ( 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" "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 () var ()

View File

@@ -2,7 +2,7 @@ package rank
import ( import (
"fmt" "fmt"
v1 "github.com/ayflying/utility_go/api/pgk/v1" v1 "new-gitlab.adesk.com/public_project/utility_go/api/pgk/v1"
"time" "time"
"github.com/gogf/gf/v2/database/gredis" "github.com/gogf/gf/v2/database/gredis"

View File

@@ -6,8 +6,8 @@
package service package service
import ( import (
v1 "github.com/ayflying/utility_go/api/system/v1"
"github.com/gogf/gf/v2/net/gclient" "github.com/gogf/gf/v2/net/gclient"
v1 "new-gitlab.adesk.com/public_project/utility_go/api/system/v1"
) )
type ( type (

View File

@@ -6,8 +6,8 @@
package service package service
import ( import (
v1 "github.com/ayflying/utility_go/api/admin/v1"
"github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/frame/g"
v1 "new-gitlab.adesk.com/public_project/utility_go/api/admin/v1"
) )
type ( type (