648540858 6fa5b37b96 Merge branch 'main' into main2 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/BroadcastResponseMessageHandler.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/resources/all-application.yml		2023-01-05 11:07:06 +08:00
..
druid	日志优化--优化本地的日志记录方式，增加druid的sql的日志打印和监控面板，修改druid的配置方式	2022-02-25 09:23:46 +08:00
exception	去除 com.sun.javafx 无引用包，会导致在linux环境下编译不通过	2022-10-09 16:20:39 +08:00
redis	升级Fastjson到Fastjson2	2022-11-05 20:49:56 +08:00
security	Merge branch 'wvp-28181-2.0'	2022-11-18 18:39:44 +08:00
ApiAccessFilter.java	优化设备在线状态	2022-05-11 18:37:24 +08:00
DynamicTask.java	优化级联注册稳定性	2022-11-17 18:09:28 +08:00
GlobalExceptionHandler.java	优化拉流代理表单以及逻辑	2022-11-22 17:17:35 +08:00
GlobalResponseAdvice.java	优化语音对讲	2022-11-24 20:01:03 +08:00
MediaConfig.java	优化语音对讲	2022-11-24 20:01:03 +08:00
MediaStatusTimerTask.java	升级Fastjson到Fastjson2	2022-11-05 20:49:56 +08:00
ProxyServletConfig.java	使用equalsIgnoreCase代替equals,忽略大小写差异	2022-09-02 10:51:55 +08:00
SipConfig.java	合并主线	2022-11-18 21:52:02 +08:00
SipPlatformRunner.java	优化级联注册稳定性	2022-11-17 18:09:28 +08:00
SpringDocConfig.java	依赖包版本升级	2022-08-19 17:12:03 +08:00
SystemInfoTimerTask.java	首页改造完成,待添加系统信息	2022-10-24 15:20:35 +08:00
ThreadPoolTaskConfig.java	优化设备在线状态	2022-05-11 18:37:24 +08:00
UserSetting.java	Merge branch 'main' into main2	2023-01-05 11:07:06 +08:00
VersionConfig.java	添加版本信息接口	2021-08-09 16:54:36 +08:00
VersionInfo.java	首页改造完成,添加系统信息	2022-10-24 18:14:31 +08:00
WVPTimerTask.java	升级Fastjson到Fastjson2	2022-11-05 20:49:56 +08:00