From da14c7f24c61cf9027a02d8e566ab89116136f19 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 25 九月 2020 17:22:22 +0800
Subject: [PATCH] 拆分redis中device与channel的存储方式 支持分页 接口直接返回播放地址
---
src/main/resources/application.yml | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7e6bc40..2784ace 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -7,27 +7,26 @@
communicate: http
redis:
# Redis鏈嶅姟鍣↖P
- #host: 10.24.20.63
- host: 127.0.0.1
+ host: 192.168.1.141
#绔彛鍙�
port: 6379
- datebase: 0
+ database: 6
#璁块棶瀵嗙爜,鑻ヤ綘鐨剅edis鏈嶅姟鍣ㄦ病鏈夎缃瘑鐮侊紝灏变笉闇�瑕佺敤瀵嗙爜鍘昏繛鎺�
- password:
+ password: 4767cb971b40a1300fa09b7f87b09d1c
#瓒呮椂鏃堕棿
timeout: 10000
datasource:
name: eiot
- url: jdbc:mysql://10.24.20.63:3306/eiot?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true
+ url: jdbc:mysql://192.168.1.141:3306/eiot?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true
username: root
- password: 123456
+ password: root
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.jdbc.Driver
server:
- port: 8080
+ port: 18080
sip:
# ip: 10.200.64.63
- ip: 192.168.0.102
+ ip: 192.168.1.20
port: 5060
# 鏍规嵁鍥芥爣6.1.2涓瀹氾紝domain瀹滈噰鐢↖D缁熶竴缂栫爜鐨勫墠鍗佷綅缂栫爜銆傚浗鏍囬檮褰旸涓畾涔夊墠8浣嶄负涓績缂栫爜锛堢敱鐪佺骇銆佸競绾с�佸尯绾с�佸熀灞傜紪鍙风粍鎴愶紝鍙傜収GB/T 2260-2007锛�
# 鍚庝袱浣嶄负琛屼笟缂栫爜锛屽畾涔夊弬鐓ч檮褰旸.3
@@ -35,8 +34,19 @@
domain: 3701020049
id: 37010200492000000001
# 榛樿璁惧璁よ瘉瀵嗙爜锛屽悗缁墿灞曚娇鐢ㄨ澶囧崟鐙瘑鐮�
- password: admin123
+ password: 12345678
media:
# ip: 10.200.64.88
- ip: 192.168.0.102
- port: 10000
\ No newline at end of file
+ ip: 192.168.1.20
+ port: 10000
+
+# 鑷畾涔変唬鐞嗙浉鍏抽厤缃�
+# 浠ｇ悊鐨勬湰鍦拌矾鐢�
+proxy:
+ servlet_url: /media/*
+ # 瑕佷唬鐞嗙殑鍦板潃
+ target_url: http://127.0.0.1:10080
+
+auth: #32浣嶅皬鍐檓d5鍔犲瘑锛堥粯璁ゅ瘑鐮佷负admin锛�
+ username: admin
+ password: 21232f297a57a5a743894a0e4a801fc3
\ No newline at end of file
--
Gitblit v1.8.0