Merge remote-tracking branch 'origin/master' into merge-temp

viewsh-module-iot/viewsh-module-iot-gateway/src/main/resources/application.yaml

@@ -4,6 +4,11 @@ spring:
   profiles:
     active: local # 默认激活本地开发环境
 
+  config:
+    import:
+      - optional:classpath:application-${spring.profiles.active}.yaml # 加载【本地】配置
+#      - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml # 加载【Nacos】的配置
+
   # Redis 配置
   data:
     redis:
@@ -12,7 +17,8 @@ spring:
       database: ${REDIS_DATABASE:0} # Redis 数据库索引
 #      password: ${REDIS_PASSWORD:9kHXcZ1ojFsD} # Redis 密码
       timeout: 30000ms # 连接超时时间
-
+server:
+  port: 48095
 --- #################### 消息队列相关 ####################
 
 # rocketmq 配置项，对应 RocketMQProperties 配置类