Merge branch 'dev' into 'master'

Dev

See merge request !11

conf/majora-dev.yaml

@@ -7,10 +7,12 @@ reconn_intervalz: 5s
 net_check_interval: 5s
 dns_cache_duration: 10m
 net_check_url: https://www.baidu.com[extra]
-account: superman
 
 redial:
   command: /bin/bash
   exec_path: /root/ppp_redial.sh
   redial_duration: 5m
   wait_time: 10s
+
+extra:
+  account: superman

conf/majora.yaml

-env: debug
 tunnel_addr: majora-vps-zj.virjar.com:5879
 dns_server: 114.114.114.114:53
 log_level: info
@@ -8,8 +7,12 @@ reconn_interval: 5s
 net_check_interval: 5s
 net_check_url: https://www.baidu.com
 dns_cache_duration: 10m
+
 redial:
   command: /bin/bash
   exec_path: /root/ppp_redial.sh
   redial_duration: 5m
   wait_time: 15s
+
+extra:
+  account: superman

conf/start.sh

 #!/usr/bin/env bash
 
-
-sudo rm -fr /usr/lib/systemd/system/majora.service
-sudo systemctl daemon-reload
-sudo systemctl stop majora.service
-
 old_pid=$(ps -ef | grep majora | grep -v grep | awk '{print $2}')
 
 echo "old pid is ${old_pid}"

initialize/config_test.go

@@ -7,11 +7,7 @@ import (
 )
 
 func TestMustInitConfig(t *testing.T) {
-	MustInitConfigAndWatch("/Users/tsaiilin/src/go/majora-go/conf/majora-dev.yaml", global.Config, func(config interface{}) {
-		fmt.Printf("config: %+v", global.Config)
-	})
-	select {
-
-	}
+	MustInitConfig("/Users/tsaiilin/src/go/majora-go/conf/majora-dev.yaml", global.Config)
+	fmt.Printf("%+v", global.Config)
 
 }

model/config.go

@@ -50,9 +50,6 @@ func NewDefMajoraConf() *Configure {
 		DNSServer:      common.DNSServer, //nolint:typecheck
 		ReconnInterval: reconninterval,
 		ClientID:       uuid.New().String(),
-		Extra: Extra{
-			Account: uuid.New().String(),
-		},
 		Redial: Redial{
 			RedialDuration: reconninterval,
 		},