Merge remote-tracking branch 'origin/master' into delete_note

# Conflicts:
#	models/wx_template_msg.go

models/admin.go

@@ -23,7 +23,7 @@ type Admin struct {
 func GetAdminByAdminId(adminId int) (item *Admin, err error) {
 
 	sql := `SELECT * FROM admin WHERE admin_id=? `
-	err = global.DEFAULT_DmSQL.Raw(sql, adminId).Find(&item).Error
+	err = global.DmSQL["eta"].Raw(sql, adminId).Find(&item).Error
 	return
 }
 

models/wx_template_msg.go

@@ -1,9 +1,5 @@
 package models
 
-import (
-	"eta_gn/eta_task/global"
-)
-
 type SendTemplateResponse struct {
 	Errcode int    `json:"errcode"`
 	Errmsg  string `json:"errmsg"`
@@ -14,27 +10,6 @@ type OpenIdList struct {
 	OpenId string
 }
 
-func DeleteTemplateRecordByDate(date string) (err error) {
-
-	sql := `DELETE FROM user_template_record WHERE create_time<? `
-	err = global.DEFAULT_DmSQL.Exec(sql, date).Error
-	return
-}
-
-
-func GetOpenIdArr() (items []string, err error) {
-
-	sql := ` SELECT DISTINCT ur.open_id FROM wx_user AS wu
-	     INNER JOIN company AS c ON c.company_id = wu.company_id
-	     INNER JOIN company_product AS d ON c.company_id=d.company_id
-		INNER JOIN user_record  AS ur ON wu.user_id=ur.user_id
-	     WHERE ur.open_id != '' AND ur.subscribe=1 AND ur.create_platform=1 AND  d.status IN('正式','试用','永续')
-	    ORDER BY FIELD(c.company_id, 16) desc, ur.user_record_id asc`
-	err = global.DEFAULT_DmSQL.Raw(sql).Find(&items).Error
-	return
-}
-
-
 func GetOpenIdArrByClassifyId(classifyId int) (items []string, err error) {
 	return
 }

services/save_log.go

@@ -2,7 +2,6 @@ package services
 
 import (
 	"context"
-	"eta_gn/eta_task/models"
 	"eta_gn/eta_task/models/data_manage"
 	"eta_gn/eta_task/services/alarm_msg"
 	"eta_gn/eta_task/utils"
@@ -25,12 +24,5 @@ func DeleteLog(cont context.Context) (err error) {
 		}
 	}()
 
-	go func() {
-		err = models.DeleteTemplateRecordByDate(date)
-		if err != nil {
-			alarm_msg.SendAlarmMsg("DeleteTemplateRecordByDate ErrMsg:"+err.Error(), 3)
-		}
-	}()
-
 	return
 }

utils/common.go

@@ -778,7 +778,7 @@ func SubFloatToFloatStr(f float64, m int) string {
 }
 
 func GetVideoPlaySeconds(videoPath string) (playSeconds float64, err error) {
-	cmd := `ffmpeg -i ` + videoPath + `  2>&1 | grep 'Duration' | cut -d ' ' -f 4 | sed s/,//`
+	cmd := fmt.Sprintf(`ffmpeg -i %s  2>&1 | grep 'Duration' | cut -d ' ' -f 4 | sed s/,//`, videoPath)
 	out, err := exec.Command("bash", "-c", cmd).Output()
 	if err != nil {
 		return