fix: 调整 iot-gateway prod 配置结构与 application.yaml 保持一致
- 移除 Nacos 配置(在 application.yaml 中通过 import 引入) - 保持与 application.yaml 完全相同的结构 - 仅将硬编码值替换为环境变量占位符
This commit is contained in:
@@ -1,22 +1,12 @@
|
|||||||
--- #################### 注册中心 + 配置中心相关配置 ####################
|
--- #################### 注册中心 + 配置中心相关配置 ####################
|
||||||
|
|
||||||
spring:
|
spring:
|
||||||
cloud:
|
application:
|
||||||
nacos:
|
name: iot-gateway-server
|
||||||
server-addr: ${NACOS_SERVER_ADDR:127.0.0.1:8848}
|
profiles:
|
||||||
username: ${NACOS_USERNAME:}
|
active: prod
|
||||||
password: ${NACOS_PASSWORD:}
|
|
||||||
discovery:
|
|
||||||
namespace: ${NACOS_NAMESPACE:}
|
|
||||||
group: ${NACOS_GROUP:DEFAULT_GROUP}
|
|
||||||
metadata:
|
|
||||||
version: 1.0.0
|
|
||||||
config:
|
|
||||||
namespace: ${NACOS_NAMESPACE:}
|
|
||||||
group: ${NACOS_GROUP:DEFAULT_GROUP}
|
|
||||||
|
|
||||||
--- #################### Redis 配置 ####################
|
# Redis 配置
|
||||||
spring:
|
|
||||||
data:
|
data:
|
||||||
redis:
|
redis:
|
||||||
host: ${REDIS_HOST:127.0.0.1}
|
host: ${REDIS_HOST:127.0.0.1}
|
||||||
@@ -24,17 +14,13 @@ spring:
|
|||||||
database: ${REDIS_DATABASE:0}
|
database: ${REDIS_DATABASE:0}
|
||||||
password: ${REDIS_PASSWORD:}
|
password: ${REDIS_PASSWORD:}
|
||||||
timeout: ${REDIS_TIMEOUT:30000ms}
|
timeout: ${REDIS_TIMEOUT:30000ms}
|
||||||
lettuce:
|
|
||||||
pool:
|
|
||||||
max-active: 8
|
|
||||||
max-wait: -1ms
|
|
||||||
max-idle: 8
|
|
||||||
min-idle: 0
|
|
||||||
|
|
||||||
--- #################### MQ 消息队列相关配置 ####################
|
--- #################### 消息队列相关 ####################
|
||||||
|
|
||||||
|
# rocketmq 配置项,对应 RocketMQProperties 配置类
|
||||||
rocketmq:
|
rocketmq:
|
||||||
name-server: ${ROCKETMQ_NAMESRV_ADDR:127.0.0.1:9876}
|
name-server: ${ROCKETMQ_NAMESRV_ADDR:127.0.0.1:9876}
|
||||||
|
# Producer 配置项
|
||||||
producer:
|
producer:
|
||||||
group: ${spring.application.name}_PRODUCER
|
group: ${spring.application.name}_PRODUCER
|
||||||
|
|
||||||
@@ -53,7 +39,6 @@ viewsh:
|
|||||||
url: ${IOT_RPC_URL:http://127.0.0.1:48091}
|
url: ${IOT_RPC_URL:http://127.0.0.1:48091}
|
||||||
connect-timeout: ${IOT_RPC_CONNECT_TIMEOUT:30s}
|
connect-timeout: ${IOT_RPC_CONNECT_TIMEOUT:30s}
|
||||||
read-timeout: ${IOT_RPC_READ_TIMEOUT:30s}
|
read-timeout: ${IOT_RPC_READ_TIMEOUT:30s}
|
||||||
|
|
||||||
# 设备 Token 配置
|
# 设备 Token 配置
|
||||||
token:
|
token:
|
||||||
secret: ${IOT_TOKEN_SECRET:viewshIotGatewayTokenSecret123456789}
|
secret: ${IOT_TOKEN_SECRET:viewshIotGatewayTokenSecret123456789}
|
||||||
@@ -61,12 +46,15 @@ viewsh:
|
|||||||
|
|
||||||
# 协议配置
|
# 协议配置
|
||||||
protocol:
|
protocol:
|
||||||
# HTTP 协议配置
|
# ====================================
|
||||||
|
# 针对引入的 HTTP 组件的配置
|
||||||
|
# ====================================
|
||||||
http:
|
http:
|
||||||
enabled: ${IOT_HTTP_ENABLED:true}
|
enabled: ${IOT_HTTP_ENABLED:true}
|
||||||
server-port: ${IOT_HTTP_PORT:8092}
|
server-port: ${IOT_HTTP_PORT:8092}
|
||||||
|
# ====================================
|
||||||
# EMQX 协议配置
|
# 针对引入的 EMQX 组件的配置
|
||||||
|
# ====================================
|
||||||
emqx:
|
emqx:
|
||||||
enabled: ${IOT_EMQX_ENABLED:false}
|
enabled: ${IOT_EMQX_ENABLED:false}
|
||||||
http-port: ${IOT_EMQX_HTTP_PORT:8090}
|
http-port: ${IOT_EMQX_HTTP_PORT:8090}
|
||||||
@@ -82,20 +70,25 @@ viewsh:
|
|||||||
keep-alive-interval-seconds: 60
|
keep-alive-interval-seconds: 60
|
||||||
max-inflight-queue: 10000
|
max-inflight-queue: 10000
|
||||||
connect-timeout-seconds: 10
|
connect-timeout-seconds: 10
|
||||||
trust-all: false # 生产环境必须为 false
|
# 是否信任所有 SSL 证书 (默认: false)。警告:生产环境必须为 false!
|
||||||
|
# 仅在开发环境或内网测试时,如果使用了自签名证书,可以临时设置为 true
|
||||||
|
trust-all: ${IOT_EMQX_TRUST_ALL:false}
|
||||||
|
# 遗嘱消息配置 (用于网关异常下线时通知其他系统)
|
||||||
will:
|
will:
|
||||||
enabled: true
|
enabled: ${IOT_EMQX_WILL_ENABLED:true}
|
||||||
topic: "gateway/status/${viewsh.iot.gateway.emqx.mqtt-client-id}"
|
topic: "gateway/status/${viewsh.iot.gateway.emqx.mqtt-client-id}"
|
||||||
payload: "offline"
|
payload: "offline"
|
||||||
qos: 1
|
qos: 1
|
||||||
retain: true
|
retain: true
|
||||||
|
# 高级 SSL/TLS 配置 (当 trust-all: false 且 mqtt-ssl: true 时生效)
|
||||||
ssl-options:
|
ssl-options:
|
||||||
key-store-path: ${IOT_EMQX_SSL_KEYSTORE_PATH:classpath:certs/client.jks}
|
key-store-path: ${IOT_EMQX_SSL_KEYSTORE_PATH:classpath:certs/client.jks}
|
||||||
key-store-password: ${IOT_EMQX_SSL_KEYSTORE_PASSWORD:}
|
key-store-password: ${IOT_EMQX_SSL_KEYSTORE_PASSWORD:your-keystore-password}
|
||||||
trust-store-path: ${IOT_EMQX_SSL_TRUSTSTORE_PATH:classpath:certs/trust.jks}
|
trust-store-path: ${IOT_EMQX_SSL_TRUSTSTORE_PATH:classpath:certs/trust.jks}
|
||||||
trust-store-password: ${IOT_EMQX_SSL_TRUSTSTORE_PASSWORD:}
|
trust-store-password: ${IOT_EMQX_SSL_TRUSTSTORE_PASSWORD:your-truststore-password}
|
||||||
|
# ====================================
|
||||||
# TCP 协议配置
|
# 针对引入的 TCP 组件的配置
|
||||||
|
# ====================================
|
||||||
tcp:
|
tcp:
|
||||||
enabled: ${IOT_TCP_ENABLED:false}
|
enabled: ${IOT_TCP_ENABLED:false}
|
||||||
port: ${IOT_TCP_PORT:8091}
|
port: ${IOT_TCP_PORT:8091}
|
||||||
@@ -104,8 +97,9 @@ viewsh:
|
|||||||
ssl-enabled: ${IOT_TCP_SSL_ENABLED:false}
|
ssl-enabled: ${IOT_TCP_SSL_ENABLED:false}
|
||||||
ssl-cert-path: ${IOT_TCP_SSL_CERT_PATH:classpath:certs/client.jks}
|
ssl-cert-path: ${IOT_TCP_SSL_CERT_PATH:classpath:certs/client.jks}
|
||||||
ssl-key-path: ${IOT_TCP_SSL_KEY_PATH:classpath:certs/client.jks}
|
ssl-key-path: ${IOT_TCP_SSL_KEY_PATH:classpath:certs/client.jks}
|
||||||
|
# ====================================
|
||||||
# MQTT 协议配置
|
# 针对引入的 MQTT 组件的配置
|
||||||
|
# ====================================
|
||||||
mqtt:
|
mqtt:
|
||||||
enabled: ${IOT_MQTT_ENABLED:true}
|
enabled: ${IOT_MQTT_ENABLED:true}
|
||||||
port: ${IOT_MQTT_PORT:1883}
|
port: ${IOT_MQTT_PORT:1883}
|
||||||
@@ -113,37 +107,26 @@ viewsh:
|
|||||||
connect-timeout-seconds: ${IOT_MQTT_CONNECT_TIMEOUT:60}
|
connect-timeout-seconds: ${IOT_MQTT_CONNECT_TIMEOUT:60}
|
||||||
ssl-enabled: ${IOT_MQTT_SSL_ENABLED:false}
|
ssl-enabled: ${IOT_MQTT_SSL_ENABLED:false}
|
||||||
|
|
||||||
--- #################### 监控相关配置 ####################
|
|
||||||
|
|
||||||
management:
|
|
||||||
endpoints:
|
|
||||||
web:
|
|
||||||
base-path: /actuator
|
|
||||||
exposure:
|
|
||||||
include: '*'
|
|
||||||
|
|
||||||
spring:
|
|
||||||
boot:
|
|
||||||
admin:
|
|
||||||
client:
|
|
||||||
instance:
|
|
||||||
service-host-type: IP
|
|
||||||
username: ${SPRING_BOOT_ADMIN_USERNAME:admin}
|
|
||||||
password: ${SPRING_BOOT_ADMIN_PASSWORD:admin}
|
|
||||||
|
|
||||||
--- #################### 日志相关配置 ####################
|
--- #################### 日志相关配置 ####################
|
||||||
|
|
||||||
|
# 基础日志配置
|
||||||
logging:
|
logging:
|
||||||
|
file:
|
||||||
|
name: ${LOG_FILE_PATH:/app/logs}/${spring.application.name}.log
|
||||||
level:
|
level:
|
||||||
root: INFO
|
# 应用基础日志级别
|
||||||
com.viewsh.module.iot.gateway: ${LOG_LEVEL_IOT_GATEWAY:INFO}
|
com.viewsh.module.iot.gateway: ${LOG_LEVEL_IOT_GATEWAY:INFO}
|
||||||
org.springframework.boot: INFO
|
org.springframework.boot: INFO
|
||||||
|
# RocketMQ 日志
|
||||||
org.apache.rocketmq: WARN
|
org.apache.rocketmq: WARN
|
||||||
|
# MQTT 客户端日志
|
||||||
|
# io.vertx.mqtt: DEBUG
|
||||||
|
# 生产环境日志
|
||||||
com.viewsh.module.iot.gateway.protocol.emqx: ${LOG_LEVEL_EMQX:INFO}
|
com.viewsh.module.iot.gateway.protocol.emqx: ${LOG_LEVEL_EMQX:INFO}
|
||||||
com.viewsh.module.iot.gateway.protocol.http: ${LOG_LEVEL_HTTP:INFO}
|
com.viewsh.module.iot.gateway.protocol.http: ${LOG_LEVEL_HTTP:INFO}
|
||||||
com.viewsh.module.iot.gateway.protocol.mqtt: ${LOG_LEVEL_MQTT:INFO}
|
com.viewsh.module.iot.gateway.protocol.mqtt: ${LOG_LEVEL_MQTT:INFO}
|
||||||
file:
|
# 根日志级别
|
||||||
name: ${LOG_FILE_PATH:/app/logs}/${spring.application.name}.log
|
root: INFO
|
||||||
|
|
||||||
debug: false
|
debug: false
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user