From e1cf0b3ad257b06e7bc55bf719d06d98cb20b27a Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期三, 16 十月 2024 16:46:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/resources/application-test.yml | 88 +++++++++++++++++++-------------------------
1 files changed, 38 insertions(+), 50 deletions(-)
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
index 4e4a249..d155af7 100644
--- 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
@@ -1,65 +1,53 @@
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 # 配置中心的配置后缀
+ autoconfigure:
+ exclude:
+ - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
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
+ web-stat-filter:
+ enabled: true
stat-view-servlet:
enabled: true
+ allow:
url-pattern: /druid/*
- #login-username: admin
- #login-password: admin
+ login-username:
+ login-password:
filter:
stat:
+ enabled: true
log-slow-sql: true
- slow-sql-millis: 1000
- merge-sql: false
+ slow-sql-millis: 100
+ merge-sql: true
wall:
config:
multi-statement-allow: true
+ dynamic:
+ 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_expert_tenant_zjgt?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+ url: jdbc:mysql://172.16.8.100:3306/iailab_expert_master?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+ username: root
+ password: 123456
+
redis:
- database: 0
- host: 172.16.1.148
+ host: 172.16.8.100
port: 6379
- password: # 密码（默认为空）
- timeout: 6000ms # 连接超时时长（毫秒）
- jedis:
- pool:
- max-active: 1000 # 连接池最大连接数（使用负值表示没有限制）
- max-wait: -1ms # 连接池最大阻塞等待时间（使用负值表示没有限制）
- max-idle: 10 # 连接池中的最大空闲连接
- min-idle: 5 # 连接池中的最小空闲连接
+ database: 0
+ password: 123456
-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
+mpk:
+ bakFilePath: D:\DLUT\mpkBakFile
+ model-file-path: D:\DLUT\MDK\Model\miail\
--
Gitblit v1.9.3