Browse Source

fix: search stra

710leo 4 years ago
parent
commit
3dc69b776a
3 changed files with 7 additions and 8 deletions
  1. 2 2
      control
  2. 5 5
      modules/web/model/strategy.go
  3. 0 1
      modules/web/store/mysql.go

+ 2 - 2
control

@@ -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"
+cd $GOPATH/src/github.com/710leo/urlooker && ./control build
+echo "install ok! run cd $GOPATH/src/github.com/710leo/urlooker && ./control start all"

+ 5 - 5
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)
 		}

+ 0 - 1
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)