Merge remote-tracking branch 'origin/develop' into develop

third_party/interlock/beijing12/interlock.go

@@ -69,12 +69,11 @@ func (i *interlockProxy) Start(manager InterlockMessageManager) {
 	if i.manager != nil {
 		panic(fmt.Sprintf("%s启动联锁消息服务错误: 存在正在运行的任务", logTag))
 	}
-	i.manager = manager
-	// 初始化客户端、服务端
 	i.initInterlockProxy()
 	ctx, cancel := context.WithCancel(context.Background())
 	go i.collectInfoStateTask(ctx)
 	i.collectInfoTaskCancel = cancel
+	i.manager = manager
 }
 
 // 采集电路状态发送间隔,单位ms