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-model/iailab-module-model-biz/src/main/resources/application.yml |   73 ++++++++++++++++++++++++------------
 1 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/application.yml b/iailab-module-model/iailab-module-model-biz/src/main/resources/application.yml
index a0441fb..8ef4a92 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/application.yml
+++ b/iailab-module-model/iailab-module-model-biz/src/main/resources/application.yml
@@ -1,3 +1,4 @@
+--- #################### 注册中心 + 配置中心相关配置 ####################
 spring:
   application:
     name: model-server
@@ -11,12 +12,12 @@
       username: @nacos.username@
       password: @nacos.password@
       discovery: # 【配置中心】配置项
-        namespace: ${spring.profiles.active}
+        namespace: @profiles.active@
         group: DEFAULT_GROUP # 使用的 Nacos 配置分组,默认为 DEFAULT_GROUP
         metadata:
           version: @nacos.metadata.version@ # 服务实例的版本号,可用于灰度发布
       config: # 【注册中心】配置项
-        namespace: ${spring.profiles.active}
+        namespace: @profiles.active@
         group: DEFAULT_GROUP # 使用的 Nacos 配置分组,默认为 DEFAULT_GROUP
 
   main:
@@ -57,7 +58,7 @@
 
 logging:
   file:
-    name: @log.path@/logs/${spring.application.name}.log # 日志文件名,全路径
+    name: @log.path@/iailab-model/log/${spring.application.name}.log # 日志文件名,全路径
   level:
     org:
       springframework:
@@ -157,8 +158,8 @@
     admin-ui:
       url:  # Admin 管理后台 UI 的地址
   swagger:
-    title: 数据采集
-    description: 数据采集
+    title: 模型管理
+    description: 模型管理
     version: ${iailab.info.version}
     base-package: ${iailab.info.base-package}
   tenant: # 多租户相关配置项
@@ -177,26 +178,50 @@
       - qrtz_triggers
       - schedule_job
       - schedule_job_log
-      - t_channel_kio_device
-      - t_channel_kio_tag
-      - t_channel_modbus_device
-      - t_channel_modbus_tag
-      - t_channel_opcda_device
-      - t_channel_opcda_tag
-      - t_channel_opcua_device
-      - t_channel_opcua_tag
-      - t_da_math_point
-      - t_da_measure_point
-      - t_da_point
-      - t_da_point_value
-      - t_da_sequence_num
-      - t_http_api
-      - t_http_tag
-      - t_http_token
-      - t_ind_item
-      - t_ind_item_atom
+      - t_dm_module
+      - t_dm_module_item
+      - t_mm_item_output
+      - t_mm_item_result
+      - t_mm_item_type
+      - t_mm_model_arith_settings
+      - t_mm_model_param
+      - t_mm_model_resultstr
+      - t_mm_predict_item
+      - t_mm_predict_merge_item
+      - t_mm_predict_model
+      - t_mm_result_table
+      - t_mm_item_result_json
+      - t_mm_item_result_last_point
+      - t_mm_item_accuracy_rate
+      - t_mm_item_accuracy_his
+      - t_mm_predict_alarm_config
+      - t_mm_predict_alarm_message
+      - t_mm_sequence_num
+      - t_st_schedule_scheme
+      - t_st_schedule_model
+      - t_st_schedule_model_param
+      - t_st_schedule_model_setting
+      - t_st_schedule_suggest
+      - t_st_schedule_record
+      - t_st_schedule_record_detail
+      - t_mpk_file
+      - t_mpk_generator_code_history
+      - t_mpk_method_setting
+      - t_mpk_model_method
+      - t_mpk_project
+      - t_mpk_project_model
+      - t_mpk_project_package_history
+      - t_mpk_project_package_history_model
+      - t_mpk_setting_select
+      - t_mpk_icon
+      - t_mpk_file_menu
+      - t_mpk_file_group
+      - t_chart_param
+      - t_chart
+      - t_mpk_pack
+      - t_mm_item_status
   app:
-    app-key: data
+    app-key: model
     app-secret: 85b0df7edc3df3611913df34ed695011
     core-host: 127.0.0.1
 

--
Gitblit v1.9.3