From 10f56d26fef3bfe67c86ab8e839bfd9cba0c6172 Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Fri, 2 Feb 2018 16:17:58 +0800 Subject: [PATCH] Change codes to make everything OK after upgrading to beego 1.9.0 --- src/common/dao/config.go | 18 +++++++++--------- src/common/models/project.go | 2 +- src/common/models/role.go | 2 +- src/common/models/user.go | 4 ++-- src/ui/filter/security_test.go | 24 ++++++++++-------------- tests/testprepare.sh | 4 ++-- 6 files changed, 25 insertions(+), 29 deletions(-) diff --git a/src/common/dao/config.go b/src/common/dao/config.go index f91435d20..a11a551fe 100644 --- a/src/common/dao/config.go +++ b/src/common/dao/config.go @@ -34,8 +34,8 @@ func AuthModeCanBeModified() (bool, error) { func GetConfigEntries() ([]*models.ConfigEntry, error) { o := GetOrmer() var p []*models.ConfigEntry - sql:="select * from properties" - n,err := o.Raw(sql,[]interface{}{}).QueryRows(&p) + sql := "select * from properties" + n, err := o.Raw(sql, []interface{}{}).QueryRows(&p) if err != nil { return nil, err @@ -44,27 +44,27 @@ func GetConfigEntries() ([]*models.ConfigEntry, error) { if n == 0 { return nil, nil } - return p,nil + return p, nil } // SaveConfigEntries Save configuration to database. -func SaveConfigEntries(entries []models.ConfigEntry) error{ +func SaveConfigEntries(entries []models.ConfigEntry) error { o := GetOrmer() - tempEntry:=models.ConfigEntry{} - for _, entry := range entries{ + for _, entry := range entries { + tempEntry := models.ConfigEntry{} tempEntry.Key = entry.Key tempEntry.Value = entry.Value - created, _, error := o.ReadOrCreate(&tempEntry,"k") + created, _, error := o.ReadOrCreate(&tempEntry, "k") if error != nil { return error } if !created { entry.ID = tempEntry.ID - _ ,err := o.Update(&entry,"v") + _, err := o.Update(&entry, "v") if err != nil { return err } } } return nil -} \ No newline at end of file +} diff --git a/src/common/models/project.go b/src/common/models/project.go index 4864076cf..f916f3c62 100644 --- a/src/common/models/project.go +++ b/src/common/models/project.go @@ -28,7 +28,7 @@ type Project struct { OwnerID int `orm:"column(owner_id)" json:"owner_id"` Name string `orm:"column(name)" json:"name"` CreationTime time.Time `orm:"column(creation_time)" json:"creation_time"` - UpdateTime time.Time `orm:"update_time" json:"update_time"` + UpdateTime time.Time `orm:"column(update_time)" json:"update_time"` Deleted int `orm:"column(deleted)" json:"deleted"` OwnerName string `orm:"-" json:"owner_name"` Togglable bool `orm:"-" json:"togglable"` diff --git a/src/common/models/role.go b/src/common/models/role.go index 27dc7a43b..209190f51 100644 --- a/src/common/models/role.go +++ b/src/common/models/role.go @@ -29,5 +29,5 @@ type Role struct { RoleCode string `orm:"column(role_code)" json:"role_code"` Name string `orm:"column(name)" json:"role_name"` - RoleMask int `orm:"role_mask" json:"role_mask"` + RoleMask int `orm:"column(role_mask)" json:"role_mask"` } diff --git a/src/common/models/user.go b/src/common/models/user.go index e46a09cda..5d4f68465 100644 --- a/src/common/models/user.go +++ b/src/common/models/user.go @@ -38,8 +38,8 @@ type User struct { HasAdminRole int `orm:"column(sysadmin_flag)" json:"has_admin_role"` ResetUUID string `orm:"column(reset_uuid)" json:"reset_uuid"` Salt string `orm:"column(salt)" json:"-"` - CreationTime time.Time `orm:"creation_time" json:"creation_time"` - UpdateTime time.Time `orm:"update_time" json:"update_time"` + CreationTime time.Time `orm:"column(creation_time)" json:"creation_time"` + UpdateTime time.Time `orm:"column(update_time)" json:"update_time"` } // UserQuery ... diff --git a/src/ui/filter/security_test.go b/src/ui/filter/security_test.go index c03ea6155..4cf2ef37d 100644 --- a/src/ui/filter/security_test.go +++ b/src/ui/filter/security_test.go @@ -16,7 +16,6 @@ package filter import ( "context" - "encoding/json" "log" "net/http" "net/http/httptest" @@ -43,21 +42,18 @@ import ( func TestMain(m *testing.M) { // initialize beego session manager - conf := map[string]interface{}{ - "cookieName": beego.BConfig.WebConfig.Session.SessionName, - "gclifetime": beego.BConfig.WebConfig.Session.SessionGCMaxLifetime, - "providerConfig": filepath.ToSlash(beego.BConfig.WebConfig.Session.SessionProviderConfig), - "secure": beego.BConfig.Listen.EnableHTTPS, - "enableSetCookie": beego.BConfig.WebConfig.Session.SessionAutoSetCookie, - "domain": beego.BConfig.WebConfig.Session.SessionDomain, - "cookieLifeTime": beego.BConfig.WebConfig.Session.SessionCookieLifeTime, - } - confBytes, err := json.Marshal(conf) - if err != nil { - log.Fatalf("failed to marshal session conf: %v", err) + conf := &session.ManagerConfig{ + CookieName: beego.BConfig.WebConfig.Session.SessionName, + Gclifetime: beego.BConfig.WebConfig.Session.SessionGCMaxLifetime, + ProviderConfig: filepath.ToSlash(beego.BConfig.WebConfig.Session.SessionProviderConfig), + Secure: beego.BConfig.Listen.EnableHTTPS, + EnableSetCookie: beego.BConfig.WebConfig.Session.SessionAutoSetCookie, + Domain: beego.BConfig.WebConfig.Session.SessionDomain, + CookieLifeTime: beego.BConfig.WebConfig.Session.SessionCookieLifeTime, } - beego.GlobalSessions, err = session.NewManager("memory", string(confBytes)) + var err error + beego.GlobalSessions, err = session.NewManager("memory", conf) if err != nil { log.Fatalf("failed to create session manager: %v", err) } diff --git a/tests/testprepare.sh b/tests/testprepare.sh index 07a712016..c55e852f0 100755 --- a/tests/testprepare.sh +++ b/tests/testprepare.sh @@ -5,8 +5,8 @@ cp tests/docker-compose.test.yml make/. mkdir -p /etc/ui cp make/common/config/ui/private_key.pem /etc/ui/. -mkdir conf -cp make/common/config/ui/app.conf conf/. +mkdir src/ui/conf +cp make/common/config/ui/app.conf src/ui/conf/. IP=`ip addr s eth0 |grep "inet "|awk '{print $2}' |awk -F "/" '{print $1}'` echo "server ip is "$IP sed -i -r "s/MYSQL_HOST=mysql/MYSQL_HOST=$IP/" make/common/config/adminserver/env