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 | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 690f2d7..5cc4f11 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -16,7 +16,7 @@
# 寮�鍙戠幆澧冮厤缃�
server:
# 鏈嶅姟鍣ㄧ殑HTTP绔彛
- port: 8001
+ port: 7002
servlet:
# 搴旂敤鐨勮闂矾寰�
context-path:
@@ -46,7 +46,7 @@
# 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
basename: i18n/messages
profiles:
- active: druid
+ active: test
# 鍏ㄥ眬鏃堕棿澶勭悊 LocalDateTime鏃堕棿搴忓垪鍙�
jackson:
date-format: yyyy-MM-dd HH:mm:ss
@@ -91,8 +91,8 @@
#闆嗗洟缁熶竴鐧诲綍
sso:
url: https://ztt-sso.asuncloud.net
- clientId: 47ded514-f447-43b4-afdf-181c10e2222d
- clientSecret: appSecret:ea93d26a68863da5d71a6e3355ec22df
- callbackUrl: https://ztzb-lims.ztt.cn/thirdpartylogin
+ clientId:
+ clientSecret:
+ callbackUrl:
--
Gitblit v1.9.3