From c3949ec79f06e7bdee9c3a12367bd97ddf46e033 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 24 二月 2025 15:28:38 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev

---
 rsf-server/src/main/resources/application-dev.yml |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/rsf-server/src/main/resources/application-dev.yml b/rsf-server/src/main/resources/application-dev.yml
index 4c4c204..f63202c 100644
--- a/rsf-server/src/main/resources/application-dev.yml
+++ b/rsf-server/src/main/resources/application-dev.yml
@@ -8,11 +8,13 @@
     name: @pom.artifactId@
   mvc:
     static-path-pattern: /**
+    path match:
+      matching-strategy: ANT_PATH_MATCHER
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://192.168.4.24:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
     username: root
-    password: xltys1995
+    password: 34821015
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       initial-size: 5
@@ -54,14 +56,13 @@
         smtp:
           auth: true
           ssl: true
+          connectiontimeout: 5000
+          timeout: 5000
           socketFactory:
             class: javax.net.ssl.SSLSocketFactory
-
 redis:
   host: 127.0.0.1
   password: xltys1995
   port: 6379
-  max: 30
-  min: 10
   timeout: 5000
-  index: 11
\ No newline at end of file
+  index: 15
\ No newline at end of file

--
Gitblit v1.9.1