Revert "fix(DEFECT-1963): temp"

This reverts commit 2d747765.

Revert "fix(DEFECT-1963): temp"
This reverts commit 2d747765.
芯火源
1 parent 2d747765
Showing 1 changed file with 24 additions and 24 deletions
application/src/main/resources/thingsboard.yml
--- a/application/src/main/resources/thingsboard.yml
View file @087ff16
+++ b/application/src/main/resources/thingsboard.yml
View file @087ff16
@@ -99,9 +99,9 @@ app:
 # Zookeeper connection parameters. Used for service discovery.
 zk:
   # Enable/disable zookeeper discovery service.
-  enabled: "${ZOOKEEPER_ENABLED:true}"
+  enabled: "${ZOOKEEPER_ENABLED:false}"
   # Zookeeper connect string
-  url: "${ZOOKEEPER_URL:123.60.37.18:22181,124.70.179.189:22181,124.71.191.130:22181}"
+  url: "${ZOOKEEPER_URL:localhost:2181}"
   # Zookeeper retry interval in milliseconds
   retry_interval_ms: "${ZOOKEEPER_RETRY_INTERVAL_MS:3000}"
   # Zookeeper connection timeout in milliseconds
@@ -109,7 +109,7 @@ zk:
   # Zookeeper session timeout in milliseconds
   session_timeout_ms: "${ZOOKEEPER_SESSION_TIMEOUT_MS:3000}"
   # Name of the directory in zookeeper 'filesystem'
-  zk_dir: "${ZOOKEEPER_NODES_DIR:/thingsKit}"
+  zk_dir: "${ZOOKEEPER_NODES_DIR:/thingsboard}"
 cluster:
   stats:
@@ -377,7 +377,7 @@ actors:
 cache:
   # caffeine or redis
-  type: "${CACHE_TYPE:redis}"
+  type: "${CACHE_TYPE:caffeine}"
   maximumPoolSize: "${CACHE_MAXIMUM_POOL_SIZE:16}" # max pool size to process futures that calls the external cache
   attributes:
     # make sure that if cache.type is 'redis' and cache.attributes.enabled is 'true' that you change 'maxmemory-policy' Redis config property to 'allkeys-lru', 'allkeys-lfu' or 'allkeys-random'
@@ -460,7 +460,7 @@ caffeine:
 redis:
   # standalone or cluster
   connection:
-    type: "${REDIS_CONNECTION_TYPE:cluster}"
+    type: "${REDIS_CONNECTION_TYPE:standalone}"
   standalone:
     host: "${REDIS_HOST:localhost}"
     port: "${REDIS_PORT:6379}"
@@ -475,14 +475,14 @@ redis:
     usePoolConfig: "${REDIS_CLIENT_USE_POOL_CONFIG:false}"
   cluster:
     # Comma-separated list of "host:port" pairs to bootstrap from.
-    nodes: "${REDIS_NODES:123.60.37.18:6379,124.70.179.189:6379,124.71.191.130:6379}"
+    nodes: "${REDIS_NODES:}"
     # Maximum number of redirects to follow when executing commands across the cluster.
     max-redirects: "${REDIS_MAX_REDIRECTS:12}"
     useDefaultPoolConfig: "${REDIS_USE_DEFAULT_POOL_CONFIG:true}"
   # db index
   db: "${REDIS_DB:0}"
   # db password
-  password: "${REDIS_PASSWORD:thingskit}"
+  password: "${REDIS_PASSWORD:redis@6379}"
   # pool config
   pool_config:
     maxTotal: "${REDIS_POOL_CONFIG_MAX_TOTAL:128}"
@@ -553,9 +553,9 @@ spring:
     database-platform: "${SPRING_JPA_DATABASE_PLATFORM:org.hibernate.dialect.PostgreSQLDialect}"
   datasource:
     driverClassName: "${SPRING_DRIVER_CLASS_NAME:org.postgresql.Driver}"
-    url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://222.180.200.114:20638/test}"
+    url: "${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/postgres}"
     username: "${SPRING_DATASOURCE_USERNAME:postgres}"
-    password: "${SPRING_DATASOURCE_PASSWORD:Thw770!!uriq}"
+    password: "${SPRING_DATASOURCE_PASSWORD:postgres}"
     hikari:
       maximumPoolSize: "${SPRING_DATASOURCE_MAXIMUM_POOL_SIZE:16}"
 # Audit log parameters
@@ -603,8 +603,8 @@ audit-log:
 state:
   # Should be greater then transport.sessions.report_timeout
-  defaultInactivityTimeoutInSec: "${DEFAULT_INACTIVITY_TIMEOUT:60}"
-  defaultStateCheckIntervalInSec: "${DEFAULT_STATE_CHECK_INTERVAL:6}"
+  defaultInactivityTimeoutInSec: "${DEFAULT_INACTIVITY_TIMEOUT:600}"
+  defaultStateCheckIntervalInSec: "${DEFAULT_STATE_CHECK_INTERVAL:60}"
   persistToTelemetry: "${PERSIST_STATE_TO_TELEMETRY:false}"
 js:
@@ -667,7 +667,7 @@ transport:
   # Local MQTT transport parameters
   mqtt:
     # Enable/disable mqtt transport protocol.
-    enabled: "${MQTT_ENABLED:false}"
+    enabled: "${MQTT_ENABLED:true}"
     bind_address: "${MQTT_BIND_ADDRESS:0.0.0.0}"
     bind_port: "${MQTT_BIND_PORT:1883}"
     # Enable proxy protocol support. Disabled by default. If enabled, supports both v1 and v2.
@@ -726,29 +726,29 @@ transport:
       # 如果要监听多张网卡，可以使用逗号分隔多个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.22}
