Merge branch 'ETA_1.6.4'

services/mail_attachment.go

@@ -8,7 +8,7 @@ import (
 )
 
 func MailAttachment(context.Context) (err error)  {
-	cmd := exec.Command("python3", utils.CoalMailAttachmentScriptPath)
+	cmd := exec.Command(utils.CoalMailAttachmentPythonVersion, utils.CoalMailAttachmentScriptPath)
 	outputByte, err := cmd.Output()
 	fmt.Println("start")
 	if err != nil {

services/task.go

@@ -62,7 +62,7 @@ func Task() {
 	}
 
 	if utils.CoalMailAttachmentOpen == "1" {
-		mailAttachment := task.NewTask("MailAttachment", "0 0 */1 * * *", MailAttachment)
+		mailAttachment := task.NewTask("MailAttachment", utils.CoalMailAttachmentTime, MailAttachment)
 		task.AddTask("启动获取邮件附件脚本", mailAttachment)
 	}
 

utils/config.go

@@ -44,10 +44,13 @@ var (
 
 // 中国煤炭网
 var (
-	CoalMineFilePath             string //excel文件地址
-	CoalMineOpen                 string //是否配置中国煤炭网数据源，1已配置
-	CoalMailAttachmentScriptPath string // 获取邮件附件的脚本目录
-	CoalMailAttachmentOpen string // 获取邮件附件功能，1已配置
+	CoalMineFilePath                string //excel文件地址
+	CoalMineOpen                    string //是否配置中国煤炭网数据源，1已配置
+	CoalMailAttachmentScriptPath    string // 获取邮件附件的脚本目录
+	CoalMailAttachmentOpen          string // 获取邮件附件功能，1已配置
+	CoalMailAttachmentTime          string // 获取邮件附件功能时间
+	CoalMailAttachmentPythonVersion string // 获取邮件附件功能python版本
+)
 )
 
 // 汾渭煤炭
@@ -114,6 +117,8 @@ func init() {
 		CoalMineOpen = config["coal_mine_open"]
 		CoalMailAttachmentScriptPath = config["coal_mail_attachment_script_path"]
 		CoalMailAttachmentOpen = config["coal_mail_attachment_open"]
+		CoalMailAttachmentTime = config["coal_mail_attachment_time"]
+		CoalMailAttachmentPythonVersion = config["coal_mail_attachment_python_version"]
 	}
 
 	// 汾渭配置