From deb25b1c56eafc4a8a9fc293b7807baad99e216c Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 03 四月 2025 15:19:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/radio_frequency' into radio_frequency
---
ruoyi-admin/src/main/resources/application.yml | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 54fd4cb..5cc4f11 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -7,7 +7,7 @@
# 鐗堟潈骞翠唤
copyrightYear: 2025
# 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: /javaWork/lims-ruoyi/file/uploadPath
+ profile: /center-lims/after/file/uploadPath
# 鑾峰彇ip鍦板潃寮�鍏�
addressEnabled: false
# 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
@@ -16,10 +16,10 @@
# 寮�鍙戠幆澧冮厤缃�
server:
# 鏈嶅姟鍣ㄧ殑HTTP绔彛
- port: 8001
+ port: 7002
servlet:
# 搴旂敤鐨勮闂矾寰�
- context-path: /
+ context-path:
tomcat:
# tomcat鐨刄RI缂栫爜
uri-encoding: UTF-8
@@ -30,13 +30,6 @@
max: 800
# Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10
min-spare: 100
-
-# 鏃ュ織閰嶇疆
-logging:
- file-location: /javaWork/lims-ruoyi
- level:
- com.ruoyi: info
- org.springframework: warn
# 鐢ㄦ埛閰嶇疆
user:
@@ -53,7 +46,7 @@
# 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
basename: i18n/messages
profiles:
- active: druid
+ active: test
# 鍏ㄥ眬鏃堕棿澶勭悊 LocalDateTime鏃堕棿搴忓垪鍙�
jackson:
date-format: yyyy-MM-dd HH:mm:ss
@@ -76,7 +69,7 @@
# 浠ょ墝鑷畾涔夋爣璇�
header: Authorization
# 浠ょ墝瀵嗛挜
- secret: abcdefghijklmnopqrstuvwxyz
+ secret: awertgbadrtawetfgfbsdfawerghbfdsftreagd
# 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
expireTime: 450
@@ -95,4 +88,11 @@
# 鍖归厤閾炬帴
urlPatterns: /system/*,/monitor/*,/tool/*
+#闆嗗洟缁熶竴鐧诲綍
+sso:
+ url: https://ztt-sso.asuncloud.net
+ clientId:
+ clientSecret:
+ callbackUrl:
+
--
Gitblit v1.9.3