From 38e87c72717cdbe896e1779da76070aae1cb23e4 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 18 九月 2024 08:34:41 +0800
Subject: [PATCH] 预测模块修改
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/DmModuleController.java | 2
/dev/null | 42 --------------
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/vo/DmModuleRespVO.java | 2
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmItemOutputController.java | 2
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmPredictItemController.java | 2
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmModelResultstrController.java | 2
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/MdkFileServiceImpl.java | 6 +-
iailab-module-model/iailab-module-model-biz/pom.xml | 55 +++++++++++------
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmItemTypeController.java | 2
iailab-module-model/iailab-module-model-biz/src/main/resources/application.yml | 4
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmResultTableController.java | 2
iailab-module-model/iailab-module-model-biz/src/main/resources/application-dev_rec.yaml | 4
12 files changed, 49 insertions(+), 76 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/pom.xml b/iailab-module-model/iailab-module-model-biz/pom.xml
index d04cd7a..6395271 100644
--- a/iailab-module-model/iailab-module-model-biz/pom.xml
+++ b/iailab-module-model/iailab-module-model-biz/pom.xml
@@ -58,11 +58,6 @@
<groupId>com.iailab</groupId>
<artifactId>iailab-common-monitor</artifactId>
</dependency>
- <!-- Job 定时任务相关 -->
- <dependency>
- <groupId>com.iailab</groupId>
- <artifactId>iailab-common-job</artifactId>
- </dependency>
<dependency>
<groupId>com.iailab</groupId>
<artifactId>iailab-common-biz-data-permission</artifactId>
@@ -188,23 +183,43 @@
<plugins>
<!-- 打包 -->
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring.boot.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
+ </goals>
+ </execution>
+ </executions>
</plugin>
- <!-- <plugin>-->
- <!-- <groupId>org.springframework.boot</groupId>-->
- <!-- <artifactId>spring-boot-maven-plugin</artifactId>-->
- <!-- <version>${spring.boot.version}</version>-->
- <!-- <executions>-->
- <!-- <execution>-->
- <!-- <goals>-->
- <!-- <goal>repackage</goal> <!– 将引入的 jar 打入其中 –>-->
- <!-- </goals>-->
- <!-- </execution>-->
- <!-- </executions>-->
- <!-- </plugin>-->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
+ <version>1.1.0</version>
+ <configuration>
+ <updatePomFile>true</updatePomFile>
+ <flattenMode>resolveCiFriendliesOnly</flattenMode>
+ </configuration>
+ <executions>
+ <execution>
+ <id>flatten</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>flatten</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>flatten.clean</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/DmModuleController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/DmModuleController.java
index 8e1089c..d34f898 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/DmModuleController.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/DmModuleController.java
@@ -23,7 +23,7 @@
* @date 2021年04月23日 9:05
*/
@RestController
-@RequestMapping("/pre/module")
+@RequestMapping("/model/pre/module")
public class DmModuleController {
@Autowired
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmItemOutputController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmItemOutputController.java
index 2df4568..bcde8f8 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmItemOutputController.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmItemOutputController.java
@@ -19,7 +19,7 @@
* @date 2021年07月23日 11:13
*/
@RestController
-@RequestMapping("/pre/item-output")
+@RequestMapping("/model/pre/item-output")
public class MmItemOutputController {
@Autowired
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmItemTypeController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmItemTypeController.java
index 4063aff..7b513c6 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmItemTypeController.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmItemTypeController.java
@@ -19,7 +19,7 @@
* @date 2021年04月22日 9:57
*/
@RestController
-@RequestMapping("/pre/item-type")
+@RequestMapping("/model/pre/item-type")
public class MmItemTypeController {
@Autowired
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmModelResultstrController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmModelResultstrController.java
index 368a1a8..3e9ee20 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmModelResultstrController.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmModelResultstrController.java
@@ -22,7 +22,7 @@
* @date 2021年05月07日 16:53
*/
@RestController
-@RequestMapping("/pre/model-resultstr")
+@RequestMapping("/model/pre/model-resultstr")
public class MmModelResultstrController {
@Autowired
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmPredictItemController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmPredictItemController.java
index eb504cc..6fe0546 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmPredictItemController.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmPredictItemController.java
@@ -22,7 +22,7 @@
* @date 2021年04月26日 14:42
*/
@RestController
-@RequestMapping("/pre/predict-item")
+@RequestMapping("/model/pre/predict-item")
public class MmPredictItemController {
@Autowired
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmResultTableController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmResultTableController.java
index 57fd8c4..5998627 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmResultTableController.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/controller/admin/MmResultTableController.java
@@ -19,7 +19,7 @@
* @date 2021年04月22日 9:57
*/
@RestController
-@RequestMapping("/pre/result-table")
+@RequestMapping("/model/pre/result-table")
public class MmResultTableController {
@Autowired
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/vo/DmModuleRespVO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/vo/DmModuleRespVO.java
index 1dba4b7..c029686 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/vo/DmModuleRespVO.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/vo/DmModuleRespVO.java
@@ -14,7 +14,7 @@
* @Description
* @createTime 2024年08月29日
*/
-@Schema(description = "模型平台 - ModBusDevice Response VO")
+@Schema(description = "模型平台 - DmModule Response VO")
@Data
@ExcelIgnoreUnannotated
public class DmModuleRespVO {
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/MdkFileServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/MdkFileServiceImpl.java
index 89110ec..b37817a 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/MdkFileServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/MdkFileServiceImpl.java
@@ -69,12 +69,12 @@
@Autowired
private ConfigApi configApi;
- private String mpkBakFilePath;
+ private String mpkBakFilePath = "";
- @PostConstruct
+ /*@PostConstruct
public void init() {
mpkBakFilePath = configApi.getConfigValueByKey("mpkBakFilePath").getCheckedData();
- }
+ }*/
@Override
public PageData<MpkFileDTO> page(Map<String, Object> params) {
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/application-dev.yml b/iailab-module-model/iailab-module-model-biz/src/main/resources/application-dev.yml
deleted file mode 100644
index 3314b19..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,91 +0,0 @@
---- #################### 注册中心 + 配置中心相关配置 ####################
-
-spring:
- cloud:
- nacos:
- server-addr: @nacos.server@ # Nacos 服务器地址
- username: @nacos.username@
- password: @nacos.password@
- discovery: # 【配置中心】配置项
- namespace: @profiles.active@ # 命名空间。这里使用 dev 开发环境
- group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP
- metadata:
- version: @nacos.metadata.version@ # 服务实例的版本号，可用于灰度发布
- config: # 【注册中心】配置项
- namespace: @profiles.active@ # 命名空间。这里使用 dev 开发环境
- group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP
-
---- #################### 数据库相关配置 ####################
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- druid:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/iailab_expert_tenant_zjgt?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
- username: root
- password: 123456
- initial-size: 10
- max-active: 100
- min-idle: 10
- max-wait: 60000
- pool-prepared-statements: true
- max-pool-prepared-statement-per-connection-size: 20
- time-between-eviction-runs-millis: 60000
- min-evictable-idle-time-millis: 300000
- #validationQuery是用来验证数据库连接的查询语句，这个查询语句必须是至少返回一条结果的SELECT语句。每种数据库都有各自的验证语句
- #validation-query: select 1 from sysibm.sysdummy1
- test-while-idle: true
- test-on-borrow: false
- test-on-return: false
- stat-view-servlet:
- enabled: true
- url-pattern: /druid/*
- #login-username: admin
- #login-password: admin
- filter:
- stat:
- log-slow-sql: true
- slow-sql-millis: 1000
- merge-sql: false
- wall:
- config:
- multi-statement-allow: true
- redis:
- database: 0
- host: 127.0.0.1
- port: 6379
- #password: # 密码（默认为空）
- timeout: 6000ms # 连接超时时长（毫秒）
- jedis:
- pool:
- max-active: 1000 # 连接池最大连接数（使用负值表示没有限制）
- max-wait: -1ms # 连接池最大阻塞等待时间（使用负值表示没有限制）
- max-idle: 10 # 连接池中的最大空闲连接
- min-idle: 5 # 连接池中的最小空闲连接
-
-##多数据源的配置
-dynamic:
- datasource:
- slave1:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
- username: root
- password: 123456
-oadp:
- domain: http://172.16.1.148:6010
-
-influx-db:
- org: IAILab
- bucket: whs_data
- token: 0p9sXgDxo4hyZ-hxhV7behQkto-8rD5GD0mTKb66_FHaDn_NoE1zusCP8fJznwfTdpttAjj7bEOeNrpt7cbRQw==
- url: http://localhost:8086
-
-iems:
- upload: C:/DLUT/nginx/static/knowledge
-
-data:
- domain: http://127.0.0.1:8980
-
-iailab:
- is-dev: y
-
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/application-dev.yaml b/iailab-module-model/iailab-module-model-biz/src/main/resources/application-dev_rec.yaml
similarity index 95%
rename from iailab-module-model/iailab-module-model-biz/src/main/resources/application-dev.yaml
rename to iailab-module-model/iailab-module-model-biz/src/main/resources/application-dev_rec.yaml
index ab357c4..dfd9856 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/application-dev.yaml
+++ b/iailab-module-model/iailab-module-model-biz/src/main/resources/application-dev_rec.yaml
@@ -44,8 +44,8 @@
# Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
redis:
- host: 127.0.0.1 # 地址
+ host: 172.16.8.100 # 地址
port: 6379 # 端口
database: 0 # 数据库索引
- # password: 123456 # 密码，建议生产环境开启
+ password: 123456 # 密码，建议生产环境开启
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/application-local.yml b/iailab-module-model/iailab-module-model-biz/src/main/resources/application-local.yml
deleted file mode 100644
index c253d89..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/application-local.yml
+++ /dev/null
@@ -1,147 +0,0 @@
---- #################### 数据库相关配置 ####################
-spring:
- # 数据源配置项
- autoconfigure:
- exclude:
- - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 排除 Druid 的自动配置，使用 dynamic-datasource-spring-boot-starter 配置多数据源
- - de.codecentric.boot.admin.client.config.SpringBootAdminClientAutoConfiguration # 禁用 Spring Boot Admin 的 Client 的自动配置
- datasource:
- druid: # Druid 【监控】相关的全局配置
- web-stat-filter:
- enabled: true
- stat-view-servlet:
- enabled: true
- allow: # 设置白名单，不填则允许所有访问
- url-pattern: /druid/*
- login-username: # 控制台管理用户名和密码
- login-password:
- filter:
- stat:
- enabled: true
- log-slow-sql: true # 慢 SQL 记录
- slow-sql-millis: 100
- merge-sql: true
- wall:
- config:
- multi-statement-allow: true
- dynamic: # 多数据源配置
- druid: # Druid 【连接池】相关的全局配置
- initial-size: 1 # 初始连接数
- min-idle: 1 # 最小连接池数量
- max-active: 20 # 最大连接池数量
- max-wait: 600000 # 配置获取连接等待超时的时间，单位：毫秒
- time-between-eviction-runs-millis: 60000 # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位：毫秒
- min-evictable-idle-time-millis: 300000 # 配置一个连接在池中最小生存的时间，单位：毫秒
- max-evictable-idle-time-millis: 900000 # 配置一个连接在池中最大生存的时间，单位：毫秒
- validation-query: SELECT 1 FROM DUAL # 配置检测连接是否有效
- test-while-idle: true
- test-on-borrow: false
- test-on-return: false
- primary: master
- datasource:
- master:
- url: jdbc:mysql://127.0.0.1:3306/iailab_ntt_model?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
- # url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai # MySQL Connector/J 5.X 连接的示例
- # url: jdbc:postgresql://127.0.0.1:5432/ruoyi-vue-pro # PostgreSQL 连接的示例
- # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
- # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=ruoyi-vue-pro # SQLServer 连接的示例
- # url: jdbc:dm://10.211.55.4:5236?schema=RUOYI_VUE_PRO # DM 连接的示例
- username: root
- password: 123456
- # username: sa # SQL Server 连接的示例
- # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W # SQL Server 连接的示例
- # username: SYSDBA # DM 连接的示例
- # password: SYSDBA # DM 连接的示例
- slave: # 模拟从库，可根据自己需要修改
- lazy: true # 开启懒加载，保证启动速度
- url: jdbc:mysql://127.0.0.1:3306/iailab_ntt_model?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
- username: root
- password: 123456
-
- # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
- redis:
- host: 172.16.8.100 # 地址
- port: 6379 # 端口
- database: 0 # 数据库索引
- password: 123456 # 密码，建议生产环境开启
-
---- #################### 定时任务相关配置 ####################
-
-xxl:
- job:
- enabled: true # 是否开启调度中心，默认为 true 开启
- admin:
- addresses: http://127.0.0.1:9090/xxl-job-admin # 调度中心部署跟地址
-
---- #################### 服务保障相关配置 ####################
-
-# Lock4j 配置项
-lock4j:
- acquire-timeout: 3000 # 获取分布式锁超时时间，默认为 3000 毫秒
- expire: 30000 # 分布式锁的超时时间，默认为 30 毫秒
-
---- #################### 监控相关配置 ####################
-
-# Actuator 监控端点的配置项
-management:
- endpoints:
- web:
- base-path: /actuator # Actuator 提供的 API 接口的根目录。默认为 /actuator
- exposure:
- include: '*' # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ，可以开放所有端点。
-
-# Spring Boot Admin 配置项
-spring:
- boot:
- admin:
- # Spring Boot Admin Client 客户端的相关配置
- client:
- instance:
- service-host-type: IP # 注册实例时，优先使用 IP [IP, HOST_NAME, CANONICAL_HOST_NAME]
-
-# 日志文件配置
-logging:
- level:
- # 配置自己写的 MyBatis Mapper 打印日志
- com.iailab.module.system.dal.mysql: debug
- com.iailab.module.system.dal.mysql.sensitiveword.SensitiveWordMapper: INFO # 配置 SensitiveWordMapper 的日志级别为 info
- com.iailab.module.system.dal.mysql.sms.SmsChannelMapper: INFO # 配置 SmsChannelMapper 的日志级别为 info
-
---- #################### 平台相关配置 ####################
-
-# 平台配置项，设置当前项目所有自定义的配置
-iailab:
- is-dev: y
- env: # 多环境的配置项
- tag: ${HOSTNAME}
- captcha:
- enable: false # 本地环境，暂时关闭图片验证码，方便登录等接口的测试
- security:
- mock-enable: true
- xss:
- enable: false
- exclude-urls: # 如下两个 url，仅仅是为了演示，去掉配置也没关系
- - ${spring.boot.admin.context-path}/** # 不处理 Spring Boot Admin 的请求
- - ${management.endpoints.web.base-path}/** # 不处理 Actuator 的请求
- access-log: # 访问日志的配置项
- enable: false
- demo: false # 关闭演示模式
-
-
-oadp:
- domain: http://172.16.1.148:6010
-
-influx-db:
- org: IAILab
- bucket: whs_data
- token: 0p9sXgDxo4hyZ-hxhV7behQkto-8rD5GD0mTKb66_FHaDn_NoE1zusCP8fJznwfTdpttAjj7bEOeNrpt7cbRQw==
- url: http://localhost:8086
-
-iems:
- upload: C:/DLUT/nginx/static/knowledge
-
-data:
- domain: http://127.0.0.1:8980
-
-
-
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/application-prod.yml b/iailab-module-model/iailab-module-model-biz/src/main/resources/application-prod.yml
deleted file mode 100644
index 3470519..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/application-prod.yml
+++ /dev/null
@@ -1,82 +0,0 @@
-spring:
- cloud:
- nacos:
- discovery:
- server-addr: 192.168.55.179:8848 # 注册中心地址 nacos server
- config:
- server-addr: 192.168.55.179:8848 # 配置中心地址 nacos server
- file-extension: yml # 配置中心的配置后缀
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- druid:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.55.180:3306/iailab_ntt_model?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
- username: root
- password: 123456
- initial-size: 10
- max-active: 100
- min-idle: 10
- max-wait: 60000
- pool-prepared-statements: true
- max-pool-prepared-statement-per-connection-size: 20
- time-between-eviction-runs-millis: 60000
- min-evictable-idle-time-millis: 300000
- #validationQuery是用来验证数据库连接的查询语句，这个查询语句必须是至少返回一条结果的SELECT语句。每种数据库都有各自的验证语句
- #validation-query: select 1 from sysibm.sysdummy1
- test-while-idle: true
- test-on-borrow: false
- test-on-return: false
- stat-view-servlet:
- enabled: true
- url-pattern: /druid/*
- #login-username: admin
- #login-password: admin
- filter:
- stat:
- log-slow-sql: true
- slow-sql-millis: 1000
- merge-sql: false
- wall:
- config:
- multi-statement-allow: true
- redis:
- database: 0
- host: 10.32.75.129
- port: 6379
- password: # 密码（默认为空）
- timeout: 6000ms # 连接超时时长（毫秒）
- jedis:
- pool:
- max-active: 1000 # 连接池最大连接数（使用负值表示没有限制）
- max-wait: -1ms # 连接池最大阻塞等待时间（使用负值表示没有限制）
- max-idle: 10 # 连接池中的最大空闲连接
- min-idle: 5 # 连接池中的最小空闲连接
-
-##多数据源的配置
-dynamic:
- datasource:
- slave1:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.55.181:3306/iailab_ntt_model_bak?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
- username: root
- password: ntt@indus
-
-oadp:
- domain: http://192.168.55.180:6010
-
-influx-db:
- org: IAILab
- bucket: whs_data
- token: 95A7quNeByW6MoUQj9cieA1JxCe-U95hOHdXXXJWMWXcXT8FFvdDCdymCav5W9S3n3LxCqHGOkzsVS6cWCKEtA==
- url: http://localhost:8086
- username: root
- password: 12345678
-
-iems:
- upload: C:/DLUT/nginx/static/knowledge
-
-data:
- domain: http://192.168.55.180:8982
-
-iailab:
- is-dev: n
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/application-test.yml b/iailab-module-model/iailab-module-model-biz/src/main/resources/application-test.yml
deleted file mode 100644
index 4e4a249..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/application-test.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-spring:
- cloud:
- nacos:
- discovery:
- server-addr: 172.16.1.148:8848 # 注册中心地址 nacos server
- config:
- server-addr: 172.16.1.148:8848 # 配置中心地址 nacos server
- file-extension: yml # 配置中心的配置后缀
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- druid:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://172.16.1.148:3306/iailab_ntt_model?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
- username: root
- password: 123456
- initial-size: 10
- max-active: 100
- min-idle: 10
- max-wait: 60000
- pool-prepared-statements: true
- max-pool-prepared-statement-per-connection-size: 20
- time-between-eviction-runs-millis: 60000
- min-evictable-idle-time-millis: 300000
- #validationQuery是用来验证数据库连接的查询语句，这个查询语句必须是至少返回一条结果的SELECT语句。每种数据库都有各自的验证语句
- #validation-query: select 1 from sysibm.sysdummy1
- test-while-idle: true
- test-on-borrow: false
- test-on-return: false
- stat-view-servlet:
- enabled: true
- url-pattern: /druid/*
- #login-username: admin
- #login-password: admin
- filter:
- stat:
- log-slow-sql: true
- slow-sql-millis: 1000
- merge-sql: false
- wall:
- config:
- multi-statement-allow: true
- redis:
- database: 0
- host: 172.16.1.148
- port: 6379
- password: # 密码（默认为空）
- timeout: 6000ms # 连接超时时长（毫秒）
- jedis:
- pool:
- max-active: 1000 # 连接池最大连接数（使用负值表示没有限制）
- max-wait: -1ms # 连接池最大阻塞等待时间（使用负值表示没有限制）
- max-idle: 10 # 连接池中的最大空闲连接
- min-idle: 5 # 连接池中的最小空闲连接
-
-oadp:
- domain: http://172.16.1.148:6010
-
-influx-db:
- org: IAILab
- bucket: whs_data
- token: dUoFsmlooCbyHsleY17w-_KpVf7vaFVRz0xBBuH4GZeOygMekoKpVi8kGIw49K_Qp_UDNf3RHpInoUIi4rTsow==
- url: http://172.16.1.148:8086
-
-iems:
- upload-dir: D:/DLUT/znjt/safe/webapp/static/temp/
\ No newline at end of file
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/application-uat.yml b/iailab-module-model/iailab-module-model-biz/src/main/resources/application-uat.yml
deleted file mode 100644
index 0d9d757..0000000
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/application-uat.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- druid:
- driver-class-name: com.ibm.db2.jcc.DB2Driver
- url: jdbc:db2://192.168.122.240:50000/MgEms:currentSchema=EXPERT;
- username: db2admin
- password: Pwd123456
- initial-size: 10
- max-active: 100
- min-idle: 10
- max-wait: 60000
- pool-prepared-statements: true
- max-pool-prepared-statement-per-connection-size: 20
- time-between-eviction-runs-millis: 60000
- min-evictable-idle-time-millis: 300000
- #validationQuery是用来验证数据库连接的查询语句，这个查询语句必须是至少返回一条结果的SELECT语句。每种数据库都有各自的验证语句
- validation-query: select 1 from sysibm.sysdummy1
- test-while-idle: true
- test-on-borrow: false
- test-on-return: false
- stat-view-servlet:
- enabled: true
- url-pattern: /druid/*
- #login-username: admin
- #login-password: admin
- filter:
- stat:
- log-slow-sql: true
- slow-sql-millis: 1000
- merge-sql: false
- wall:
- config:
- multi-statement-allow: true
-
-oadp:
- domain: http://172.16.1.148:6010
-
-influx-db:
- org: IAILab
- bucket: whs_data
- token: vhNZN5bZ4c2aa9daQUsmYtaM5qExnLVZYGE0fscVV9mAQhzAnFfExVdPWKrfGVtKPVPUUmM_xfWAJZ1iqqh0qQ==
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 1161edd..983a693 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
@@ -11,12 +11,12 @@
username: @nacos.username@
password: @nacos.password@
discovery: # 【配置中心】配置项
- namespace: ${spring.profiles.active}
+ namespace: test
group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP
metadata:
version: @nacos.metadata.version@ # 服务实例的版本号，可用于灰度发布
config: # 【注册中心】配置项
- namespace: ${spring.profiles.active}
+ namespace: test
group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP
main:
--
Gitblit v1.9.3