From 4ff7c2059695b73aadc0ddb510dad27a5a83e780 Mon Sep 17 00:00:00 2001 From: liuxiaolong <736321739@qq.com> Date: 星期三, 25 九月 2019 14:08:35 +0800 Subject: [PATCH] update libcffmpeg.so --- config/test.yaml | 117 +++++++++++-------- config/dev.yaml | 69 +++++++---- runtime/libcffmpeg.so | 0 config/pro.yaml | 96 ++++++++++++---- extend/config/config.go | 20 --- 5 files changed, 186 insertions(+), 116 deletions(-) diff --git a/config/dev.yaml b/config/dev.yaml index 84b96f3..0150370 100644 --- a/config/dev.yaml +++ b/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 \ No newline at end of file diff --git a/config/pro.yaml b/config/pro.yaml index 60b8a0a..ecc5bc4 100644 --- a/config/pro.yaml +++ b/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銆乻qlite - 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 \ No newline at end of file diff --git a/config/test.yaml b/config/test.yaml index 1ac8eba..8b54455 100644 --- a/config/test.yaml +++ b/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 \ No newline at end of file diff --git a/extend/config/config.go b/extend/config/config.go index df3e1d6..5e9d97e 100644 --- a/extend/config/config.go +++ b/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) diff --git a/runtime/libcffmpeg.so b/runtime/libcffmpeg.so index 243b677..e5065a9 100644 --- a/runtime/libcffmpeg.so +++ b/runtime/libcffmpeg.so Binary files differ -- Gitblit v1.8.0