From 92cbbefcf4773ba136f15afa1ca89e9c050b1aba Mon Sep 17 00:00:00 2001
From: swwhaha <swwheihei@163.com>
Date: 星期五, 26 六月 2020 12:05:23 +0800
Subject: [PATCH] Merge pull request #10 from lawrencehj/master
---
src/main/resources/application.yml | 36 +++++++-----------------------------
1 files changed, 7 insertions(+), 29 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index df0a190..7e6bc40 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -16,49 +16,27 @@
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: eiot
url: jdbc:mysql://10.24.20.63:3306/eiot?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true
username: root
- password: Ptjsinspur19.?
+ password: 123456
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.jdbc.Driver
server:
port: 8080
sip:
- ip: 10.200.64.63
+# ip: 10.200.64.63
+ ip: 192.168.0.102
port: 5060
# 鏍规嵁鍥芥爣6.1.2涓瀹氾紝domain瀹滈噰鐢↖D缁熶竴缂栫爜鐨勫墠鍗佷綅缂栫爜銆傚浗鏍囬檮褰旸涓畾涔夊墠8浣嶄负涓績缂栫爜锛堢敱鐪佺骇銆佸競绾с�佸尯绾с�佸熀灞傜紪鍙风粍鎴愶紝鍙傜収GB/T 2260-2007锛�
# 鍚庝袱浣嶄负琛屼笟缂栫爜锛屽畾涔夊弬鐓ч檮褰旸.3
# 3701020049鏍囪瘑灞变笢娴庡崡鍘嗕笅鍖� 淇℃伅琛屼笟鎺ュ叆
domain: 3701020049
- server_id: 37010200492000000001
+ id: 37010200492000000001
# 榛樿璁惧璁よ瘉瀵嗙爜锛屽悗缁墿灞曚娇鐢ㄨ澶囧崟鐙瘑鐮�
- password: admin
+ password: admin123
media:
- ip: 10.200.64.88
+# ip: 10.200.64.88
+ ip: 192.168.0.102
port: 10000
\ No newline at end of file
--
Gitblit v1.8.0