From b531004a3cbd33d7bb9f5b7dce06ddd4f5e7ec9a Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 18 十一月 2022 11:57:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xm-20221107' into xm-20221107

---
 ximon-admin/src/main/resources/application.yml |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ximon-admin/src/main/resources/application.yml b/ximon-admin/src/main/resources/application.yml
index 0b58b1a..c1e7fa6 100644
--- a/ximon-admin/src/main/resources/application.yml
+++ b/ximon-admin/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: prod
+    active: xm
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
@@ -53,4 +53,5 @@
 
 #涓绘澘rrpc閫氫俊PRODUCT_KEY
 #rrpc:
-#  key: a1JsfPG4iKW
\ No newline at end of file
+#  key: a1JsfPG4iKW
+

--
Gitblit v1.9.3