From 662ce3b484c3726369e4cf6b70fc875e57d2f66e Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期四, 15 四月 2021 11:52:14 +0800 Subject: [PATCH] Merge pull request #84 from lawrencehj/wvp-28181-2.0 --- src/main/resources/application-dev.yml | 33 ++++++++++++++++----------------- 1 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 26f5d08..fad47f9 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -11,14 +11,14 @@ password: # [鍙�塢 瓒呮椂鏃堕棿 timeout: 10000 - # [涓嶅彲鐢╙ jdbc鏁版嵁搴撻厤缃�, 鏆備笉鏀寔 + # [鍙�塢 jdbc鏁版嵁搴撻厤缃�, 椤圭洰浣跨敤sqlite浣滀负鏁版嵁搴擄紝涓�鑸笉闇�瑕侀厤缃� 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 + # 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 name: eiot url: jdbc:sqlite::resource:wvp.sqlite username: @@ -48,19 +48,12 @@ # [鍙�塢 榛樿璁惧璁よ瘉瀵嗙爜锛屽悗缁墿灞曚娇鐢ㄨ澶囧崟鐙瘑鐮� password: admin123 -# 鐧婚檰鐨勭敤鎴峰悕瀵嗙爜 -auth: - # [鍙�塢 鐢ㄦ埛鍚� - username: admin - # [鍙�塢 瀵嗙爜, 榛樿涓篴dmin - password: 21232f297a57a5a743894a0e4a801fc3 - #zlm鏈嶅姟鍣ㄩ厤缃� media: # [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑鍐呯綉IP ip: 192.168.0.100 # [鍙�塢 zlm鏈嶅姟鍣ㄧ殑鍏綉IP, 鍐呯綉閮ㄧ讲缃┖鍗冲彲 - wanIp: + wanIp: # [鍙�塢 zlm鏈嶅姟鍣ㄧ殑hook鎵�浣跨敤鐨処P, 榛樿浣跨敤sip.ip hookIp: # [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑http.port @@ -75,7 +68,7 @@ autoApplyPlay: false # [鍙�塢 閮ㄥ垎璁惧闇�瑕佹墿灞昐DP锛岄渶瑕佹墦寮�姝よ缃� seniorSdp: false - # 鍚敤udp澶氱鍙fā寮�, 璇︾粏瑙i噴鍙傝��: https://github.com/xia-chu/ZLMediaKit/wiki/GB28181%E6%8E%A8%E6%B5%81 涓嬬殑楂橀樁浣跨敤 + # 鍚敤udp澶氱鍙fā寮� rtp: # [鍙�塢 鏄惁鍚敤udp澶氱鍙fā寮�, 寮�鍚悗浼氬湪udpPortRange鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈� enable: true @@ -96,4 +89,10 @@ # [鏍规嵁涓氬姟闇�姹傞厤缃甝 userSettings: # 淇濆瓨绉诲姩浣嶇疆鍘嗗彶杞ㄨ抗锛歵rue:淇濈暀鍘嗗彶鏁版嵁锛宖alse:浠呬繚鐣欐渶鍚庣殑浣嶇疆(榛樿) - savePositionHistory: false \ No newline at end of file + savePositionHistory: false + +# 鍦ㄧ嚎鏂囨。锛� swagger-ui锛堢敓浜х幆澧冨缓璁叧闂級 +springfox: + documentation: + swagger-ui: + enabled: true \ No newline at end of file -- Gitblit v1.8.0