From f36eb7ebebf5b4bbe79d27636d4a4ddb49067273 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 02 十一月 2023 14:17:20 +0800
Subject: [PATCH] 添加打包文件
---
打包/config/assist-application.yml | 63 +++++++++
打包/config/wvp-application.yml | 120 +++++++++++++++++
打包/config/config.ini | 166 +++++++++++++++++++++++
src/main/resources/all-application.yml | 13 +
数据库/更新-mysql-2.6.9.sql | 3
5 files changed, 363 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index 59dac15..6a07514 100644
--- a/src/main/resources/all-application.yml
+++ b/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
diff --git "a/\346\211\223\345\214\205/config/assist-application.yml" "b/\346\211\223\345\214\205/config/assist-application.yml"
new file mode 100755
index 0000000..8f69d1d
--- /dev/null
+++ "b/\346\211\223\345\214\205/config/assist-application.yml"
@@ -0,0 +1,63 @@
+spring:
+ # REDIS鏁版嵁搴撻厤缃�
+ redis:
+ # [鍙�塢 瓒呮椂鏃堕棿
+ timeout: 10000
+ # 浠ヤ笅涓哄崟鏈洪厤缃�
+ # [蹇呴』淇敼] Redis鏈嶅姟鍣↖P, REDIS瀹夎鍦ㄦ湰鏈虹殑,浣跨敤127.0.0.1
+ host: 127.0.0.1
+ # [蹇呴』淇敼] 绔彛鍙�
+ port: 6379
+ # [鍙�塢 鏁版嵁搴� DB
+ database: 1
+ # [鍙�塢 璁块棶瀵嗙爜,鑻ヤ綘鐨剅edis鏈嶅姟鍣ㄦ病鏈夎缃瘑鐮侊紝灏变笉闇�瑕佺敤瀵嗙爜鍘昏繛鎺�
+ password: adminadmin123.
+ # 浠ヤ笅涓洪泦缇ら厤缃�
+# cluster:
+# nodes: 192.168.1.242:7001
+# password: 4767cb971b40a1300fa09b7f87b09d1c
+
+# [鍙�塢 WVP鐩戝惉鐨凥TTP绔彛, 缃戦〉鍜屾帴鍙ｈ皟鐢ㄩ兘鏄繖涓鍙�
+server:
+ port: 18081
+ # [鍙�塢 HTTPS閰嶇疆锛� 榛樿涓嶅紑鍚�
+ ssl:
+ # [鍙�塢 鏄惁寮�鍚疕TTPS璁块棶
+ enabled: false
+ # [鍙�塢 璇佷功鏂囦欢璺緞锛屾斁缃湪resource/鐩綍涓嬪嵆鍙紝淇敼xxx涓烘枃浠跺悕
+ key-store: classpath:xxx.jks
+ # [鍙�塢 璇佷功瀵嗙爜
+ key-password: password
+ # [鍙�塢 璇佷功绫诲瀷锛� 榛樿涓簀ks锛屾牴鎹疄闄呬慨鏀�
+ key-store-type: JKS
+
+# [鏍规嵁涓氬姟闇�姹傞厤缃甝
+userSettings:
+ # [蹇呴�� ] 鏈嶅姟ID
+ id: 334533
+ # [鍙�� ] 褰曞儚涓嬭浇鍚堟垚涓存椂鏂囦欢淇濆瓨鏃堕暱锛� 涓嶉厤缃粯璁ゅ彇鍊紃ecordDay锛堝崟浣嶏細 澶╋級姣忓ぉ鏅�12鐐硅嚜鍔ㄥ杩囨湡鏂囦欢鎵ц娓呯悊
+ # recordTempDay: 7
+ # [蹇呴�� ] ffmpeg璺緞
+ ffmpeg: lib/ffmpeg
+ # [蹇呴�� ] ffprobe璺緞锛� 涓�鑸畨瑁協fmpeg灏变細鑷甫锛� 涓�鑸窡ffmpeg鍦ㄥ悓涓�鐩綍,鐢ㄤ簬鏌ヨ鏂囦欢鐨勪俊鎭�
+ ffprobe: lib/ffprobe
+ # [鍙�� ] 闄愬埗 ffmpeg 鍚堝苟鏂囦欢浣跨敤鐨勭嚎绋嬫暟锛岄棿鎺ラ檺鍒禼pu浣跨敤鐜囷紝 榛樿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
diff --git "a/\346\211\223\345\214\205/config/config.ini" "b/\346\211\223\345\214\205/config/config.ini"
new file mode 100755
index 0000000..5e4e595
--- /dev/null
+++ "b/\346\211\223\345\214\205/config/config.ini"
@@ -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
+
+; } ---
diff --git "a/\346\211\223\345\214\205/config/wvp-application.yml" "b/\346\211\223\345\214\205/config/wvp-application.yml"
new file mode 100755
index 0000000..8083e36
--- /dev/null
+++ "b/\346\211\223\345\214\205/config/wvp-application.yml"
@@ -0,0 +1,120 @@
+spring:
+ # [鍙�塢涓婁紶鏂囦欢澶у皬闄愬埗
+ servlet:
+ multipart:
+ max-file-size: 10MB
+ max-request-size: 100MB
+ # REDIS鏁版嵁搴撻厤缃�
+ redis:
+ # [鍙�塢 瓒呮椂鏃堕棿
+ timeout: 10000
+ # 浠ヤ笅涓哄崟鏈洪厤缃�
+ # [蹇呴』淇敼] Redis鏈嶅姟鍣↖P, REDIS瀹夎鍦ㄦ湰鏈虹殑,浣跨敤127.0.0.1
+ host: 127.0.0.1
+ # # [蹇呴』淇敼] 绔彛鍙�
+ port: 6379
+ # [鍙�塢 鏁版嵁搴� DB
+ database: 1
+ # [鍙�塢 璁块棶瀵嗙爜,鑻ヤ綘鐨剅edis鏈嶅姟鍣ㄦ病鏈夎缃瘑鐮侊紝灏变笉闇�瑕佺敤瀵嗙爜鍘昏繛鎺�
+ 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鐩戝惉鐨凥TTP绔彛, 缃戦〉鍜屾帴鍙ｈ皟鐢ㄩ兘鏄繖涓鍙�
+server:
+ port: 18080
+
+# 浣滀负28181鏈嶅姟鍣ㄧ殑閰嶇疆
+sip:
+ # [蹇呴』淇敼] 鏈満鐨処P
+ ip: 192.168.1.3
+ # [鍙�塢 28181鏈嶅姟鐩戝惉鐨勭鍙�
+ port: 15060
+ # 鏍规嵁鍥芥爣6.1.2涓瀹氾紝domain瀹滈噰鐢↖D缁熶竴缂栫爜鐨勫墠鍗佷綅缂栫爜銆傚浗鏍囬檮褰旸涓畾涔夊墠8浣嶄负涓績缂栫爜锛堢敱鐪佺骇銆佸競绾с�佸尯绾с�佸熀灞傜紪鍙风粍鎴愶紝鍙傜収GB/T 2260-2007锛�
+ # 鍚庝袱浣嶄负琛屼笟缂栫爜锛屽畾涔夊弬鐓ч檮褰旸.3
+ # 3701020049鏍囪瘑灞变笢娴庡崡鍘嗕笅鍖� 淇℃伅琛屼笟鎺ュ叆
+ # [鍙�塢
+ domain: 3402000001
+ # [鍙�塢
+ id: 34020000013000000001
+ # [鍙�塢 榛樿璁惧璁よ瘉瀵嗙爜锛屽悗缁墿灞曚娇鐢ㄨ澶囧崟鐙瘑鐮�, 绉婚櫎瀵嗙爜灏嗕笉杩涜鏍￠獙
+ password: 12345678
+
+#zlm 榛樿鏈嶅姟鍣ㄩ厤缃�
+media:
+ # [蹇呴』淇敼] zlm鏈嶅姟鍣ㄥ敮涓�id锛岀敤浜庤Е鍙慼ook鏃跺尯鍒槸鍝彴鏈嶅姟鍣�,general.mediaServerId
+ id: GQ3TF8yT83wh5Wvz
+ # [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑鍐呯綉IP
+ ip: 192.168.1.3
+ # [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑http.port
+ http-port: 6080
+ # [鍙�塢 zlm鏈嶅姟鍣ㄧ殑hook.admin_params=secret
+ secret: 034523TF8yT83wh5Wvz73f7
+ # 鍚敤澶氱鍙ｆā寮�, 澶氱鍙ｆā寮忎娇鐢ㄧ鍙ｅ尯鍒嗘瘡璺祦锛屽吋瀹规�ф洿濂姐�� 鍗曠鍙ｄ娇鐢ㄦ祦鐨剆src鍖哄垎锛� 鐐规挱瓒呮椂寤鸿浣跨敤澶氱鍙ｆ祴璇�
+ rtp:
+ # [鍙�塢 鏄惁鍚敤澶氱鍙ｆā寮�, 寮�鍚悗浼氬湪portRange鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�
+ enable: true
+ # [鍙�塢 鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�,
+ port-range: 30000,30500 # 绔彛鑼冨洿
+ # [鍙�塢 鍥芥爣绾ц仈鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鍙戦�佸獟浣撴祦锛岃涓嶈涓庢敹娴佺鍙ｈ寖鍥撮噸鍚�
+ send-port-range: 50502,50506 # 绔彛鑼冨洿
+ # 褰曞儚杈呭姪鏈嶅姟锛� 閮ㄧ讲姝ゆ湇鍔″彲浠ュ疄鐜皕lm褰曞儚鐨勭鐞嗕笌涓嬭浇锛� 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
+
+
diff --git "a/\346\225\260\346\215\256\345\272\223/\346\233\264\346\226\260-mysql-2.6.9.sql" "b/\346\225\260\346\215\256\345\272\223/\346\233\264\346\226\260-mysql-2.6.9.sql"
index c994d5b..1e4f439 100644
--- "a/\346\225\260\346\215\256\345\272\223/\346\233\264\346\226\260-mysql-2.6.9.sql"
+++ "b/\346\225\260\346\215\256\345\272\223/\346\233\264\346\226\260-mysql-2.6.9.sql"
@@ -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-寮�鍚級鐜板湪宸茬煡鏀寔璁惧涓� 澶у崕銆乀P鈥斺�擫INK鍏ㄧ郴璁惧'
-
+ add COLUMN switch_primary_sub_stream bool default false comment '寮�鍚富瀛愮爜娴佸垏鎹㈢殑寮�鍏筹紙0-涓嶅紑鍚紝1-寮�鍚級鐜板湪宸茬煡鏀寔璁惧涓� 澶у崕銆乀P鈥斺�擫INK鍏ㄧ郴璁惧';
alter table device_alarm
change deviceId device_id varchar(50) not null;
--
Gitblit v1.8.0