From 2c28fca01548b02e4b644f0607cd2052a14fd683 Mon Sep 17 00:00:00 2001 From: mr Date: Thu, 28 May 2026 08:43:25 +0200 Subject: [PATCH] modernize ocshared --- controllers/collaborative_area.go | 4 ++-- controllers/rule.go | 4 ++-- main.go | 29 +---------------------------- 3 files changed, 5 insertions(+), 32 deletions(-) diff --git a/controllers/collaborative_area.go b/controllers/collaborative_area.go index 6f94c86..11900cd 100644 --- a/controllers/collaborative_area.go +++ b/controllers/collaborative_area.go @@ -45,7 +45,7 @@ func (o *CollaborativeAreaController) Search() { // store and return Id or post with UUID search := o.Ctx.Input.Param(":search") isDraft := o.Ctx.Input.Query("is_draft") - o.Data["json"] = oclib.NewRequest(oclib.LibDataEnum(oclib.COLLABORATIVE_AREA), user, peerID, groups, nil).Search(nil, search, isDraft == "true") + o.Data["json"] = oclib.NewRequest(oclib.LibDataEnum(oclib.COLLABORATIVE_AREA), user, peerID, groups, nil).Search(nil, search, isDraft == "true", 0, 10000) o.ServeJSON() } @@ -91,7 +91,7 @@ func (o *CollaborativeAreaController) Post() { func (o *CollaborativeAreaController) GetAll() { user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request) isDraft := o.Ctx.Input.Query("is_draft") - o.Data["json"] = oclib.NewRequest(oclib.LibDataEnum(oclib.COLLABORATIVE_AREA), user, peerID, groups, nil).LoadAll(isDraft == "true") + o.Data["json"] = oclib.NewRequest(oclib.LibDataEnum(oclib.COLLABORATIVE_AREA), user, peerID, groups, nil).LoadAll(isDraft == "true", 0, 10000) o.ServeJSON() } diff --git a/controllers/rule.go b/controllers/rule.go index 2213b33..af257a4 100644 --- a/controllers/rule.go +++ b/controllers/rule.go @@ -23,7 +23,7 @@ func (o *RuleController) Search() { // store and return Id or post with UUID search := o.Ctx.Input.Param(":search") isDraft := o.Ctx.Input.Query("is_draft") - o.Data["json"] = oclib.NewRequest(oclib.LibDataEnum(oclib.RULE), user, peerID, groups, nil).Search(nil, search, isDraft == "true") + o.Data["json"] = oclib.NewRequest(oclib.LibDataEnum(oclib.RULE), user, peerID, groups, nil).Search(nil, search, isDraft == "true", 0, 10000) o.ServeJSON() } @@ -64,7 +64,7 @@ func (o *RuleController) Post() { func (o *RuleController) GetAll() { user, peerID, groups := oclib.ExtractTokenInfo(*o.Ctx.Request) isDraft := o.Ctx.Input.Query("is_draft") - o.Data["json"] = oclib.NewRequest(oclib.LibDataEnum(oclib.RULE), user, peerID, groups, nil).LoadAll(isDraft == "true") + o.Data["json"] = oclib.NewRequest(oclib.LibDataEnum(oclib.RULE), user, peerID, groups, nil).LoadAll(isDraft == "true", 0, 10000) o.ServeJSON() } diff --git a/main.go b/main.go index 1e2b4ce..bbf4e56 100644 --- a/main.go +++ b/main.go @@ -5,39 +5,12 @@ import ( oclib "cloud.o-forge.io/core/oc-lib" beego "github.com/beego/beego/v2/server/web" - "github.com/beego/beego/v2/server/web/filter/cors" ) const appname = "oc-shared" func main() { // Init the oc-lib - // Init the oc-lib - oclib.Init(appname) - - // Load the right config file - o := oclib.GetConfLoader() - - // feed the library with the loaded config - oclib.SetConfig( - o.GetStringDefault("MONGO_URL", "mongodb://127.0.0.1:27017"), - o.GetStringDefault("MONGO_DATABASE", "DC_myDC"), - o.GetStringDefault("NATS_URL", "nats://localhost:4222"), - o.GetStringDefault("LOKI_URL", ""), - o.GetStringDefault("LOG_LEVEL", "info"), - ) - // Beego init - beego.BConfig.AppName = appname - beego.BConfig.Listen.HTTPPort = o.GetIntDefault("port", 8080) - beego.BConfig.WebConfig.DirectoryIndex = true - beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger" - 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, - })) - + oclib.InitAPI(appname) beego.Run() }