From 44d216100b45c3337c593ee82ee68e7e0f35d24b Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期三, 16 十二月 2020 20:29:19 +0800
Subject: [PATCH] 与master分支同步

---
 src/main/resources/application.yml |   65 +-------------------------------
 1 files changed, 2 insertions(+), 63 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index fd7509e..caf4dfc 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,64 +1,3 @@
 spring:
-    application:
-        name: iot-vmp-vmanager
-        # 褰卞瓙鏁版嵁瀛樺偍鏂瑰紡锛屾敮鎸乺edis銆乯dbc,鏆備笉鏀寔mysql
-        database: redis
-        # 閫氫俊鏂瑰紡锛屾敮鎸乲afka銆乭ttp
-        communicate: http
-    redis:
-        # Redis鏈嶅姟鍣↖P
-        host: 192.168.1.141
-        #绔彛鍙�
-        port: 6379
-        database: 6
-        #璁块棶瀵嗙爜,鑻ヤ綘鐨剅edis鏈嶅姟鍣ㄦ病鏈夎缃瘑鐮侊紝灏变笉闇�瑕佺敤瀵嗙爜鍘昏繛鎺�
-        password: 4767cb971b40a1300fa09b7f87b09d1c
-        #瓒呮椂鏃堕棿
-        timeout: 10000
-    datasource: 
-        name: eiot
-        url: jdbc:mysql://127.0.0.1:3306/eiot?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true
-        username:
-        password:
-        type: com.alibaba.druid.pool.DruidDataSource
-        driver-class-name: com.mysql.jdbc.Driver
-server:
-    port: 18080
-sip:
-    ip: 192.168.1.20
-    port: 5060
-    # 鏍规嵁鍥芥爣6.1.2涓瀹氾紝domain瀹滈噰鐢↖D缁熶竴缂栫爜鐨勫墠鍗佷綅缂栫爜銆傚浗鏍囬檮褰旸涓畾涔夊墠8浣嶄负涓績缂栫爜锛堢敱鐪佺骇銆佸競绾с�佸尯绾с�佸熀灞傜紪鍙风粍鎴愶紝鍙傜収GB/T 2260-2007锛�
-    # 鍚庝袱浣嶄负琛屼笟缂栫爜锛屽畾涔夊弬鐓ч檮褰旸.3
-    # 3701020049鏍囪瘑灞变笢娴庡崡鍘嗕笅鍖� 淇℃伅琛屼笟鎺ュ叆
-    domain: 3402000000
-    id: 34020000002000000001
-    # 榛樿璁惧璁よ瘉瀵嗙爜锛屽悗缁墿灞曚娇鐢ㄨ澶囧崟鐙瘑鐮�
-    password: 12345678
-
-auth: #32浣嶅皬鍐檓d5鍔犲瘑锛堥粯璁ゅ瘑鐮佷负admin锛�
-    username: admin
-    password: 21232f297a57a5a743894a0e4a801fc3
-
-media: #zlm鏈嶅姟鍣ㄧ殑ip涓巋ttp绔彛, 閲嶇偣: 杩欐槸http绔彛
-    ip: 127.0.0.1
-    wanIp: 192.168.1.20
-    port: 6080
-    secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc
-    streamNoneReaderDelayMS:  600000  # 鏃犱汉瑙傜湅澶氫箙鑷姩鍏抽棴娴�
-    # 鍏抽棴绛夊緟鏀跺埌娴佺紪鐮佷俊鎭悗鍦ㄨ繑鍥�,
-    # 璁句负false鍙互鑾峰緱鏇村ソ鐨勫吋瀹规��,淇濊瘉杩斿洖鍚庢祦灏卞彲浠ユ挱鏀�,
-    # 璁句负true鍙互蹇�熸墦寮�鎾斁绐楀彛,鍙互鑾峰緱鏇村ソ鐨勪綋楠�
-    closeWaitRTPInfo: true
-    rtp: # 鍚敤udp澶氱鍙ｆā寮�
-        enable: true
-        udpPortRange: 30000,30500 # 绔彛鑼冨洿
-logging:
-    file:
-        name: logs/wvp.log
-        max-history: 30
-        max-size: 10MB
-        total-size-cap: 300MB
-    level:
-        com:
-            genersoft:
-                iot: debug
\ No newline at end of file
+  profiles:
+    active: dev
\ No newline at end of file

--
Gitblit v1.8.0