Merge remote-tracking branch 'origin/master'

sunty

2019-11-01 712ef81c6b8813a498a66cf61ffcd37e5c502c8c

 config/test.yaml

@@ -24,16 +24,17 @@
  sysThresholds:
  -
    value: 60
    color: #13ce66
    color: '#13ce66'
  -
    value: 80
    color: #FF9C4A
    color: '#FF9C4A'
  -
    value: 95
    color: #f53d3d
    color: '#f53d3d'
  -
    value: 100
    color: #5d0000
    color: '#5d0000'
  ptzSpeed: 50
database:
  driver: sqlite
  name: sqlite3