perf: 调整gbt28181条件式加载,默认为false

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.yunteng.config.media.ZLMediaKitServerConfig;
@@ -24,6 +25,8 @@ import java.util.Optional;
 
 @Component("ZLMediaKitState")
 @TbCoreComponent
+@ConditionalOnExpression(
+        "'${service.type:null}'=='tb-transport' || ('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true' && '${transport.gbt28181.enabled}'=='true')")
 @Slf4j
 public class ZLMediaKitStateRunner {
   private final ZLMediaKitRestFulUtils zlMediaKitRestFulUtils;

@@ -720,7 +720,7 @@ transport:
   # Local CoAP transport parameters
   gbt28181:
     # Enable/disable gbt28181 transport protocol.
-    enabled: "${GBT28181_ENABLED:true}"
+    enabled: "${GBT28181_ENABLED:false}"
   tcp:
     # Enable/disable tcp transport protocol.
     enabled: "${TCP_ENABLED:true}"
@@ -1232,7 +1232,7 @@ sip:
   # 如果要监听多张网卡，可以使用逗号分隔多个IP， 例如： 192.168.1.4,10.0.0.4
   # 如果不明白，就使用0.0.0.0，大部分情况都是可以的
   # 请不要使用127.0.0.1，任何包括localhost在内的域名都是不可以的。
-  ip: ${GBT28181_SIP_IP:192.168.1.15}
+  ip: ${GBT28181_SIP_IP:127.0.0.1}
   # [可选] 28181服务监听的端口
   port: ${GBT28181_SIP_PORT:5060}
   #[可选]
@@ -1248,7 +1248,7 @@ sip:
 media:
   id: ${GBT28181_MEDIA_GENERAL_ID:D2okJWKKaQ5bX7Va}
   # [必须修改] zlm服务器的内网IP
-  ip: ${GBT28181_MEDIA_IP:192.168.1.20}
+  ip: ${GBT28181_MEDIA_IP:127.0.0.1}
   # [必须修改] zlm服务器的http.port
   http-port: ${GBT28181_MEDIA_HTTP_PORT:28080}
   # [可选] zlm服务器的hook.admin_params=secret

@@ -15,8 +15,6 @@ import org.thingsboard.server.common.data.yunteng.enums.SessionTypeEnum;
 /** 视频流session管理器，管理视频预览、预览回放的通信句柄 */
 @Component
 @Slf4j
-@ConditionalOnExpression(
-    "'${service.type:null}'=='tb-transport' || ('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true' && '${transport.gbt28181.enabled}'=='true')")
 public class VideoStreamSessionManager {
 
   @Autowired private UserSetting userSetting;

@@ -11,7 +11,6 @@ import javax.sip.message.Request;
 import javax.sip.message.Response;
 import lombok.extern.slf4j.Slf4j;
 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.common.data.yunteng.config.media.ThingsKitVersionConfig;
@@ -21,8 +20,6 @@ import org.thingsboard.server.transport.util.TKSipUtils;
 
 /** 发送SIP信息 */
 @Component
-@ConditionalOnExpression(
-    "'${service.type:null}'=='tb-transport' || ('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true' && '${transport.gbt28181.enabled}'=='true')")
 @Slf4j
 public class SIPSender {
 

@@ -10,15 +10,12 @@ import javax.sip.address.AddressFactory;
 import javax.sip.address.SipURI;
 import javax.sip.header.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.data.yunteng.config.media.SipConfig;
 import org.thingsboard.server.common.data.yunteng.config.media.ThingsKitVersionConfig;
 import org.thingsboard.server.transport.gbt28181.SipLayer;
 
 @Component
-@ConditionalOnExpression(
-    "'${service.type:null}'=='tb-transport' || ('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true' && '${transport.gbt28181.enabled}'=='true')")
 public class AbstractSIPRequestProcess {
   @Autowired private SipConfig sipConfig;
   @Autowired protected ThingsKitVersionConfig thingsKitVersionConfig;

@@ -15,15 +15,12 @@ import javax.sip.address.SipURI;
 import javax.sip.header.*;
 import javax.sip.message.Request;
 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.util.TKSipUtils;
 
 @Component
-@ConditionalOnExpression(
-    "'${service.type:null}'=='tb-transport' || ('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true' && '${transport.gbt28181.enabled}'=='true')")
 public class SIPRequestHeaderProcess extends AbstractSIPRequestProcess {
   public Request createMessageRequest(
       GbtDeviceSessionCtx sessionCtx,

@@ -6,12 +6,15 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.transport.gbt28181.ITimeoutProcessor;
 import org.thingsboard.server.transport.SIPProcessorObserver;
 import org.thingsboard.server.transport.gbt28181.SipSubscribe;
 
 @Component
+@ConditionalOnExpression(
+        "'${service.type:null}'=='tb-transport' || ('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true' && '${transport.gbt28181.enabled}'=='true')")
 public class TimeoutProcessorImpl implements InitializingBean, ITimeoutProcessor {
 
     private Logger logger = LoggerFactory.getLogger(TimeoutProcessorImpl.class);