diff --git a/config/README.md b/config/README.md index c56919ed2fee8c6583cd5283a0fc768ec4dcb3be..f26fdd230b4019e19b4bbb54728267f2e0db3eb3 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 46376ab25b8a1f2a3224866371d08115e4034d84..0a6dd1423d01682f9574f1de279db34643121c31 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 616b202b52e60ff04059f9c266fa384711e4b564..f987cc8b361b3f3adbdd88d020d96104665b4c36 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 c57282e23b3086ba5e012ee7c81620c1ce0010dc..14cb28c92f5b9e8ec9583f8497a859cc2e4e025e 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 4b8d97306c81d49416bd3b1c780f248127aab237..a517ef17c5e00525661803e42c0bd695a5194780 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 fad25bbab5e015937cc1a34604cc5961fc3eef55..a7c8f6103d34924188737fadde2b6961952a5e54 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 36ee13c9a31f29366216e9f1c7c180536d98aaf0..d9668246caa0bb9462be2e7f16c7fd3648196215 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 341ec17f9b3316ed4352f5a6edcaa5515f1bceac..1efe568e28c7f431b5c7b30a9a0687deca170045 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 e8aaf192b3a0e12309b82cb08e479db49ba2cd32..34fa07a05538f2eaac9664b830c419a53dfd7bf2 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 0fafe16b4d00197d8ce470105d763612ac16a93e..3dbbb808b9f11abed961f537d8d2a6ba8c5d3eba 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 9b4c0b116497e24c17814cbfd1a7ff7fb4423a9c..5e5a28a814997a0fba55433f133ef1cd5fd9eb42 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 8e7d2c0075c0e511133477a09c3912d9f81253e6..2f78eea54b368948464c7031ee0187f8c48d6451 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 588258f5ae8328af4d2b1452210c6008d3d30635..4dd70e9e220e7bf8468fda35d3016c4170af9a75 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 b48ae9cd7988870bfcea5e5e613bce184c3843eb..9de85bab8bc3c1581ffbc03c9ffbd948e40e7d9e 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 c670788f75f0c6f3a10f6a34a3fa60cb73960df6..4ab3c0ed267ebe1fd69e16c4bd7cab4772ef6b38 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 c1a0038ce4275713342cb4b1336d5586ae577cba..2a6b23864fd7bca0cceae7486039f67a0adbb92f 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 e2a45e30a673f157ce5c086e28509387f1383d43..c0332f1c30742975c937c63548c2042f973abfff 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 d19fb6bf4260e7f84d7f35b63e50138b1756a200..1d431958e000c174d8d7ec0c1cd5c921dd4d855e 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 326d5e8914300248417918ef7fe766368eb9a86a..1433fd001e41fb99c17a31e708a8d8fb58278097 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 8b60705a33593b63a5d4a1d67cd51e8567dce93a..94699ee3ae950f7909036dbfa99a15ce7070af54 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 c08038c6a842749e186a2cbb5da68d80cd4cc188..5cfe2fd303505b96c8719331747d66f26b558be9 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 21a6e87b29c38f4fbc839faca7099a6630b073bb..55673b90b2e824efe60f37cb7e73ca4be0baee25 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 bdabcfc5d784d1323279dc3bbe59365d8add7252..07237ad2b9feb72f873e168b91115b6931b47c0b 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 13d6414f49be720fc82dd0aae23bd576078b9b3b..7e075ad4e1227df057ff426a9d31a66bf06173eb 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 abc73f648df2774da9645c1f864f63c26ea9213e..02ab278e16f8f58218f820e843e630d722c58f83 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 952d81b4c6ebe468a99d4ae92927e6d7901b5c38..491a3b63bf659116a2fd0b4b0053a0868196c147 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 572e699c4df7b130216775f185e475fdfc3651b6..59291025b3e7d1bedb5aa2a0bfa82f8bd8fad3c8 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 9de0cad9338bb831988795736e0e78f90f08634f..05294671eecf6d1c83971745693848255328cfef 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 a510377360321533d530c2158344355b59178315..d30bfde81a949ae8d212ed7cbdcdbda4e6c5b09b 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 81907cef830df1855ea9eeb64b123f3703afebc2..55af1c9fc2af9ceec2847b384be1086c436b16ab 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 b5750f73ad78ecdbe7dd7c3bd7780945ee56b22c..88e58d36dfdec0f5a2ace4140c303c52f29a7bbe 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 cdfd5b840135b1553f44f2fec299a5a64a2b8e2f..205022e38cc2f5b75d667a2db469c2b20ef22007 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 9f2e28dd05b5c74250b90b58780e8311c0abad87..588e4a27c844f3d28e94c58d290754736b0c9300 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 cd233e2dc7fe4e817538e714e9ac2afdf25c4fe2..4a15c779ccb6a6b555f85d3c64236080dde58893 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 0d42bb0f24cedef2761e519a8313d3d56c48c216..cf8b24bdc5ef4e3be00b00b585655303aaf11de5 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 69130aea2b41867b9518939197088e256b33c605..5eca6eef410dd132dd478cf1d35f63baa217dc60 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 e1bb01e8858d50715287152582924b7081ccca1d..baff49572b3928fac738565b1b1fa1268597c95a 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 bd8d3dbc6a7f82f592c209417ff7338c2a7cbdbc..d5d2a5b18be132056295c89c7dc571663c4c138d 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 996d6e6193bf9bd68c1ba0e859c1ade1d5a13eca..d0df506c5c59485de4b36154edaf9fb76a05ca35 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 1b67d1c033b8ea02c96f4c85f0d6a579951b0815..beca0e2cfa07c1185987fca72a57e3f35d4a58f7 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 d6ce8064d5568632941ebd254bad2011e959fa08..213ae74bbb53d7827cebe5e58d35d0716f8a6d10 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/go.mod b/go.mod index e07c437689c4c9ad98d4d03b51f7b893f0b619aa..d1cde3fc8768ae81587891d7ad3d02b2a8743c60 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ -module github.com/go-admin-team/go-admin-core +module gitee.com/wangyfbe/go-admin-core -go 1.14 +go 1.18 require ( github.com/BurntSushi/toml v0.3.1 diff --git a/logger/default.go b/logger/default.go index edb189912e387deec917d242d9a91ba584bd1d7b..2c75d1332c1d908cf3126ad6f2e7ceb08944419f 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 7dfac8e83877deea7ffdc05e0e9cd7d4ae6f7bdd..0c082571300bf14a01d4d520e7be713ed3f3045e 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 4833fe937e091512479a6f68ed59b309ca9cee87..78b4c9a0b04edbc62f7ef068f75b78f9e2227482 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.10.0 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 dfacf7636c228c4d4bb5d635e0d8631a6f07f52c..13a4ac1010ba87f5f22fe253ecd5e9740e087b5b 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 03e7ff9c2a0574c0092508cc606136a07e83dede..7d9d8cd7eee210de202c3c7a8b4d421b00755cc6 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 7357285b8d044463bfeff874b6753b411f9b84c6..43451e5240e2789c3ed2b155c4967127108582ce 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 c93fda0fbc38effd508a2815c8208c13be3d6134..89e263749e70abd811ce5bdb78221a24d0c7a299 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.10.0 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 4da7c08a582a5d13d2db5523f4aea02aca785a14..055de690919f33e2533f44fd54e8d14a87f606f7 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 45cf048e813559bc20affb3f2bcf23a33098db7b..58df7a221d227661bcdec140c317dc8190a4c8a6 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 3e7fc442ef9fa71fe7dab4312777acbae0adb21e..211ad297fe9de6b6291ee52aef5da14b7dc01874 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 c94b966eb93366eebe3529e1f156ca5e14bb7bff..aab045a0e051be6ffc601cea82ce2bec7c21ea97 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 bb1fc91dc06a705d01bd26deef444b55d37552b0..173ec1ce3e194c2c88fd1cc2baa7530123be368c 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 66ed33d057336e652a6c7969326efcd406a8b473..d466d17cb8e52dcb814d1fae86e4e667a4e22075 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 b70bd58ad9e66165977f3ec746b54f0503133f11..51c6a799d7a18778931ee2130b07ab5c08ac7de6 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 00b83728d60844f2426b851cec4569403cfc8774..4408e7ec974bc15556ad9f6e60d4d1885ddc852c 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 3e11ab383442de1379f3ae7e466dc3e21ffdbc70..d6860247630d4c3a944cab7504c0facee652c49a 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 ( @@ -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 0000000000000000000000000000000000000000..1a0db486bcad6e04b1053b855c2d672b1e878c27 --- /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) diff --git a/sdk/config/locker.go b/sdk/config/locker.go index fc761fa9480d0b3bfbd0820286e957a42d177aa5..4bd2fcf040c0e6cea27ce19971110380103ba727 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 dbfc3b45b25a438a40a2cf4c505eaa1f05b64c44..ed9fb815cd28afaba7d6514bbc41f168a71a6320 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 3409e20170bd564598b89522eaa201f7ccd6d53a..2e8cd7681600d485700742f6edec526c74059064 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 ea97896ad8f216593295c494504ee22cfded4da9..9d2fbebe840a0d8d495158610d83aa002de09371 100644 --- a/sdk/go.mod +++ b/sdk/go.mod @@ -1,6 +1,6 @@ -module github.com/go-admin-team/go-admin-core/sdk +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 - 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.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 @@ -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 707b1d4e42ea50cff49c36aac307f4145e31d286..6e386a8ed0416d389a3865667b36d62ac5c5ffa9 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 3653f460cc33e0721edf17ac43352813c201970c..db5fc8ae85d9638f50ba69218a76a0e62a4a450a 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 6498c24d057ceba9eeebf138334a0f2331fc650b..4ac22b3f09dff007ba2def77c1f52018177b344d 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 fcbe44d1e75cc64dcde10d83546a0619ea973b4f..839af740b640d226db98a58fb95d59491dd3d5b9 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 f035b5098a42a93e07d04b67e7120382a3b79d05..e9b615b679f60de4f7f538e3a1f391d0770d57d7 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 a3297a0a82c1ebd81d4b1676996a6679fb461f89..8d3b061ed25339dc6e459b55728bc0429bf24b9e 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 f0fe2b6b18e9e21a90b6776142b2e85b6b02e631..b3d02adf234a1df0206686375c7e89d926fd9286 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 21f054449879968395258b7453d0c25511e64af8..6d1508e6e24d603f5cbf3f3bf2ec66e434f75145 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 1e907c84db5ae05f1f357b48c4af9783915772a0..bfd7e4b7f7bec508147eac76e040003fe1b2648f 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 ee43007688def6599aa11d629a42f4f2b1ef3686..cc46dc7bee054ac8b7935521a35f162540135f89 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 6530869b6e7dcc263f5715fcd557e900bc194548..72fed9c979ce34fe67f324d540d523a64bca75cc 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 c52d5e5cdda8f631e0e6e75e9a5007d3aa05fe62..5e95103a7b4b557c2f03a57b27dd8fc0e5179967 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 1c8d08a841da295fd2af4f3b7d63bfd2ee08ab80..ef4b0c403bcc8e8fff222a1256a490edf5f85df3 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 2502d7961a4b6ed44992a3cf87bff163a1918cd6..075534177a2a7f287b27bc1b7761de8f8dbade67 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 79b640f61d1ec7546a90103e33e111ea8bd7d097..14b071fee1ae85754a633115f8f051a52f62fa6d 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 0deb4a926148814231ed089ef797855ed4df8238..425d46107df9c9bd5566709c25fac16169a00406 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 518c9fc4d6199024b90ba1e93b79f611d6b2b49d..8ae253c7d093e3ba7c77808cae872f9df44d4d65 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 220d187c578250699f98c109b894f6651c9ab101..434d7993f6fcd6d13eaeb796e58cbef57e1bb9bb 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 56ad70cc32501ec540d6a1360be2d69cc37eff54..a1496ee40b6741c9584dff7eedb4500aaad9328d 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 94f55e0154014744083fc1574fe348cf83981cab..dd3f258cde189e7cdf04b14b488d004af6ce254e 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 1b30010b1a599417d7d7fd88641d1878324b1546..160bceae3149102b37d13f28569890539af9878f 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 b0e5f5a40e06b17a8f7a01b7222eea3f7f08a8d4..9c3463ddf713358de84b5f6ee975b2877d0e38c4 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 79de5a4934e1b55f9bb88dc4829483ee5e985e1b..c448018fbce0858db23f66550a0ead2dc8764f9e 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 4fef5e70fd563410b89c0a85e2c0be0710cd77de..f383d733a3fb94c4467bf4a00161d2a339465c54 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 58f0f8291eecb97cac77264b9a1f885d69f1f32d..b495e52b4eb50594d94e0a96722659c4dac07025 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 d27df185a295fcb4372ed4920de9f61d84801309..96d431957f9c38d8e6d25e58ef6420e7ca175c6d 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 b061b6581b9a3bae03569eddce8dcc0428ca58af..011252e79a50b430ffe1f171319ed1dfabfbfa65 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 9d7bf2eebbd08de902078d39e52cbabe5b740f12..56e2de4850c8ccd6641d06ef2352b0a29f2e5d03 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 220259032161e97efc8e0cb06905831ac33d45e6..ba6454455186ebf125a7250e1716affbb40281b0 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 92095341afc89bddb76320eb38d0c0a0c5888113..7ac0c5919f870ca38acc678c0bae347d098df54a 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 850eba4c188a1088c4c30b59f6d818829eec5257..86ece30c5d471b8df5ca19ef55fba29911d1b15d 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 bcfb9818936bf54d278efc25645e9075a2736966..65d6a34c0a712feccdaeccb989b54a7abd1e7c7a 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 ce5c22c4bbf244e3ad5148fe190eddafa3257ff2..3ec5080cb1efcb02055d83654d546a54224e3eb7 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 7964dc5505b475bdce307cff3d8f5959713d7db4..bff828b458a98a1bc5bab1d7734ae7b3cfc92976 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 8ced16bdcee14b536ecb73d05810b3efcd4413e5..27ca706ed9574171484bb8c8dd3c24127a5cd5fd 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 b780380f1284fc7d6690bd49fcc4006516ece596..d42e4d99d67f222b187b6b0a2b5c9649d54252c8 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" )