update dm config (#251)

xiejingru · web-flow · commit fc7e6c200403 · 2021-04-08T19:35:09.000+08:00
diff --git a/dmcontext/config.go b/dmcontext/config.go
@@ -47,8 +47,10 @@ type AccessConfig struct {
 }
 
 type ModbusAccessConfig struct {
-	Tcp *TcpConfig `yaml:"tcp,omitempty" json:"tcp,omitempty"`
-	Rtu *RtuConfig `yaml:"rtu,omitempty" json:"rtu,omitempty"`
+	Id       byte          `yaml:"id,omitempty" json:"id,omitempty"`
+	Interval time.Duration `yaml:"interval,omitempty" json:"omitempty"`
+	Tcp      *TcpConfig    `yaml:"tcp,omitempty" json:"tcp,omitempty"`
+	Rtu      *RtuConfig    `yaml:"rtu,omitempty" json:"rtu,omitempty"`
 }
 
 type TcpConfig struct {
@@ -65,7 +67,8 @@ type RtuConfig struct {
 }
 
 type OpcuaAccessConfig struct {
-	ID          byte             `yaml:"id,omitempty" json:"id,omitempty"`
+	Id          byte             `yaml:"id,omitempty" json:"id,omitempty"`
+	Interval    time.Duration    `yaml:"interval,omitempty" json:"omitempty"`
 	Timeout     time.Duration    `yaml:"timeout,omitempty" json:"timeout,omitempty"`
 	Security    OpcuaSecurity    `yaml:"security,omitempty" json:"security,omitempty"`
 	Auth        OpcuaAuth        `yaml:"auth,omitempty" json:"auth,omitempty"`

Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,10 @@ type AccessConfig struct {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`type ModbusAccessConfig struct {`
`50`		- Tcp *TcpConfig `yaml:"tcp,omitempty" json:"tcp,omitempty"`
`51`		- Rtu *RtuConfig `yaml:"rtu,omitempty" json:"rtu,omitempty"`
	`50`	+ Id byte `yaml:"id,omitempty" json:"id,omitempty"`
	`51`	+ Interval time.Duration `yaml:"interval,omitempty" json:"omitempty"`
	`52`	+ Tcp *TcpConfig `yaml:"tcp,omitempty" json:"tcp,omitempty"`
	`53`	+ Rtu *RtuConfig `yaml:"rtu,omitempty" json:"rtu,omitempty"`
`52`	`54`	`}`
`53`	`55`
`54`	`56`	`type TcpConfig struct {`
`@@ -65,7 +67,8 @@ type RtuConfig struct {`
`65`	`67`	`}`
`66`	`68`
`67`	`69`	`type OpcuaAccessConfig struct {`
`68`		- ID byte `yaml:"id,omitempty" json:"id,omitempty"`
	`70`	+ Id byte `yaml:"id,omitempty" json:"id,omitempty"`
	`71`	+ Interval time.Duration `yaml:"interval,omitempty" json:"omitempty"`
`69`	`72`	Timeout time.Duration `yaml:"timeout,omitempty" json:"timeout,omitempty"`
`70`	`73`	Security OpcuaSecurity `yaml:"security,omitempty" json:"security,omitempty"`
`71`	`74`	Auth OpcuaAuth `yaml:"auth,omitempty" json:"auth,omitempty"`