Compare commits
2 Commits
8ffea6b337
...
6f0b1ffcf4
Author | SHA1 | Date | |
---|---|---|---|
|
6f0b1ffcf4 | ||
8f3ffd2348 |
@ -8,7 +8,7 @@ import (
|
|||||||
oclib "cloud.o-forge.io/core/oc-lib"
|
oclib "cloud.o-forge.io/core/oc-lib"
|
||||||
"cloud.o-forge.io/core/oc-lib/models/utils"
|
"cloud.o-forge.io/core/oc-lib/models/utils"
|
||||||
w "cloud.o-forge.io/core/oc-lib/models/workflow"
|
w "cloud.o-forge.io/core/oc-lib/models/workflow"
|
||||||
tools "cloud.o-forge.io/core/oc-lib/tools"
|
"cloud.o-forge.io/core/oc-lib/tools"
|
||||||
beego "github.com/beego/beego/v2/server/web"
|
beego "github.com/beego/beego/v2/server/web"
|
||||||
"github.com/nats-io/nats.go"
|
"github.com/nats-io/nats.go"
|
||||||
)
|
)
|
||||||
@ -40,18 +40,7 @@ func (o *WorkflowController) Put() {
|
|||||||
var paths = map[string]map[tools.METHOD]string{
|
var paths = map[string]map[tools.METHOD]string{
|
||||||
utils.BOOKING.String(): {
|
utils.BOOKING.String(): {
|
||||||
tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.BOOKING)) + "/oc/booking/",
|
tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.BOOKING)) + "/oc/booking/",
|
||||||
},
|
tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.BOOKING)) + "/oc/booking/:id",
|
||||||
utils.SHARED_WORKSPACE.String(): {
|
|
||||||
tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE)) + "/oc/shared/workspace/:id",
|
|
||||||
tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE)) + "/oc/shared/workspace/",
|
|
||||||
},
|
|
||||||
utils.WORKSPACE.String(): {
|
|
||||||
tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.WORKSPACE)) + "/oc/workspace/:id",
|
|
||||||
tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.WORKSPACE)) + "/oc/workspace/",
|
|
||||||
},
|
|
||||||
utils.WORKFLOW.String(): {
|
|
||||||
tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.WORKFLOW)) + "/oc/workflow/:id",
|
|
||||||
tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.WORKFLOW)) + "/oc/workflow/",
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
// store and return Id or post with UUID
|
// store and return Id or post with UUID
|
||||||
@ -106,18 +95,7 @@ func (o *WorkflowController) Post() {
|
|||||||
var paths = map[string]map[tools.METHOD]string{
|
var paths = map[string]map[tools.METHOD]string{
|
||||||
utils.BOOKING.String(): {
|
utils.BOOKING.String(): {
|
||||||
tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.BOOKING)) + "/oc/booking/",
|
tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.BOOKING)) + "/oc/booking/",
|
||||||
},
|
tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.BOOKING)) + "/oc/booking/:id",
|
||||||
utils.SHARED_WORKSPACE.String(): {
|
|
||||||
tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE)) + "/oc/shared/workspace/:id",
|
|
||||||
tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE)) + "/oc/shared/workspace/",
|
|
||||||
},
|
|
||||||
utils.WORKSPACE.String(): {
|
|
||||||
tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.WORKSPACE)) + "/oc/workspace/:id",
|
|
||||||
tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.WORKSPACE)) + "/oc/workspace/",
|
|
||||||
},
|
|
||||||
utils.WORKFLOW.String(): {
|
|
||||||
tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.WORKFLOW)) + "/oc/workflow/:id",
|
|
||||||
tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.WORKFLOW)) + "/oc/workflow/",
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
var res map[string]interface{}
|
var res map[string]interface{}
|
||||||
@ -171,8 +149,15 @@ func (o *WorkflowController) Get() {
|
|||||||
// @Success 200 {string} delete success!
|
// @Success 200 {string} delete success!
|
||||||
// @router /:id [delete]
|
// @router /:id [delete]
|
||||||
func (o *WorkflowController) Delete() {
|
func (o *WorkflowController) Delete() {
|
||||||
|
var paths = map[string]map[tools.METHOD]string{
|
||||||
|
utils.BOOKING.String(): {
|
||||||
|
tools.POST: oclib.GetPath(oclib.LibDataEnum(oclib.BOOKING)) + "/oc/booking/",
|
||||||
|
tools.DELETE: oclib.GetPath(oclib.LibDataEnum(oclib.BOOKING)) + "/oc/booking/:id",
|
||||||
|
},
|
||||||
|
}
|
||||||
id := o.Ctx.Input.Param(":id")
|
id := o.Ctx.Input.Param(":id")
|
||||||
o.Data["json"] = oclib.DeleteOne(oclib.LibDataEnum(oclib.WORKFLOW), id)
|
caller := tools.NewHTTPCaller(paths)
|
||||||
|
o.Data["json"] = oclib.DeleteOne(oclib.LibDataEnum(oclib.WORKFLOW), id, caller)
|
||||||
o.ServeJSON()
|
o.ServeJSON()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
5
main.go
5
main.go
@ -1,7 +1,6 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
_ "oc-workflow/routers"
|
_ "oc-workflow/routers"
|
||||||
|
|
||||||
oclib "cloud.o-forge.io/core/oc-lib"
|
oclib "cloud.o-forge.io/core/oc-lib"
|
||||||
@ -39,10 +38,6 @@ func main() {
|
|||||||
)
|
)
|
||||||
oclib.Init("oc-workflow")
|
oclib.Init("oc-workflow")
|
||||||
oclib.AddPath(oclib.LibDataEnum(oclib.BOOKING), o.GetStringDefault("BOOKING_URL", ":8092"))
|
oclib.AddPath(oclib.LibDataEnum(oclib.BOOKING), o.GetStringDefault("BOOKING_URL", ":8092"))
|
||||||
fmt.Println(oclib.GetPath(oclib.LibDataEnum(oclib.BOOKING)))
|
|
||||||
oclib.AddPath(oclib.LibDataEnum(oclib.SHARED_WORKSPACE), o.GetStringDefault("SHARED_WORKSPACE_URL", ":8091"))
|
|
||||||
oclib.AddPath(oclib.LibDataEnum(oclib.WORKSPACE), o.GetStringDefault("WORKSPACE_URL", ":8089"))
|
|
||||||
oclib.AddPath(oclib.LibDataEnum(oclib.WORKFLOW), o.GetStringDefault("WORKFLOW_URL", ":8088"))
|
|
||||||
// Normal beego init
|
// Normal beego init
|
||||||
//if beego.BConfig.RunMode == "dev" {
|
//if beego.BConfig.RunMode == "dev" {
|
||||||
beego.BConfig.WebConfig.DirectoryIndex = true
|
beego.BConfig.WebConfig.DirectoryIndex = true
|
||||||
|
BIN
oc-workflow
BIN
oc-workflow
Binary file not shown.
Loading…
Reference in New Issue
Block a user