From ea94079e74182be590b9fff356c97f522d9a7828 Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期二, 18 十月 2022 09:26:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/resources/application.yml | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/ximon-admin/src/main/resources/application.yml b/ximon-admin/src/main/resources/application.yml
index e55d057..0b58b1a 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: prod
jackson:
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
@@ -22,17 +22,12 @@
logging:
file:
path: logs
-wx:
- pay:
- appId: dsd #寰俊鍏紬鍙锋垨鑰呭皬绋嬪簭绛夌殑appid
- mchId: dsdsd #寰俊鏀粯鍟嗘埛鍙�
- mchKey: dsd #寰俊鏀粯鍟嗘埛瀵嗛挜
# led灞忓箷鏈嶅姟鍣ㄥ湴鍧�锛堟洿鏀归渶瑕佸悓鏃舵洿鏀癸級
realtime-server:
-# command: http://101.132.131.91:8081/payload/
-# url: http://101.132.131.91:8081/
+ # command: http://101.132.131.91:8081/payload/
+ # url: http://101.132.131.91:8081/
command: http://112.74.63.130:20018/command/
url: http://112.74.63.130:20018/
@@ -48,3 +43,14 @@
secretKey: zhxm2512209
secure: false
+#闊虫煴鏈嶅姟鍣ㄥ湴鍧�
+broadcastApi:
+ serviceUrl: http://47.106.172.9:8000
+
+nova-conf: #璇虹摝璐﹀彿瀵嗙爜
+ username: zhxm
+ password: xm2512209.
+
+#涓绘澘rrpc閫氫俊PRODUCT_KEY
+#rrpc:
+# key: a1JsfPG4iKW
\ No newline at end of file
--
Gitblit v1.9.3