From 3a502b36a8cfcdd455edb22e5771115559873731 Mon Sep 17 00:00:00 2001
From: songww <songww@inspur.com>
Date: 星期日, 10 五月 2020 22:33:21 +0800
Subject: [PATCH] 完善ssrc符合国标,并完善很多小问题

---
 src/main/resources/application.yml |   52 ++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6314fa4..df0a190 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,10 +1,13 @@
 spring:
     application:
-        name: wvp
-        # 鏁版嵁瀛樺偍鏂瑰紡锛屾殏鍙敮鎸乺edis锛屽悗缁敮鎸乯dbc
+        name: iot-vmp-vmanager
+        # 褰卞瓙鏁版嵁瀛樺偍鏂瑰紡锛屾敮鎸乺edis銆乯dbc
         database: redis
+        # 閫氫俊鏂瑰紡锛屾敮鎸乲afka銆乭ttp
+        communicate: http
     redis: 
         # Redis鏈嶅姟鍣↖P
+        #host: 10.24.20.63
         host: 127.0.0.1
         #绔彛鍙�
         port: 6379
@@ -13,24 +16,49 @@
         password:
         #瓒呮椂鏃堕棿
         timeout: 10000
+        # 鍙敤杩炴帴瀹炰緥鐨勬渶澶ф暟鐩紝榛樿鍊间负8
+        maxTotal: 512
+        #鎺у埗涓�涓猵ool鏈�澶氭湁澶氬皯涓姸鎬佷负idle(绌洪棽鐨�)鐨刯edis瀹炰緥锛岄粯璁ゅ�间篃鏄�8
+        maxIdle: 100
+        #鏈�灏忕┖闂茶繛鎺ユ暟
+        minIdle: 50
+        #鑾峰彇杩炴帴鏃剁殑鏈�澶х瓑寰呮绉掓暟,灏忎簬闆�:闃诲涓嶇‘瀹氱殑鏃堕棿,榛樿-1
+        maxWaitMillis: 10000
+        #姣忔閲婃斁杩炴帴鐨勬渶澶ф暟鐩�
+        numTestsPerEvictionRun: 100
+        #閲婃斁杩炴帴鐨勬壂鎻忛棿闅旓紙姣锛�
+        timeBetweenEvictionRunsMillis: 3000
+        #杩炴帴鏈�灏忕┖闂叉椂闂�
+        minEvictableIdleTimeMillis: 1800000
+        #杩炴帴绌洪棽澶氫箙鍚庨噴鏀�,褰撶┖闂叉椂闂�>璇ュ�间笖绌洪棽杩炴帴>鏈�澶х┖闂茶繛鎺ユ暟鏃剁洿鎺ラ噴鏀�
+        softMinEvictableIdleTimeMillis: 10000
+        #鍦ㄨ幏鍙栬繛鎺ョ殑鏃跺�欐鏌ユ湁鏁堟��,榛樿false
+        testOnBorrow: true
+        #鍦ㄧ┖闂叉椂妫�鏌ユ湁鏁堟��,榛樿false
+        testWhileIdle: true
+        #鍦ㄥ綊杩樼粰pool鏃讹紝鏄惁鎻愬墠杩涜validate鎿嶄綔
+        testOnReturn: true
+        #杩炴帴鑰楀敖鏃舵槸鍚﹂樆濉�,false鎶ュ紓甯�,ture闃诲鐩村埌瓒呮椂,榛樿true
+        blockWhenExhausted: false
     datasource: 
-        name: wcp
-        url: jdbc:mysql://127.0.0.1:3306/wcp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true
+        name: eiot
+        url: jdbc:mysql://10.24.20.63:3306/eiot?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true
         username: root
-        password: 123456
+        password: Ptjsinspur19.?
         type: com.alibaba.druid.pool.DruidDataSource
         driver-class-name: com.mysql.jdbc.Driver
 server:
     port: 8080
 sip:
-    # 鏈湴鏈嶅姟鍦板潃
-    ip: 192.168.0.3
-    server_id: 34020000002000000001
+    ip: 10.200.64.63
     port: 5060
-    domain: 34020000
-    # 鏆傛椂浣跨敤缁熶竴瀵嗙爜锛屽悗缁敼涓轰竴鏈轰竴瀵�
+    # 鏍规嵁鍥芥爣6.1.2涓瀹氾紝domain瀹滈噰鐢↖D缁熶竴缂栫爜鐨勫墠鍗佷綅缂栫爜銆傚浗鏍囬檮褰旸涓畾涔夊墠8浣嶄负涓績缂栫爜锛堢敱鐪佺骇銆佸競绾с�佸尯绾с�佸熀灞傜紪鍙风粍鎴愶紝鍙傜収GB/T 2260-2007锛�
+    # 鍚庝袱浣嶄负琛屼笟缂栫爜锛屽畾涔夊弬鐓ч檮褰旸.3
+    # 3701020049鏍囪瘑灞变笢娴庡崡鍘嗕笅鍖� 淇℃伅琛屼笟鎺ュ叆
+    domain: 3701020049
+    server_id: 37010200492000000001
+    # 榛樿璁惧璁よ瘉瀵嗙爜锛屽悗缁墿灞曚娇鐢ㄨ澶囧崟鐙瘑鐮�
     password: admin
 media:
-    # ZLMediaServer IP
-    ip: 192.168.0.4
+    ip: 10.200.64.88
     port: 10000
\ No newline at end of file

--
Gitblit v1.8.0