From 4f986140a10e71c07c7001ccbcda6e93e17736b1 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 23 四月 2024 15:59:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 system-run/src/main/resources/application-dev.yml |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/system-run/src/main/resources/application-dev.yml b/system-run/src/main/resources/application-dev.yml
index 2b36d65..8436085 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,6 +37,7 @@
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
+    #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
@@ -65,7 +67,7 @@
     # redis绔彛锛堥粯璁や负6379锛�
     port: 6379
     # redis璁块棶瀵嗙爜锛堥粯璁や负绌猴級
-    password: null
+    password: 123456
     # redis杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶆绉掞級
     timeout: 50
     # redis杩炴帴姹犻厤缃�

--
Gitblit v1.9.3