From 8451f8d8cc95b45ddac57b3936bce13425031269 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 23 五月 2024 18:04:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
system-run/src/main/resources/application-dev.yml | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/system-run/src/main/resources/application-dev.yml b/system-run/src/main/resources/application-dev.yml
index 2b36d65..13e6c40 100644
--- a/system-run/src/main/resources/application-dev.yml
+++ b/system-run/src/main/resources/application-dev.yml
@@ -5,7 +5,7 @@
logging:
config: classpath:logback-spring.xml
# 鏃ュ織瀛樺偍璺緞+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
- file-location: D:\Download\log
+ file-location: D:\椤圭洰鏂囦欢瀛樺偍\log
# 鏁版嵁搴撳浠借矾寰�
backup:
@@ -18,11 +18,12 @@
# 鐓х墖瀛樺偍璺緞+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
file:
- path: D:\Download\鍏徃瀛樺偍鍦板潃
+ path: D:\椤圭洰鏂囦欢瀛樺偍\image
# 涓婁紶鏂囦欢鍏佽鐨勬墿灞曞悕
allowed: png,jpg,jpeg,gif
-wordUrl: D:\Download\鍏徃瀛樺偍鍦板潃
+wordUrl: D:\椤圭洰鏂囦欢瀛樺偍\word
+twoCode: D:\椤圭洰鏂囦欢瀛樺偍\two_code
mybatis-plus:
type-aliases-package: com.yuanchu.mom.pojo
@@ -36,7 +37,8 @@
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://114.132.189.42:9004/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+ url: jdbc:mysql://localhost:3306/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+# url: jdbc:mysql://114.132.189.42:9004/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
username: root
password: 123456
druid:
@@ -65,7 +67,7 @@
# redis绔彛锛堥粯璁や负6379锛�
port: 6379
# redis璁块棶瀵嗙爜锛堥粯璁や负绌猴級
- password: null
+ password:
# redis杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶆绉掞級
timeout: 50
# redis杩炴帴姹犻厤缃�
@@ -77,5 +79,4 @@
# 鏈�灏忕┖闂茶繛鎺ユ暟锛堥粯璁や负0锛岃鍊煎彧鏈変负姝ｆ暟鎵嶆湁鐢級
min-idle: 0
# 浠庤繛鎺ユ睜涓幏鍙栬繛鎺ユ渶澶х瓑寰呮椂闂达紙榛樿涓�-1锛屽崟浣嶄负姣锛岃礋鏁拌〃绀烘棤闄愶級
- max-wait: -1
-
+ max-wait: -1
\ No newline at end of file
--
Gitblit v1.9.3