Merge branch 'master_dev_gtb0323' into 'master_dev'

Revert "fix(DEFECT-1963): temp"

See merge request yunteng/thingskit!375

@@ -23,11 +23,13 @@ import org.thingsboard.server.common.data.yunteng.dto.sip.StreamContentDTO;
 import org.thingsboard.server.common.data.yunteng.enums.PTZCommandEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.yunteng.media.TkVideoControlService;
 
 @RestController
 @RequestMapping("api/yt/video/control")
 @Api(tags = {"视频控制管理"})
+@TbCoreComponent
 @RequiredArgsConstructor
 @Slf4j
 public class TkVideoControlController extends BaseController {

@@ -16,10 +16,12 @@ import org.thingsboard.server.common.data.yunteng.dto.sip.hook.param.*;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.media.TkMediaServerService;
 import org.thingsboard.server.dao.yunteng.service.media.TkVideoChannelService;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.yunteng.media.TkVideoControlService;
 
 /** ZLMediaServer的hook事件监听 */
 @RestController
+@TbCoreComponent
 @RequestMapping("api/index/hook")
 @Api(tags = {"ZLMediaServer的hook事件监听"})
 @RequiredArgsConstructor

@@ -39,10 +39,12 @@ import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest;
 import org.thingsboard.server.dao.util.yunteng.ZLMediaKitTaskUtils;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
 import org.thingsboard.server.dao.yunteng.service.media.*;
+import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.rpc.TbCoreDeviceRpcService;
 import org.thingsboard.server.service.security.model.SecurityUser;
 
 @Service
+@TbCoreComponent
 @RequiredArgsConstructor
 @Slf4j
 public class TkVideoControlServiceImpl implements TkVideoControlService {

-package org.thingsboard.server.transport.config;
-
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.stereotype.Component;
-
-@Component
-@ConditionalOnExpression(
-        "'${service.type:null}'=='tb-transport' || ('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true' && '${transport.gbt28181.enabled}'=='true')")
-@Data
-public class ThingsKitVersionConfig {
-  @Value("${thingskit.release.version}")
-  private String releaseVersion;
-
-  @Value("${thingskit.release.date}")
-  private String releaseDate;
-}

-package org.thingsboard.server.transport.cmd;
+package org.thingsboard.server.transport.gbt28181.cmd;
 
 import java.text.ParseException;
 import java.util.ArrayList;
@@ -10,13 +10,11 @@ import javax.sip.address.AddressFactory;
 import javax.sip.address.SipURI;
 import javax.sip.header.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.thingsboard.server.transport.config.SipConfig;
-import org.thingsboard.server.transport.config.ThingsKitVersionConfig;
+import org.thingsboard.server.transport.gbt28181.config.SipConfig;
 import org.thingsboard.server.transport.gbt28181.sip.SipTransportService;
 
 public abstract class AbstractSIPRequestProcess {
   @Autowired private SipConfig sipConfig;
-  @Autowired protected ThingsKitVersionConfig thingsKitVersionConfig;
 
   protected static SipFactory sipFactory = SipFactory.getInstance();
 

-package org.thingsboard.server.transport.cmd;
+package org.thingsboard.server.transport.gbt28181.cmd;
 
 import gov.nist.javax.sip.header.SIPDateHeader;
 import gov.nist.javax.sip.message.SIPRequest;
@@ -19,7 +19,7 @@ import javax.sip.message.Response;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.data.yunteng.dto.sip.SipMessageHeaderDTO;
-import org.thingsboard.server.transport.session.GbtDeviceSessionCtx;
+import org.thingsboard.server.transport.gbt28181.session.GbtDeviceSessionCtx;
 import org.thingsboard.server.transport.util.TKSipUtils;
 
 @Component
@@ -168,7 +168,7 @@ public class SIPRequestHeaderProcess extends AbstractSIPRequestProcess {
                 viaHeaders,
                 maxForwards);
 
-    request.addHeader(TKSipUtils.createUserAgentHeader(thingsKitVersionConfig));
+    request.addHeader(TKSipUtils.createUserAgentHeader());
 
     ContactHeader contactHeader = buildMessageHeaderContact(localIp);
     request.addHeader(contactHeader);
@@ -213,7 +213,7 @@ public class SIPRequestHeaderProcess extends AbstractSIPRequestProcess {
                 toHeader,
                 viaHeaders,
                 maxForwards);
-    request.addHeader(TKSipUtils.createUserAgentHeader(thingsKitVersionConfig));
+    request.addHeader(TKSipUtils.createUserAgentHeader());
     return request;
   }
 }

-package org.thingsboard.server.transport.cmd;
+package org.thingsboard.server.transport.gbt28181.cmd;
 
 import gov.nist.javax.sip.SipProviderImpl;
 import java.text.ParseException;
@@ -14,9 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
-import org.thingsboard.server.transport.config.ThingsKitVersionConfig;
-import org.thingsboard.server.transport.gbt28181.sip.SipTransportService;
 import org.thingsboard.server.transport.gbt28181.SipSubscribe;
+import org.thingsboard.server.transport.gbt28181.sip.SipTransportService;
 import org.thingsboard.server.transport.util.TKSipUtils;
 
 /** 发送SIP信息 */
@@ -27,7 +26,6 @@ import org.thingsboard.server.transport.util.TKSipUtils;
 public class SIPSender {
 
   @Autowired private SipSubscribe sipSubscribe;
-  @Autowired private ThingsKitVersionConfig thingsKitVersionConfig;
 
   private static final String TCP = "TCP";
   private static final String UDP = "UDP";
@@ -54,7 +52,7 @@ public class SIPSender {
     }
     if (message.getHeader(UserAgentHeader.NAME) == null) {
       try {
-        message.addHeader(TKSipUtils.createUserAgentHeader(thingsKitVersionConfig));
+        message.addHeader(TKSipUtils.createUserAgentHeader());
       } catch (ParseException e) {
         log.error("添加UserAgentHeader失败", e);
       }

-package org.thingsboard.server.transport.cmd;
+package org.thingsboard.server.transport.gbt28181.cmd;
 
 import java.text.ParseException;
 import javax.sip.InvalidArgumentException;
-import javax.sip.PeerUnavailableException;
 import javax.sip.SipException;
 import org.thingsboard.server.common.data.yunteng.dto.sip.*;
 import org.thingsboard.server.transport.gbt28181.SipSubscribe;
-import org.thingsboard.server.transport.session.GbtDeviceSessionCtx;
+import org.thingsboard.server.transport.gbt28181.session.GbtDeviceSessionCtx;
 
 public interface TKSipCommanderService {
   /**

-package org.thingsboard.server.transport.cmd;
+package org.thingsboard.server.transport.gbt28181.cmd;
 
 import java.text.ParseException;
 import javax.sip.InvalidArgumentException;
@@ -15,7 +15,7 @@ import org.thingsboard.server.common.data.yunteng.dto.sip.*;
 import org.thingsboard.server.common.data.yunteng.enums.VideoCmdEnum;
 import org.thingsboard.server.transport.gbt28181.sip.SipTransportService;
 import org.thingsboard.server.transport.gbt28181.SipSubscribe;
-import org.thingsboard.server.transport.session.GbtDeviceSessionCtx;
+import org.thingsboard.server.transport.gbt28181.session.GbtDeviceSessionCtx;
 import org.thingsboard.server.transport.util.TKSipUtils;
 
 @Service

-package org.thingsboard.server.transport.config;
+package org.thingsboard.server.transport.gbt28181.config;
 
 import java.io.Serializable;
 import lombok.Data;

-package org.thingsboard.server.transport.config;
+package org.thingsboard.server.transport.gbt28181.config;
 
 import lombok.Data;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;

-package org.thingsboard.server.transport.session;
+package org.thingsboard.server.transport.gbt28181.session;
 
 import io.netty.util.ReferenceCountUtil;
 

@@ -21,27 +21,12 @@ import org.thingsboard.server.common.transport.TransportContext;
 public class GbtTransportContext extends TransportContext {
 
 
-  @Getter
-  @Value("${transport.tcp.netty.max_payload_size}")
-  private Integer maxPayloadSize;
 
-  @Getter
-  @Value("${transport.tcp.ssl.skip_validity_check_for_client_cert:false}")
-  private boolean skipValidityCheckForClientCert;
 
-  @Getter @Setter private SslHandler sslHandler;
 
-  @Getter
-  @Value("${transport.tcp.msg_queue_size_per_device_limit:100}")
-  private int messageQueueSizePerDeviceLimit;
 
-  @Getter
-  @Value("${transport.tcp.timeout:10000}")
-  private long timeout;
 
-  @Getter
-  @Value("${transport.tcp.proxy_enabled:false}")
-  private boolean proxyEnabled;
+
 
   private final AtomicInteger connectionsCounter = new AtomicInteger();
   protected ScheduledExecutorService schedulerExecutor;

-package org.thingsboard.server.transport.session;
+package org.thingsboard.server.transport.gbt28181.session;
 
 
 import io.swagger.annotations.ApiModel;

@@ -19,29 +19,31 @@ import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import javax.annotation.PostConstruct;
 import javax.sip.*;
+
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.TbTransportService;
 import org.thingsboard.server.transport.gbt28181.sip.processor.SIPProvider;
-import org.thingsboard.server.transport.config.SipConfig;
+import org.thingsboard.server.transport.gbt28181.config.SipConfig;
 
 /**
  * @author Andrew Shvayka
  */
-@Service()
+@Service("SipTransportService")
+@RequiredArgsConstructor
 @ConditionalOnExpression(
     "'${service.type:null}'=='tb-transport' || ('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true' && '${transport.gbt28181.enabled}'=='true')")
 @Slf4j
 public class SipTransportService implements TbTransportService {
   private static final Map<String, SipProviderImpl> tcpSipProviderMap = new ConcurrentHashMap<>();
   private static final Map<String, SipProviderImpl> udpSipProviderMap = new ConcurrentHashMap<>();
-  @Autowired private SIPProvider sipProvider;
+  private final SIPProvider sipProvider;
 
-  @Autowired private SipConfig sipConfig;
+  private final SipConfig sipConfig;
 
   @PostConstruct
   public void init() {

@@ -57,25 +57,23 @@ import org.thingsboard.server.common.transport.auth.ValidateDeviceCredentialsRes
 import org.thingsboard.server.common.transport.util.DataDecodingEncodingService;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.transport.gbt28181.session.GbtTransportContext;
-import org.thingsboard.server.transport.cmd.SIPRequestHeaderProcess;
-import org.thingsboard.server.transport.cmd.TKSipCommanderService;
-import org.thingsboard.server.transport.config.MediaConfig;
-import org.thingsboard.server.transport.config.SipConfig;
+import org.thingsboard.server.transport.gbt28181.cmd.SIPRequestHeaderProcess;
+import org.thingsboard.server.transport.gbt28181.cmd.TKSipCommanderService;
+import org.thingsboard.server.transport.gbt28181.config.MediaConfig;
+import org.thingsboard.server.transport.gbt28181.config.SipConfig;
 import org.thingsboard.server.transport.gbt28181.*;
 import org.thingsboard.server.transport.gbt28181.auth.DigestServerAuthenticationHelper;
-import org.thingsboard.server.transport.gbt28181.sip.ISIPRequestProcessor;
-import org.thingsboard.server.transport.gbt28181.sip.ISIPResponseProcessor;
 import org.thingsboard.server.transport.gbt28181.auth.RemoteAddressInfo;
-import org.thingsboard.server.transport.session.GbtDeviceSessionCtx;
+import org.thingsboard.server.transport.gbt28181.session.GbtDeviceSessionCtx;
 import org.thingsboard.server.transport.util.TKSipUtils;
 import org.thingsboard.server.transport.util.TKXmlUtil;
 
 /** SIP信令处理类观察者 */
 @Component
+@RequiredArgsConstructor
 @ConditionalOnExpression(
     "'${service.type:null}'=='tb-transport' || ('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true' && '${transport.gbt28181.enabled}'=='true')")
 @Slf4j
-@RequiredArgsConstructor
 public class SIPProcessorObserver extends SIPRequestProcessorParent
     implements SIPProvider, SessionMsgListener {
 
@@ -100,33 +98,14 @@ public class SIPProcessorObserver extends SIPRequestProcessorParent
 
   private final ConcurrentHashMap<String, List<VideoChanelDTO>> deviceNewChanel =
       new ConcurrentHashMap<>();
-  private static final Map<String, ISIPRequestProcessor> requestProcessorMap =
-      new ConcurrentHashMap<>();
-  private static final Map<String, ISIPResponseProcessor> responseProcessorMap =
-      new ConcurrentHashMap<>();
+
   private static ITimeoutProcessor timeoutProcessor;
 
   private final SipSubscribe sipSubscribe;
 
-  /**
-   * 添加 request订阅
-   *
-   * @param method 方法名
-   * @param processor 处理程序
-   */
-  public void addRequestProcessor(String method, ISIPRequestProcessor processor) {
-    requestProcessorMap.put(method, processor);
-  }
 
-  /**
-   * 添加 response订阅
-   *
-   * @param method 方法名
-   * @param processor 处理程序
-   */
-  public void addResponseProcessor(String method, ISIPResponseProcessor processor) {
-    responseProcessorMap.put(method, processor);
-  }
+
+
 
   /**
    * 添加 超时事件订阅
@@ -272,17 +251,17 @@ public class SIPProcessorObserver extends SIPRequestProcessorParent
     if (sessionCtx == null) {
       return;
     }
-    final int queueSize = sessionCtx.getMsgQueueSize();
-    if (queueSize >= context.getMessageQueueSizePerDeviceLimit()) {
-      log.info(
-          "Closing current session because msq queue size for device {} exceed limit {} with msgQueueSize counter {} and actual queue size {}",
-          sessionCtx.getDeviceId(),
-          context.getMessageQueueSizePerDeviceLimit(),
-          queueSize,
-          sessionCtx.getMsgQueueSize());
-
-      return;
-    }
+//    final int queueSize = sessionCtx.getMsgQueueSize();
+//    if (queueSize >= context.getMessageQueueSizePerDeviceLimit()) {
+//      log.info(
+//          "Closing current session because msq queue size for device {} exceed limit {} with msgQueueSize counter {} and actual queue size {}",
+//          sessionCtx.getDeviceId(),
+//          context.getMessageQueueSizePerDeviceLimit(),
+//          queueSize,
+//          sessionCtx.getMsgQueueSize());
+//
+//      return;
+//    }
     sessionCtx.addToQueue(evt);
     processMsgQueue(
         sessionCtx); // Under the normal conditions the msg queue will contain 0 messages. Many

@@ -20,7 +20,7 @@ import org.dom4j.DocumentException;
 import org.dom4j.Element;
 import org.dom4j.io.SAXReader;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.thingsboard.server.transport.cmd.SIPSender;
+import org.thingsboard.server.transport.gbt28181.cmd.SIPSender;
 import org.thingsboard.server.transport.util.TKSipUtils;
 
 /** 处理接收IPCamera发来的SIP协议请求消息 */

@@ -21,8 +21,8 @@ import org.thingsboard.server.common.data.yunteng.utils.DataUtils;
 import org.thingsboard.server.common.transport.TransportService;
 import org.thingsboard.server.common.transport.util.DataDecodingEncodingService;
 import org.thingsboard.server.gen.transport.TransportProtos;
-import org.thingsboard.server.transport.config.MediaConfig;
-import org.thingsboard.server.transport.config.SipConfig;
+import org.thingsboard.server.transport.gbt28181.config.MediaConfig;
+import org.thingsboard.server.transport.gbt28181.config.SipConfig;
 
 @Component()
 @Slf4j

@@ -12,7 +12,6 @@ import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.util.ObjectUtils;
 import org.thingsboard.server.common.data.yunteng.dto.sip.PTZCmdDTO;
 import org.thingsboard.server.common.data.yunteng.dto.sip.VideoChanelDTO;
-import org.thingsboard.server.transport.config.ThingsKitVersionConfig;
 import org.thingsboard.server.transport.gbt28181.auth.RemoteAddressInfo;
 
 public class TKSipUtils {
@@ -63,19 +62,10 @@ public class TKSipUtils {
     return builder.toString();
   }
 
-  public static UserAgentHeader createUserAgentHeader(ThingsKitVersionConfig config)
+  public static UserAgentHeader createUserAgentHeader()
       throws PeerUnavailableException, ParseException {
     List<String> agentParam = new ArrayList<>();
     agentParam.add("ThingsKit ");
-    if (config != null) {
-      if (!ObjectUtils.isEmpty(config.getReleaseVersion())) {
-        agentParam.add("v");
-        agentParam.add(config.getReleaseVersion() + ".");
-      }
-      if (!ObjectUtils.isEmpty(config.getReleaseDate())) {
-        agentParam.add(config.getReleaseDate());
-      }
-    }
     return SipFactory.getInstance().createHeaderFactory().createUserAgentHeader(agentParam);
   }
 

@@ -21,7 +21,7 @@ import org.thingsboard.server.common.data.yunteng.dto.sip.VideoChanelDTO;
 import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
 import org.thingsboard.server.common.data.yunteng.utils.DataUtils;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
-import org.thingsboard.server.transport.session.GbtDeviceSessionCtx;
+import org.thingsboard.server.transport.gbt28181.session.GbtDeviceSessionCtx;
 
 /** 基于dom4j的工具包 */
 @Slf4j