evan/tank
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove useless field in user. Use default utf8 when installing.

Browse Source
This commit is contained in:
zicla 2019-05-31 02:34:34 +08:00
parent b12cc3f306
commit bc7c720218
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/rest/install_controller.go
View File

@ -226,8 +226,8 @@ func (this *InstallController) CreateTable(writer http.ResponseWriter, request *
for _, iBase := range this.tableNames {
//complete the missing fields or create table.
db1 := db.AutoMigrate(iBase)
//complete the missing fields or create table. use utf8 charset
db1 := db.Set("gorm:table_options", "CHARSET=utf8").AutoMigrate(iBase)
this.PanicError(db1.Error)
exist, allFields, missingFields := this.getTableMeta(db, iBase)

4
code/rest/user_controller.go
View File

@ -274,8 +274,6 @@ func (this *UserController) Page(writer http.ResponseWriter, request *http.Reque
orderSort := request.FormValue("orderSort")
username := request.FormValue("username")
email := request.FormValue("email")
phone := request.FormValue("phone")
status := request.FormValue("status")
orderLastTime := request.FormValue("orderLastTime")
@ -311,7 +309,7 @@ func (this *UserController) Page(writer http.ResponseWriter, request *http.Reque
},
}
pager := this.userDao.Page(page, pageSize, username, email, phone, status, sortArray)
pager := this.userDao.Page(page, pageSize, username, status, sortArray)
return this.Success(pager)
}

10
code/rest/user_dao.go
View File

@ -72,7 +72,7 @@ func (this *UserDao) FindByUsername(username string) *User {
return user
}
func (this *UserDao) Page(page int, pageSize int, username string, email string, phone string, status string, sortArray []builder.OrderPair) *Pager {
func (this *UserDao) Page(page int, pageSize int, username string, status string, sortArray []builder.OrderPair) *Pager {
var wp = &builder.WherePair{}
@ -80,14 +80,6 @@ func (this *UserDao) Page(page int, pageSize int, username string, email string,
wp = wp.And(&builder.WherePair{Query: "username LIKE ?", Args: []interface{}{"%" + username + "%"}})
}
if email != "" {
wp = wp.And(&builder.WherePair{Query: "email LIKE ?", Args: []interface{}{"%" + email + "%"}})
}
if phone != "" {
wp = wp.And(&builder.WherePair{Query: "phone = ?", Args: []interface{}{phone}})
}
if status != "" {
wp = wp.And(&builder.WherePair{Query: "status = ?", Args: []interface{}{status}})
}