From 2d84b9771e11b64f4224c57ebc36a157fe9a15b4 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 21 十月 2025 14:52:59 +0800
Subject: [PATCH] Merge branch 'master' into 0929-master
---
ruoyi-admin/src/main/resources/application.yml | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 42f8831..e418f3f 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -74,7 +74,7 @@
# 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
basename: i18n/messages
profiles:
- active: druid
+ active: sltd
# 鏂囦欢涓婁紶
servlet:
multipart:
@@ -114,8 +114,8 @@
mapperLocations: classpath*:mapper/**/*Mapper.xml
# 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
configLocation: classpath:mybatis/mybatis-config.xml
- configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+ #configuration:
+ # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# 娌冲崡SSO閰嶇疆锛堜附姘寸敤涓嶅埌锛�
@@ -128,15 +128,19 @@
authorize_url: "http://10.10.13.112:37727/connect/authorize"
token_url: "http://10.10.13.112:37727/connect/token"
userinfo_url: "http://10.10.13.112:37727/connect/userinfo"
- redirect_uri: "http://10.10.13.142:8096/sso/callback"
+ redirect_uri: "http://172.20.111.142:8096/login"
# 澶栫綉閰嶇疆
external:
authorize_url: "http://172.20.111.142:37727/connect/authorize"
token_url: "http://172.20.111.142:37727/connect/token"
userinfo_url: "http://172.20.111.142:37727/connect/userinfo"
- redirect_uri: "http://172.20.111.142:8096/sso/callback"
+ redirect_uri: "http://172.20.111.142:8096/login"
state: "smartor" # 浣犱滑绯荤粺鏍囪瘑
- scope: "openid roles profile"
+ scope: "openid%20roles%20profile"
+ #鍗曠偣鐧婚檰鐧藉悕鍗旾P閰嶇疆
+ whitelist:
+ ips:
+
# 闃叉XSS鏀诲嚮
xss:
@@ -148,4 +152,10 @@
urlPatterns: /system/*,/monitor/*,/tool/*
#涓嶉渶瑕佽繘琛岄暱鏈熶换鍔＄殑鏈烘瀯
-noLongTask: 47231022633110211A2101,
+noLongTask:
+
+#鐪佺珛鍚屽痉鍙栨暟鎹叕鍏辨帴鍙�
+sltd_pub_path: "http://open-tdyy.cfuture.shop/kapi/gw-api/"
+
+#鐢ㄦ埛榛樿瀵嗙爜
+userPwd: 123456
--
Gitblit v1.9.3