commit

aarch64/kinglong/slave/main/slave.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"cicv-data-closedloop/aarch64/kinglong/common/config"
-	"cicv-data-closedloop/aarch64/kinglong/common/init"
+	commonInit "cicv-data-closedloop/aarch64/kinglong/common/init"
 	commonService "cicv-data-closedloop/aarch64/kinglong/common/service"
 	slaveConfig "cicv-data-closedloop/aarch64/kinglong/slave/package/config"
 	slaveService "cicv-data-closedloop/aarch64/kinglong/slave/package/service"
@@ -13,7 +13,7 @@ import (
 func init() {
 	//runtime.GOMAXPROCS(1)
 	c_log.InitLog("mnt/media/sda1/cicv-data-closedloop/log", "kinglong-master")
-	init.Init()
+	commonInit.Init()
 	slaveConfig.InitTcpListener()
 	config.InitKillSignalListener(config.CloudConfig.Hosts[1].Ip)
 	// 等待重启，接收到重启信号，会把信号分发给以下channel

aarch64/pjisuv/control/main/control.go

@@ -2,9 +2,9 @@ package main
 
 import (
 	"cicv-data-closedloop/aarch64/pjisuv/common/config"
+	commonService "cicv-data-closedloop/aarch64/pjisuv/common/service"
 	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/util"
-	commonService "cicv-data-closedloop/kinglong/common/svc"
 	"net/rpc"
 	"os"
 	"runtime"