From b18718cb4799b4921def6d7a1d810d109dd821f3 Mon Sep 17 00:00:00 2001 From: mr Date: Tue, 3 Feb 2026 16:20:25 +0100 Subject: [PATCH] compact conf --- go.mod | 2 +- go.sum | 2 ++ main.go | 14 +------------- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index 324700e..cf42755 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.23.0 toolchain go1.23.3 require ( - cloud.o-forge.io/core/oc-lib v0.0.0-20260203074447-30e6c9a6183c + cloud.o-forge.io/core/oc-lib v0.0.0-20260203150531-ef916fe2d995 github.com/beego/beego/v2 v2.3.1 github.com/smartystreets/goconvey v1.7.2 go.uber.org/zap v1.27.0 diff --git a/go.sum b/go.sum index 80f47ff..7ede957 100644 --- a/go.sum +++ b/go.sum @@ -20,6 +20,8 @@ cloud.o-forge.io/core/oc-lib v0.0.0-20260129122033-186ba3e689c7 h1:NRFGRqN+j5g3D cloud.o-forge.io/core/oc-lib v0.0.0-20260129122033-186ba3e689c7/go.mod h1:vHWauJsS6ryf7UDqq8hRXoYD5RsONxcFTxeZPOztEuI= cloud.o-forge.io/core/oc-lib v0.0.0-20260203074447-30e6c9a6183c h1:c19lIseiUk5Hp+06EowfEbMWH1pK8AC/hvQ4ryWgJtY= cloud.o-forge.io/core/oc-lib v0.0.0-20260203074447-30e6c9a6183c/go.mod h1:vHWauJsS6ryf7UDqq8hRXoYD5RsONxcFTxeZPOztEuI= +cloud.o-forge.io/core/oc-lib v0.0.0-20260203150531-ef916fe2d995 h1:ZDRvnzTTNHgMm5hYmseHdEPqQ6rn/4v+P9f/JIxPaNw= +cloud.o-forge.io/core/oc-lib v0.0.0-20260203150531-ef916fe2d995/go.mod h1:T0UCxRd8w+qCVVC0NEyDiWIGC5ADwEbQ7hFcvftd4Ks= github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+s7s0MwaRv9igoPqLRdzOLzw/8Xvq8= github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= diff --git a/main.go b/main.go index 382ab69..2f2770c 100644 --- a/main.go +++ b/main.go @@ -19,8 +19,6 @@ import ( peer "cloud.o-forge.io/core/oc-lib/models/peer" "cloud.o-forge.io/core/oc-lib/models/utils" "cloud.o-forge.io/core/oc-lib/tools" - beego "github.com/beego/beego/v2/server/web" - "github.com/beego/beego/v2/server/web/filter/cors" "github.com/i-core/rlog" ) @@ -31,8 +29,6 @@ const appname = "oc-auth" // @name Authorization // @description Type "Bearer" followed by a space and JWT token. func main() { - // Init the oc-lib - oclib.Init(appname) // Load the right config file o := oclib.GetConfLoader() @@ -63,15 +59,7 @@ func main() { go generateSelfPeer() go generateRole() go discovery() - beego.BConfig.Listen.HTTPPort = o.GetIntDefault("port", 8080) - beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{ - AllowAllOrigins: true, - AllowMethods: []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"}, - AllowHeaders: []string{"Origin", "Authorization", "Content-Type"}, - ExposeHeaders: []string{"Content-Length", "Content-Type"}, - AllowCredentials: true, - })) - beego.Run() + oclib.InitAPI(appname) } func generateRole() {