fix bug

services/onekey-service/internal/executer.go

@@ -23,10 +23,15 @@ func (a *TaskExecutor) Do() error {
 	for _, action := range a.Actions {
 		switch action.ActionExecutor {
 		case "delay":
-			return a.doDelayTask(action.EntityId, action.SubEntityId, action.ExecutorProperty)
+			if err := a.doDelayTask(action.EntityId, action.SubEntityId, action.ExecutorProperty); err != nil {
+				return err
+			}
 		case "device_issue":
-			return a.doDeviceIssueTask(action.EntityId, action.SubEntityId, action.ExecutorProperty)
+			if err := a.doDeviceIssueTask(action.EntityId, action.SubEntityId, action.ExecutorProperty); err != nil {
+				return err
+			}
 		}
+		time.Sleep(100 * time.Millisecond)
 	}
 	return nil
 }
@@ -50,7 +55,6 @@ func (a *TaskExecutor) doDeviceIssueTask(entityId, subEntityId string, action *r
 	if err != nil {
 		return err
 	}
-	time.Sleep(100 * time.Millisecond)
 	return nil
 }
 

services/onekey-service/internal/onekey_service.go

@@ -88,7 +88,6 @@ func (s *OneKeyService) initTaskConsumer() error {
 }
 
 func (s *OneKeyService) handleOneKeyTask(msg []byte) {
-	server.Log.Debugf("do task %s", msg)
 	err := s.taskSchedule.DoTask(msg)
 	if err != nil {
 		server.Log.Errorf("do task error :%s", err.Error())

services/scene-access/internal/service/scene.go

@@ -46,7 +46,6 @@ func (s *SceneService) SubmitTask(args rpcs.ArgsSubmitTask, reply *rpcs.ReplyEmp
 	case "oneKey":
 		topic = OneKeyTopic
 	}
-	server.Log.Debugf("收到类型为%s的任务: %s", args.Type, args.Data)
 	return s.taskManager.Publish(topic, []byte(args.Data))
 }
 

services/timer-service/internal/executer.go

@@ -23,9 +23,13 @@ func (a *TaskExecutor) Do() error {
 	for _, action := range a.Actions {
 		switch action.ActionExecutor {
 		case "delay":
-			return a.doDelayTask(action.EntityId, action.SubEntityId, action.ExecutorProperty)
+			if err := a.doDelayTask(action.EntityId, action.SubEntityId, action.ExecutorProperty); err != nil {
+				return err
+			}
 		case "device_issue":
-			return a.doDeviceIssueTask(action.EntityId, action.SubEntityId, action.ExecutorProperty)
+			if err := a.doDeviceIssueTask(action.EntityId, action.SubEntityId, action.ExecutorProperty); err != nil {
+				return err
+			}
 		}
 	}
 	return nil