From 076179015fea55c3840672e9ebc48f375da025eb Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期二, 03 六月 2025 14:57:41 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo
---
ruoyi-admin/src/main/resources/application-druid.yml | 5 ++
ruoyi-admin/src/main/resources/application-srm.yml | 69 ++++++++++++++++++++++++++++++++++
ruoyi-admin/src/main/resources/application.yml | 11 +----
3 files changed, 76 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index e7e3ad8..1b0e340 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -63,3 +63,8 @@
wall:
config:
multi-statement-allow: true
+
+##閽夐拤鐨勫瘑閽ワ紙鍏徃锛�
+agentId: 1779052814
+dingAppid: dingn8iip5ubj7clrrsv
+dingAppSecret: qlEK8D3oOVwGPOTiBQIBYTqQVlAfy9S_qQizEQFjJdSScwemWFryg4gbneu-NqWD
diff --git a/ruoyi-admin/src/main/resources/application-srm.yml b/ruoyi-admin/src/main/resources/application-srm.yml
new file mode 100644
index 0000000..1a55ef4
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/application-srm.yml
@@ -0,0 +1,69 @@
+# 鏁版嵁婧愰厤缃�
+spring:
+ datasource:
+ type: com.alibaba.druid.pool.DruidDataSource
+ driverClassName: com.mysql.cj.jdbc.Driver
+ druid:
+ # 涓诲簱鏁版嵁婧�
+ master:
+ # 鍖婚櫌鐜
+# url: jdbc:mysql://129.88.242.37:3308/opo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+# username: JQ
+# password: Jqserver88
+
+# # 寮�鍙戠幆澧�
+ url: jdbc:mysql://116.62.18.175:6002/opo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+ username: opo
+ password: opo@2022
+
+ # 浠庡簱鏁版嵁婧�
+ slave:
+ # 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
+ enabled: false
+ url:
+ username:
+ password:
+ # 鍒濆杩炴帴鏁�
+ initialSize: 5
+ # 鏈�灏忚繛鎺ユ睜鏁伴噺
+ minIdle: 10
+ # 鏈�澶ц繛鎺ユ睜鏁伴噺
+ maxActive: 20
+ # 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
+ maxWait: 60000
+ # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
+ timeBetweenEvictionRunsMillis: 60000
+ # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
+ minEvictableIdleTimeMillis: 300000
+ # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�澶х敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
+ maxEvictableIdleTimeMillis: 900000
+ # 閰嶇疆妫�娴嬭繛鎺ユ槸鍚︽湁鏁�
+ validationQuery: SELECT 1 FROM DUAL
+ testWhileIdle: true
+ testOnBorrow: false
+ testOnReturn: false
+ webStatFilter:
+ enabled: true
+ statViewServlet:
+ # 寮�鍏�
+ enabled: false
+ # 璁剧疆鐧藉悕鍗曪紝涓嶅～鍒欏厑璁告墍鏈夎闂�
+ allow:
+ url-pattern: /druid/*
+ # 鎺у埗鍙扮鐞嗙敤鎴峰悕鍜屽瘑鐮�
+ login-username: lihu
+ login-password: Lihu.7647Sa89.94
+ filter:
+ stat:
+ enabled: true
+ # 鎱QL璁板綍
+ log-slow-sql: true
+ slow-sql-millis: 1000
+ merge-sql: true
+ wall:
+ config:
+ multi-statement-allow: true
+#閽夐拤鐨勫瘑閽ワ紙鐪佷汉姘戯級
+agentId: 2975938892
+dingAppid: dingbxgfddodocmtqqsu
+dingAppSecret: sw1NDcgErqWqkaWVo4DPck9EagJ-2yihYNxmhOjXo_F9E6X_-6Cl3LAybqAPt9gi
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 3fb9563..b6f5a84 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -53,7 +53,7 @@
# 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
basename: i18n/messages
profiles:
- active: druid
+ active: srm
# 鏂囦欢涓婁紶
servlet:
multipart:
@@ -149,12 +149,5 @@
urlPatterns: /system/*,/monitor/*,/tool/*
-###閽夐拤鐨勫瘑閽ワ紙鍏徃锛�
-#agentId: 1779052814
-#dingAppid: dingn8iip5ubj7clrrsv
-#dingAppSecret: qlEK8D3oOVwGPOTiBQIBYTqQVlAfy9S_qQizEQFjJdSScwemWFryg4gbneu-NqWD
-#閽夐拤鐨勫瘑閽ワ紙鐪佷汉姘戯級
-agentId: 2975938892
-dingAppid: dingbxgfddodocmtqqsu
-dingAppSecret: sw1NDcgErqWqkaWVo4DPck9EagJ-2yihYNxmhOjXo_F9E6X_-6Cl3LAybqAPt9gi
+
--
Gitblit v1.9.3