Merge branch 'master' into debug

models/db.go

@@ -51,6 +51,13 @@ func init() {
 	gl, _ := orm.GetDB("gl")
 	gl.SetConnMaxLifetime(10 * time.Minute)
 
+	_ = orm.RegisterDataBase("weekly_trial", "mysql", utils.MYSQL_URL_WEEKLY_TRIAL)
+	orm.SetMaxIdleConns("weekly_trial", 50)
+	orm.SetMaxOpenConns("weekly_trial", 100)
+
+	trial_datadb, _ := orm.GetDB("weekly_trial")
+	trial_datadb.SetConnMaxLifetime(10 * time.Minute)
+
 	orm.Debug = true
 	orm.DebugLog = orm.NewLog(utils.Binlog)
 

models/eta_trial.go

@@ -28,8 +28,8 @@ type ETATrialListRespItem struct {
 
 func GetETATrialDisableList(endDate string) (items []*ETATrialListRespItem, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM eta_trial WHERE modify_time < ? AND enabled = 1 `
-	_, err = o.Raw(sql, endDate).QueryRows(&items)
+	sql := `SELECT * FROM eta_trial WHERE modify_time < '`+endDate+`'  `
+	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
 
@@ -40,9 +40,9 @@ func UpdateETATrialDisable(disableIds []int) (err error) {
 	return
 }
 
-func UpdateETATrialAdminDisable(disableMobiles []string) (err error) {
+func UpdateETATrialAdminDisable(mobiles string) (err error) {
 	o := orm.NewOrmUsingDB("weekly_trial")
-	sql := `UPDATE admin SET enabled = 0 WHERE mobile IN (` + utils.GetOrmInReplace(len(disableMobiles)) + `) `
-	_, err = o.Raw(sql, disableMobiles).Exec()
+	sql := `UPDATE admin SET enabled = 0 WHERE mobile IN  (` + mobiles + `) `
+	_, err = o.Raw(sql).Exec()
 	return
 }

services/eta_trial.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"hongze/hongze_task/models"
 	"hongze/hongze_task/utils"
+	"strings"
 	"time"
 )
 
@@ -28,7 +29,7 @@ func ETATrialDisabled(cont context.Context) (err error) {
 	disableMobiles := make([]string, 0)
 	for _, v := range items {
 		disableIds = append(disableIds, v.EtaTrialId)
-		disableMobiles = append(disableMobiles, "`" + v.Mobile + "`")
+		disableMobiles = append(disableMobiles, "'" + v.Mobile + "'")
 	}
 
 	if len(disableIds) > 0 {
@@ -36,7 +37,10 @@ func ETATrialDisabled(cont context.Context) (err error) {
 		if err != nil {
 			return err
 		}
-		err = models.UpdateETATrialAdminDisable(disableMobiles)
+	}
+	if len(disableMobiles) > 0 {
+		mobiles := strings.Join(disableMobiles, ",")
+		err = models.UpdateETATrialAdminDisable(mobiles)
 		if err != nil {
 			return err
 		}