Quellcode durchsuchen

增加FTP执行间隔配置项

zhou.xiaoning vor 2 Jahren
Ursprung
Commit
4f54e937c9
4 geänderte Dateien mit 11 neuen und 7 gelöschten Zeilen
  1. 1 0
      config.j2
  2. 7 6
      config.yaml
  3. 1 0
      config/ftp.go
  4. 2 1
      service/ftp.go

+ 1 - 0
config.j2

@@ -39,5 +39,6 @@ ftp:
   name: '{{ftp_name}}'
   pwd: '{{ftp_pwd}}'
   time-at: 5 # 每天执行小时数,0-23
+  duration: 30 # timer执行间隔,单位:分钟
   folder: 'wms_reckon'
   folder-bakup: 'wms_reckon_bk'

+ 7 - 6
config.yaml

@@ -16,14 +16,14 @@ oracle:
   address: '192.168.31.88'
   name: 'orcl'
   port: '1521'
-  user: 'mtp2_test104'
+  user: 'mtp2_test201'
   pwd: 'muchinfo'
   max-idle-conns: 10
   max-open-conns: 100
 
 # rabbitmq configuration
 rabbitmq:
-  url: 'amqp://guest:guest@192.168.31.104:5020/test'
+  url: 'amqp://guest:guest@192.168.31.201:5020/test'
   exchange: 'entry'
 
 # system configuration
@@ -33,11 +33,12 @@ system:
 
 # ftp configuration
 ftp:
-  enable: false
-  address: '218.17.158.45'
-  port: '23110'
+  enable: true
+  address: '192.168.31.207'
+  port: '21'
   name: 'wmsuser'
   pwd: 'Much*ws#230410'
-  time-at: '17:30:00' # 格式 HH:mm:ss
+  time-at: '11:15:00' # 格式 HH:mm:ss
+  duration: 30 # timer执行间隔,单位:分钟
   folder: 'wms_reckon'
   folder-bakup: 'wms_reckon_bk'

+ 1 - 0
config/ftp.go

@@ -7,6 +7,7 @@ type FTP struct {
 	Name        string `mapstructure:"name" json:"name" yaml:"name"`
 	PWD         string `mapstructure:"pwd" json:"pwd" yaml:"pwd"`
 	TimeAt      string `mapstructure:"time-at" json:"time-at" yaml:"time-at"`
+	Duration    int    `mapstructure:"duration" json:"duration" yaml:"duration"`
 	Folder      string `mapstructure:"folder" json:"folder" yaml:"folder"`
 	FolderBakup string `mapstructure:"folder-bakup" json:"folder-bakup" yaml:"folder-bakup"`
 }

+ 2 - 1
service/ftp.go

@@ -29,9 +29,10 @@ func InitTimer() (err error) {
 	loc, err := time.LoadLocation("Local")
 	targetTime := time.Date(time.Now().Year(), time.Now().Month(), time.Now().Day(), hour, min, sec, 0, loc)
 
+	duration := time.Duration(global.M2A_CONFIG.FTP.Duration)
 	// 启动协程处理任务
 	go func() {
-		for range time.Tick(24 * time.Hour) {
+		for range time.Tick(duration * time.Minute) {
 			// 计算时间差,等待执行时间
 			dur := time.Until(targetTime)
 			if dur < 0 {