+      ip: ${GBT28181_SIP_IP:127.0.0.1}
       # [可选] 28181服务监听的端口
       port: ${GBT28181_SIP_PORT:5060}
       #[可选]
-      id: ${GBT28181_SIP_ID:44010200492000000001}
+      id: ${GBT28181_SIP_ID:51010700599000000001}
       # 根据国标6.1.2中规定，domain宜采用ID统一编码的前十位编码。国标附录D中定义前8位为中心编码（由省级、市级、区级、基层编号组成，参照GB/T 2260-2007）
       # 后两位为行业编码，定义参照附录D.3
       # 3701020049标识山东济南历下区 信息行业接入
       # [可选]
-      domain: ${GBT28181_SIP_DOMAIN:4401020049}
+      domain: ${GBT28181_SIP_DOMAIN:5101070059}
       #[可选]
       password: ${GBT28181_SIP_PASSWORD:61332286}
     #zlm 默认服务器配置
     media:
-      id: ${GBT28181_MEDIA_GENERAL_ID:f6GfbO0BGEaROKLP}
+      id: ${GBT28181_MEDIA_GENERAL_ID:D2okJWKKaQ5bX7Va}
       # [必须修改] zlm服务器的内网IP
-      ip: ${GBT28181_MEDIA_IP:192.168.1.35}
+      ip: ${GBT28181_MEDIA_IP:127.0.0.1}
       # [必须修改] zlm服务器的http.port
       http-port: ${GBT28181_MEDIA_HTTP_PORT:28080}
       hook-ip: ${GBT28181_MEDIA_HOOK_IP:}
       stream-ip: ${GBT28181_MEDIA_STREAM_IP:}
       # [可选] zlm服务器的hook.admin_params=secret
-      secret: ${GBT28181_MEDIA_API_SECRET:5PnbPDCcxQGeK15OowHPPdSgort2Cx9Y}
+      secret: ${GBT28181_MEDIA_API_SECRET:QhrTN7k6HcDnt0YyeolwHwiVYDgIHPMZ}
       # 启用多端口模式, 多端口模式使用端口区分每路流，兼容性更好。 单端口使用流的ssrc区分， 点播超时建议使用多端口测试
       rtp:
         # [可选] 是否启用多端口模式, 开启后会在portRange范围内选择端口用于媒体流传输
@@ -1012,13 +1012,13 @@ swagger:
   version: "${SWAGGER_VERSION:}"
 queue:
-  type: "${TB_QUEUE_TYPE:kafka}" # in-memory or kafka (Apache Kafka) or aws-sqs (AWS SQS) or pubsub (PubSub) or service-bus (Azure Service Bus) or rabbitmq (RabbitMQ)
+  type: "${TB_QUEUE_TYPE:in-memory}" # in-memory or kafka (Apache Kafka) or aws-sqs (AWS SQS) or pubsub (PubSub) or service-bus (Azure Service Bus) or rabbitmq (RabbitMQ)
   in_memory:
     stats:
       # For debug lvl
       print-interval-ms: "${TB_QUEUE_IN_MEMORY_STATS_PRINT_INTERVAL_MS:60000}"
   kafka:
-    bootstrap.servers: "${TB_KAFKA_SERVERS:123.60.37.18:29092,124.70.179.189:29092,124.71.191.130:29092}"
+    bootstrap.servers: "${TB_KAFKA_SERVERS:localhost:9092}"
     acks: "${TB_KAFKA_ACKS:all}"
     retries: "${TB_KAFKA_RETRIES:1}"
     compression.type: "${TB_KAFKA_COMPRESSION_TYPE:none}" # none or gzip
@@ -1032,11 +1032,11 @@ queue:
     max_poll_records: "${TB_QUEUE_KAFKA_MAX_POLL_RECORDS:8192}"
     max_partition_fetch_bytes: "${TB_QUEUE_KAFKA_MAX_PARTITION_FETCH_BYTES:16777216}"
     fetch_max_bytes: "${TB_QUEUE_KAFKA_FETCH_MAX_BYTES:134217728}"
-    use_confluent_cloud: "${TB_QUEUE_KAFKA_USE_CONFLUENT_CLOUD:true}"
+    use_confluent_cloud: "${TB_QUEUE_KAFKA_USE_CONFLUENT_CLOUD:false}"
     confluent:
-      ssl.algorithm: "${TB_QUEUE_KAFKA_CONFLUENT_SSL_ALGORITHM:http}"
-      sasl.mechanism: "${TB_QUEUE_KAFKA_CONFLUENT_SASL_MECHANISM:SCRAM-SHA-512}"
-      sasl.config: "${TB_QUEUE_KAFKA_CONFLUENT_SASL_JAAS_CONFIG:org.apache.kafka.common.security.scram.ScramLoginModule required  username=\"thingskit\" password=\"thingskit\";}"
+      ssl.algorithm: "${TB_QUEUE_KAFKA_CONFLUENT_SSL_ALGORITHM:https}"
+      sasl.mechanism: "${TB_QUEUE_KAFKA_CONFLUENT_SASL_MECHANISM:PLAIN}"
+      sasl.config: "${TB_QUEUE_KAFKA_CONFLUENT_SASL_JAAS_CONFIG:org.apache.kafka.common.security.plain.PlainLoginModule required username=\"CLUSTER_API_KEY\" password=\"CLUSTER_API_SECRET\";}"
       security.protocol: "${TB_QUEUE_KAFKA_CONFLUENT_SECURITY_PROTOCOL:SASL_SSL}"
     # Key-value properties for Kafka consumer per specific topic, e.g. tb_ota_package is a topic name for ota, tb_rule_engine.sq is a topic name for default SequentialByOriginator queue.
     # Check TB_QUEUE_CORE_OTA_TOPIC and TB_QUEUE_RE_SQ_TOPIC params