From 4800caf0bc511a26624da1b9a9cf34275b6c2c4a Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 01 九月 2023 17:10:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 sys/src/main/resources/application-dev.yml |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/src/main/resources/application-dev.yml b/sys/src/main/resources/application-dev.yml
index c77aa8e..c1b729a 100644
--- a/sys/src/main/resources/application-dev.yml
+++ b/sys/src/main/resources/application-dev.yml
@@ -40,12 +40,12 @@
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-#    url: jdbc:mysql://192.168.110.209:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
-#    username: user
-#    password: 123456
     url: jdbc:mysql://192.168.110.209:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
     username: user
     password: 123456
+#    url: jdbc:mysql://localhost:3306/lims_laboratory?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+#    username: root
+#    password: 123456
     druid:
       #   Druid鏁版嵁婧愰厤缃�
       initialSize: 5 # 鍒濆杩炴帴鏁�
@@ -68,8 +68,8 @@
     # redis鏁版嵁搴撶储寮�(榛樿涓�0)锛屾垜浠娇鐢ㄧ储寮曚负3鐨勬暟鎹簱锛岄伩鍏嶅拰鍏朵粬鏁版嵁搴撳啿绐�
     database: 0
     # redis鏈嶅姟鍣ㄥ湴鍧�锛堥粯璁や负localhost锛�
-#    host: 192.168.110.209
     host: 192.168.110.209
+#    host: localhost
     # redis绔彛锛堥粯璁や负6379锛�
     port: 6380
     # redis璁块棶瀵嗙爜锛堥粯璁や负绌猴級

--
Gitblit v1.9.3