From fcfa009cadb1b12b1eb0d0cf326b00c3c8a078e7 Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Tue, 14 Jun 2016 13:04:31 +0800 Subject: [PATCH 1/2] remove duplicate mysql installation --- .travis.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4b204162e..9251eb585 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,18 +36,18 @@ before_install: install: - sudo apt-get update && sudo apt-get install -y libldap2-dev - - sudo apt-get remove -y mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-client-core-5.5 - - sudo apt-get autoremove -y - - sudo apt-get install -y libaio1 - - wget -O mysql-5.6.14.deb http://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-5.6.14-debian6.0-x86_64.deb/from/http://cdn.mysql.com/ - - sudo dpkg -i mysql-5.6.14.deb - - sudo cp /opt/mysql/server-5.6/support-files/mysql.server /etc/init.d/mysql.server - - sudo ln -s /opt/mysql/server-5.6/bin/* /usr/bin/ - - sudo sed -i'' 's/table_cache/table_open_cache/' /etc/mysql/my.cnf - - sudo sed -i'' 's/log_slow_queries/slow_query_log/' /etc/mysql/my.cnf - - sudo sed -i'' 's/basedir[^=]\+=.*$/basedir = \/opt\/mysql\/server-5.6/' /etc/mysql/my.cnf - - sudo /etc/init.d/mysql.server start - - mysql --version +# - sudo apt-get remove -y mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-client-core-5.5 +# - sudo apt-get autoremove -y +# - sudo apt-get install -y libaio1 +# - wget -O mysql-5.6.14.deb http://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-5.6.14-debian6.0-x86_64.deb/from/http://cdn.mysql.com/ +# - sudo dpkg -i mysql-5.6.14.deb +# - sudo cp /opt/mysql/server-5.6/support-files/mysql.server /etc/init.d/mysql.server +# - sudo ln -s /opt/mysql/server-5.6/bin/* /usr/bin/ +# - sudo sed -i'' 's/table_cache/table_open_cache/' /etc/mysql/my.cnf +# - sudo sed -i'' 's/log_slow_queries/slow_query_log/' /etc/mysql/my.cnf +# - sudo sed -i'' 's/basedir[^=]\+=.*$/basedir = \/opt\/mysql\/server-5.6/' /etc/mysql/my.cnf +# - sudo /etc/init.d/mysql.server start +# - mysql --version - go get -d github.com/docker/distribution - go get -d github.com/docker/libtrust - go get -d github.com/go-sql-driver/mysql From db9347135c1a01adfa056169a4a7534c7657f2db Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Tue, 14 Jun 2016 17:33:37 +0800 Subject: [PATCH 2/2] bug fix --- api/project.go | 2 +- api/replication_policy.go | 2 +- dao/projectmember.go | 2 +- models/user.go | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/api/project.go b/api/project.go index 98a8fa649..073fcdab0 100644 --- a/api/project.go +++ b/api/project.go @@ -77,7 +77,7 @@ func (p *ProjectAPI) Post() { err := validateProjectReq(req) if err != nil { log.Errorf("Invalid project request, error: %v", err) - p.RenderError(http.StatusBadRequest, "Invalid request for creating project") + p.RenderError(http.StatusBadRequest, fmt.Sprintf("invalid request: %v", err)) return } projectName := req.ProjectName diff --git a/api/replication_policy.go b/api/replication_policy.go index 26b5b0a61..884f566c1 100644 --- a/api/replication_policy.go +++ b/api/replication_policy.go @@ -139,7 +139,7 @@ func (pa *RepPolicyAPI) Put() { pa.CustomAbort(http.StatusNotFound, http.StatusText(http.StatusNotFound)) } - var policy *models.RepPolicy + policy := &models.RepPolicy{} pa.DecodeJSONReq(policy) policy.ProjectID = originalPolicy.ProjectID policy.TargetID = originalPolicy.TargetID diff --git a/dao/projectmember.go b/dao/projectmember.go index 52947f869..4c165aa82 100644 --- a/dao/projectmember.go +++ b/dao/projectmember.go @@ -58,7 +58,7 @@ func DeleteProjectMember(projectID int64, userID int) error { func GetUserByProject(projectID int64, queryUser models.User) ([]models.User, error) { o := GetOrmer() u := []models.User{} - sql := `select u.user_id, u.username, r.name rolename, r.role_id + sql := `select u.user_id, u.username, r.name rolename, r.role_id as role from user u join project_member pm on pm.project_id = ? and u.user_id = pm.user_id diff --git a/models/user.go b/models/user.go index 1b8b2ae86..ad93d0e5e 100644 --- a/models/user.go +++ b/models/user.go @@ -29,7 +29,9 @@ type User struct { Comment string `orm:"column(comment)" json:"comment"` Deleted int `orm:"column(deleted)" json:"deleted"` Rolename string `json:"role_name"` - RoleID int `json:"role_id"` + //if this field is named as "RoleID", beego orm can not map role_id + //to it. + Role int `json:"role_id"` // RoleList []Role `json:"role_list"` HasAdminRole int `orm:"column(sysadmin_flag)" json:"has_admin_role"` ResetUUID string `orm:"column(reset_uuid)" json:"reset_uuid"`