diff --git a/control b/control old mode 100644 new mode 100755 diff --git a/install.sh b/install.sh index 656eb53..2fecc5e 100644 --- a/install.sh +++ b/install.sh @@ -12,5 +12,5 @@ if [ ! -d "$GOPATH/src/github.com/710leo/urlooker" ]; then else cd $GOPATH/src/github.com/710leo/urlooker && git pull fi -cd $GOPATH/src/github.com/710leo/urlooker && ./control.sh build -echo "install ok! run cd $GOPATH/src/github.com/710leo/urlooker && ./control.sh start all" \ No newline at end of file +cd $GOPATH/src/github.com/710leo/urlooker && ./control build +echo "install ok! run cd $GOPATH/src/github.com/710leo/urlooker && ./control start all" \ No newline at end of file diff --git a/modules/web/model/strategy.go b/modules/web/model/strategy.go index 51f7e6f..15238f0 100644 --- a/modules/web/model/strategy.go +++ b/modules/web/model/strategy.go @@ -10,14 +10,14 @@ type Strategy dataobj.Strategy func GetAllStrategyCount(mine int, query, username string) (int64, error) { if mine == 1 { if query != "" { - return Orm.Where("url LIKE ? AND creator = ? ORDER BY id", "%"+query+"%", username).Count(new(Strategy)) + return Orm.Where("url LIKE ? AND creator = ?", "%"+query+"%", username).Count(new(Strategy)) } else { num, err := Orm.Where("creator = ?", username).Count(new(Strategy)) return num, err } } else { if query != "" { - return Orm.Where("url LIKE ? ORDER BY id", "%"+query+"%").Count(new(Strategy)) + return Orm.Where("url LIKE ?", "%"+query+"%").Count(new(Strategy)) } else { num, err := Orm.Count(new(Strategy)) return num, err @@ -32,13 +32,13 @@ func GetAllStrategy(mine, limit, offset int, query, username string) ([]*Strateg var err error if mine == 1 { if query != "" { - err = Orm.Where("url LIKE ? AND creator = ? ORDER BY id", "%"+query+"%", username).Limit(limit, offset).Find(&items) + err = Orm.Where("url LIKE ? AND creator = ?", "%"+query+"%", username).Limit(limit, offset).OrderBy("id").Find(&items) } else { - err = Orm.Where("creator = ?", username).Limit(limit, offset).Find(&items) + err = Orm.Where("creator = ?", username).Limit(limit, offset).OrderBy("id").Find(&items) } } else { if query != "" { - err = Orm.Where("url LIKE ? ORDER BY id", "%"+query+"%").Limit(limit, offset).Find(&items) + err = Orm.Where("url LIKE ?", "%"+query+"%").Limit(limit, offset).OrderBy("id").Find(&items) } else { err = Orm.Limit(limit, offset).Find(&items) } diff --git a/modules/web/store/mysql.go b/modules/web/store/mysql.go index 13a33cf..b861771 100644 --- a/modules/web/store/mysql.go +++ b/modules/web/store/mysql.go @@ -15,7 +15,6 @@ func InitMysql() { cfg := g.Config var err error - log.Println(g.Config) Orm, err = xorm.NewEngine("mysql", cfg.Mysql.Addr) if err != nil { log.Fatalln("fail to connect mysql", err)