From c9c4976f4e1e553edc98e4171a1d1741bde542f5 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 10 八月 2023 14:03:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
sys/src/main/resources/application-dev.yml | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/sys/src/main/resources/application-dev.yml b/sys/src/main/resources/application-dev.yml
index 35f3bd4..c84fc36 100644
--- a/sys/src/main/resources/application-dev.yml
+++ b/sys/src/main/resources/application-dev.yml
@@ -19,6 +19,8 @@
# 鐓х墖瀛樺偍璺緞+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
file:
path: E:/webapp/images
+ # 涓婁紶鏂囦欢鍏佽鐨勬墿灞曞悕
+ allowed: png,jpg,jpeg,gif
# 榈烽洀绠＄悊绯荤粺瀵嗛挜
login:
@@ -38,8 +40,8 @@
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://localhost:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
- username: root
+ url: jdbc:mysql://192.168.110.209:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+ username: user
password: 123456
druid:
# Druid鏁版嵁婧愰厤缃�
@@ -65,7 +67,7 @@
# redis鏈嶅姟鍣ㄥ湴鍧�锛堥粯璁や负localhost锛�
host: localhost
# redis绔彛锛堥粯璁や负6379锛�
- port: 6380
+ port: 6379
# redis璁块棶瀵嗙爜锛堥粯璁や负绌猴級
password: null
# redis杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶆绉掞級
--
Gitblit v1.9.3