From b32bad4b54373a9e71e3118756ecb6fb918d1450 Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期日, 29 三月 2026 19:42:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-jxthTV
---
src/main/resources/application.yml | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4d8bc99..9af49c4 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -16,17 +16,18 @@
hikari:
validation-timeout: 3000
connection-test-query: select 1
- driver-class-name: com.mysql.jdbc.Driver
+ driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/monitor?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: root
mvc:
static-path-pattern: /**
- redis:
- host: 127.0.0.1
- port: 6379
- database: 6
- # password: 123456
+ data:
+ redis:
+ host: 127.0.0.1
+ port: 6379
+ database: 0
+ # password: 123456
servlet:
multipart:
max-file-size: 100MB
@@ -55,7 +56,7 @@
logging:
file:
- path: /stock/out/@pom.build.finalName@/logs
+ path: ./stock/out/@pom.build.finalName@/logs
super:
pwd: xltys1995
@@ -82,4 +83,4 @@
default-package: com.zy
file:
- upload-path: D:/zy_monitor_files/upload_files/
\ No newline at end of file
+ upload-path: D:/zy_monitor_files/upload_files/
--
Gitblit v1.9.1