From 727a69f859060093e685582fa10e5de82dcc138a Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期四, 29 十二月 2022 15:37:49 +0800
Subject: [PATCH] 放假备份。完成集中控制器对接。

---
 ximon-admin/src/main/resources/application.yml |   32 ++++++++++++++------------------
 1 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/ximon-admin/src/main/resources/application.yml b/ximon-admin/src/main/resources/application.yml
index 46fd8c2..7bcbf06 100644
--- a/ximon-admin/src/main/resources/application.yml
+++ b/ximon-admin/src/main/resources/application.yml
@@ -1,7 +1,6 @@
 spring:
   profiles:
-    #   active: dev
-    active: "@profileActive@"
+    active: xm_local
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
@@ -23,29 +22,15 @@
 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/
 
-# nginx鐩稿叧鍦板潃
-nginx:
-  port: 443
-  cameraSaveUrl: D:/NginX/nginx-1.15.9/data/file/cameraPresetPoint
-nginx-config:
-  filePath: D:\NginX\nginx-1.15.9\data\file\
-  url: http://47.106.172.9:443/download/
-  apkUrl: http://47.106.172.9:443/apk/
-  lcdUrl: http://47.106.172.9:443/download/lcd/
 
 server-conf:
   ip: 47.106.172.9 # 47.106.172.9/101.132.131.91
@@ -58,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

--
Gitblit v1.9.3