From f26a0cab5bca17b7eab57f6330e576271e17a17f Mon Sep 17 00:00:00 2001 From: liuxiaolong <736321739@qq.com> Date: 星期三, 13 十一月 2019 19:12:08 +0800 Subject: [PATCH] update ynSwagger,sync to master --- config/test.yaml | 81 +++++++++++++++++++++++++++++----------- 1 files changed, 59 insertions(+), 22 deletions(-) diff --git a/config/test.yaml b/config/test.yaml index cd8dca9..52e4d1e 100644 --- a/config/test.yaml +++ b/config/test.yaml @@ -3,31 +3,57 @@ jwtSecret: BASIC jwtExpire: 24 url: http://127.0.0.1:8080 - imageUrl: http://192.168.1.203:6080 - publicDomain: http://192.168.1.203 + analyServerId: DSVAD010120190703 networkAdapter: enp8s0 -dbpersoncompare: - url: 127.0.0.1:40010 -espersoncompare: - url: - - 127.0.0.1:40011 -weedfs: - ip: 192.168.1.203 - uploadport: 6333 - visitport: 6080 -redis: - host: 127.0.0.1 - port: 6379 - password: password - db: 1 + #璁惧缂栧彿 + deviceNum: 001 + #璁惧鍨嬪彿 + deviceType: 鍒嗘瀽璁惧 + #璁惧搴忓垪鍙� + deviceSerialNum: 01 + #涓绘帶鐗堟湰 + masterVersion: 1 + #web鐗堟湰 + webVersion: 2.0 + #閫氶亾涓暟 + channelCount: 0 + #纭洏涓暟 + diskCount: 2 + #Exec root command + sudoPassword: 123 + sysThresholds: + - + value: 60 + color: '#13ce66' + - + value: 80 + color: '#FF9C4A' + - + value: 95 + color: '#f53d3d' + - + value: 100 + color: '#5d0000' + ptzSpeed: 50 database: driver: sqlite name: sqlite3 - filepath: config/testdb -# es 鏁版嵁 绱㈠紩 浠ュ強 ip 绔彛 閰嶇疆 + filepath: /opt/vasystem/config/testdb.db +cluster: + pwdpre: bjbasic123 + +facedetect: + ip: 127.0.0.1 + port: 4009 +dbpersoncompare: + ip: 127.0.0.1 + port: 4010 +espersoncompare: + port: 4011 + ips: + - 127.0.0.1 es: - masterip: 192.168.1.182 - httpport: 9200 + shards: 1,2,3 index: # 浜鸿劯鎶撴媿璁板綍 videopersons: @@ -45,5 +71,16 @@ personaction: index: personaction type: perVideoAction - - +#so閰嶇疆 +sopath: + ip: 192.168.1.182 + port: 8008 +#閫氱敤閰嶇疆 +LogBasePath: /opt/vasystem/logs/ +LogLevel: 5 +MaxStreamsNum: 16 +#鎺ㄦ祦 +LibFfmpegPath: /opt/vasystem/bin/libcffmpeg.so +VideoPublishWidth: 960 +VideoPublishHeight: 640 +VideoPublishPort: 10101 \ No newline at end of file -- Gitblit v1.8.0