Merge branch 'master_dev' into 'master'

fix: 执行install时,调整tbClusterService为按需加载

See merge request yunteng/thingskit!415

@@ -3,9 +3,11 @@ package org.thingsboard.server.dao.yunteng.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.script.api.ScriptType;
 import org.thingsboard.script.api.ScriptType;
@@ -51,10 +53,13 @@ public class TkDeviceScriptServiceImpl
   private final TkDeviceService tkDeviceService;
   private final TkDeviceService tkDeviceService;
   private final JsInvokeService jsInvokeService;
   private final JsInvokeService jsInvokeService;
   private final TbelInvokeService tbelInvokeService;
   private final TbelInvokeService tbelInvokeService;
-  private final TbClusterService tbClusterService;
   private final DeviceProfileService deviceProfileService;
   private final DeviceProfileService deviceProfileService;
   private final TkTenantService tenantService;
   private final TkTenantService tenantService;
 
 
+  @Autowired(required = false)
+  @Getter
+  private TbClusterService tbClusterService;
+
   @Override
   @Override
   public boolean validateFormdata(TkDeviceScriptDTO scriptDTO, boolean created) {
   public boolean validateFormdata(TkDeviceScriptDTO scriptDTO, boolean created) {
     String tenantId = scriptDTO.getTenantId();
     String tenantId = scriptDTO.getTenantId();
@@ -226,7 +231,7 @@ public class TkDeviceScriptServiceImpl
                 deviceProfileService.findDeviceProfileById(
                 deviceProfileService.findDeviceProfileById(
                     TenantId.fromUUID(UUID.fromString(tenantId)), deviceProfileId);
                     TenantId.fromUUID(UUID.fromString(tenantId)), deviceProfileId);
             if (null != deviceProfile) {
             if (null != deviceProfile) {
-              tbClusterService.onDeviceProfileChange(deviceProfile, null);
+              getTbClusterService().onDeviceProfileChange(deviceProfile, null);
             }
             }
           }
           }
         }
         }