From 23b85c1495662c809a505762cd45fb20b7b2839c Mon Sep 17 00:00:00 2001 From: veypi Date: Mon, 4 Nov 2024 16:07:31 +0800 Subject: [PATCH] feat: db resource add id --- oa/api/app/resource.go | 70 +++++++++++++++++++---------------------- oa/go.mod | 10 ++---- oa/go.sum | 33 ++++++------------- oa/models/access.gen.go | 26 ++++++++------- oa/models/access.go | 3 ++ oa/models/app.gen.go | 29 +++++++---------- oa/models/app.go | 6 ++-- oa/models/init.go | 14 +++++---- 8 files changed, 85 insertions(+), 106 deletions(-) diff --git a/oa/api/app/resource.go b/oa/api/app/resource.go index 38eaa16..d9c59a3 100644 --- a/oa/api/app/resource.go +++ b/oa/api/app/resource.go @@ -14,82 +14,78 @@ func useResource(r rest.Router) { r.Get("/:resource_id", resourceGet) r.Patch("/:resource_id", resourcePatch) } -func resourcePost(x *rest.X) (any, error) { - opts := &M.ResourcePost{} +func resourceGet(x *rest.X) (any, error) { + opts := &M.ResourceGet{} err := x.Parse(opts) if err != nil { return nil, err } data := &M.Resource{} - data.AppID = opts.AppID - data.Name = opts.Name - data.Des = opts.Des - err = cfg.DB().Create(data).Error + err = cfg.DB().Where("id = ?", opts.ID).First(data).Error return data, err } -func resourceDelete(x *rest.X) (any, error) { - opts := &M.ResourceDelete{} +func resourcePatch(x *rest.X) (any, error) { + opts := &M.ResourcePatch{} err := x.Parse(opts) if err != nil { return nil, err } - data := &M.Resource{ - AppID: opts.AppID, - Name: opts.Name, - } + data := &M.Resource{} - err = cfg.DB().Delete(data).Error + err = cfg.DB().Where("id = ?", opts.ID).First(data).Error + if err != nil { + return nil, err + } + optsMap := make(map[string]interface{}) + if opts.Des != nil { + optsMap["des"] = opts.Des + } + err = cfg.DB().Model(data).Updates(optsMap).Error return data, err } -func resourceList(x *rest.X) (any, error) { - opts := &M.ResourceList{} +func resourceDelete(x *rest.X) (any, error) { + opts := &M.ResourceDelete{} err := x.Parse(opts) if err != nil { return nil, err } - data := make([]*M.Resource, 0, 10) + data := &M.Resource{} - query := cfg.DB() - if opts.CreatedAt != nil { - query = query.Where("created_at > ?", opts.CreatedAt) - } - if opts.UpdatedAt != nil { - query = query.Where("updated_at > ?", opts.UpdatedAt) - } - query = query.Where("app_id = ?", opts.AppID) - err = query.Find(&data).Error + err = cfg.DB().Where("id = ?", opts.ID).Delete(data).Error return data, err } -func resourceGet(x *rest.X) (any, error) { - opts := &M.ResourceGet{} +func resourceList(x *rest.X) (any, error) { + opts := &M.ResourceList{} err := x.Parse(opts) if err != nil { return nil, err } - data := &M.Resource{} + data := make([]*M.Resource, 0, 10) - err = cfg.DB().Where("id = ?", opts.ID).First(data).Error + query := cfg.DB() + if opts.AppID != nil { + query = query.Where("app_id LIKE ?", opts.AppID) + } + err = query.Find(&data).Error return data, err } -func resourcePatch(x *rest.X) (any, error) { - opts := &M.ResourcePatch{} +func resourcePost(x *rest.X) (any, error) { + opts := &M.ResourcePost{} err := x.Parse(opts) if err != nil { return nil, err } data := &M.Resource{} - err = cfg.DB().Where("id = ?", opts.ID).First(data).Error - if err != nil { - return nil, err - } - optsMap := make(map[string]interface{}) - err = cfg.DB().Model(data).Updates(optsMap).Error + data.AppID = opts.AppID + data.Name = opts.Name + data.Des = opts.Des + err = cfg.DB().Create(data).Error return data, err } diff --git a/oa/go.mod b/oa/go.mod index 7fb65cd..2ee88b4 100644 --- a/oa/go.mod +++ b/oa/go.mod @@ -13,19 +13,15 @@ require ( github.com/nats-io/nats-server/v2 v2.10.21 github.com/veypi/OneBD v0.0.0-00010101000000-000000000000 github.com/veypi/utils v0.3.7 - gorm.io/driver/postgres v1.5.9 + gorm.io/driver/mysql v1.5.7 gorm.io/gorm v1.25.12 ) require ( - github.com/jackc/pgpassfile v1.0.0 // indirect - github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect - github.com/jackc/pgx/v5 v5.5.5 // indirect - github.com/jackc/puddle/v2 v2.2.1 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect github.com/klauspost/compress v1.17.9 // indirect - github.com/kr/text v0.2.0 // indirect + github.com/kr/pretty v0.3.0 // indirect github.com/minio/highwayhash v1.0.3 // indirect github.com/nats-io/jwt/v2 v2.5.8 // indirect github.com/nats-io/nkeys v0.4.7 // indirect @@ -34,10 +30,10 @@ require ( github.com/rs/zerolog v1.17.2 // indirect golang.org/x/crypto v0.27.0 // indirect golang.org/x/net v0.21.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 golang.org/x/time v0.6.0 // indirect + gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/oa/go.sum b/oa/go.sum index 1639bfb..4dd3b90 100644 --- a/oa/go.sum +++ b/oa/go.sum @@ -2,31 +2,24 @@ github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0 github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc= github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk= github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= -github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= -github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk= -github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= -github.com/jackc/pgx/v5 v5.5.5 h1:amBjrZVmksIdNjxGW/IiIMzxMKZFelXbUoPNb+8sjQw= -github.com/jackc/pgx/v5 v5.5.5/go.mod h1:ez9gk+OAat140fv9ErkZDYFWmXLfV+++K0uAOiwgm1A= -github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk= -github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/minio/highwayhash v1.0.3 h1:kbnuUMoHYyVl7szWjSxJnxw11k2U709jqFPPmIUyD6Q= @@ -42,18 +35,12 @@ github.com/nats-io/nkeys v0.4.7/go.mod h1:kqXRgRDPlGy7nGaEDMuYzmiJCIAAWDK0IMBtDm github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/zerolog v1.17.2 h1:RMRHFw2+wF7LO0QqtELQwo8hqSmqISyCJeFeAAuWcRo= github.com/rs/zerolog v1.17.2/go.mod h1:9nvC1axdVrAHcu/s9taAVfBuIdTZLVQmKQyvrUjF5+I= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= @@ -62,8 +49,6 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= -golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= @@ -76,16 +61,18 @@ golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20190828213141-aed303cbaa74/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/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= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gorm.io/driver/postgres v1.5.9 h1:DkegyItji119OlcaLjqN11kHoUgZ/j13E0jkJZgD6A8= -gorm.io/driver/postgres v1.5.9/go.mod h1:DX3GReXH+3FPWGrrgffdvCk3DQ1dwDPdmbenSkweRGI= +gorm.io/driver/mysql v1.5.7 h1:MndhOPYOfEp2rHKgkZIhJ16eVUIRf2HmzgoPmh7FCWo= +gorm.io/driver/mysql v1.5.7/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkDM= +gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8= gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ= diff --git a/oa/models/access.gen.go b/oa/models/access.gen.go index 78f86fb..9ecb693 100644 --- a/oa/models/access.gen.go +++ b/oa/models/access.gen.go @@ -3,21 +3,23 @@ package models import "time" type AccessList struct { - CreatedAt *time.Time `json:"created_at" parse:"query"` - UpdatedAt *time.Time `json:"updated_at" parse:"query"` - AppID string `json:"app_id" gorm:"index;type:varchar(32)" parse:"json"` - UserID *string `json:"user_id" gorm:"index;type:varchar(32);default: null" parse:"json"` - RoleID *string `json:"role_id" gorm:"index;type:varchar(32);default: null" parse:"json"` - Name *string `json:"name" parse:"json"` + CreatedAt *time.Time `json:"created_at" parse:"query"` + UpdatedAt *time.Time `json:"updated_at" parse:"query"` + AppID string `json:"app_id" gorm:"index;type:varchar(32)" parse:"json"` + UserID *string `json:"user_id" gorm:"index;type:varchar(32);default: null" parse:"json"` + RoleID *string `json:"role_id" gorm:"index;type:varchar(32);default: null" parse:"json"` + Name *string `json:"name" parse:"json"` + ResourceID *string `json:"resource_id" gorm:"index;type:varchar(32);default: null" parse:"json"` } type AccessPost struct { - AppID string `json:"app_id" gorm:"index;type:varchar(32)" parse:"json"` - UserID *string `json:"user_id" gorm:"index;type:varchar(32);default: null" parse:"json"` - RoleID *string `json:"role_id" gorm:"index;type:varchar(32);default: null" parse:"json"` - Name string `json:"name" parse:"json"` - TID string `json:"tid" parse:"json"` - Level uint `json:"level" parse:"json"` + AppID string `json:"app_id" gorm:"index;type:varchar(32)" parse:"json"` + UserID *string `json:"user_id" gorm:"index;type:varchar(32);default: null" parse:"json"` + RoleID *string `json:"role_id" gorm:"index;type:varchar(32);default: null" parse:"json"` + Name string `json:"name" parse:"json"` + TID string `json:"tid" parse:"json"` + Level uint `json:"level" parse:"json"` + ResourceID *string `json:"resource_id" gorm:"index;type:varchar(32);default: null" parse:"json"` } type AccessGet struct { diff --git a/oa/models/access.go b/oa/models/access.go index a35ce88..0d473d9 100644 --- a/oa/models/access.go +++ b/oa/models/access.go @@ -18,6 +18,9 @@ type Access struct { RoleID *string `json:"role_id" gorm:"index;type:varchar(32);default: null" methods:"post,list" parse:"json"` Role *Role `json:"-" gorm:"foreignKey:RoleID;references:ID"` + ResourceID *string `json:"resource_id" gorm:"index;type:varchar(32);default: null" methods:"post,list" parse:"json"` + Resource *Resource `json:"-" gorm:"foreignKey:ResourceID;references:ID"` + Name string `json:"name" methods:"post,*list" parse:"json"` TID string `json:"tid" methods:"post" parse:"json"` diff --git a/oa/models/app.gen.go b/oa/models/app.gen.go index d4df61f..2ba3bea 100644 --- a/oa/models/app.gen.go +++ b/oa/models/app.gen.go @@ -1,7 +1,5 @@ package models -import "time" - type AppGet struct { ID string `json:"id" gorm:"primaryKey;type:varchar(32)" parse:"path@app_id"` } @@ -61,30 +59,25 @@ type AppUserPost struct { AppID string `json:"app_id" parse:"path"` } -type ResourceList struct { - CreatedAt *time.Time `json:"created_at" parse:"query"` - UpdatedAt *time.Time `json:"updated_at" parse:"query"` - AppID string `json:"app_id" gorm:"primaryKey;type:varchar(32)" parse:"path"` +type ResourceGet struct { + ID string `json:"id" gorm:"primaryKey;type:varchar(32)" parse:"path@resource_id"` } -type ResourcePost struct { - Name string `json:"name" gorm:"primaryKey" parse:"json"` - Des string `json:"des" parse:"json"` - AppID string `json:"app_id" gorm:"primaryKey;type:varchar(32)" parse:"path"` +type ResourcePatch struct { + ID string `json:"id" gorm:"primaryKey;type:varchar(32)" parse:"path@resource_id"` + Des *string `json:"des" parse:"json"` } type ResourceDelete struct { - Name string `json:"name" gorm:"primaryKey" parse:"json"` - AppID string `json:"app_id" gorm:"primaryKey;type:varchar(32)" parse:"path"` - ID string `json:"id" gorm:"primaryKey;type:varchar(32)" parse:"path@resource_id"` + ID string `json:"id" gorm:"primaryKey;type:varchar(32)" parse:"path@resource_id"` } -type ResourceGet struct { - AppID string `json:"app_id" parse:"path"` - ID string `json:"id" gorm:"primaryKey;type:varchar(32)" parse:"path@resource_id"` +type ResourceList struct { + AppID *string `json:"app_id" parse:"path"` } -type ResourcePatch struct { +type ResourcePost struct { AppID string `json:"app_id" parse:"path"` - ID string `json:"id" gorm:"primaryKey;type:varchar(32)" parse:"path@resource_id"` + Name string `json:"name" parse:"json"` + Des string `json:"des" parse:"json"` } diff --git a/oa/models/app.go b/oa/models/app.go index 0e7dbdc..dd6d3ea 100644 --- a/oa/models/app.go +++ b/oa/models/app.go @@ -69,8 +69,8 @@ func (m *AppUser) AfterUpdate(tx *gorm.DB) error { type Resource struct { BaseModel - AppID string `json:"app_id" methods:"get,list,post,patch,delete" parse:"path"` + AppID string `json:"app_id" methods:"*list,post" parse:"path"` App *App `json:"-" gorm:"foreignKey:AppID;references:ID"` - Name string `json:"name" gorm:"primaryKey" methods:"post,delete" parse:"json"` - Des string `json:"des" methods:"post" parse:"json"` + Name string `json:"name" methods:"post" parse:"json"` + Des string `json:"des" methods:"post,*patch" parse:"json"` } diff --git a/oa/models/init.go b/oa/models/init.go index 8a86e2f..9958777 100644 --- a/oa/models/init.go +++ b/oa/models/init.go @@ -61,10 +61,11 @@ func InitDBData() error { } adminID := "" for r, roles := range initRole { - logv.AssertError(cfg.DB().Where("app_id = ? AND name = ?", app.ID, r).FirstOrCreate(&Resource{ + resource := &Resource{ AppID: app.ID, Name: r, - }).Error) + } + logv.AssertError(cfg.DB().Where("app_id = ? AND name = ?", app.ID, r).FirstOrCreate(resource).Error) for rName, l := range roles { role := &Role{} logv.AssertError(cfg.DB().Where("app_id = ? AND name = ?", app.ID, rName).Attrs(&Role{ @@ -75,10 +76,11 @@ func InitDBData() error { Name: rName, }).FirstOrCreate(role).Error) logv.AssertError(cfg.DB().Where("app_id = ? AND role_id = ? AND name = ?", app.ID, role.ID, r).FirstOrCreate(&Access{ - AppID: app.ID, - RoleID: &role.ID, - Name: r, - Level: l, + AppID: app.ID, + RoleID: &role.ID, + ResourceID: &resource.ID, + Name: r, + Level: l, }).Error) if rName == "admin" { adminID = role.ID