diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index 59dac15d..6a075140 100644
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -34,6 +34,19 @@ spring:
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/打包/config/assist-application.yml b/打包/config/assist-application.yml
new file mode 100755
index 00000000..8f69d1d6
--- /dev/null
+++ b/打包/config/assist-application.yml
@@ -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
diff --git a/打包/config/config.ini b/打包/config/config.ini
new file mode 100755
index 00000000..5e4e5958
--- /dev/null
+++ b/打包/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=404 Not Found您访问的资源不存在！
ZLMediaKit(git hash:f6cba98/2023-02-06T14:18:21+08:00,branch:master,build time:2023-02-07T10:51:47)
+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/打包/config/wvp-application.yml b/打包/config/wvp-application.yml
new file mode 100755
index 00000000..8083e369
--- /dev/null
+++ b/打包/config/wvp-application.yml
@@ -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
+
+
diff --git a/数据库/更新-mysql-2.6.9.sql b/数据库/更新-mysql-2.6.9.sql
index c994d5b6..1e4f439d 100644
--- a/数据库/更新-mysql-2.6.9.sql
+++ b/数据库/更新-mysql-2.6.9.sql
@@ -60,8 +60,7 @@ alter table device
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;