diff --git a/controllers/collaborative_area.go b/controllers/collaborative_area.go
index 0cc18c5..a284b8b 100644
--- a/controllers/collaborative_area.go
+++ b/controllers/collaborative_area.go
@@ -17,19 +17,19 @@ type CollaborativeAreaController struct {
var paths = map[tools.DataType]map[tools.METHOD]string{ // paths used to call other OC services
tools.COLLABORATIVE_AREA: {
- tools.DELETE: "/oc/shared/workspace/:id?is_remote=true",
- tools.POST: "/oc/shared/workspace/?is_remote=true",
+ tools.DELETE: "/collaborative_area/:id?is_remote=true",
+ tools.POST: "/collaborative_area/?is_remote=true",
},
tools.WORKSPACE: {
- tools.DELETE: "/oc/workspace/:id?is_remote=true",
- tools.POST: "/oc/workspace/?is_remote=true",
+ tools.DELETE: "/:id?is_remote=true",
+ tools.POST: "/?is_remote=true",
},
tools.WORKFLOW: {
- tools.DELETE: "/oc/workflow/:id?is_remote=true",
- tools.POST: "/oc/workflow/?is_remote=true",
+ tools.DELETE: "/:id?is_remote=true",
+ tools.POST: "/?is_remote=true",
},
tools.PEER: {
- tools.POST: "/oc/peer",
+ tools.POST: "/status/",
},
}
diff --git a/go.mod b/go.mod
index 44e3eff..a1d1c19 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.22.0
toolchain go1.22.4
require (
- cloud.o-forge.io/core/oc-lib v0.0.0-20241002120813-a09a04e1a71e
+ cloud.o-forge.io/core/oc-lib v0.0.0-20241015083538-9f5e6d60185a
github.com/beego/beego/v2 v2.3.1
)
@@ -13,7 +13,7 @@ require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
- github.com/gabriel-vasile/mimetype v1.4.5 // indirect
+ github.com/gabriel-vasile/mimetype v1.4.6 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.22.1 // indirect
@@ -21,7 +21,7 @@ require (
github.com/google/uuid v1.6.0 // indirect
github.com/goraz/onion v0.1.3 // indirect
github.com/hashicorp/golang-lru v1.0.2 // indirect
- github.com/klauspost/compress v1.17.10 // indirect
+ github.com/klauspost/compress v1.17.11 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
@@ -47,11 +47,11 @@ require (
github.com/xdg-go/stringprep v1.0.4 // indirect
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
go.mongodb.org/mongo-driver v1.17.1 // indirect
- golang.org/x/crypto v0.27.0 // indirect
- golang.org/x/net v0.29.0 // indirect
+ golang.org/x/crypto v0.28.0 // indirect
+ golang.org/x/net v0.30.0 // indirect
golang.org/x/sync v0.8.0 // indirect
- golang.org/x/sys v0.25.0 // indirect
- golang.org/x/text v0.18.0 // indirect
- google.golang.org/protobuf v1.34.2 // indirect
+ golang.org/x/sys v0.26.0 // indirect
+ golang.org/x/text v0.19.0 // indirect
+ google.golang.org/protobuf v1.35.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
diff --git a/go.sum b/go.sum
index 915af5f..6e52720 100644
--- a/go.sum
+++ b/go.sum
@@ -8,6 +8,8 @@ cloud.o-forge.io/core/oc-lib v0.0.0-20241002102322-c309d9762350 h1:ybK3Qz1inr9xg
cloud.o-forge.io/core/oc-lib v0.0.0-20241002102322-c309d9762350/go.mod h1:FIJD0taWLJ5pjQLJ6sfE2KlTkvbmk5SMcyrxdjsaVz0=
cloud.o-forge.io/core/oc-lib v0.0.0-20241002120813-a09a04e1a71e h1:77QHk5JSf0q13B/Ai3xjcsGSS7nX+9AfxcsYz5oDo/A=
cloud.o-forge.io/core/oc-lib v0.0.0-20241002120813-a09a04e1a71e/go.mod h1:t+zpCTVKVdHH/BImwtMYY2QIWLMXKgY4n/JhFm3Vpu8=
+cloud.o-forge.io/core/oc-lib v0.0.0-20241015083538-9f5e6d60185a h1:2mBMc36WKh1/Dpomktx9dVXGxK0agFr7RdgvHTtyn2w=
+cloud.o-forge.io/core/oc-lib v0.0.0-20241015083538-9f5e6d60185a/go.mod h1:t+zpCTVKVdHH/BImwtMYY2QIWLMXKgY4n/JhFm3Vpu8=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/beego/beego/v2 v2.3.0 h1:iECVwzm6egw6iw6tkWrEDqXG4NQtKLQ6QBSYqlM6T/I=
github.com/beego/beego/v2 v2.3.0/go.mod h1:Ob/5BJ9fIKZLd4s9ZV3o9J6odkkIyL83et+p98gyYXo=
@@ -31,6 +33,8 @@ github.com/etcd-io/etcd v3.3.17+incompatible/go.mod h1:cdZ77EstHBwVtD6iTgzgvogwc
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/gabriel-vasile/mimetype v1.4.5 h1:J7wGKdGu33ocBOhGy0z653k/lFKLFDPJMG8Gql0kxn4=
github.com/gabriel-vasile/mimetype v1.4.5/go.mod h1:ibHel+/kbxn9x2407k1izTA1S81ku1z/DlgOW2QE0M4=
+github.com/gabriel-vasile/mimetype v1.4.6 h1:3+PzJTKLkvgjeTbts6msPJt4DixhT4YtFNf1gtGe3zc=
+github.com/gabriel-vasile/mimetype v1.4.6/go.mod h1:JX1qVKqZd40hUPpAfiNTe0Sne7hdfKSbOqqmkq8GCXc=
github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
@@ -63,6 +67,8 @@ github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2
github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
github.com/klauspost/compress v1.17.10 h1:oXAz+Vh0PMUvJczoi+flxpnBEPxoER1IaAnU/NMPtT0=
github.com/klauspost/compress v1.17.10/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
+github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
+github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -151,6 +157,8 @@ golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
+golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
+golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -161,6 +169,8 @@ golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
+golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
@@ -177,6 +187,8 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -185,6 +197,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
+golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -192,6 +206,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
+google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
diff --git a/oc-shared b/oc-shared
index 14437ca..3ec6cf4 100755
Binary files a/oc-shared and b/oc-shared differ
diff --git a/routers/router.go b/routers/router.go
index 190f2ff..6da6d38 100644
--- a/routers/router.go
+++ b/routers/router.go
@@ -15,14 +15,14 @@ import (
func init() {
ns := beego.NewNamespace("/oc",
- beego.NSNamespace("/shared/collaborative_area",
+ beego.NSNamespace("/collaborative_area",
beego.NSInclude(
&controllers.CollaborativeAreaController{},
),
- ),
- beego.NSNamespace("/shared/collaborative_area/rule",
- beego.NSInclude(
- &controllers.RuleController{},
+ beego.NSNamespace("/rule",
+ beego.NSInclude(
+ &controllers.RuleController{},
+ ),
),
),
beego.NSNamespace("/version",
@@ -31,6 +31,5 @@ func init() {
),
),
)
-
beego.AddNamespace(ns)
}
diff --git a/swagger/swagger.json b/swagger/swagger.json
index 4d496fa..9a7f83c 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -15,10 +15,10 @@
},
"basePath": "/oc",
"paths": {
- "/shared/collaborative_area/": {
+ "/collaborative_area/": {
"get": {
"tags": [
- "shared/collaborative_area"
+ "collaborative_area"
],
"description": "find shared workspace by id\n\u003cbr\u003e",
"operationId": "CollaborativeAreaController.GetAll",
@@ -30,7 +30,7 @@
},
"post": {
"tags": [
- "shared/collaborative_area"
+ "collaborative_area"
],
"description": "create shared workspace\n\u003cbr\u003e",
"operationId": "CollaborativeAreaController.Create",
@@ -52,144 +52,10 @@
}
}
},
- "/shared/collaborative_area/rule/": {
+ "/collaborative_area/search/{search}": {
"get": {
"tags": [
- "shared/collaborative_area/rule"
- ],
- "description": "find rule by id\n\u003cbr\u003e",
- "operationId": "RuleController.GetAll",
- "responses": {
- "200": {
- "description": "{rule} models.rule"
- }
- }
- },
- "post": {
- "tags": [
- "shared/collaborative_area/rule"
- ],
- "description": "create rule\n\u003cbr\u003e",
- "operationId": "RuleController.Create",
- "parameters": [
- {
- "in": "body",
- "name": "data",
- "description": "body for data content (Json format)",
- "required": true,
- "schema": {
- "$ref": "#/definitions/json"
- }
- }
- ],
- "responses": {
- "200": {
- "description": "{rule} models.rule"
- }
- }
- }
- },
- "/shared/collaborative_area/rule/search/{search}": {
- "get": {
- "tags": [
- "shared/collaborative_area/rule"
- ],
- "description": "search rule\n\u003cbr\u003e",
- "operationId": "RuleController.Search",
- "parameters": [
- {
- "in": "path",
- "name": "search",
- "description": "the word search you want to get",
- "required": true,
- "type": "string"
- }
- ],
- "responses": {
- "200": {
- "description": "{rule} models.rule"
- }
- }
- }
- },
- "/shared/collaborative_area/rule/{id}": {
- "get": {
- "tags": [
- "shared/collaborative_area/rule"
- ],
- "description": "find rule by id\n\u003cbr\u003e",
- "operationId": "RuleController.Get",
- "parameters": [
- {
- "in": "path",
- "name": "id",
- "description": "the id you want to get",
- "required": true,
- "type": "string"
- }
- ],
- "responses": {
- "200": {
- "description": "{rule} models.rule"
- }
- }
- },
- "put": {
- "tags": [
- "shared/collaborative_area/rule"
- ],
- "description": "create rules\n\u003cbr\u003e",
- "operationId": "RuleController.Update",
- "parameters": [
- {
- "in": "path",
- "name": "id",
- "description": "the rule id you want to get",
- "required": true,
- "type": "string"
- },
- {
- "in": "body",
- "name": "body",
- "description": "The rule content",
- "required": true,
- "schema": {
- "$ref": "#/definitions/models.rule"
- }
- }
- ],
- "responses": {
- "200": {
- "description": "{rule} models.rule"
- }
- }
- },
- "delete": {
- "tags": [
- "shared/collaborative_area/rule"
- ],
- "description": "delete the rule\n\u003cbr\u003e",
- "operationId": "RuleController.Delete",
- "parameters": [
- {
- "in": "path",
- "name": "id",
- "description": "The id you want to delete",
- "required": true,
- "type": "string"
- }
- ],
- "responses": {
- "200": {
- "description": "{rule} delete success!"
- }
- }
- }
- },
- "/shared/collaborative_area/search/{search}": {
- "get": {
- "tags": [
- "shared/collaborative_area"
+ "collaborative_area"
],
"description": "search shared workspace\n\u003cbr\u003e",
"operationId": "CollaborativeAreaController.Search",
@@ -209,10 +75,10 @@
}
}
},
- "/shared/collaborative_area/{id}": {
+ "/collaborative_area/{id}": {
"get": {
"tags": [
- "shared/collaborative_area"
+ "collaborative_area"
],
"description": "find shared workspace by id\n\u003cbr\u003e",
"operationId": "CollaborativeAreaController.Get",
@@ -233,7 +99,7 @@
},
"put": {
"tags": [
- "shared/collaborative_area"
+ "collaborative_area"
],
"description": "create shared workspaces\n\u003cbr\u003e",
"operationId": "CollaborativeAreaController.Update",
@@ -263,7 +129,7 @@
},
"delete": {
"tags": [
- "shared/collaborative_area"
+ "collaborative_area"
],
"description": "delete the shared workspace\n\u003cbr\u003e",
"operationId": "CollaborativeAreaController.Delete",
@@ -283,10 +149,10 @@
}
}
},
- "/shared/collaborative_area/{id}/peer/{id2}": {
+ "/collaborative_area/{id}/peer/{id2}": {
"post": {
"tags": [
- "shared/collaborative_area"
+ "collaborative_area"
],
"description": "find shared workspace by id\n\u003cbr\u003e",
"operationId": "CollaborativeAreaController.Add Peer",
@@ -314,7 +180,7 @@
},
"delete": {
"tags": [
- "shared/collaborative_area"
+ "collaborative_area"
],
"description": "find shared workspace by id\n\u003cbr\u003e",
"operationId": "CollaborativeAreaController.Remove Peer",
@@ -341,10 +207,10 @@
}
}
},
- "/shared/collaborative_area/{id}/rule/{id2}": {
+ "/collaborative_area/{id}/rule/{id2}": {
"post": {
"tags": [
- "shared/collaborative_area"
+ "collaborative_area"
],
"description": "find shared workspace by id\n\u003cbr\u003e",
"operationId": "CollaborativeAreaController.Add Rule",
@@ -372,7 +238,7 @@
},
"delete": {
"tags": [
- "shared/collaborative_area"
+ "collaborative_area"
],
"description": "find shared workspace by id\n\u003cbr\u003e",
"operationId": "CollaborativeAreaController.Remove Rule",
@@ -399,10 +265,10 @@
}
}
},
- "/shared/collaborative_area/{id}/workflow/{id2}": {
+ "/collaborative_area/{id}/workflow/{id2}": {
"post": {
"tags": [
- "shared/collaborative_area"
+ "collaborative_area"
],
"description": "find shared workspace by id\n\u003cbr\u003e",
"operationId": "CollaborativeAreaController.Add Workflow",
@@ -430,7 +296,7 @@
},
"delete": {
"tags": [
- "shared/collaborative_area"
+ "collaborative_area"
],
"description": "find shared workspace by id\n\u003cbr\u003e",
"operationId": "CollaborativeAreaController.Remove Workflow",
@@ -457,10 +323,10 @@
}
}
},
- "/shared/collaborative_area/{id}/workspace/{id2}": {
+ "/collaborative_area/{id}/workspace/{id2}": {
"post": {
"tags": [
- "shared/collaborative_area"
+ "collaborative_area"
],
"description": "find shared workspace by id\n\u003cbr\u003e",
"operationId": "CollaborativeAreaController.Add Workspace",
@@ -488,7 +354,7 @@
},
"delete": {
"tags": [
- "shared/collaborative_area"
+ "collaborative_area"
],
"description": "find shared workspace by id\n\u003cbr\u003e",
"operationId": "CollaborativeAreaController.Add Workspace",
@@ -560,13 +426,9 @@
},
"tags": [
{
- "name": "shared/collaborative_area",
+ "name": "collaborative_area",
"description": "Operations about workspace\n"
},
- {
- "name": "shared/collaborative_area/rule",
- "description": "Operations about rule\n"
- },
{
"name": "version",
"description": "VersionController operations for Version\n"
diff --git a/swagger/swagger.yml b/swagger/swagger.yml
index 1671d9a..d7a7a67 100644
--- a/swagger/swagger.yml
+++ b/swagger/swagger.yml
@@ -12,10 +12,10 @@ info:
url: https://opensource.org/license/mit
basePath: /oc
paths:
- /shared/collaborative_area/:
+ /collaborative_area/:
get:
tags:
- - shared/collaborative_area
+ - collaborative_area
description: |-
find shared workspace by id
@@ -25,7 +25,7 @@ paths:
description: '{shared_workspace} models.shared_workspace'
post:
tags:
- - shared/collaborative_area
+ - collaborative_area
description: |-
create shared workspace
@@ -40,10 +40,10 @@ paths:
responses:
"200":
description: '{shared workspace} models.shared_workspace'
- /shared/collaborative_area/{id}:
+ /collaborative_area/{id}:
get:
tags:
- - shared/collaborative_area
+ - collaborative_area
description: |-
find shared workspace by id
@@ -59,7 +59,7 @@ paths:
description: '{shared workspace} models.shared_workspace'
put:
tags:
- - shared/collaborative_area
+ - collaborative_area
description: |-
create shared workspaces
@@ -81,7 +81,7 @@ paths:
description: '{shared workspace} models.shared_workspace'
delete:
tags:
- - shared/collaborative_area
+ - collaborative_area
description: |-
delete the shared workspace
@@ -95,10 +95,10 @@ paths:
responses:
"200":
description: '{shared workspace} delete success!'
- /shared/collaborative_area/{id}/peer/{id2}:
+ /collaborative_area/{id}/peer/{id2}:
post:
tags:
- - shared/collaborative_area
+ - collaborative_area
description: |-
find shared workspace by id
@@ -119,7 +119,7 @@ paths:
description: '{shared workspace} models.shared_workspace'
delete:
tags:
- - shared/collaborative_area
+ - collaborative_area
description: |-
find shared workspace by id
@@ -138,10 +138,10 @@ paths:
responses:
"200":
description: '{shared workspace} models.shared_workspace'
- /shared/collaborative_area/{id}/rule/{id2}:
+ /collaborative_area/{id}/rule/{id2}:
post:
tags:
- - shared/collaborative_area
+ - collaborative_area
description: |-
find shared workspace by id
@@ -162,7 +162,7 @@ paths:
description: '{shared workspace} models.shared_workspace'
delete:
tags:
- - shared/collaborative_area
+ - collaborative_area
description: |-
find shared workspace by id
@@ -181,10 +181,10 @@ paths:
responses:
"200":
description: '{shared workspace} models.shared_workspace'
- /shared/collaborative_area/{id}/workflow/{id2}:
+ /collaborative_area/{id}/workflow/{id2}:
post:
tags:
- - shared/collaborative_area
+ - collaborative_area
description: |-
find shared workspace by id
@@ -205,7 +205,7 @@ paths:
description: '{shared workspace} models.shared_workspace'
delete:
tags:
- - shared/collaborative_area
+ - collaborative_area
description: |-
find shared workspace by id
@@ -224,10 +224,10 @@ paths:
responses:
"200":
description: '{shared workspace} models.shared_workspace'
- /shared/collaborative_area/{id}/workspace/{id2}:
+ /collaborative_area/{id}/workspace/{id2}:
post:
tags:
- - shared/collaborative_area
+ - collaborative_area
description: |-
find shared workspace by id
@@ -248,7 +248,7 @@ paths:
description: '{shared workspace} models.shared_workspace'
delete:
tags:
- - shared/collaborative_area
+ - collaborative_area
description: |-
find shared workspace by id
@@ -267,110 +267,10 @@ paths:
responses:
"200":
description: '{shared workspace} models.shared_workspace'
- /shared/collaborative_area/rule/:
+ /collaborative_area/search/{search}:
get:
tags:
- - shared/collaborative_area/rule
- description: |-
- find rule by id
-
- operationId: RuleController.GetAll
- responses:
- "200":
- description: '{rule} models.rule'
- post:
- tags:
- - shared/collaborative_area/rule
- description: |-
- create rule
-
- operationId: RuleController.Create
- parameters:
- - in: body
- name: data
- description: body for data content (Json format)
- required: true
- schema:
- $ref: '#/definitions/json'
- responses:
- "200":
- description: '{rule} models.rule'
- /shared/collaborative_area/rule/{id}:
- get:
- tags:
- - shared/collaborative_area/rule
- description: |-
- find rule by id
-
- operationId: RuleController.Get
- parameters:
- - in: path
- name: id
- description: the id you want to get
- required: true
- type: string
- responses:
- "200":
- description: '{rule} models.rule'
- put:
- tags:
- - shared/collaborative_area/rule
- description: |-
- create rules
-
- operationId: RuleController.Update
- parameters:
- - in: path
- name: id
- description: the rule id you want to get
- required: true
- type: string
- - in: body
- name: body
- description: The rule content
- required: true
- schema:
- $ref: '#/definitions/models.rule'
- responses:
- "200":
- description: '{rule} models.rule'
- delete:
- tags:
- - shared/collaborative_area/rule
- description: |-
- delete the rule
-
- operationId: RuleController.Delete
- parameters:
- - in: path
- name: id
- description: The id you want to delete
- required: true
- type: string
- responses:
- "200":
- description: '{rule} delete success!'
- /shared/collaborative_area/rule/search/{search}:
- get:
- tags:
- - shared/collaborative_area/rule
- description: |-
- search rule
-
- operationId: RuleController.Search
- parameters:
- - in: path
- name: search
- description: the word search you want to get
- required: true
- type: string
- responses:
- "200":
- description: '{rule} models.rule'
- /shared/collaborative_area/search/{search}:
- get:
- tags:
- - shared/collaborative_area
+ - collaborative_area
description: |-
search shared workspace
@@ -417,12 +317,9 @@ definitions:
title: workspace
type: object
tags:
-- name: shared/collaborative_area
+- name: collaborative_area
description: |
Operations about workspace
-- name: shared/collaborative_area/rule
- description: |
- Operations about rule
- name: version
description: |
VersionController operations for Version