go-gost/gost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update registry

Browse Source
This commit is contained in:
ginuerzh
2022-02-27 22:32:15 +08:00
parent 0aee4f0ebd
commit 07132d8de7
115 changed files with 651 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/api/config_admission.go
View File

@ -42,7 +42,7 @@ func createAdmission(ctx *gin.Context) {
v := parsing.ParseAdmission(&req.Data)
if err := registry.Admission().Register(req.Data.Name, v); err != nil {
if err := registry.AdmissionRegistry().Register(req.Data.Name, v); err != nil {
writeError(ctx, ErrDup)
return
}
@ -86,7 +86,7 @@ func updateAdmission(ctx *gin.Context) {
ctx.ShouldBindUri(&req)
ctx.ShouldBindJSON(&req.Data)
if !registry.Admission().IsRegistered(req.Admission) {
if !registry.AdmissionRegistry().IsRegistered(req.Admission) {
writeError(ctx, ErrNotFound)
return
}
@ -95,9 +95,9 @@ func updateAdmission(ctx *gin.Context) {
v := parsing.ParseAdmission(&req.Data)
registry.Admission().Unregister(req.Admission)
registry.AdmissionRegistry().Unregister(req.Admission)
if err := registry.Admission().Register(req.Admission, v); err != nil {
if err := registry.AdmissionRegistry().Register(req.Admission, v); err != nil {
writeError(ctx, ErrDup)
return
}
@ -143,11 +143,11 @@ func deleteAdmission(ctx *gin.Context) {
var req deleteAdmissionRequest
ctx.ShouldBindUri(&req)
if !registry.Admission().IsRegistered(req.Admission) {
if !registry.AdmissionRegistry().IsRegistered(req.Admission) {
writeError(ctx, ErrNotFound)
return
}
registry.Admission().Unregister(req.Admission)
registry.AdmissionRegistry().Unregister(req.Admission)
cfg := config.Global()
admissiones := cfg.Admissions

12
pkg/api/config_auther.go
View File

@ -41,7 +41,7 @@ func createAuther(ctx *gin.Context) {
}
v := parsing.ParseAuther(&req.Data)
if err := registry.Auther().Register(req.Data.Name, v); err != nil {
if err := registry.AutherRegistry().Register(req.Data.Name, v); err != nil {
writeError(ctx, ErrDup)
return
}
@ -85,7 +85,7 @@ func updateAuther(ctx *gin.Context) {
ctx.ShouldBindUri(&req)
ctx.ShouldBindJSON(&req.Data)
if !registry.Auther().IsRegistered(req.Auther) {
if !registry.AutherRegistry().IsRegistered(req.Auther) {
writeError(ctx, ErrNotFound)
return
}
@ -93,9 +93,9 @@ func updateAuther(ctx *gin.Context) {
req.Data.Name = req.Auther
v := parsing.ParseAuther(&req.Data)
registry.Auther().Unregister(req.Auther)
registry.AutherRegistry().Unregister(req.Auther)
if err := registry.Auther().Register(req.Auther, v); err != nil {
if err := registry.AutherRegistry().Register(req.Auther, v); err != nil {
writeError(ctx, ErrDup)
return
}
@ -141,11 +141,11 @@ func deleteAuther(ctx *gin.Context) {
var req deleteAutherRequest
ctx.ShouldBindUri(&req)
if !registry.Auther().IsRegistered(req.Auther) {
if !registry.AutherRegistry().IsRegistered(req.Auther) {
writeError(ctx, ErrNotFound)
return
}
registry.Auther().Unregister(req.Auther)
registry.AutherRegistry().Unregister(req.Auther)
cfg := config.Global()
authers := cfg.Authers

12
pkg/api/config_bypass.go
View File

@ -42,7 +42,7 @@ func createBypass(ctx *gin.Context) {
v := parsing.ParseBypass(&req.Data)
if err := registry.Bypass().Register(req.Data.Name, v); err != nil {
if err := registry.BypassRegistry().Register(req.Data.Name, v); err != nil {
writeError(ctx, ErrDup)
return
}
@ -86,7 +86,7 @@ func updateBypass(ctx *gin.Context) {
ctx.ShouldBindUri(&req)
ctx.ShouldBindJSON(&req.Data)
if !registry.Bypass().IsRegistered(req.Bypass) {
if !registry.BypassRegistry().IsRegistered(req.Bypass) {
writeError(ctx, ErrNotFound)
return
}
@ -95,9 +95,9 @@ func updateBypass(ctx *gin.Context) {
v := parsing.ParseBypass(&req.Data)
registry.Bypass().Unregister(req.Bypass)
registry.BypassRegistry().Unregister(req.Bypass)
if err := registry.Bypass().Register(req.Bypass, v); err != nil {
if err := registry.BypassRegistry().Register(req.Bypass, v); err != nil {
writeError(ctx, ErrDup)
return
}
@ -143,11 +143,11 @@ func deleteBypass(ctx *gin.Context) {
var req deleteBypassRequest
ctx.ShouldBindUri(&req)
if !registry.Bypass().IsRegistered(req.Bypass) {
if !registry.BypassRegistry().IsRegistered(req.Bypass) {
writeError(ctx, ErrNotFound)
return
}
registry.Bypass().Unregister(req.Bypass)
registry.BypassRegistry().Unregister(req.Bypass)
cfg := config.Global()
bypasses := cfg.Bypasses

12
pkg/api/config_chain.go
View File

@ -46,7 +46,7 @@ func createChain(ctx *gin.Context) {
return
}
if err := registry.Chain().Register(req.Data.Name, v); err != nil {
if err := registry.ChainRegistry().Register(req.Data.Name, v); err != nil {
writeError(ctx, ErrDup)
return
}
@ -91,7 +91,7 @@ func updateChain(ctx *gin.Context) {
ctx.ShouldBindUri(&req)
ctx.ShouldBindJSON(&req.Data)
if !registry.Chain().IsRegistered(req.Chain) {
if !registry.ChainRegistry().IsRegistered(req.Chain) {
writeError(ctx, ErrNotFound)
return
}
@ -104,9 +104,9 @@ func updateChain(ctx *gin.Context) {
return
}
registry.Chain().Unregister(req.Chain)
registry.ChainRegistry().Unregister(req.Chain)
if err := registry.Chain().Register(req.Chain, v); err != nil {
if err := registry.ChainRegistry().Register(req.Chain, v); err != nil {
writeError(ctx, ErrDup)
return
}
@ -152,11 +152,11 @@ func deleteChain(ctx *gin.Context) {
var req deleteChainRequest
ctx.ShouldBindUri(&req)
if !registry.Chain().IsRegistered(req.Chain) {
if !registry.ChainRegistry().IsRegistered(req.Chain) {
writeError(ctx, ErrNotFound)
return
}
registry.Chain().Unregister(req.Chain)
registry.ChainRegistry().Unregister(req.Chain)
cfg := config.Global()
chains := cfg.Chains

12
pkg/api/config_hosts.go
View File

@ -42,7 +42,7 @@ func createHosts(ctx *gin.Context) {
v := parsing.ParseHosts(&req.Data)
if err := registry.Hosts().Register(req.Data.Name, v); err != nil {
if err := registry.HostsRegistry().Register(req.Data.Name, v); err != nil {
writeError(ctx, ErrDup)
return
}
@ -86,7 +86,7 @@ func updateHosts(ctx *gin.Context) {
ctx.ShouldBindUri(&req)
ctx.ShouldBindJSON(&req.Data)
if !registry.Hosts().IsRegistered(req.Hosts) {
if !registry.HostsRegistry().IsRegistered(req.Hosts) {
writeError(ctx, ErrNotFound)
return
}
@ -95,9 +95,9 @@ func updateHosts(ctx *gin.Context) {
v := parsing.ParseHosts(&req.Data)
registry.Hosts().Unregister(req.Hosts)
registry.HostsRegistry().Unregister(req.Hosts)
if err := registry.Hosts().Register(req.Hosts, v); err != nil {
if err := registry.HostsRegistry().Register(req.Hosts, v); err != nil {
writeError(ctx, ErrDup)
return
}
@ -143,11 +143,11 @@ func deleteHosts(ctx *gin.Context) {
var req deleteHostsRequest
ctx.ShouldBindUri(&req)
if !registry.Hosts().IsRegistered(req.Hosts) {
if !registry.HostsRegistry().IsRegistered(req.Hosts) {
writeError(ctx, ErrNotFound)
return
}
registry.Hosts().Unregister(req.Hosts)
registry.HostsRegistry().Unregister(req.Hosts)
cfg := config.Global()
hosts := cfg.Hosts

12
pkg/api/config_resolver.go
View File

@ -46,7 +46,7 @@ func createResolver(ctx *gin.Context) {
return
}
if err := registry.Resolver().Register(req.Data.Name, v); err != nil {
if err := registry.ResolverRegistry().Register(req.Data.Name, v); err != nil {
writeError(ctx, ErrDup)
return
}
@ -90,7 +90,7 @@ func updateResolver(ctx *gin.Context) {
ctx.ShouldBindUri(&req)
ctx.ShouldBindJSON(&req.Data)
if !registry.Resolver().IsRegistered(req.Resolver) {
if !registry.ResolverRegistry().IsRegistered(req.Resolver) {
writeError(ctx, ErrNotFound)
return
}
@ -103,9 +103,9 @@ func updateResolver(ctx *gin.Context) {
return
}
registry.Resolver().Unregister(req.Resolver)
registry.ResolverRegistry().Unregister(req.Resolver)
if err := registry.Resolver().Register(req.Resolver, v); err != nil {
if err := registry.ResolverRegistry().Register(req.Resolver, v); err != nil {
writeError(ctx, ErrDup)
return
}
@ -151,11 +151,11 @@ func deleteResolver(ctx *gin.Context) {
var req deleteResolverRequest
ctx.ShouldBindUri(&req)
if !registry.Resolver().IsRegistered(req.Resolver) {
if !registry.ResolverRegistry().IsRegistered(req.Resolver) {
writeError(ctx, ErrNotFound)
return
}
registry.Resolver().Unregister(req.Resolver)
registry.ResolverRegistry().Unregister(req.Resolver)
cfg := config.Global()
resolvers := cfg.Resolvers

14
pkg/api/config_service.go
View File

@ -40,7 +40,7 @@ func createService(ctx *gin.Context) {
return
}
if registry.Service().IsRegistered(req.Data.Name) {
if registry.ServiceRegistry().IsRegistered(req.Data.Name) {
writeError(ctx, ErrDup)
return
}
@ -51,7 +51,7 @@ func createService(ctx *gin.Context) {
return
}
if err := registry.Service().Register(req.Data.Name, svc); err != nil {
if err := registry.ServiceRegistry().Register(req.Data.Name, svc); err != nil {
svc.Close()
writeError(ctx, ErrDup)
return
@ -98,7 +98,7 @@ func updateService(ctx *gin.Context) {
ctx.ShouldBindUri(&req)
ctx.ShouldBindJSON(&req.Data)
old := registry.Service().Get(req.Service)
old := registry.ServiceRegistry().Get(req.Service)
if old == nil {
writeError(ctx, ErrNotFound)
return
@ -113,9 +113,9 @@ func updateService(ctx *gin.Context) {
return
}
registry.Service().Unregister(req.Service)
registry.ServiceRegistry().Unregister(req.Service)
if err := registry.Service().Register(req.Service, svc); err != nil {
if err := registry.ServiceRegistry().Register(req.Service, svc); err != nil {
svc.Close()
writeError(ctx, ErrDup)
return
@ -164,13 +164,13 @@ func deleteService(ctx *gin.Context) {
var req deleteServiceRequest
ctx.ShouldBindUri(&req)
svc := registry.Service().Get(req.Service)
svc := registry.ServiceRegistry().Get(req.Service)
if svc == nil {
writeError(ctx, ErrNotFound)
return
}
registry.Service().Unregister(req.Service)
registry.ServiceRegistry().Unregister(req.Service)
svc.Close()
cfg := config.Global()

2
pkg/api/middleware.go
View File

@ -17,7 +17,7 @@ func mwLogger() gin.HandlerFunc {
ctx.Next()
duration := time.Since(startTime)
logger.Default().WithFields(map[string]interface{}{
logger.Default().WithFields(map[string]any{
"kind": "api",
"method": ctx.Request.Method,
"uri": ctx.Request.RequestURI,