From 9aca6b6a72ebaa209f83778ee1e6d746fd54522f Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 11 六月 2026 14:53:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/resources/application.yml | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 0f69eba..c326222 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -69,12 +69,13 @@
# Spring閰嶇疆
spring:
+ datasource:
# 璧勬簮淇℃伅
messages:
# 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
basename: i18n/messages
profiles:
- active: ls
+ active: druid
# 鏂囦欢涓婁紶
servlet:
@@ -115,6 +116,8 @@
mapperLocations: classpath*:mapper/**/*Mapper.xml
# 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
configLocation: classpath:mybatis/mybatis-config.xml
+ # 娉ㄥ唽鑷畾涔塗ypeHandler鍖�
+ typeHandlersPackage: com.smartor.typehandler
#configuration:
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
@@ -160,3 +163,13 @@
#鐢ㄦ埛榛樿瀵嗙爜
userPwd: 123456
+
+#杩欎簺绌哄�奸兘鏄潵鏈潵鐨勫彉閲忥紝鍏堝崰浣�
+lwl_app_key:
+sms_accountName:
+sms_password:
+sms_url:
+sms_sourceAddr:
+sms_serviceCode:
+sms_appkey:
+sms_flag:
--
Gitblit v1.9.3