From 13905aea60de466fc0c6ebfa5b6fd1189c4f2d17 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Sat, 23 Aug 2025 11:49:38 +0800
Subject: [PATCH] yml配置

---
 src/main/resources/application.properties |    2 +-
 src/main/resources/application.yml        |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 4123c5c..b3f28cc 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -20,7 +20,7 @@
 ftp.server.http.prefix=https://img.yanshiz.com/
 
 redis1.ip=localhost
-redis1.port=6380
+redis1.port=6379
 redis1.pwd=
 redis1.timeout=10000
 redis.max.total=50
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c9b2f45..8cd80cf 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -62,7 +62,7 @@
   urlPatterns: /system/*,/monitor/*,/tool/*
 spring:
   jackson:
-    time-zone: Asia/Kolkata
+    time-zone: Asia/Shanghai
   profiles:
     active: druid
   flyway:
@@ -104,7 +104,7 @@
     # 地址
     host: localhost
     # 端口,默认为6379
-    port: 6380
+    port: 6379
     # 数据库索引
     database: 0
     # 密码
@@ -124,10 +124,10 @@
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:6306/stock_ci?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#    url: jdbc:mysql://127.0.0.1:3306/stock_ci?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-    username: stock_ci
-    password: 123456
+    #url: jdbc:mysql://127.0.0.1:6306/stock_ci?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+    url: jdbc:mysql://127.0.0.1:3306/stock?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+    username: stock
+    password: aGZyCy3YrBXwAxJs
     druid:
       # 初始连接数
       initialSize: 5

--
Gitblit v1.9.3