config/dev.yaml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
config/pro.yaml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
config/test.yaml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
extend/config/config.go | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
runtime/libcffmpeg.so | 补丁 | 查看 | 原始文档 | blame | 历史 |
config/dev.yaml
@@ -1,35 +1,45 @@ server: runmode: debug jwtSecret: BASIC jwtExpire: 24 jwtSecret: BASIC jwtExpire: 24 url: http://127.0.0.1:8080 analyServerId: DSVAD010120190622 imageUrl: http://192.168.1.203:6080 publicDomain: http://bsic.asuscomm.com networkAdapter: enp8s0 facedetect: url: 127.0.0.1:4009 dbpersoncompare: url: 127.0.0.1:4010 espersoncompare: url: - 127.0.0.1:4011 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 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: @@ -47,5 +57,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 config/pro.yaml
@@ -1,24 +1,72 @@ runmode: release timezone: Asia/Chongqing dbLogMode: true addr: :8080 name: albedo url: http://127.0.0.1:8080 redis: host: 127.0.0.1 port: 6379 password: password db: 1 db: # 可选值:mysql、sqlite driver: mysql name: db_apiserver addr: 127.0.0.1:3306 username: root password: root docker_db: driver: mysql name: db_apiserver addr: 127.0.0.1:3306 username: root password: root server: runmode: debug jwtSecret: BASIC jwtExpire: 24 url: http://127.0.0.1:8080 analyServerId: DSVAD010120190703 imageUrl: http://192.168.1.203:6080 publicDomain: http://bsic.asuscomm.com networkAdapter: enp8s0 #设备编号 deviceNum: 001 #设备型号 deviceType: 分析设备 #设备序列号 deviceSerialNum: 01 #主控版本 masterVersion: 1 #web版本 webVersion: 2.0 #通道个数 channelCount: 0 #硬盘个数 diskCount: 2 database: driver: sqlite name: sqlite3 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: shards: 1,2,3 index: # 人脸抓拍记录 videopersons: index: videopersons type: perVideoPicture # 底库 列表 dbtables: index: dbtables type: dbpersontables # 底库人员库 dbtablepersons: index: dbtablepersons type: dbpersons # 行为抓拍记录* personaction: index: personaction type: perVideoAction #so配置 sopath: ip: 192.168.1.182 port: 8008 #通用配置 LogBasePath: /data/disk1/valog/ LogLevel: 5 MaxStreamsNum: 16 #推流 LibFfmpegPath: /opt/vasystem/bin/libcffmpeg.so VideoPublishWidth: 960 VideoPublishHeight: 640 VideoPublishPort: 10101 config/test.yaml
@@ -1,51 +1,72 @@ server: runmode: debug jwtSecret: BASIC jwtExpire: 24 url: http://127.0.0.1:8080 imageUrl: http://192.168.1.203:6080 publicDomain: http://bsic.asuscomm.com networkAdapter: enp8s0 facedetect: url: 127.0.0.1:4009 dbpersoncompare: url: 127.0.0.1:4010 espersoncompare: url: - 127.0.0.1:4011 weedfs: ip: 192.168.1.203 uploadport: 6333 visitport: 6080 redis: host: 127.0.0.1 port: 6379 password: password db: 1 runmode: debug jwtSecret: BASIC jwtExpire: 24 url: http://127.0.0.1:8080 analyServerId: DSVAD010120190703 imageUrl: http://192.168.1.203:6080 publicDomain: http://bsic.asuscomm.com networkAdapter: enp8s0 #设备编号 deviceNum: 001 #设备型号 deviceType: 分析设备 #设备序列号 deviceSerialNum: 01 #主控版本 masterVersion: 1 #web版本 webVersion: 2.0 #通道个数 channelCount: 0 #硬盘个数 diskCount: 2 database: driver: sqlite name: sqlite3 filepath: config/testdb # es 数据 索引 以及 ip 端口 配置 driver: sqlite name: sqlite3 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 index: # 人脸抓拍记录 videopersons: index: videopersons type: perVideoPicture # 底库 列表 dbtables: index: dbtables type: dbpersontables # 底库人员库 dbtablepersons: index: dbtablepersons type: dbpersons # 行为抓拍记录* personaction: index: personaction type: perVideoAction shards: 1,2,3 index: # 人脸抓拍记录 videopersons: index: videopersons type: perVideoPicture # 底库 列表 dbtables: index: dbtables type: dbpersontables # 底库人员库 dbtablepersons: index: dbtablepersons type: dbpersons # 行为抓拍记录* 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 extend/config/config.go
@@ -26,24 +26,8 @@ var Server = &server{} type weedfs struct { Ip string `mapstructure: "ip"` UploadPort int `mapstructure: "uploadport"` VisitPort int `mapstructure: "visitport"` } var WeedFs = &weedfs{} type database struct { Drive string `mapstructure:"drive"` Name string `mapstructure:"name"` FilePath string `mapstructure:"filepath"` } // wp add es 索引 以及 IP port type esinfo struct { Masterip string `mapstructure:"masterip"` Httpport string `mapstructure:"httpport"` Shards string `mapstructure:"shards"` EsIndex esindexlist `mapstructure:"index"` } @@ -67,8 +51,6 @@ var SoPath = &sopath{} var EsInfo = &esinfo{} var DBconf = &database{} type facedetect struct { Ip string `mapstructure:"Ip"` @@ -104,8 +86,6 @@ } viper.UnmarshalKey("es", EsInfo) viper.UnmarshalKey("server", Server) viper.UnmarshalKey("database", DBconf) viper.UnmarshalKey("weedfs", WeedFs) viper.UnmarshalKey("sopath",SoPath) viper.UnmarshalKey("facedetect", FaceDetectSet) viper.UnmarshalKey("dbpersoncompare",DbPersonCompInfo) runtime/libcffmpeg.soBinary files differ