From ad581c11894a1574aac08faac6c1a9a378d7962b Mon Sep 17 00:00:00 2001 From: "LinskRuis.32" Date: Fri, 10 Jan 2020 11:31:12 +0800 Subject: [PATCH] update xid --- cloud/sysCloud/comm.go | 2 +- go.mod | 5 ++--- go.sum | 13 +++++++------ models/sys_file.go | 2 +- models/sys_param.go | 2 +- models/sys_permssion.go | 4 ++-- models/sys_role.go | 2 +- models/sys_user.go | 4 ++-- modeluis/sys_permssion.go | 2 +- modeluis/sys_role.go | 4 ++-- modeluis/sys_user.go | 2 +- modeluis/tree_permission.go | 2 +- service/sysService/file.go | 4 ++-- service/sysService/param.go | 8 ++++---- service/sysService/role.go | 14 +++++++------- service/userService/role.go | 26 +++++++++++++------------- service/userService/user.go | 8 ++++---- webs/sys/controller/user.go | 6 +++--- 18 files changed, 55 insertions(+), 55 deletions(-) diff --git a/cloud/sysCloud/comm.go b/cloud/sysCloud/comm.go index 6c9231b..47ce0bc 100644 --- a/cloud/sysCloud/comm.go +++ b/cloud/sysCloud/comm.go @@ -64,7 +64,7 @@ func CheckUPermission(perm string, c *macaron.Context) (rb bool) { if lguser == nil { return false } - return CheckPermission(lguser.Uuid, perm) + return CheckPermission(lguser.Xid, perm) } func GetUserPerms(uid string) map[string]bool { diff --git a/go.mod b/go.mod index 4c8fec6..9b595e9 100644 --- a/go.mod +++ b/go.mod @@ -8,9 +8,8 @@ require ( github.com/go-sql-driver/mysql v1.4.1 github.com/mgr9525/go-cloud v1.0.6-0.20191115021000-e912b446b8a9 github.com/mgr9525/go-ruisutil v1.0.8-0.20191105071958-41a4e7d87b4f - github.com/satori/go.uuid v1.2.0 github.com/xormplus/builder v0.0.0-20190724032102-0ee351fedce9 - github.com/xormplus/xorm v0.0.0-20190815102311-3995c60c8bb6 + github.com/xormplus/xorm v0.0.0-20190926190243-42377f593eb1 gopkg.in/macaron.v1 v1.3.4 - gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce + gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 ) diff --git a/go.sum b/go.sum index 48cd33d..d2e1b7f 100644 --- a/go.sum +++ b/go.sum @@ -78,6 +78,8 @@ github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerX github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-xid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-xid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= @@ -104,8 +106,6 @@ github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= -github.com/mgr9525/go-cloud v1.0.6-0.20191107091222-524f1218fb4e h1:A2GUbaNotiiQNMZ+1DnOByNbLaoGId1rvBhXIzOuPfk= -github.com/mgr9525/go-cloud v1.0.6-0.20191107091222-524f1218fb4e/go.mod h1:Wc25es8QefcN6HXFUroKShVuzvfjjkkaZDNVAc5q2sA= github.com/mgr9525/go-cloud v1.0.6-0.20191115021000-e912b446b8a9 h1:B5IIZcHuFAO3m+0fd8v1fbgd4KxRfgtzsCSkdHPdijs= github.com/mgr9525/go-cloud v1.0.6-0.20191115021000-e912b446b8a9/go.mod h1:Wc25es8QefcN6HXFUroKShVuzvfjjkkaZDNVAc5q2sA= github.com/mgr9525/go-ruisutil v1.0.8-0.20191105071958-41a4e7d87b4f h1:OkBmLGM6QfRasXO2qR46H4rvIcDb6sfowY5mS0rePM4= @@ -128,8 +128,6 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= -github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726/go.mod h1:3yhqj7WBBfRhbBlzyOC3gUxftwsU0u8gqevxwIHQpMw= github.com/siddontang/ledisdb v0.0.0-20190202134119-8ceb77e66a92/go.mod h1:mF1DpOSOUiJRMR+FDqaqu3EBqrybQtrDDszLUZ6oxPg= @@ -151,8 +149,9 @@ github.com/xormplus/builder v0.0.0-20190724032102-0ee351fedce9 h1:h7b9aRnem5U6Yu github.com/xormplus/builder v0.0.0-20190724032102-0ee351fedce9/go.mod h1:DR+4rxdyeR2G5yyiNx6j3/0TLjG5g+CICZfXmL2AHBg= github.com/xormplus/core v0.0.0-20190724072625-00f5a85ad6e0 h1:vqleyrxQwTNEr+jlW3VuOYlTRtoyDp/h6C6b0R9Ewro= github.com/xormplus/core v0.0.0-20190724072625-00f5a85ad6e0/go.mod h1:V3p6iAR/MaICgU6GJqxGQxspfljTyfOTv4Czz0B5atU= -github.com/xormplus/xorm v0.0.0-20190815102311-3995c60c8bb6 h1:LiYC4AwitnpxxRj0/knyqZIlPs14EWFc2fN1T9Q0Jho= github.com/xormplus/xorm v0.0.0-20190815102311-3995c60c8bb6/go.mod h1:+v6b10b4x5IcQmp1/Cbo9IqaknxVeuhQng+fhya6bdI= +github.com/xormplus/xorm v0.0.0-20190926190243-42377f593eb1 h1:aAOoM0H2aCXMrbD29iHSQL8zjQDDCFLisrgVBI5zZVY= +github.com/xormplus/xorm v0.0.0-20190926190243-42377f593eb1/go.mod h1:+v6b10b4x5IcQmp1/Cbo9IqaknxVeuhQng+fhya6bdI= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc= @@ -172,6 +171,7 @@ golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa h1:KIDDMLT1O0Nr7TSxp8xM5tJcdn8tgyAONntO829og1M= golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= @@ -187,8 +187,9 @@ gopkg.in/ini.v1 v1.46.0 h1:VeDZbLYGaupuvIrsYCEOe/L/2Pcs5n7hdO1ZTjporag= gopkg.in/ini.v1 v1.46.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/macaron.v1 v1.3.4 h1:HvIscOwxhFhx3swWM/979wh2QMYyuXrNmrF9l+j3HZs= gopkg.in/macaron.v1 v1.3.4/go.mod h1:/RoHTdC8ALpyJ3+QR36mKjwnT1F1dyYtsGM9Ate6ZFI= -gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce h1:xcEWjVhvbDy+nHP67nPDDpbYrY+ILlfndk4bRioVHaU= gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= +gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw= +gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= diff --git a/models/sys_file.go b/models/sys_file.go index 2c3cc93..043ff90 100644 --- a/models/sys_file.go +++ b/models/sys_file.go @@ -6,7 +6,7 @@ import ( type SysFile struct { Id int64 `xorm:"pk autoincr BIGINT(20)"` - Uuid string `xorm:"not null pk VARCHAR(64)"` + Xid string `xorm:"not null pk VARCHAR(64)"` Types string `xorm:"comment('类型') VARCHAR(50)"` Uid string `xorm:"VARCHAR(64)"` Toid string `xorm:"VARCHAR(64)"` diff --git a/models/sys_param.go b/models/sys_param.go index 7da4b2a..495331b 100644 --- a/models/sys_param.go +++ b/models/sys_param.go @@ -6,7 +6,7 @@ import ( type SysParam struct { Id int64 `xorm:"pk autoincr BIGINT(20)"` - Uuid string `xorm:"not null pk VARCHAR(64)"` + Xid string `xorm:"not null pk VARCHAR(64)"` Name string `xorm:"not null pk comment('key') VARCHAR(50)"` Title string `xorm:"comment('名称') VARCHAR(100)"` Value []byte `xorm:"BLOB"` diff --git a/models/sys_permssion.go b/models/sys_permssion.go index f796482..fe95c80 100644 --- a/models/sys_permssion.go +++ b/models/sys_permssion.go @@ -6,8 +6,8 @@ import ( type SysPermssion struct { Id int64 `xorm:"pk autoincr BIGINT(20)"` - Uuid string `xorm:"not null pk VARCHAR(64)"` - Parent string `xorm:"VARCHAR(64)"` + Xid string `xorm:"not null pk VARCHAR(64)"` + Parent string `xorm:"index VARCHAR(64)"` Title string `xorm:"VARCHAR(100)"` Value string `xorm:"VARCHAR(100)"` Times time.Time `xorm:"default 'CURRENT_TIMESTAMP' TIMESTAMP"` diff --git a/models/sys_role.go b/models/sys_role.go index d7e4b0d..9ffe9da 100644 --- a/models/sys_role.go +++ b/models/sys_role.go @@ -6,7 +6,7 @@ import ( type SysRole struct { Id int64 `xorm:"pk autoincr BIGINT(20)"` - Uuid string `xorm:"not null pk VARCHAR(64)"` + Xid string `xorm:"not null pk VARCHAR(64)"` Title string `xorm:"VARCHAR(100)"` Perms string `xorm:"TEXT"` Times time.Time `xorm:"default 'CURRENT_TIMESTAMP' TIMESTAMP"` diff --git a/models/sys_user.go b/models/sys_user.go index d041b9d..6adec67 100644 --- a/models/sys_user.go +++ b/models/sys_user.go @@ -6,11 +6,11 @@ import ( type SysUser struct { Id int64 `xorm:"pk autoincr BIGINT(20)"` - Uuid string `xorm:"not null pk VARCHAR(64)"` + Xid string `xorm:"not null pk VARCHAR(64)"` Name string `xorm:"not null pk VARCHAR(50)"` Pass string `xorm:"VARCHAR(100)"` Nick string `xorm:"VARCHAR(100)"` - Phone string `xorm:"comment('备用电话') VARCHAR(50)"` + Phone string `xorm:"index comment('备用电话') VARCHAR(50)"` Times time.Time `xorm:"default 'CURRENT_TIMESTAMP' comment('创建时间') TIMESTAMP"` Logintm time.Time `xorm:"comment('登陆时间') TIMESTAMP"` Fwtm time.Time `xorm:"comment('访问时间') TIMESTAMP"` diff --git a/modeluis/sys_permssion.go b/modeluis/sys_permssion.go index 18a5091..5442c00 100644 --- a/modeluis/sys_permssion.go +++ b/modeluis/sys_permssion.go @@ -6,7 +6,7 @@ import ( type SysPermssion struct { Id int64 `xorm:"pk autoincr BIGINT(20)"` - Uuid string `xorm:"not null pk VARCHAR(64)"` + Xid string `xorm:"not null pk VARCHAR(64)"` Parent string `xorm:"VARCHAR(64)"` Title string `xorm:"VARCHAR(100)"` Value string `xorm:"VARCHAR(100)"` diff --git a/modeluis/sys_role.go b/modeluis/sys_role.go index dbd4586..985fe41 100644 --- a/modeluis/sys_role.go +++ b/modeluis/sys_role.go @@ -6,7 +6,7 @@ import ( type SysRole struct { Id int64 `xorm:"pk autoincr BIGINT(20)"` - Uuid string `xorm:"not null pk VARCHAR(64)"` + Xid string `xorm:"not null pk VARCHAR(64)"` Title string `xorm:"VARCHAR(100)"` Perms string `xorm:"TEXT"` Times time.Time `xorm:"TIMESTAMP"` @@ -15,7 +15,7 @@ type SysRole struct { } type SysURole struct { Id int64 `xorm:"pk autoincr BIGINT(20)"` - Uuid string `xorm:"not null pk VARCHAR(64)"` + Xid string `xorm:"not null pk VARCHAR(64)"` Title string `xorm:"VARCHAR(100)"` Perms string `xorm:"TEXT" json:"-"` Times time.Time `xorm:"TIMESTAMP"` diff --git a/modeluis/sys_user.go b/modeluis/sys_user.go index e58fac7..4fef25b 100644 --- a/modeluis/sys_user.go +++ b/modeluis/sys_user.go @@ -6,7 +6,7 @@ import ( type SysUser struct { Id int64 `xorm:"pk autoincr BIGINT(20)"` - Uuid string `xorm:"not null pk VARCHAR(64)"` + Xid string `xorm:"not null pk VARCHAR(64)"` Name string `xorm:"not null pk VARCHAR(50)"` Nick string `xorm:"VARCHAR(100)"` Phone string `xorm:"comment('备用电话') VARCHAR(50)"` diff --git a/modeluis/tree_permission.go b/modeluis/tree_permission.go index 7037c5a..cec5c37 100644 --- a/modeluis/tree_permission.go +++ b/modeluis/tree_permission.go @@ -4,7 +4,7 @@ import "time" type TreePermssion struct { Id int64 `xorm:"pk autoincr BIGINT(20)"` - Uuid string `xorm:"not null pk VARCHAR(64)"` + Xid string `xorm:"not null pk VARCHAR(64)"` Parent string `xorm:"VARCHAR(64)"` Title string `xorm:"VARCHAR(100)"` Value string `xorm:"VARCHAR(100)"` diff --git a/service/sysService/file.go b/service/sysService/file.go index 240c627..06db1ad 100644 --- a/service/sysService/file.go +++ b/service/sysService/file.go @@ -5,9 +5,9 @@ import ( "GoClouds/models" ) -func FindFile(uuid string) *models.SysFile { +func FindFile(xid string) *models.SysFile { e := new(models.SysFile) - ok, err := comm.DbSys.Where("uuid=?", uuid).Get(e) + ok, err := comm.DbSys.Where("xid=?", xid).Get(e) if err != nil { return nil } diff --git a/service/sysService/param.go b/service/sysService/param.go index c96902c..4d45e4e 100644 --- a/service/sysService/param.go +++ b/service/sysService/param.go @@ -4,7 +4,7 @@ import ( "GoClouds/core/comm" "GoClouds/models" "encoding/json" - uuid "github.com/satori/go.uuid" + "gopkg.in/mgo.v2/bson" "time" ) @@ -27,7 +27,7 @@ func GetParam(key string) map[string]interface{} { return nil } if !ok { - /*e.Uuid=uuid.NewV4().String() + /*e.Xid=xid.NewV4().String() e.Name=key e.*/ return nil @@ -58,9 +58,9 @@ func SetParam(key string, val *map[string]interface{}, tits ...string) bool { } if ok { - comm.DbSys.Where("uuid=?", e.Uuid).Update(e) + comm.DbSys.Where("xid=?", e.Xid).Update(e) } else { - e.Uuid = uuid.NewV4().String() + e.Xid = bson.NewObjectId().Hex() e.Name = key e.Times = time.Now() comm.DbSys.Insert(e) diff --git a/service/sysService/role.go b/service/sysService/role.go index 819a7d6..1bd9f63 100644 --- a/service/sysService/role.go +++ b/service/sysService/role.go @@ -7,9 +7,9 @@ import ( "strings" ) -func FindRole(uuid string) *models.SysRole { +func FindRole(xid string) *models.SysRole { e := new(models.SysRole) - ok, err := comm.DbSys.Where("uuid=?", uuid).Get(e) + ok, err := comm.DbSys.Where("xid=?", xid).Get(e) if err != nil { return nil } @@ -18,9 +18,9 @@ func FindRole(uuid string) *models.SysRole { } return nil } -func FindPermission(uuid string) *models.SysPermssion { +func FindPermission(xid string) *models.SysPermssion { e := new(models.SysPermssion) - ok, err := comm.DbSys.Where("uuid=?", uuid).Get(e) + ok, err := comm.DbSys.Where("xid=?", xid).Get(e) if err != nil { return nil } @@ -29,14 +29,14 @@ func FindPermission(uuid string) *models.SysPermssion { } return nil } -func FindPermissions(uuids string) string { - if len(uuids) <= 0 { +func FindPermissions(xids string) string { + if len(xids) <= 0 { return "" } rets := "" permssions := make([]*models.SysPermssion, 0) - err := comm.DbSys.Where(builder.In("uuid", strings.Split(uuids, ","))).Find(&permssions) + err := comm.DbSys.Where(builder.In("xid", strings.Split(xids, ","))).Find(&permssions) if err == nil { ln := len(permssions) for i, o := range permssions { diff --git a/service/userService/role.go b/service/userService/role.go index 521ad0c..b0a9982 100644 --- a/service/userService/role.go +++ b/service/userService/role.go @@ -33,7 +33,7 @@ func findPermChilds(parent *modeluis.TreePermssion, upms map[string]bool) { return } childs := make([]*modeluis.TreePermssion, 0) - err := comm.DbSys.Where("parent=?", parent.Uuid).OrderBy("sort ASC,id ASC").Find(&childs) + err := comm.DbSys.Where("parent=?", parent.Xid).OrderBy("sort ASC,id ASC").Find(&childs) if err != nil { println("findPermChilds err:" + err.Error()) return @@ -47,7 +47,7 @@ func findPermChilds(parent *modeluis.TreePermssion, upms map[string]bool) { t := *parent ts := []*modeluis.TreePermssion{&t} childs = append(ts, childs...) - parent.Uuid = "" + parent.Xid = "" } parent.Childs = childs } @@ -59,10 +59,10 @@ func FindUPermissions(uid string) []*modeluis.SysPermssion { userRole := FindUserRole(uid) //comm.DbSys.SqlTemplateClient("role.stpl") //rids:=strings.Split(userRole.RoleCodes,",") - ses := comm.DbSys.Where("uuid='common'") + ses := comm.DbSys.Where("xid='common'") if len(userRole.RoleCodes) > 0 { rcds := strings.Split(userRole.RoleCodes, ",") - ses.Or(builder.In("uuid", rcds)) + ses.Or(builder.In("xid", rcds)) } roles := make([]*models.SysRole, 0) err := ses.Find(&roles) @@ -75,7 +75,7 @@ func FindUPermissions(uid string) []*modeluis.SysPermssion { continue } permssions := make([]*modeluis.SysPermssion, 0) - ses := comm.DbSys.Where(builder.In("uuid", strings.Split(role.Perms, ","))) + ses := comm.DbSys.Where(builder.In("xid", strings.Split(role.Perms, ","))) err := ses.Find(&permssions) if err != nil { println("FindUserPermission err:" + err.Error()) @@ -92,7 +92,7 @@ func FindUPermissions(uid string) []*modeluis.SysPermssion { for _, perm := range permssions { if len(perm.Value) > 0 { - if limids[perm.Uuid] == true { + if limids[perm.Xid] == true { perm.Had = true } perms[perm.Value] = perm @@ -128,12 +128,12 @@ func FindUserRoles(uid string) []*modeluis.SysURole { } } roles := make([]*modeluis.SysURole, 0) - err := comm.DbSys.Where("uuid!='common'").Find(&roles) + err := comm.DbSys.Where("xid!='common'").Find(&roles) if err != nil { println("FindUserRoles:" + err.Error()) } for _, v := range roles { - v.Had = rcds[v.Uuid] == true + v.Had = rcds[v.Xid] == true v.Permls = sysService.FindPermissions(v.Perms) } return roles @@ -143,10 +143,10 @@ func FindUserPermission(uid string) map[string]bool { userRole := FindUserRole(uid) //comm.DbSys.SqlTemplateClient("role.stpl") //rids:=strings.Split(userRole.RoleCodes,",") - ses := comm.DbSys.Where("uuid='common'") + ses := comm.DbSys.Where("xid='common'") if len(userRole.RoleCodes) > 0 { rcds := strings.Split(userRole.RoleCodes, ",") - ses.Or(builder.In("uuid", rcds)) + ses.Or(builder.In("xid", rcds)) } roles := make([]*models.SysRole, 0) err := ses.Find(&roles) @@ -159,10 +159,10 @@ func FindUserPermission(uid string) map[string]bool { continue } permssions := make([]*models.SysPermssion, 0) - ses := comm.DbSys.Where(builder.In("uuid", strings.Split(role.Perms, ","))) + ses := comm.DbSys.Where(builder.In("xid", strings.Split(role.Perms, ","))) if len(userRole.Limits) > 0 { rcds := strings.Split(userRole.Limits, ",") - ses.And(builder.NotIn("uuid", rcds)) + ses.And(builder.NotIn("xid", rcds)) } err := ses.Find(&permssions) if err != nil { @@ -221,5 +221,5 @@ func CheckUPermission(perm string, c *macaron.Context, ch cache.Cache) (rb bool) return false } - return CheckPermission(lguser.Uuid, perm, ch) + return CheckPermission(lguser.Xid, perm, ch) } diff --git a/service/userService/user.go b/service/userService/user.go index ca41508..85f5c49 100644 --- a/service/userService/user.go +++ b/service/userService/user.go @@ -9,14 +9,14 @@ import ( "gopkg.in/macaron.v1" ) -func FindUUID(id string) *models.SysUser { +func FindXid(id string) *models.SysUser { if len(id) <= 0 { return nil } e := new(models.SysUser) - ok, err := comm.DbSys.Where("uuid=?", id).Get(e) + ok, err := comm.DbSys.Where("xid=?", id).Get(e) if err != nil { - logger.Info("FindUserUUID err:", err.Error()) + logger.Info("FindUserXid err:", err.Error()) return nil } if ok { @@ -47,5 +47,5 @@ func GetCurrentUser(c *macaron.Context) *models.SysUser { if len(id) <= 0 { return nil } - return FindUUID(id) + return FindXid(id) } diff --git a/webs/sys/controller/user.go b/webs/sys/controller/user.go index 129efd1..f7c55c8 100644 --- a/webs/sys/controller/user.go +++ b/webs/sys/controller/user.go @@ -43,13 +43,13 @@ func (e *UserController) login(c *macaron.Context, ctj gocloud.ContJSON) { c.PlainText(513, []byte("密码错误")) return } - if !sysCloud.CheckPermission(usr.Uuid, "login") { + if !sysCloud.CheckPermission(usr.Xid, "login") { c.PlainText(514, []byte("帐号禁止登录")) return } usr.Logintm = time.Now() - comm.DbSys.Cols("logintm").Where("uuid=?", usr.Uuid).Update(usr) + comm.DbSys.Cols("logintm").Where("xid=?", usr.Xid).Update(usr) - c.PlainText(200, []byte(usr.Uuid)) + c.PlainText(200, []byte(usr.Xid)) }