648540858 5a7a7a12bd Merge branch 'wvp-28181-2.0' into main-dev ...

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/InviteResponseProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
#	src/main/resources/all-application.yml
#	web_src/config/index.js
#	web_src/src/components/dialog/devicePlayer.vue

2023-06-27 16:46:26 +08:00

..

exception

去除 com.sun.javafx 无引用包，会导致在linux环境下编译不通过

2022-10-09 16:20:39 +08:00

redis

Merge branch 'wvp-28181-2.0' into main-dev

2023-06-27 16:46:26 +08:00

security

Merge branch 'wvp-28181-2.0' into main-dev

2023-06-27 16:46:26 +08:00

ApiAccessFilter.java

优化redis连接

2023-03-20 10:05:00 +08:00

CivilCodeFileConf.java

优化国标级联的目录创建以及推送规则，优化接收目录规则，更加规范

2023-06-19 18:42:36 +08:00

DynamicTask.java

优化子码流切换逻辑，去除主子多开逻辑。优化单端口模式ssrc变化导致的无法移出点播缓存 #895

2023-06-22 22:35:35 +08:00

GlobalExceptionHandler.java

修复可空时间参数的校验 #784

2023-03-22 15:21:22 +08:00

GlobalResponseAdvice.java

合并开源主线

2023-04-04 09:09:07 +08:00

MediaConfig.java

Merge branch 'wvp-28181-2.0' into main-dev

2023-06-27 16:46:26 +08:00

MediaStatusTimerTask.java

升级Fastjson到Fastjson2

2022-11-05 20:49:56 +08:00

MybatisConfig.java

移除手动配置mybatis下划线转驼峰

2023-05-30 10:32:08 +08:00

ProxyServletConfig.java

修复引入的错误Order

2023-05-29 20:18:42 +08:00

ScheduleConfig.java

"@schedule"是Spring框架提供的一种定时任务执行机制，默认情况下它是单线程执行，项目中多次使用fixedRate按指定频率执行任务(不管前面任务是否已经完成)，在同时执行多个定时任务时可能会出现阻塞和性能问题，为了解决这种单线程瓶颈问题，将定时任务的执行机制改为支持多线程

2023-05-10 15:38:22 +08:00

ServiceInfo.java

同时支持打包为Jar和War

2023-02-07 20:59:33 +08:00

SipConfig.java

修复引入的错误Order

2023-05-29 20:18:42 +08:00

SipPlatformRunner.java

优化国标级联注册机制

2023-06-19 20:09:16 +08:00

SpringDocConfig.java

修复引入的错误Order

2023-05-29 20:18:42 +08:00

SystemInfoTimerTask.java

首页改造完成,待添加系统信息

2022-10-24 15:20:35 +08:00

ThreadPoolTaskConfig.java

修复引入的错误Order

2023-05-29 20:18:42 +08:00

UserSetting.java

Merge branch 'wvp-28181-2.0' into main-dev

2023-06-27 16:46:26 +08:00

VersionConfig.java

修复引入的错误Order

2023-05-29 20:18:42 +08:00

VersionInfo.java

首页改造完成,添加系统信息

2022-10-24 18:14:31 +08:00

WVPTimerTask.java

升级Fastjson到Fastjson2

2022-11-05 20:49:56 +08:00