| src/main/resources/all-application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| 打包/config/assist-application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| 打包/config/config.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| 打包/config/wvp-application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| 数据库/更新-mysql-2.6.9.sql | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/resources/all-application.yml
@@ -34,6 +34,19 @@ poolMaxWait: 5 # [å¿ é] jdbcæ°æ®åºé ç½® datasource: # kingbaseé ç½® # type: com.zaxxer.hikari.HikariDataSource # driver-class-name: com.kingbase8.Driver # url: jdbc:kingbase8://192.168.1.55:54321/wvp?useUnicode=true&characterEncoding=utf8 # username: system # password: system # postgresqlé ç½® # type: com.zaxxer.hikari.HikariDataSource # driver-class-name: org.postgresql.Driver # url: jdbc:postgresql://192.168.1.242:3306/242wvp # username: root # password: SYceshizu1234 # mysqlé ç½® type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://127.0.0.1:3306/wvp2?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false&allowMultiQueries=true ´ò°ü/config/assist-application.yml
New file @@ -0,0 +1,63 @@ spring: # REDISæ°æ®åºé ç½® redis: # [å¯é] è¶ æ¶æ¶é´ timeout: 10000 # 以ä¸ä¸ºåæºé ç½® # [å¿ é¡»ä¿®æ¹] Redisæå¡å¨IP, REDISå®è£ å¨æ¬æºç,使ç¨127.0.0.1 host: 127.0.0.1 # [å¿ é¡»ä¿®æ¹] 端å£å· port: 6379 # [å¯é] æ°æ®åº DB database: 1 # [å¯é] 访é®å¯ç ,è¥ä½ çredisæå¡å¨æ²¡æ设置å¯ç ï¼å°±ä¸éè¦ç¨å¯ç å»è¿æ¥ password: adminadmin123. # 以ä¸ä¸ºé群é ç½® # cluster: # nodes: 192.168.1.242:7001 # password: 4767cb971b40a1300fa09b7f87b09d1c # [å¯é] WVPçå¬çHTTP端å£, ç½é¡µåæ¥å£è°ç¨é½æ¯è¿ä¸ªç«¯å£ server: port: 18081 # [å¯é] HTTPSé ç½®ï¼ é»è®¤ä¸å¼å¯ ssl: # [å¯é] æ¯å¦å¼å¯HTTPSè®¿é® enabled: false # [å¯é] è¯ä¹¦æ件路å¾ï¼æ¾ç½®å¨resource/ç®å½ä¸å³å¯ï¼ä¿®æ¹xxx为æ件å key-store: classpath:xxx.jks # [å¯é] è¯ä¹¦å¯ç key-password: password # [å¯é] è¯ä¹¦ç±»åï¼ é»è®¤ä¸ºjksï¼æ ¹æ®å®é ä¿®æ¹ key-store-type: JKS # [æ ¹æ®ä¸å¡éæ±é ç½®] userSettings: # [å¿ é ] æå¡ID id: 334533 # [å¯é ] å½åä¸è½½åæ临æ¶æ件ä¿åæ¶é¿ï¼ ä¸é ç½®é»è®¤åå¼recordDayï¼åä½ï¼ 天ï¼æ¯å¤©æ12ç¹èªå¨å¯¹è¿ææ件æ§è¡æ¸ ç # recordTempDay: 7 # [å¿ é ] ffmpegè·¯å¾ ffmpeg: lib/ffmpeg # [å¿ é ] ffprobeè·¯å¾ï¼ ä¸è¬å®è£ ffmpegå°±ä¼èªå¸¦ï¼ ä¸è¬è·ffmpegå¨åä¸ç®å½,ç¨äºæ¥è¯¢æ件çä¿¡æ¯ ffprobe: lib/ffprobe # [å¯é ] éå¶ ffmpeg å并æ件使ç¨ç线ç¨æ°ï¼é´æ¥éå¶cpu使ç¨çï¼ é»è®¤2 éå¶å°50% threads: 2 swagger-ui: enabled: true # [å¯é] æ¥å¿é ç½®, ä¸è¬ä¸éè¦æ¹ logging: file: name: logs/wvp.log max-history: 30 max-size: 10MB total-size-cap: 300MB level: root: WARN top: panll: assist: info net: bramp: ffmpeg: error ´ò°ü/config/config.ini
New file @@ -0,0 +1,166 @@ ; auto-generated by mINI class { [api] apiDebug=1 defaultSnap=./www/logo.png secret=034523TF8yT83wh5Wvz73f7 snapRoot=./www/snap/ [cluster] origin_url= retry_count=3 timeout_sec=15 [ffmpeg] bin=/usr/bin/ffmpeg cmd=%s -re -i %s -c:a aac -strict -2 -ar 44100 -ab 48k -c:v libx264 -f flv %s log=./ffmpeg/ffmpeg.log restart_sec=0 snap=%s -i %s -y -f mjpeg -t 0.001 %s [general] check_nvidia_dev=1 enableVhost=0 enable_ffmpeg_log=0 flowThreshold=1024 maxStreamWaitMS=15000 mediaServerId=GQ3TF8yT83wh5Wvz mergeWriteMS=0 resetWhenRePlay=1 streamNoneReaderDelayMS=15000 unready_frame_cache=100 wait_add_track_ms=3000 wait_track_ready_ms=10000 [hls] broadcastRecordTs=0 deleteDelaySec=10 fileBufSize=65536 segDur=2 segKeep=0 segNum=3 segRetain=5 [hook] admin_params=secret=034523TF8yT83wh5Wvz73f7 alive_interval=30.000000 enable=1 on_flow_report= on_http_access= on_play=http://192.168.1.3:18082/index/hook/on_play on_publish=http://192.168.1.3:18082/index/hook/on_publish on_record_mp4= on_record_ts= on_rtp_server_timeout=http://192.168.1.3:18082/index/hook/on_rtp_server_timeout on_rtsp_auth= on_rtsp_realm= on_send_rtp_stopped=http://192.168.1.3:18082/index/hook/on_send_rtp_stopped on_server_keepalive=http://192.168.1.3:18082/index/hook/on_server_keepalive on_server_started=http://192.168.1.3:18082/index/hook/on_server_started on_shell_login= on_stream_changed=http://192.168.1.3:18082/index/hook/on_stream_changed on_stream_none_reader=http://192.168.1.3:18082/index/hook/on_stream_none_reader on_stream_not_found=http://192.168.1.3:18082/index/hook/on_stream_not_found retry=1 retry_delay=3.000000 timeoutSec=20 [http] charSet=utf-8 dirMenu=1 forbidCacheSuffix= forwarded_ip_header= keepAliveSecond=15 maxReqSize=40960 notFound=<html><head><title>404 Not Found</title></head><body bgcolor="white"><center><h1>æ¨è®¿é®çèµæºä¸åå¨ï¼</h1></center><hr><center>ZLMediaKit(git hash:f6cba98/2023-02-06T14:18:21+08:00,branch:master,build time:2023-02-07T10:51:47)</center></body></html> port=6080 rootPath=./www sendBufSize=65536 sslport=16080 virtualPath= [multicast] addrMax=239.255.255.255 addrMin=239.0.0.0 udpTTL=64 [protocol] add_mute_audio=1 continue_push_ms=3000 enable_audio=1 enable_fmp4=1 enable_hls=1 enable_mp4=0 enable_rtmp=1 enable_rtsp=1 enable_ts=1 fmp4_demand=0 hls_demand=0 hls_save_path=./www modify_stamp=0 mp4_as_player=0 mp4_max_second=3600 mp4_save_path=./www rtmp_demand=0 rtsp_demand=0 ts_demand=0 [record] appName=record fastStart=0 fileBufSize=65536 fileRepeat=0 sampleMS=500 [rtc] externIP=192.168.1.3 port=8000 preferredCodecA=PCMA,PCMU,opus,mpeg4-generic preferredCodecV=H264,H265,AV1,VP9,VP8 rembBitRate=0 tcpPort=8000 timeoutSec=15 [rtmp] handshakeSecond=15 keepAliveSecond=15 modifyStamp=0 port=1935 sslport=19350 [rtp] audioMtuSize=600 lowLatency=0 rtpMaxSize=10 videoMtuSize=1400 [rtp_proxy] dumpDir= h264_pt=98 h265_pt=99 opus_pt=100 port=10000 port_range=40000-40500 ps_pt=96 timeoutSec=15 [rtsp] authBasic=0 directProxy=1 handshakeSecond=15 keepAliveSecond=15 lowLatency=0 port=10554 sslport= [shell] maxReqSize=1024 port=9000 [srt] latencyMul=4 pktBufSize=8192 port=9000 timeoutSec=5 ; } --- ´ò°ü/config/wvp-application.yml
New file @@ -0,0 +1,120 @@ spring: # [å¯é]ä¸ä¼ æ件大å°éå¶ servlet: multipart: max-file-size: 10MB max-request-size: 100MB # REDISæ°æ®åºé ç½® redis: # [å¯é] è¶ æ¶æ¶é´ timeout: 10000 # 以ä¸ä¸ºåæºé ç½® # [å¿ é¡»ä¿®æ¹] Redisæå¡å¨IP, REDISå®è£ å¨æ¬æºç,使ç¨127.0.0.1 host: 127.0.0.1 # # [å¿ é¡»ä¿®æ¹] 端å£å· port: 6379 # [å¯é] æ°æ®åº DB database: 1 # [å¯é] 访é®å¯ç ,è¥ä½ çredisæå¡å¨æ²¡æ设置å¯ç ï¼å°±ä¸éè¦ç¨å¯ç å»è¿æ¥ password: adminadmin123. # 以ä¸ä¸ºé群é ç½® # cluster: # nodes: 192.168.1.66:9001,192.168.1.66:9002,192.168.1.66:9003,192.168.1.66:9004,192.168.1.66:9005,192.168.1.66:9006 # password: adminadmin123. # [å¯é] jdbcæ°æ®åºé ç½®, 项ç®ä½¿ç¨sqliteä½ä¸ºæ°æ®åºï¼ä¸è¬ä¸éè¦é ç½® # mysqlæ°æ®æº datasource: # kingbaseé ç½® # type: com.zaxxer.hikari.HikariDataSource # driver-class-name: com.kingbase8.Driver # url: jdbc:kingbase8://192.168.1.55:54321/wvp?useUnicode=true&characterEncoding=utf8 # username: system # password: system # postgresqlé ç½® # type: com.zaxxer.hikari.HikariDataSource # driver-class-name: org.postgresql.Driver # url: jdbc:postgresql://192.168.1.242:3306/242wvp # username: root # password: SYceshizu1234 # mysqlé ç½® type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://192.168.1.242:3306/242wvp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true username: root password: SYceshizu1234 # kingbase å postgresqléè¦å¼å¯è¿ä¸ªé ç½® #pagehelper: # helper-dialect: postgresql #[å¯é] WVPçå¬çHTTP端å£, ç½é¡µåæ¥å£è°ç¨é½æ¯è¿ä¸ªç«¯å£ server: port: 18080 # ä½ä¸º28181æå¡å¨çé ç½® sip: # [å¿ é¡»ä¿®æ¹] æ¬æºçIP ip: 192.168.1.3 # [å¯é] 28181æå¡çå¬çç«¯å£ port: 15060 # æ ¹æ®å½æ 6.1.2ä¸è§å®ï¼domainå®éç¨IDç»ä¸ç¼ç çååä½ç¼ç ãå½æ éå½Dä¸å®ä¹å8ä½ä¸ºä¸å¿ç¼ç ï¼ç±ç级ãå¸çº§ãåºçº§ãåºå±ç¼å·ç»æï¼åç §GB/T 2260-2007ï¼ # å两ä½ä¸ºè¡ä¸ç¼ç ï¼å®ä¹åç §éå½D.3 # 3701020049æ è¯å±±ä¸æµååä¸åº ä¿¡æ¯è¡ä¸æ¥å ¥ # [å¯é] domain: 3402000001 # [å¯é] id: 34020000013000000001 # [å¯é] é»è®¤è®¾å¤è®¤è¯å¯ç ï¼åç»æ©å±ä½¿ç¨è®¾å¤åç¬å¯ç , 移é¤å¯ç å°ä¸è¿è¡æ ¡éª password: 12345678 #zlm é»è®¤æå¡å¨é ç½® media: # [å¿ é¡»ä¿®æ¹] zlmæå¡å¨å¯ä¸idï¼ç¨äºè§¦åhookæ¶åºå«æ¯åªå°æå¡å¨,general.mediaServerId id: GQ3TF8yT83wh5Wvz # [å¿ é¡»ä¿®æ¹] zlmæå¡å¨çå ç½IP ip: 192.168.1.3 # [å¿ é¡»ä¿®æ¹] zlmæå¡å¨çhttp.port http-port: 6080 # [å¯é] zlmæå¡å¨çhook.admin_params=secret secret: 034523TF8yT83wh5Wvz73f7 # å¯ç¨å¤ç«¯å£æ¨¡å¼, å¤ç«¯å£æ¨¡å¼ä½¿ç¨ç«¯å£åºåæ¯è·¯æµï¼å ¼å®¹æ§æ´å¥½ã å端å£ä½¿ç¨æµçssrcåºåï¼ ç¹æè¶ æ¶å»ºè®®ä½¿ç¨å¤ç«¯å£æµè¯ rtp: # [å¯é] æ¯å¦å¯ç¨å¤ç«¯å£æ¨¡å¼, å¼å¯åä¼å¨portRangeèå´å éæ©ç«¯å£ç¨äºåªä½æµä¼ è¾ enable: true # [å¯é] å¨æ¤èå´å éæ©ç«¯å£ç¨äºåªä½æµä¼ è¾, port-range: 30000,30500 # 端å£èå´ # [å¯é] å½æ 级èå¨æ¤èå´å éæ©ç«¯å£åéåªä½æµï¼è¯·ä¸è¦ä¸æ¶æµç«¯å£èå´éå send-port-range: 50502,50506 # 端å£èå´ # å½åè¾ å©æå¡ï¼ é¨ç½²æ¤æå¡å¯ä»¥å®ç°zlmå½åç管çä¸ä¸è½½ï¼ 0 表示ä¸ä½¿ç¨ record-assist-port: 18089 # å½åè·¯å¾ record-path: ./www/record # å½åä¿åæ¶é¿ record-day: 7 # [å¯é] æ¥å¿é ç½®, ä¸è¬ä¸éè¦æ¹ logging: config: classpath:logback-spring-local.xml # [æ ¹æ®ä¸å¡éæ±é ç½®] user-settings: server-id: 741266 auto-apply-play: true interface-authentication: true interface-authentication-excludes: - /api/v1/** - /api/media/stream_info_by_app_and_stream - /api/v1/control/ptz - /api/cloud/record/*/** # æ¨æµç´ææ¯å¦å½å¶ record-push-live: true # å½æ æ¯å¦å½å¶ record-sip: false # 使ç¨æ¨æµç¶æä½ä¸ºæ¨æµééç¶æ use-pushing-as-status: false # 设å¤ä¸çº¿æ¶æ¯å¦èªå¨åæ¥éé sync-channel-on-device-online: false # æ¶æ¯ééåè½-缺å°å½æ IDæ¯å¦ç»ææä¸çº§åéæ¶æ¯ send-to-platforms-when-id-lost: false
@@ -60,8 +60,7 @@ change online on_line varchar(50) null; alter table device add COLUMN switch_primary_sub_stream bool default false comment 'å¼å¯ä¸»åç æµåæ¢çå¼å ³ï¼0-ä¸å¼å¯ï¼1-å¼å¯ï¼ç°å¨å·²ç¥æ¯æ设å¤ä¸º 大åãTPââLINKå ¨ç³»è®¾å¤' add COLUMN switch_primary_sub_stream bool default false comment 'å¼å¯ä¸»åç æµåæ¢çå¼å ³ï¼0-ä¸å¼å¯ï¼1-å¼å¯ï¼ç°å¨å·²ç¥æ¯æ设å¤ä¸º 大åãTPââLINKå ¨ç³»è®¾å¤'; alter table device_alarm change deviceId device_id varchar(50) not null;
