From 76743b009ca5ea67557fcab597b332f8d1947813 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期二, 24 十二月 2024 14:09:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 iailab-module-data/iailab-module-data-biz/src/main/resources/application.yaml |   43 +++++++++++--------------------------------
 1 files changed, 11 insertions(+), 32 deletions(-)

diff --git a/iailab-module-data/iailab-module-data-biz/src/main/resources/application.yaml b/iailab-module-data/iailab-module-data-biz/src/main/resources/application.yaml
index 46343cd..1aa2d73 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/resources/application.yaml
+++ b/iailab-module-data/iailab-module-data-biz/src/main/resources/application.yaml
@@ -11,6 +11,7 @@
       username: @nacos.username@
       password: @nacos.password@
       discovery: # 【配置中心】配置项
+        ip: @deploy.server@
         namespace: ${spring.profiles.active}
         group: DEFAULT_GROUP # 使用的 Nacos 配置分组,默认为 DEFAULT_GROUP
         metadata:
@@ -60,7 +61,7 @@
 
 logging:
   file:
-    name: @log.path@/logs/${spring.application.name}.log # 日志文件名,全路径
+    name: @log.path@/iailab-data/log/${spring.application.name}.log # 日志文件名,全路径
   level:
     org:
       springframework:
@@ -121,34 +122,6 @@
   is-enable-global: true # 启用全局翻译(拦截所有 SpringMVC ResponseBody 进行自动翻译 )。如果对于性能要求很高可关闭此配置,或通过 @IgnoreTrans 忽略某个接口
   is-enable-cloud: false # 禁用 TransType.RPC 微服务模式
 
---- #################### RPC 远程调用相关配置 ####################
-
---- #################### 消息队列相关 ####################
-
-# rocketmq 配置项,对应 RocketMQProperties 配置类
-rocketmq:
-  # Producer 配置项
-  producer:
-    group: ${spring.application.name}_PRODUCER # 生产者分组
-
-spring:
-  # Kafka 配置项,对应 KafkaProperties 配置类
-  kafka:
-    # Kafka Producer 配置项
-    producer:
-      acks: 1 # 0-不应答。1-leader 应答。all-所有 leader 和 follower 应答。
-      retries: 3 # 发送失败时,重试发送的次数
-      value-serializer: org.springframework.kafka.support.serializer.JsonSerializer # 消息的 value 的序列化
-    # Kafka Consumer 配置项
-    consumer:
-      auto-offset-reset: earliest # 设置消费者分组最初的消费进度为 earliest 。可参考博客 https://blog.csdn.net/lishuangzhe7047/article/details/74530417 理解
-      value-deserializer: org.springframework.kafka.support.serializer.JsonDeserializer
-      properties:
-        spring.json.trusted.packages: '*'
-    # Kafka Consumer Listener 监听器配置
-    listener:
-      missing-topics-fatal: false # 消费监听接口监听的主题不存在时,默认会报错。所以通过设置为 false ,解决报错
-
 
 --- #################### 平台相关配置 ####################
 
@@ -203,9 +176,15 @@
       - t_ind_item_atom
       - t_ind_item_der
       - t_ind_item_cal
-      - t_dev_nvr
-      - t_dev_log
-      - t_dev_camera
+      - t_video_nvr
+      - t_video_log
+      - t_video_camera
+      - t_video_image
+      - t_plan_data_set
+      - t_plan_item_category
+      - t_plan_item
+      - t_da_cumulate_point
+      - t_da_point_collect_status
   app:
     app-key: data
     app-secret: 85b0df7edc3df3611913df34ed695011

--
Gitblit v1.9.3