From 74b97ccb914938d42a85aa8a3921f99bff1fe794 Mon Sep 17 00:00:00 2001 From: brandwwang Date: Sat, 3 Jun 2023 17:52:24 +0800 Subject: [PATCH 1/7] change go mod --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index e07c437..184a393 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/go-admin-team/go-admin-core +module gitee.com/wangyfbe/go-admin-core go 1.14 -- Gitee From 6479be4581e73eca85e8bc61e4e0f2452b4c378b Mon Sep 17 00:00:00 2001 From: brandwwang Date: Sat, 3 Jun 2023 17:53:16 +0800 Subject: [PATCH 2/7] change go version --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 184a393..d1cde3f 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module gitee.com/wangyfbe/go-admin-core -go 1.14 +go 1.18 require ( github.com/BurntSushi/toml v0.3.1 -- Gitee From d7a7b65f59bf764ef760c7bf393d41dcca20f238 Mon Sep 17 00:00:00 2001 From: brandwwang Date: Sat, 3 Jun 2023 18:01:49 +0800 Subject: [PATCH 3/7] change go mod --- config/README.md | 4 ++-- config/config.go | 8 +++---- config/default.go | 10 ++++---- config/default_test.go | 8 +++---- config/encoder/json/json.go | 2 +- config/encoder/toml/toml.go | 2 +- config/encoder/xml/xml.go | 2 +- config/encoder/yaml/yaml.go | 2 +- config/loader/loader.go | 4 ++-- config/loader/memory/memory.go | 8 +++---- config/loader/memory/options.go | 6 ++--- config/options.go | 6 ++--- config/reader/json/json.go | 8 +++---- config/reader/json/json_test.go | 2 +- config/reader/json/values.go | 4 ++-- config/reader/json/values_test.go | 2 +- config/reader/options.go | 10 ++++---- config/reader/reader.go | 2 +- config/secrets/box/box.go | 2 +- config/secrets/box/box_test.go | 2 +- config/secrets/secretbox/secretbox.go | 2 +- config/secrets/secretbox/secretbox_test.go | 2 +- config/source/env/env.go | 2 +- config/source/env/env_test.go | 2 +- config/source/env/options.go | 2 +- config/source/env/watcher.go | 2 +- config/source/file/file.go | 2 +- config/source/file/file_test.go | 4 ++-- config/source/file/format.go | 2 +- config/source/file/format_test.go | 2 +- config/source/file/options.go | 2 +- config/source/file/watcher.go | 5 ++-- config/source/file/watcher_linux.go | 5 ++-- config/source/flag/flag.go | 2 +- config/source/flag/options.go | 2 +- config/source/memory/memory.go | 2 +- config/source/memory/options.go | 2 +- config/source/memory/watcher.go | 2 +- config/source/options.go | 4 ++-- config/value.go | 2 +- errors/errors.proto | 2 +- logger/default.go | 2 +- plugins/logger/logrus/README.md | 4 ++-- plugins/logger/logrus/go.mod | 6 ++--- plugins/logger/logrus/logrus.go | 2 +- plugins/logger/logrus/logrus_test.go | 2 +- plugins/logger/logrus/options.go | 2 +- plugins/logger/zap/go.mod | 6 ++--- plugins/logger/zap/options.go | 2 +- plugins/logger/zap/zap.go | 2 +- plugins/logger/zap/zap_test.go | 4 ++-- sdk/antd_api/api.go | 23 +++++++++---------- sdk/api/api.go | 10 ++++---- sdk/api/request_logger.go | 6 ++--- sdk/application.go | 2 +- sdk/config/cache.go | 4 ++-- sdk/config/config.go | 4 ++-- sdk/config/locker.go | 4 ++-- sdk/config/logger.go | 2 +- sdk/config/queue.go | 4 ++-- sdk/go.mod | 10 ++++---- sdk/pkg/captcha/store.go | 2 +- sdk/pkg/captcha/store_test.go | 4 ++-- sdk/pkg/casbin/log.go | 2 +- sdk/pkg/jwtauth/user/user.go | 4 ++-- sdk/pkg/logger/log.go | 10 ++++---- sdk/pkg/response/antd/model.go | 10 ++++---- sdk/pkg/response/antd/return.go | 2 +- sdk/pkg/response/return.go | 2 +- sdk/pkg/ws/ws.go | 2 +- sdk/runtime/application.go | 6 ++--- sdk/runtime/cache.go | 2 +- sdk/runtime/locker.go | 2 +- sdk/runtime/queue.go | 2 +- sdk/runtime/queue_test.go | 4 ++-- sdk/runtime/type.go | 4 ++-- sdk/service/service.go | 2 +- .../logging/client_interceptors.go | 4 ++-- .../interceptors/logging/ctxlog/context.go | 2 +- server/grpc/interceptors/logging/options.go | 4 ++-- .../logging/server_interceptors.go | 4 ++-- server/grpc/interceptors/request_tag/tags.go | 2 +- server/grpc/options.go | 8 +++---- server/grpc/server.go | 2 +- server/grpc/service.go | 6 ++--- server/listener/server.go | 4 ++-- server/server.go | 2 +- storage/cache/message.go | 2 +- storage/queue/memory.go | 2 +- storage/queue/memory_test.go | 2 +- storage/queue/message.go | 2 +- storage/queue/nsq.go | 2 +- storage/queue/redis.go | 2 +- storage/queue/redis_test.go | 2 +- tools/gorm/logger/logger.go | 2 +- tools/gorm/logger/logger_test.go | 2 +- tools/transfer/gin.go | 2 +- 97 files changed, 183 insertions(+), 182 deletions(-) diff --git a/config/README.md b/config/README.md index c56919e..f26fdd2 100644 --- a/config/README.md +++ b/config/README.md @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/go-admin-team/go-admin-core/config" - "github.com/go-admin-team/go-admin-core/config/source/file" + "gitee.com/wangyfbe/go-admin-core/config" + "gitee.com/wangyfbe/go-admin-core/config/source/file" ) func TestApp(t *testing.T) { diff --git a/config/config.go b/config/config.go index 46376ab..0a6dd14 100644 --- a/config/config.go +++ b/config/config.go @@ -4,10 +4,10 @@ package config import ( "context" - "github.com/go-admin-team/go-admin-core/config/loader" - "github.com/go-admin-team/go-admin-core/config/reader" - "github.com/go-admin-team/go-admin-core/config/source" - "github.com/go-admin-team/go-admin-core/config/source/file" + "gitee.com/wangyfbe/go-admin-core/config/loader" + "gitee.com/wangyfbe/go-admin-core/config/reader" + "gitee.com/wangyfbe/go-admin-core/config/source" + "gitee.com/wangyfbe/go-admin-core/config/source/file" ) // Config is an interface abstraction for dynamic configuration diff --git a/config/default.go b/config/default.go index 616b202..f987cc8 100644 --- a/config/default.go +++ b/config/default.go @@ -5,11 +5,11 @@ import ( "sync" "time" - "github.com/go-admin-team/go-admin-core/config/loader" - "github.com/go-admin-team/go-admin-core/config/loader/memory" - "github.com/go-admin-team/go-admin-core/config/reader" - "github.com/go-admin-team/go-admin-core/config/reader/json" - "github.com/go-admin-team/go-admin-core/config/source" + "gitee.com/wangyfbe/go-admin-core/config/loader" + "gitee.com/wangyfbe/go-admin-core/config/loader/memory" + "gitee.com/wangyfbe/go-admin-core/config/reader" + "gitee.com/wangyfbe/go-admin-core/config/reader/json" + "gitee.com/wangyfbe/go-admin-core/config/source" ) type config struct { diff --git a/config/default_test.go b/config/default_test.go index c57282e..14cb28c 100644 --- a/config/default_test.go +++ b/config/default_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - "github.com/go-admin-team/go-admin-core/config/source" - "github.com/go-admin-team/go-admin-core/config/source/env" - "github.com/go-admin-team/go-admin-core/config/source/file" - "github.com/go-admin-team/go-admin-core/config/source/memory" + "gitee.com/wangyfbe/go-admin-core/config/source" + "gitee.com/wangyfbe/go-admin-core/config/source/env" + "gitee.com/wangyfbe/go-admin-core/config/source/file" + "gitee.com/wangyfbe/go-admin-core/config/source/memory" ) func createFileForIssue18(t *testing.T, content string) *os.File { diff --git a/config/encoder/json/json.go b/config/encoder/json/json.go index 4b8d973..a517ef1 100644 --- a/config/encoder/json/json.go +++ b/config/encoder/json/json.go @@ -3,7 +3,7 @@ package json import ( "encoding/json" - "github.com/go-admin-team/go-admin-core/config/encoder" + "gitee.com/wangyfbe/go-admin-core/config/encoder" ) type jsonEncoder struct{} diff --git a/config/encoder/toml/toml.go b/config/encoder/toml/toml.go index fad25bb..a7c8f61 100644 --- a/config/encoder/toml/toml.go +++ b/config/encoder/toml/toml.go @@ -3,8 +3,8 @@ package toml import ( "bytes" + "gitee.com/wangyfbe/go-admin-core/config/encoder" "github.com/BurntSushi/toml" - "github.com/go-admin-team/go-admin-core/config/encoder" ) type tomlEncoder struct{} diff --git a/config/encoder/xml/xml.go b/config/encoder/xml/xml.go index 36ee13c..d966824 100644 --- a/config/encoder/xml/xml.go +++ b/config/encoder/xml/xml.go @@ -3,7 +3,7 @@ package xml import ( "encoding/xml" - "github.com/go-admin-team/go-admin-core/config/encoder" + "gitee.com/wangyfbe/go-admin-core/config/encoder" ) type xmlEncoder struct{} diff --git a/config/encoder/yaml/yaml.go b/config/encoder/yaml/yaml.go index 341ec17..1efe568 100644 --- a/config/encoder/yaml/yaml.go +++ b/config/encoder/yaml/yaml.go @@ -1,8 +1,8 @@ package yaml import ( + "gitee.com/wangyfbe/go-admin-core/config/encoder" "github.com/ghodss/yaml" - "github.com/go-admin-team/go-admin-core/config/encoder" ) type yamlEncoder struct{} diff --git a/config/loader/loader.go b/config/loader/loader.go index e8aaf19..34fa07a 100644 --- a/config/loader/loader.go +++ b/config/loader/loader.go @@ -4,8 +4,8 @@ package loader import ( "context" - "github.com/go-admin-team/go-admin-core/config/reader" - "github.com/go-admin-team/go-admin-core/config/source" + "gitee.com/wangyfbe/go-admin-core/config/reader" + "gitee.com/wangyfbe/go-admin-core/config/source" ) // Loader manages loading sources diff --git a/config/loader/memory/memory.go b/config/loader/memory/memory.go index 0fafe16..3dbbb80 100644 --- a/config/loader/memory/memory.go +++ b/config/loader/memory/memory.go @@ -9,10 +9,10 @@ import ( "sync" "time" - "github.com/go-admin-team/go-admin-core/config/loader" - "github.com/go-admin-team/go-admin-core/config/reader" - "github.com/go-admin-team/go-admin-core/config/reader/json" - "github.com/go-admin-team/go-admin-core/config/source" + "gitee.com/wangyfbe/go-admin-core/config/loader" + "gitee.com/wangyfbe/go-admin-core/config/reader" + "gitee.com/wangyfbe/go-admin-core/config/reader/json" + "gitee.com/wangyfbe/go-admin-core/config/source" ) type memory struct { diff --git a/config/loader/memory/options.go b/config/loader/memory/options.go index 9b4c0b1..5e5a28a 100644 --- a/config/loader/memory/options.go +++ b/config/loader/memory/options.go @@ -1,9 +1,9 @@ package memory import ( - "github.com/go-admin-team/go-admin-core/config/loader" - "github.com/go-admin-team/go-admin-core/config/reader" - "github.com/go-admin-team/go-admin-core/config/source" + "gitee.com/wangyfbe/go-admin-core/config/loader" + "gitee.com/wangyfbe/go-admin-core/config/reader" + "gitee.com/wangyfbe/go-admin-core/config/source" ) // WithSource appends a source to list of sources diff --git a/config/options.go b/config/options.go index 8e7d2c0..2f78eea 100644 --- a/config/options.go +++ b/config/options.go @@ -1,9 +1,9 @@ package config import ( - "github.com/go-admin-team/go-admin-core/config/loader" - "github.com/go-admin-team/go-admin-core/config/reader" - "github.com/go-admin-team/go-admin-core/config/source" + "gitee.com/wangyfbe/go-admin-core/config/loader" + "gitee.com/wangyfbe/go-admin-core/config/reader" + "gitee.com/wangyfbe/go-admin-core/config/source" ) // WithLoader sets the loader for manager config diff --git a/config/reader/json/json.go b/config/reader/json/json.go index 588258f..4dd70e9 100644 --- a/config/reader/json/json.go +++ b/config/reader/json/json.go @@ -4,10 +4,10 @@ import ( "errors" "time" - "github.com/go-admin-team/go-admin-core/config/encoder" - "github.com/go-admin-team/go-admin-core/config/encoder/json" - "github.com/go-admin-team/go-admin-core/config/reader" - "github.com/go-admin-team/go-admin-core/config/source" + "gitee.com/wangyfbe/go-admin-core/config/encoder" + "gitee.com/wangyfbe/go-admin-core/config/encoder/json" + "gitee.com/wangyfbe/go-admin-core/config/reader" + "gitee.com/wangyfbe/go-admin-core/config/source" "github.com/imdario/mergo" ) diff --git a/config/reader/json/json_test.go b/config/reader/json/json_test.go index b48ae9c..9de85ba 100644 --- a/config/reader/json/json_test.go +++ b/config/reader/json/json_test.go @@ -3,7 +3,7 @@ package json import ( "testing" - "github.com/go-admin-team/go-admin-core/config/source" + "gitee.com/wangyfbe/go-admin-core/config/source" ) func TestReader(t *testing.T) { diff --git a/config/reader/json/values.go b/config/reader/json/values.go index c670788..4ab3c0e 100644 --- a/config/reader/json/values.go +++ b/config/reader/json/values.go @@ -7,9 +7,9 @@ import ( "strings" "time" + "gitee.com/wangyfbe/go-admin-core/config/reader" + "gitee.com/wangyfbe/go-admin-core/config/source" simple "github.com/bitly/go-simplejson" - "github.com/go-admin-team/go-admin-core/config/reader" - "github.com/go-admin-team/go-admin-core/config/source" ) type jsonValues struct { diff --git a/config/reader/json/values_test.go b/config/reader/json/values_test.go index c1a0038..2a6b238 100644 --- a/config/reader/json/values_test.go +++ b/config/reader/json/values_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/go-admin-team/go-admin-core/config/source" + "gitee.com/wangyfbe/go-admin-core/config/source" ) func TestValues(t *testing.T) { diff --git a/config/reader/options.go b/config/reader/options.go index e2a45e3..c0332f1 100644 --- a/config/reader/options.go +++ b/config/reader/options.go @@ -1,11 +1,11 @@ package reader import ( - "github.com/go-admin-team/go-admin-core/config/encoder" - "github.com/go-admin-team/go-admin-core/config/encoder/json" - "github.com/go-admin-team/go-admin-core/config/encoder/toml" - "github.com/go-admin-team/go-admin-core/config/encoder/xml" - "github.com/go-admin-team/go-admin-core/config/encoder/yaml" + "gitee.com/wangyfbe/go-admin-core/config/encoder" + "gitee.com/wangyfbe/go-admin-core/config/encoder/json" + "gitee.com/wangyfbe/go-admin-core/config/encoder/toml" + "gitee.com/wangyfbe/go-admin-core/config/encoder/xml" + "gitee.com/wangyfbe/go-admin-core/config/encoder/yaml" ) type Options struct { diff --git a/config/reader/reader.go b/config/reader/reader.go index d19fb6b..1d43195 100644 --- a/config/reader/reader.go +++ b/config/reader/reader.go @@ -4,7 +4,7 @@ package reader import ( "time" - "github.com/go-admin-team/go-admin-core/config/source" + "gitee.com/wangyfbe/go-admin-core/config/source" ) // Reader is an interface for merging changesets diff --git a/config/secrets/box/box.go b/config/secrets/box/box.go index 326d5e8..1433fd0 100644 --- a/config/secrets/box/box.go +++ b/config/secrets/box/box.go @@ -2,7 +2,7 @@ package box import ( - "github.com/go-admin-team/go-admin-core/config/secrets" + "gitee.com/wangyfbe/go-admin-core/config/secrets" "github.com/pkg/errors" naclbox "golang.org/x/crypto/nacl/box" diff --git a/config/secrets/box/box_test.go b/config/secrets/box/box_test.go index 8b60705..94699ee 100644 --- a/config/secrets/box/box_test.go +++ b/config/secrets/box/box_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/go-admin-team/go-admin-core/config/secrets" + "gitee.com/wangyfbe/go-admin-core/config/secrets" naclbox "golang.org/x/crypto/nacl/box" ) diff --git a/config/secrets/secretbox/secretbox.go b/config/secrets/secretbox/secretbox.go index c08038c..5cfe2fd 100644 --- a/config/secrets/secretbox/secretbox.go +++ b/config/secrets/secretbox/secretbox.go @@ -3,7 +3,7 @@ package secretbox import ( - "github.com/go-admin-team/go-admin-core/config/secrets" + "gitee.com/wangyfbe/go-admin-core/config/secrets" "github.com/pkg/errors" "golang.org/x/crypto/nacl/secretbox" diff --git a/config/secrets/secretbox/secretbox_test.go b/config/secrets/secretbox/secretbox_test.go index 21a6e87..55673b9 100644 --- a/config/secrets/secretbox/secretbox_test.go +++ b/config/secrets/secretbox/secretbox_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/go-admin-team/go-admin-core/config/secrets" + "gitee.com/wangyfbe/go-admin-core/config/secrets" ) func TestSecretBox(t *testing.T) { diff --git a/config/source/env/env.go b/config/source/env/env.go index bdabcfc..07237ad 100644 --- a/config/source/env/env.go +++ b/config/source/env/env.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/go-admin-team/go-admin-core/config/source" + "gitee.com/wangyfbe/go-admin-core/config/source" "github.com/imdario/mergo" ) diff --git a/config/source/env/env_test.go b/config/source/env/env_test.go index 13d6414..7e075ad 100644 --- a/config/source/env/env_test.go +++ b/config/source/env/env_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/go-admin-team/go-admin-core/config/source" + "gitee.com/wangyfbe/go-admin-core/config/source" ) func TestEnv_Read(t *testing.T) { diff --git a/config/source/env/options.go b/config/source/env/options.go index abc73f6..02ab278 100644 --- a/config/source/env/options.go +++ b/config/source/env/options.go @@ -5,7 +5,7 @@ import ( "strings" - "github.com/go-admin-team/go-admin-core/config/source" + "gitee.com/wangyfbe/go-admin-core/config/source" ) type strippedPrefixKey struct{} diff --git a/config/source/env/watcher.go b/config/source/env/watcher.go index 952d81b..491a3b6 100644 --- a/config/source/env/watcher.go +++ b/config/source/env/watcher.go @@ -1,7 +1,7 @@ package env import ( - "github.com/go-admin-team/go-admin-core/config/source" + "gitee.com/wangyfbe/go-admin-core/config/source" ) type watcher struct { diff --git a/config/source/file/file.go b/config/source/file/file.go index 572e699..5929102 100644 --- a/config/source/file/file.go +++ b/config/source/file/file.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "os" - "github.com/go-admin-team/go-admin-core/config/source" + "gitee.com/wangyfbe/go-admin-core/config/source" ) type file struct { diff --git a/config/source/file/file_test.go b/config/source/file/file_test.go index 9de0cad..0529467 100644 --- a/config/source/file/file_test.go +++ b/config/source/file/file_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/go-admin-team/go-admin-core/config" - "github.com/go-admin-team/go-admin-core/config/source/file" + "gitee.com/wangyfbe/go-admin-core/config" + "gitee.com/wangyfbe/go-admin-core/config/source/file" ) func TestConfig(t *testing.T) { diff --git a/config/source/file/format.go b/config/source/file/format.go index a510377..d30bfde 100644 --- a/config/source/file/format.go +++ b/config/source/file/format.go @@ -3,7 +3,7 @@ package file import ( "strings" - "github.com/go-admin-team/go-admin-core/config/encoder" + "gitee.com/wangyfbe/go-admin-core/config/encoder" ) func format(p string, e encoder.Encoder) string { diff --git a/config/source/file/format_test.go b/config/source/file/format_test.go index 81907ce..55af1c9 100644 --- a/config/source/file/format_test.go +++ b/config/source/file/format_test.go @@ -3,7 +3,7 @@ package file import ( "testing" - "github.com/go-admin-team/go-admin-core/config/source" + "gitee.com/wangyfbe/go-admin-core/config/source" ) func TestFormat(t *testing.T) { diff --git a/config/source/file/options.go b/config/source/file/options.go index b5750f7..88e58d3 100644 --- a/config/source/file/options.go +++ b/config/source/file/options.go @@ -3,7 +3,7 @@ package file import ( "context" - "github.com/go-admin-team/go-admin-core/config/source" + "gitee.com/wangyfbe/go-admin-core/config/source" ) type filePathKey struct{} diff --git a/config/source/file/watcher.go b/config/source/file/watcher.go index cdfd5b8..205022e 100644 --- a/config/source/file/watcher.go +++ b/config/source/file/watcher.go @@ -1,12 +1,13 @@ -//+build !linux +//go:build !linux +// +build !linux package file import ( "os" + "gitee.com/wangyfbe/go-admin-core/config/source" "github.com/fsnotify/fsnotify" - "github.com/go-admin-team/go-admin-core/config/source" ) type watcher struct { diff --git a/config/source/file/watcher_linux.go b/config/source/file/watcher_linux.go index 9f2e28d..588e4a2 100644 --- a/config/source/file/watcher_linux.go +++ b/config/source/file/watcher_linux.go @@ -1,12 +1,13 @@ -//+build linux +//go:build linux +// +build linux package file import ( "os" + "gitee.com/wangyfbe/go-admin-core/config/source" "github.com/fsnotify/fsnotify" - "github.com/go-admin-team/go-admin-core/config/source" ) type watcher struct { diff --git a/config/source/flag/flag.go b/config/source/flag/flag.go index cd233e2..4a15c77 100644 --- a/config/source/flag/flag.go +++ b/config/source/flag/flag.go @@ -3,7 +3,7 @@ package flag import ( "errors" "flag" - "github.com/go-admin-team/go-admin-core/config/source" + "gitee.com/wangyfbe/go-admin-core/config/source" "github.com/imdario/mergo" "strings" "time" diff --git a/config/source/flag/options.go b/config/source/flag/options.go index 0d42bb0..cf8b24b 100644 --- a/config/source/flag/options.go +++ b/config/source/flag/options.go @@ -3,7 +3,7 @@ package flag import ( "context" - "github.com/go-admin-team/go-admin-core/config/source" + "gitee.com/wangyfbe/go-admin-core/config/source" ) type includeUnsetKey struct{} diff --git a/config/source/memory/memory.go b/config/source/memory/memory.go index 69130ae..5eca6ee 100644 --- a/config/source/memory/memory.go +++ b/config/source/memory/memory.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/go-admin-team/go-admin-core/config/source" + "gitee.com/wangyfbe/go-admin-core/config/source" "github.com/google/uuid" ) diff --git a/config/source/memory/options.go b/config/source/memory/options.go index e1bb01e..baff495 100644 --- a/config/source/memory/options.go +++ b/config/source/memory/options.go @@ -3,7 +3,7 @@ package memory import ( "context" - "github.com/go-admin-team/go-admin-core/config/source" + "gitee.com/wangyfbe/go-admin-core/config/source" ) type changeSetKey struct{} diff --git a/config/source/memory/watcher.go b/config/source/memory/watcher.go index bd8d3db..d5d2a5b 100644 --- a/config/source/memory/watcher.go +++ b/config/source/memory/watcher.go @@ -1,7 +1,7 @@ package memory import ( - "github.com/go-admin-team/go-admin-core/config/source" + "gitee.com/wangyfbe/go-admin-core/config/source" ) type watcher struct { diff --git a/config/source/options.go b/config/source/options.go index 996d6e6..d0df506 100644 --- a/config/source/options.go +++ b/config/source/options.go @@ -3,8 +3,8 @@ package source import ( "context" - "github.com/go-admin-team/go-admin-core/config/encoder" - "github.com/go-admin-team/go-admin-core/config/encoder/json" + "gitee.com/wangyfbe/go-admin-core/config/encoder" + "gitee.com/wangyfbe/go-admin-core/config/encoder/json" ) type Options struct { diff --git a/config/value.go b/config/value.go index 1b67d1c..beca0e2 100644 --- a/config/value.go +++ b/config/value.go @@ -3,7 +3,7 @@ package config import ( "time" - "github.com/go-admin-team/go-admin-core/config/reader" + "gitee.com/wangyfbe/go-admin-core/config/reader" ) type value struct{} diff --git a/errors/errors.proto b/errors/errors.proto index d6ce806..213ae74 100644 --- a/errors/errors.proto +++ b/errors/errors.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package errors; -option go_package = "github.com/go-admin-team/go-admin-core/errors"; +option go_package = "gitee.com/wangyfbe/go-admin-core/errors"; message Error { // Success if request is success diff --git a/logger/default.go b/logger/default.go index edb1899..2c75d13 100644 --- a/logger/default.go +++ b/logger/default.go @@ -11,7 +11,7 @@ import ( "sync" "time" - dlog "github.com/go-admin-team/go-admin-core/debug/log" + dlog "gitee.com/wangyfbe/go-admin-core/debug/log" ) func init() { diff --git a/plugins/logger/logrus/README.md b/plugins/logger/logrus/README.md index 7dfac8e..0c08257 100644 --- a/plugins/logger/logrus/README.md +++ b/plugins/logger/logrus/README.md @@ -1,6 +1,6 @@ # logrus -[logrus](https://github.com/sirupsen/logrus) logger implementation for __go-admin__ [meta logger](https://github.com/go-admin-team/go-admin-core/tree/master/logger). +[logrus](https://github.com/sirupsen/logrus) logger implementation for __go-admin__ [meta logger](https://gitee.com/wangyfbe/go-admin-core/tree/master/logger). ## Usage @@ -8,7 +8,7 @@ import ( "os" "github.com/sirupsen/logrus" - "github.com/go-admin-team/go-admin-core/logger" + "gitee.com/wangyfbe/go-admin-core/logger" ) func ExampleWithOutput() { diff --git a/plugins/logger/logrus/go.mod b/plugins/logger/logrus/go.mod index 4833fe9..ea965db 100644 --- a/plugins/logger/logrus/go.mod +++ b/plugins/logger/logrus/go.mod @@ -1,10 +1,10 @@ -module github.com/go-admin-team/go-admin-core/plugins/logger/logrus +module gitee.com/wangyfbe/go-admin-core/plugins/logger/logrus go 1.14 require ( - github.com/go-admin-team/go-admin-core v1.3.5-rc.5 + gitee.com/wangyfbe/go-admin-core v1.3.5-rc.5 github.com/sirupsen/logrus v1.8.0 ) -replace github.com/go-admin-team/go-admin-core => ../../../ +replace gitee.com/wangyfbe/go-admin-core => ../../../ diff --git a/plugins/logger/logrus/logrus.go b/plugins/logger/logrus/logrus.go index dfacf76..13a4ac1 100644 --- a/plugins/logger/logrus/logrus.go +++ b/plugins/logger/logrus/logrus.go @@ -7,7 +7,7 @@ import ( "github.com/sirupsen/logrus" - "github.com/go-admin-team/go-admin-core/logger" + "gitee.com/wangyfbe/go-admin-core/logger" ) type entryLogger interface { diff --git a/plugins/logger/logrus/logrus_test.go b/plugins/logger/logrus/logrus_test.go index 03e7ff9..7d9d8cd 100644 --- a/plugins/logger/logrus/logrus_test.go +++ b/plugins/logger/logrus/logrus_test.go @@ -7,7 +7,7 @@ import ( "github.com/sirupsen/logrus" - "github.com/go-admin-team/go-admin-core/logger" + "gitee.com/wangyfbe/go-admin-core/logger" ) func TestName(t *testing.T) { diff --git a/plugins/logger/logrus/options.go b/plugins/logger/logrus/options.go index 7357285..43451e5 100644 --- a/plugins/logger/logrus/options.go +++ b/plugins/logger/logrus/options.go @@ -3,7 +3,7 @@ package logrus import ( "github.com/sirupsen/logrus" - "github.com/go-admin-team/go-admin-core/logger" + "gitee.com/wangyfbe/go-admin-core/logger" ) type Options struct { diff --git a/plugins/logger/zap/go.mod b/plugins/logger/zap/go.mod index c93fda0..74c507a 100644 --- a/plugins/logger/zap/go.mod +++ b/plugins/logger/zap/go.mod @@ -1,10 +1,10 @@ -module github.com/go-admin-team/go-admin-core/plugins/logger/zap +module gitee.com/wangyfbe/go-admin-core/plugins/logger/zap go 1.14 require ( - github.com/go-admin-team/go-admin-core v1.3.5-rc.5 + gitee.com/wangyfbe/go-admin-core v1.3.5-rc.5 go.uber.org/zap v1.10.0 ) -replace github.com/go-admin-team/go-admin-core => ../../../ +replace gitee.com/wangyfbe/go-admin-core => ../../../ diff --git a/plugins/logger/zap/options.go b/plugins/logger/zap/options.go index 4da7c08..055de69 100644 --- a/plugins/logger/zap/options.go +++ b/plugins/logger/zap/options.go @@ -6,7 +6,7 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "github.com/go-admin-team/go-admin-core/logger" + "gitee.com/wangyfbe/go-admin-core/logger" ) type Options struct { diff --git a/plugins/logger/zap/zap.go b/plugins/logger/zap/zap.go index 45cf048..58df7a2 100644 --- a/plugins/logger/zap/zap.go +++ b/plugins/logger/zap/zap.go @@ -10,7 +10,7 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "github.com/go-admin-team/go-admin-core/logger" + "gitee.com/wangyfbe/go-admin-core/logger" ) type zaplog struct { diff --git a/plugins/logger/zap/zap_test.go b/plugins/logger/zap/zap_test.go index 3e7fc44..211ad29 100644 --- a/plugins/logger/zap/zap_test.go +++ b/plugins/logger/zap/zap_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/go-admin-team/go-admin-core/debug/writer" - "github.com/go-admin-team/go-admin-core/logger" + "gitee.com/wangyfbe/go-admin-core/debug/writer" + "gitee.com/wangyfbe/go-admin-core/logger" ) func TestName(t *testing.T) { diff --git a/sdk/antd_api/api.go b/sdk/antd_api/api.go index c94b966..aab045a 100644 --- a/sdk/antd_api/api.go +++ b/sdk/antd_api/api.go @@ -5,15 +5,15 @@ import ( "fmt" vd "github.com/bytedance/go-tagexpr/v2/validator" "github.com/gin-gonic/gin/binding" - "github.com/go-admin-team/go-admin-core/sdk/service" + "gitee.com/wangyfbe/go-admin-core/sdk/service" "net/http" "strconv" "github.com/gin-gonic/gin" - "github.com/go-admin-team/go-admin-core/logger" - "github.com/go-admin-team/go-admin-core/sdk/api" - "github.com/go-admin-team/go-admin-core/sdk/pkg" - "github.com/go-admin-team/go-admin-core/sdk/pkg/response/antd" + "gitee.com/wangyfbe/go-admin-core/logger" + "gitee.com/wangyfbe/go-admin-core/sdk/api" + "gitee.com/wangyfbe/go-admin-core/sdk/pkg" + "gitee.com/wangyfbe/go-admin-core/sdk/pkg/response/antd" "gorm.io/gorm" ) @@ -28,11 +28,12 @@ type Api struct { func (e Api) GetLogger() *logger.Helper { return api.GetRequestLogger(e.Context) } + // GetOrm 获取Orm DB func (e *Api) GetOrm(c *gin.Context) (*gorm.DB, error) { db, err := pkg.GetOrm(c) if err != nil { - e.Error( http.StatusInternalServerError, "数据库连接获取失败", "9") + e.Error(http.StatusInternalServerError, "数据库连接获取失败", "9") return nil, err } return db, nil @@ -40,7 +41,7 @@ func (e *Api) GetOrm(c *gin.Context) (*gorm.DB, error) { // Error 通常错误数据处理 // showType error display type： 0 silent; 1 message.warn; 2 message.error; 4 notification; 9 page -func (e *Api) Error( errCode int, errMsg string, showType string) { +func (e *Api) Error(errCode int, errMsg string, showType string) { if showType == "" { showType = "2" } @@ -48,21 +49,20 @@ func (e *Api) Error( errCode int, errMsg string, showType string) { } // OK 通常成功数据处理 -func (e *Api) OK( data interface{}) { +func (e *Api) OK(data interface{}) { antd.OK(e.Context, data) } // PageOK 分页数据处理 -func (e *Api) PageOK( result interface{}, total int, current int, pageSize int) { +func (e *Api) PageOK(result interface{}, total int, current int, pageSize int) { antd.PageOK(e.Context, result, total, current, pageSize) } // Custom 兼容函数 -func (e *Api) Custom( data gin.H) { +func (e *Api) Custom(data gin.H) { antd.Custum(e.Context, data) } - // MakeContext 设置http上下文 func (e *Api) MakeContext(c *gin.Context) *Api { e.Context = c @@ -70,7 +70,6 @@ func (e *Api) MakeContext(c *gin.Context) *Api { return e } - // Bind 参数校验 func (e *Api) Bind(d interface{}, bindings ...binding.Binding) *Api { var err error diff --git a/sdk/api/api.go b/sdk/api/api.go index bb1fc91..173ec1c 100644 --- a/sdk/api/api.go +++ b/sdk/api/api.go @@ -7,11 +7,11 @@ import ( vd "github.com/bytedance/go-tagexpr/v2/validator" "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" - "github.com/go-admin-team/go-admin-core/logger" - "github.com/go-admin-team/go-admin-core/sdk/pkg" - "github.com/go-admin-team/go-admin-core/sdk/pkg/response" - "github.com/go-admin-team/go-admin-core/sdk/service" - "github.com/go-admin-team/go-admin-core/tools/language" + "gitee.com/wangyfbe/go-admin-core/logger" + "gitee.com/wangyfbe/go-admin-core/sdk/pkg" + "gitee.com/wangyfbe/go-admin-core/sdk/pkg/response" + "gitee.com/wangyfbe/go-admin-core/sdk/service" + "gitee.com/wangyfbe/go-admin-core/tools/language" "gorm.io/gorm" "net/http" ) diff --git a/sdk/api/request_logger.go b/sdk/api/request_logger.go index 66ed33d..d466d17 100644 --- a/sdk/api/request_logger.go +++ b/sdk/api/request_logger.go @@ -5,9 +5,9 @@ import ( "github.com/gin-gonic/gin" - "github.com/go-admin-team/go-admin-core/logger" - "github.com/go-admin-team/go-admin-core/sdk" - "github.com/go-admin-team/go-admin-core/sdk/pkg" + "gitee.com/wangyfbe/go-admin-core/logger" + "gitee.com/wangyfbe/go-admin-core/sdk" + "gitee.com/wangyfbe/go-admin-core/sdk/pkg" ) type loggerKey struct{} diff --git a/sdk/application.go b/sdk/application.go index b70bd58..51c6a79 100644 --- a/sdk/application.go +++ b/sdk/application.go @@ -1,5 +1,5 @@ package sdk -import "github.com/go-admin-team/go-admin-core/sdk/runtime" +import "gitee.com/wangyfbe/go-admin-core/sdk/runtime" var Runtime runtime.Runtime = runtime.NewConfig() diff --git a/sdk/config/cache.go b/sdk/config/cache.go index 00b8372..4408e7e 100644 --- a/sdk/config/cache.go +++ b/sdk/config/cache.go @@ -1,8 +1,8 @@ package config import ( - "github.com/go-admin-team/go-admin-core/storage" - "github.com/go-admin-team/go-admin-core/storage/cache" + "gitee.com/wangyfbe/go-admin-core/storage" + "gitee.com/wangyfbe/go-admin-core/storage/cache" ) type Cache struct { diff --git a/sdk/config/config.go b/sdk/config/config.go index 3e11ab3..8236b17 100644 --- a/sdk/config/config.go +++ b/sdk/config/config.go @@ -4,8 +4,8 @@ import ( "fmt" "log" - "github.com/go-admin-team/go-admin-core/config" - "github.com/go-admin-team/go-admin-core/config/source" + "gitee.com/wangyfbe/go-admin-core/config" + "gitee.com/wangyfbe/go-admin-core/config/source" ) var ( diff --git a/sdk/config/locker.go b/sdk/config/locker.go index fc761fa..4bd2fcf 100644 --- a/sdk/config/locker.go +++ b/sdk/config/locker.go @@ -1,8 +1,8 @@ package config import ( - "github.com/go-admin-team/go-admin-core/storage" - "github.com/go-admin-team/go-admin-core/storage/locker" + "gitee.com/wangyfbe/go-admin-core/storage" + "gitee.com/wangyfbe/go-admin-core/storage/locker" "github.com/go-redis/redis/v7" ) diff --git a/sdk/config/logger.go b/sdk/config/logger.go index dbfc3b4..ed9fb81 100644 --- a/sdk/config/logger.go +++ b/sdk/config/logger.go @@ -1,6 +1,6 @@ package config -import "github.com/go-admin-team/go-admin-core/sdk/pkg/logger" +import "gitee.com/wangyfbe/go-admin-core/sdk/pkg/logger" type Logger struct { Type string diff --git a/sdk/config/queue.go b/sdk/config/queue.go index 3409e20..2e8cd76 100644 --- a/sdk/config/queue.go +++ b/sdk/config/queue.go @@ -1,8 +1,8 @@ package config import ( - "github.com/go-admin-team/go-admin-core/storage" - "github.com/go-admin-team/go-admin-core/storage/queue" + "gitee.com/wangyfbe/go-admin-core/storage" + "gitee.com/wangyfbe/go-admin-core/storage/queue" "github.com/go-redis/redis/v7" "github.com/robinjoseph08/redisqueue/v2" "time" diff --git a/sdk/go.mod b/sdk/go.mod index ea97896..1681fc5 100644 --- a/sdk/go.mod +++ b/sdk/go.mod @@ -1,4 +1,4 @@ -module github.com/go-admin-team/go-admin-core/sdk +module gitee.com/wangyfbe/go-admin-core/sdk go 1.14 @@ -9,8 +9,8 @@ require ( github.com/chanxuehong/wechat v0.0.0-20201110083048-0180211b69fd github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/gin-gonic/gin v1.7.3 - github.com/go-admin-team/go-admin-core v1.3.5-rc.5 - github.com/go-admin-team/go-admin-core/plugins/logger/zap v0.0.0-20210610020726-2db73adb505d + gitee.com/wangyfbe/go-admin-core v1.3.5-rc.5 + gitee.com/wangyfbe/go-admin-core/plugins/logger/zap v0.0.0-20210610020726-2db73adb505d github.com/go-admin-team/gorm-adapter/v3 v3.2.1-0.20210902112335-4148cb356a24 github.com/go-playground/locales v0.13.0 github.com/go-playground/universal-translator v0.17.0 @@ -30,6 +30,6 @@ require ( ) replace ( - github.com/go-admin-team/go-admin-core => ../ - github.com/go-admin-team/go-admin-core/plugins/logger/zap => ../plugins/logger/zap + gitee.com/wangyfbe/go-admin-core => ../ + gitee.com/wangyfbe/go-admin-core/plugins/logger/zap => ../plugins/logger/zap ) diff --git a/sdk/pkg/captcha/store.go b/sdk/pkg/captcha/store.go index 707b1d4..6e386a8 100644 --- a/sdk/pkg/captcha/store.go +++ b/sdk/pkg/captcha/store.go @@ -1,7 +1,7 @@ package captcha import ( - "github.com/go-admin-team/go-admin-core/storage" + "gitee.com/wangyfbe/go-admin-core/storage" "github.com/mojocn/base64Captcha" ) diff --git a/sdk/pkg/captcha/store_test.go b/sdk/pkg/captcha/store_test.go index 3653f46..db5fc8a 100644 --- a/sdk/pkg/captcha/store_test.go +++ b/sdk/pkg/captcha/store_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/go-admin-team/go-admin-core/storage" - "github.com/go-admin-team/go-admin-core/storage/cache" + "gitee.com/wangyfbe/go-admin-core/storage" + "gitee.com/wangyfbe/go-admin-core/storage/cache" "github.com/mojocn/base64Captcha" ) diff --git a/sdk/pkg/casbin/log.go b/sdk/pkg/casbin/log.go index 6498c24..4ac22b3 100644 --- a/sdk/pkg/casbin/log.go +++ b/sdk/pkg/casbin/log.go @@ -3,7 +3,7 @@ package mycasbin import ( "sync/atomic" - "github.com/go-admin-team/go-admin-core/logger" + "gitee.com/wangyfbe/go-admin-core/logger" ) // Logger is the implementation for a Logger using golang log. diff --git a/sdk/pkg/jwtauth/user/user.go b/sdk/pkg/jwtauth/user/user.go index fcbe44d..839af74 100644 --- a/sdk/pkg/jwtauth/user/user.go +++ b/sdk/pkg/jwtauth/user/user.go @@ -5,8 +5,8 @@ import ( "github.com/gin-gonic/gin" - "github.com/go-admin-team/go-admin-core/sdk/pkg" - jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" + "gitee.com/wangyfbe/go-admin-core/sdk/pkg" + jwt "gitee.com/wangyfbe/go-admin-core/sdk/pkg/jwtauth" ) func ExtractClaims(c *gin.Context) jwt.MapClaims { diff --git a/sdk/pkg/logger/log.go b/sdk/pkg/logger/log.go index f035b50..e9b615b 100644 --- a/sdk/pkg/logger/log.go +++ b/sdk/pkg/logger/log.go @@ -4,12 +4,12 @@ import ( "io" "os" - "github.com/go-admin-team/go-admin-core/debug/writer" - "github.com/go-admin-team/go-admin-core/logger" - "github.com/go-admin-team/go-admin-core/plugins/logger/zap" - "github.com/go-admin-team/go-admin-core/sdk/pkg" + "gitee.com/wangyfbe/go-admin-core/debug/writer" + "gitee.com/wangyfbe/go-admin-core/logger" + "gitee.com/wangyfbe/go-admin-core/plugins/logger/zap" + "gitee.com/wangyfbe/go-admin-core/sdk/pkg" - log "github.com/go-admin-team/go-admin-core/logger" + log "gitee.com/wangyfbe/go-admin-core/logger" ) // SetupLogger 日志 cap 单位为kb diff --git a/sdk/pkg/response/antd/model.go b/sdk/pkg/response/antd/model.go index a3297a0..8d3b061 100644 --- a/sdk/pkg/response/antd/model.go +++ b/sdk/pkg/response/antd/model.go @@ -3,7 +3,7 @@ package antd import ( "fmt" - resp "github.com/go-admin-team/go-admin-core/sdk/pkg/response" + resp "gitee.com/wangyfbe/go-admin-core/sdk/pkg/response" ) const ( @@ -29,10 +29,10 @@ type response struct { type Pages struct { Response - Data interface{} `json:"data,omitempty"` // response data - Total int `json:"total,omitempty"` - Current int `json:"current,omitempty"` - PageSize int `json:"pageSize,omitempty"` + Data interface{} `json:"data,omitempty"` // response data + Total int `json:"total,omitempty"` + Current int `json:"current,omitempty"` + PageSize int `json:"pageSize,omitempty"` } type pages struct { diff --git a/sdk/pkg/response/antd/return.go b/sdk/pkg/response/antd/return.go index f0fe2b6..b3d02ad 100644 --- a/sdk/pkg/response/antd/return.go +++ b/sdk/pkg/response/antd/return.go @@ -2,7 +2,7 @@ package antd import ( "github.com/gin-gonic/gin" - "github.com/go-admin-team/go-admin-core/sdk/pkg" + "gitee.com/wangyfbe/go-admin-core/sdk/pkg" "net/http" ) diff --git a/sdk/pkg/response/return.go b/sdk/pkg/response/return.go index 21f0544..6d1508e 100644 --- a/sdk/pkg/response/return.go +++ b/sdk/pkg/response/return.go @@ -5,7 +5,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/go-admin-team/go-admin-core/sdk/pkg" + "gitee.com/wangyfbe/go-admin-core/sdk/pkg" ) var Default = &response{} diff --git a/sdk/pkg/ws/ws.go b/sdk/pkg/ws/ws.go index 1e907c8..bfd7e4b 100644 --- a/sdk/pkg/ws/ws.go +++ b/sdk/pkg/ws/ws.go @@ -11,7 +11,7 @@ import ( "github.com/gin-gonic/gin" "github.com/gorilla/websocket" - "github.com/go-admin-team/go-admin-core/sdk/pkg" + "gitee.com/wangyfbe/go-admin-core/sdk/pkg" ) // Manager 所有 websocket 信息 diff --git a/sdk/runtime/application.go b/sdk/runtime/application.go index ee43007..cc46dc7 100644 --- a/sdk/runtime/application.go +++ b/sdk/runtime/application.go @@ -6,9 +6,9 @@ import ( "sync" "github.com/casbin/casbin/v2" - "github.com/go-admin-team/go-admin-core/logger" - "github.com/go-admin-team/go-admin-core/storage" - "github.com/go-admin-team/go-admin-core/storage/queue" + "gitee.com/wangyfbe/go-admin-core/logger" + "gitee.com/wangyfbe/go-admin-core/storage" + "gitee.com/wangyfbe/go-admin-core/storage/queue" "github.com/robfig/cron/v3" "gorm.io/gorm" ) diff --git a/sdk/runtime/cache.go b/sdk/runtime/cache.go index 6530869..72fed9c 100644 --- a/sdk/runtime/cache.go +++ b/sdk/runtime/cache.go @@ -6,7 +6,7 @@ import ( "github.com/chanxuehong/wechat/oauth2" - "github.com/go-admin-team/go-admin-core/storage" + "gitee.com/wangyfbe/go-admin-core/storage" ) const ( diff --git a/sdk/runtime/locker.go b/sdk/runtime/locker.go index c52d5e5..5e95103 100644 --- a/sdk/runtime/locker.go +++ b/sdk/runtime/locker.go @@ -3,7 +3,7 @@ package runtime import ( "github.com/bsm/redislock" - "github.com/go-admin-team/go-admin-core/storage" + "gitee.com/wangyfbe/go-admin-core/storage" ) // NewLocker 创建对应上下文分布式锁 diff --git a/sdk/runtime/queue.go b/sdk/runtime/queue.go index 1c8d08a..ef4b0c4 100644 --- a/sdk/runtime/queue.go +++ b/sdk/runtime/queue.go @@ -1,6 +1,6 @@ package runtime -import "github.com/go-admin-team/go-admin-core/storage" +import "gitee.com/wangyfbe/go-admin-core/storage" // NewQueue 创建对应上下文队列 func NewQueue(prefix string, queue storage.AdapterQueue) storage.AdapterQueue { diff --git a/sdk/runtime/queue_test.go b/sdk/runtime/queue_test.go index 2502d79..0755341 100644 --- a/sdk/runtime/queue_test.go +++ b/sdk/runtime/queue_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/go-admin-team/go-admin-core/storage" - "github.com/go-admin-team/go-admin-core/storage/queue" + "gitee.com/wangyfbe/go-admin-core/storage" + "gitee.com/wangyfbe/go-admin-core/storage/queue" "github.com/go-redis/redis/v7" "github.com/robinjoseph08/redisqueue/v2" ) diff --git a/sdk/runtime/type.go b/sdk/runtime/type.go index 79b640f..14b071f 100644 --- a/sdk/runtime/type.go +++ b/sdk/runtime/type.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/casbin/casbin/v2" - "github.com/go-admin-team/go-admin-core/logger" - "github.com/go-admin-team/go-admin-core/storage" + "gitee.com/wangyfbe/go-admin-core/logger" + "gitee.com/wangyfbe/go-admin-core/storage" "github.com/robfig/cron/v3" "gorm.io/gorm" ) diff --git a/sdk/service/service.go b/sdk/service/service.go index 0deb4a9..425d461 100644 --- a/sdk/service/service.go +++ b/sdk/service/service.go @@ -3,7 +3,7 @@ package service import ( "fmt" - "github.com/go-admin-team/go-admin-core/logger" + "gitee.com/wangyfbe/go-admin-core/logger" "gorm.io/gorm" ) diff --git a/server/grpc/interceptors/logging/client_interceptors.go b/server/grpc/interceptors/logging/client_interceptors.go index 518c9fc..8ae253c 100644 --- a/server/grpc/interceptors/logging/client_interceptors.go +++ b/server/grpc/interceptors/logging/client_interceptors.go @@ -12,8 +12,8 @@ import ( "path" "time" - "github.com/go-admin-team/go-admin-core/logger" - "github.com/go-admin-team/go-admin-core/server/grpc/interceptors/logging/ctxlog" + "gitee.com/wangyfbe/go-admin-core/logger" + "gitee.com/wangyfbe/go-admin-core/server/grpc/interceptors/logging/ctxlog" "google.golang.org/grpc" ) diff --git a/server/grpc/interceptors/logging/ctxlog/context.go b/server/grpc/interceptors/logging/ctxlog/context.go index 220d187..434d799 100644 --- a/server/grpc/interceptors/logging/ctxlog/context.go +++ b/server/grpc/interceptors/logging/ctxlog/context.go @@ -2,7 +2,7 @@ package ctxlog import ( "context" - "github.com/go-admin-team/go-admin-core/logger" + "gitee.com/wangyfbe/go-admin-core/logger" "github.com/grpc-ecosystem/go-grpc-middleware/tags" ) diff --git a/server/grpc/interceptors/logging/options.go b/server/grpc/interceptors/logging/options.go index 56ad70c..a1496ee 100644 --- a/server/grpc/interceptors/logging/options.go +++ b/server/grpc/interceptors/logging/options.go @@ -11,8 +11,8 @@ import ( "context" "time" - "github.com/go-admin-team/go-admin-core/logger" - "github.com/go-admin-team/go-admin-core/server/grpc/interceptors/logging/ctxlog" + "gitee.com/wangyfbe/go-admin-core/logger" + "gitee.com/wangyfbe/go-admin-core/server/grpc/interceptors/logging/ctxlog" grpc_logging "github.com/grpc-ecosystem/go-grpc-middleware/logging" "google.golang.org/grpc/codes" ) diff --git a/server/grpc/interceptors/logging/server_interceptors.go b/server/grpc/interceptors/logging/server_interceptors.go index 94f55e0..dd3f258 100644 --- a/server/grpc/interceptors/logging/server_interceptors.go +++ b/server/grpc/interceptors/logging/server_interceptors.go @@ -12,8 +12,8 @@ import ( "path" "time" - "github.com/go-admin-team/go-admin-core/server/grpc/interceptors/logging/ctxlog" - "github.com/go-admin-team/go-admin-core/tools/utils" + "gitee.com/wangyfbe/go-admin-core/server/grpc/interceptors/logging/ctxlog" + "gitee.com/wangyfbe/go-admin-core/tools/utils" middleware "github.com/grpc-ecosystem/go-grpc-middleware" "google.golang.org/grpc" ) diff --git a/server/grpc/interceptors/request_tag/tags.go b/server/grpc/interceptors/request_tag/tags.go index 1b30010..160bcea 100644 --- a/server/grpc/interceptors/request_tag/tags.go +++ b/server/grpc/interceptors/request_tag/tags.go @@ -9,7 +9,7 @@ package requesttag import ( "context" - "github.com/go-admin-team/go-admin-core/tools/utils" + "gitee.com/wangyfbe/go-admin-core/tools/utils" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/server/grpc/options.go b/server/grpc/options.go index b0e5f5a..9c3463d 100644 --- a/server/grpc/options.go +++ b/server/grpc/options.go @@ -13,10 +13,10 @@ import ( "math" "time" - pbErr "github.com/go-admin-team/go-admin-core/errors" - log "github.com/go-admin-team/go-admin-core/logger" - "github.com/go-admin-team/go-admin-core/server/grpc/interceptors/logging" - requesttag "github.com/go-admin-team/go-admin-core/server/grpc/interceptors/request_tag" + pbErr "gitee.com/wangyfbe/go-admin-core/errors" + log "gitee.com/wangyfbe/go-admin-core/logger" + "gitee.com/wangyfbe/go-admin-core/server/grpc/interceptors/logging" + requesttag "gitee.com/wangyfbe/go-admin-core/server/grpc/interceptors/request_tag" recovery "github.com/grpc-ecosystem/go-grpc-middleware/recovery" ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags" opentracing "github.com/grpc-ecosystem/go-grpc-middleware/tracing/opentracing" diff --git a/server/grpc/server.go b/server/grpc/server.go index 79de5a4..c448018 100644 --- a/server/grpc/server.go +++ b/server/grpc/server.go @@ -14,7 +14,7 @@ import ( "net" "sync" - log "github.com/go-admin-team/go-admin-core/logger" + log "gitee.com/wangyfbe/go-admin-core/logger" middleware "github.com/grpc-ecosystem/go-grpc-middleware" prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "google.golang.org/grpc" diff --git a/server/grpc/service.go b/server/grpc/service.go index 4fef5e7..f383d73 100644 --- a/server/grpc/service.go +++ b/server/grpc/service.go @@ -12,9 +12,9 @@ import ( "fmt" "time" - log "github.com/go-admin-team/go-admin-core/logger" - "github.com/go-admin-team/go-admin-core/server/grpc/interceptors/logging" - reqtags "github.com/go-admin-team/go-admin-core/server/grpc/interceptors/request_tag" + log "gitee.com/wangyfbe/go-admin-core/logger" + "gitee.com/wangyfbe/go-admin-core/server/grpc/interceptors/logging" + reqtags "gitee.com/wangyfbe/go-admin-core/server/grpc/interceptors/request_tag" middleware "github.com/grpc-ecosystem/go-grpc-middleware" opentracing "github.com/grpc-ecosystem/go-grpc-middleware/tracing/opentracing" "google.golang.org/grpc" diff --git a/server/listener/server.go b/server/listener/server.go index 58f0f82..b495e52 100644 --- a/server/listener/server.go +++ b/server/listener/server.go @@ -12,8 +12,8 @@ import ( "net" "net/http" - log "github.com/go-admin-team/go-admin-core/logger" - "github.com/go-admin-team/go-admin-core/server" + log "gitee.com/wangyfbe/go-admin-core/logger" + "gitee.com/wangyfbe/go-admin-core/server" "github.com/prometheus/client_golang/prometheus/promhttp" ) diff --git a/server/server.go b/server/server.go index d27df18..96d4319 100644 --- a/server/server.go +++ b/server/server.go @@ -13,7 +13,7 @@ import ( "fmt" "sync" - "github.com/go-admin-team/go-admin-core/logger" + "gitee.com/wangyfbe/go-admin-core/logger" ) type Server struct { diff --git a/storage/cache/message.go b/storage/cache/message.go index b061b65..011252e 100644 --- a/storage/cache/message.go +++ b/storage/cache/message.go @@ -1,7 +1,7 @@ package cache import ( - "github.com/go-admin-team/go-admin-core/storage" + "gitee.com/wangyfbe/go-admin-core/storage" "github.com/robinjoseph08/redisqueue/v2" ) diff --git a/storage/queue/memory.go b/storage/queue/memory.go index 9d7bf2e..56e2de4 100644 --- a/storage/queue/memory.go +++ b/storage/queue/memory.go @@ -5,7 +5,7 @@ import ( "github.com/google/uuid" - "github.com/go-admin-team/go-admin-core/storage" + "gitee.com/wangyfbe/go-admin-core/storage" ) type queue chan storage.Messager diff --git a/storage/queue/memory_test.go b/storage/queue/memory_test.go index 2202590..ba64544 100644 --- a/storage/queue/memory_test.go +++ b/storage/queue/memory_test.go @@ -9,7 +9,7 @@ import ( "github.com/robinjoseph08/redisqueue/v2" - "github.com/go-admin-team/go-admin-core/storage" + "gitee.com/wangyfbe/go-admin-core/storage" ) func TestMemory_Append(t *testing.T) { diff --git a/storage/queue/message.go b/storage/queue/message.go index 9209534..7ac0c59 100644 --- a/storage/queue/message.go +++ b/storage/queue/message.go @@ -3,7 +3,7 @@ package queue import ( "github.com/robinjoseph08/redisqueue/v2" - "github.com/go-admin-team/go-admin-core/storage" + "gitee.com/wangyfbe/go-admin-core/storage" ) type Message struct { diff --git a/storage/queue/nsq.go b/storage/queue/nsq.go index 850eba4..86ece30 100644 --- a/storage/queue/nsq.go +++ b/storage/queue/nsq.go @@ -8,7 +8,7 @@ package queue import ( - "github.com/go-admin-team/go-admin-core/storage" + "gitee.com/wangyfbe/go-admin-core/storage" json "github.com/json-iterator/go" "github.com/nsqio/go-nsq" ) diff --git a/storage/queue/redis.go b/storage/queue/redis.go index bcfb981..65d6a34 100644 --- a/storage/queue/redis.go +++ b/storage/queue/redis.go @@ -4,7 +4,7 @@ import ( "github.com/go-redis/redis/v7" "github.com/robinjoseph08/redisqueue/v2" - "github.com/go-admin-team/go-admin-core/storage" + "gitee.com/wangyfbe/go-admin-core/storage" ) // NewRedis redis模式 diff --git a/storage/queue/redis_test.go b/storage/queue/redis_test.go index ce5c22c..3ec5080 100644 --- a/storage/queue/redis_test.go +++ b/storage/queue/redis_test.go @@ -8,7 +8,7 @@ import ( "github.com/go-redis/redis/v7" "github.com/robinjoseph08/redisqueue/v2" - "github.com/go-admin-team/go-admin-core/storage" + "gitee.com/wangyfbe/go-admin-core/storage" ) func TestRedis_Append(t *testing.T) { diff --git a/tools/gorm/logger/logger.go b/tools/gorm/logger/logger.go index 7964dc5..bff828b 100644 --- a/tools/gorm/logger/logger.go +++ b/tools/gorm/logger/logger.go @@ -8,7 +8,7 @@ import ( "gorm.io/gorm/logger" "gorm.io/gorm/utils" - loggerCore "github.com/go-admin-team/go-admin-core/logger" + loggerCore "gitee.com/wangyfbe/go-admin-core/logger" ) // Colors diff --git a/tools/gorm/logger/logger_test.go b/tools/gorm/logger/logger_test.go index 8ced16b..27ca706 100644 --- a/tools/gorm/logger/logger_test.go +++ b/tools/gorm/logger/logger_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - logCore "github.com/go-admin-team/go-admin-core/logger" + logCore "gitee.com/wangyfbe/go-admin-core/logger" "gorm.io/gorm/logger" ) diff --git a/tools/transfer/gin.go b/tools/transfer/gin.go index b780380..d42e4d9 100644 --- a/tools/transfer/gin.go +++ b/tools/transfer/gin.go @@ -13,7 +13,7 @@ package main import ( "github.com/gin-gonic/gin" - "github.com/go-admin-team/go-admin-core/transfer" + "gitee.com/wangyfbe/go-admin-core/transfer" "github.com/prometheus/client_golang/prometheus/promhttp" ) -- Gitee From 6508b41b1f58fbac732bf7d389e904ac7e32576b Mon Sep 17 00:00:00 2001 From: brandwwang Date: Sat, 3 Jun 2023 18:21:16 +0800 Subject: [PATCH 4/7] change go mod --- sdk/go.mod | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/go.mod b/sdk/go.mod index 1681fc5..9d2fbeb 100644 --- a/sdk/go.mod +++ b/sdk/go.mod @@ -1,6 +1,6 @@ module gitee.com/wangyfbe/go-admin-core/sdk -go 1.14 +go 1.18 require ( github.com/bsm/redislock v0.5.0 @@ -9,8 +9,8 @@ require ( github.com/chanxuehong/wechat v0.0.0-20201110083048-0180211b69fd github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/gin-gonic/gin v1.7.3 - gitee.com/wangyfbe/go-admin-core v1.3.5-rc.5 - gitee.com/wangyfbe/go-admin-core/plugins/logger/zap v0.0.0-20210610020726-2db73adb505d + gitee.com/wangyfbe/go-admin-core v1.10.0 + gitee.com/wangyfbe/go-admin-core/plugins/logger/zap v1.10.0 github.com/go-admin-team/gorm-adapter/v3 v3.2.1-0.20210902112335-4148cb356a24 github.com/go-playground/locales v0.13.0 github.com/go-playground/universal-translator v0.17.0 -- Gitee From acdd05f00c6c25ace03aacad75b4f71459691138 Mon Sep 17 00:00:00 2001 From: brandwwang Date: Sat, 3 Jun 2023 18:29:21 +0800 Subject: [PATCH 5/7] change go mod --- sdk/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/go.mod b/sdk/go.mod index 9d2fbeb..d2e5000 100644 --- a/sdk/go.mod +++ b/sdk/go.mod @@ -10,7 +10,7 @@ require ( github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/gin-gonic/gin v1.7.3 gitee.com/wangyfbe/go-admin-core v1.10.0 - gitee.com/wangyfbe/go-admin-core/plugins/logger/zap v1.10.0 + gitee.com/wangyfbe/go-admin-core/plugins/logger/zap v1.3.0 github.com/go-admin-team/gorm-adapter/v3 v3.2.1-0.20210902112335-4148cb356a24 github.com/go-playground/locales v0.13.0 github.com/go-playground/universal-translator v0.17.0 -- Gitee From f95d7a0a87b04d309d7102d62b2f06fcd87db13c Mon Sep 17 00:00:00 2001 From: brandwwang Date: Sat, 3 Jun 2023 18:35:38 +0800 Subject: [PATCH 6/7] change go mod --- plugins/logger/logrus/go.mod | 2 +- plugins/logger/zap/go.mod | 2 +- sdk/go.mod | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/logger/logrus/go.mod b/plugins/logger/logrus/go.mod index ea965db..78b4c9a 100644 --- a/plugins/logger/logrus/go.mod +++ b/plugins/logger/logrus/go.mod @@ -3,7 +3,7 @@ module gitee.com/wangyfbe/go-admin-core/plugins/logger/logrus go 1.14 require ( - gitee.com/wangyfbe/go-admin-core v1.3.5-rc.5 + gitee.com/wangyfbe/go-admin-core v1.10.0 github.com/sirupsen/logrus v1.8.0 ) diff --git a/plugins/logger/zap/go.mod b/plugins/logger/zap/go.mod index 74c507a..89e2637 100644 --- a/plugins/logger/zap/go.mod +++ b/plugins/logger/zap/go.mod @@ -3,7 +3,7 @@ module gitee.com/wangyfbe/go-admin-core/plugins/logger/zap go 1.14 require ( - gitee.com/wangyfbe/go-admin-core v1.3.5-rc.5 + gitee.com/wangyfbe/go-admin-core v1.10.0 go.uber.org/zap v1.10.0 ) diff --git a/sdk/go.mod b/sdk/go.mod index d2e5000..9d2fbeb 100644 --- a/sdk/go.mod +++ b/sdk/go.mod @@ -10,7 +10,7 @@ require ( github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/gin-gonic/gin v1.7.3 gitee.com/wangyfbe/go-admin-core v1.10.0 - gitee.com/wangyfbe/go-admin-core/plugins/logger/zap v1.3.0 + gitee.com/wangyfbe/go-admin-core/plugins/logger/zap v1.10.0 github.com/go-admin-team/gorm-adapter/v3 v3.2.1-0.20210902112335-4148cb356a24 github.com/go-playground/locales v0.13.0 github.com/go-playground/universal-translator v0.17.0 -- Gitee From 7a8a3b29d453378ec18782f7999d5ca06f22a0b5 Mon Sep 17 00:00:00 2001 From: brandwwang Date: Sat, 3 Jun 2023 18:55:46 +0800 Subject: [PATCH 7/7] change go mod --- sdk/config/config.go | 2 ++ sdk/config/cos.go | 9 +++++++++ 2 files changed, 11 insertions(+) create mode 100644 sdk/config/cos.go diff --git a/sdk/config/config.go b/sdk/config/config.go index 8236b17..d686024 100644 --- a/sdk/config/config.go +++ b/sdk/config/config.go @@ -54,6 +54,7 @@ type Config struct { Queue *Queue `yaml:"queue"` Locker *Locker `yaml:"locker"` Extend interface{} `yaml:"extend"` + Cos *Cos `yaml:"cos"` } // 多db改造 @@ -82,6 +83,7 @@ func Setup(s source.Source, Queue: QueueConfig, Locker: LockerConfig, Extend: ExtendConfig, + Cos: CosConfig, }, callbacks: fs, } diff --git a/sdk/config/cos.go b/sdk/config/cos.go new file mode 100644 index 0000000..1a0db48 --- /dev/null +++ b/sdk/config/cos.go @@ -0,0 +1,9 @@ +package config + +type Cos struct { + Url string + SecretId string + SecretKey string +} + +var CosConfig = new(Cos) -- Gitee