648540858
|
019d95cfba
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
|
2023-02-22 18:08:25 +08:00 |
|
648540858
|
2d2832dbe9
|
优化各个配置启动顺序
|
2023-02-22 18:01:30 +08:00 |
|
648540858
|
f2c6210539
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# doc/_content/introduction/deployment.md
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisAlarmMsgListener.java
# src/main/resources/all-application.yml
# web_src/src/components/dialog/devicePlayer.vue
|
2023-02-10 16:24:27 +08:00 |
|
648540858
|
6484f52e46
|
同时支持打包为Jar和War
|
2023-02-07 20:59:33 +08:00 |
|
648540858
|
f223aad705
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.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/ByeRequestProcessor.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/request/impl/RegisterRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.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/media/zlm/ZLMRTPServerFactory.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java
# src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
# web_src/src/components/dialog/devicePlayer.vue
|
2022-11-18 18:39:44 +08:00 |
|
WuPeng
|
ab909feedf
|
升级Fastjson到Fastjson2
|
2022-11-05 20:49:56 +08:00 |
|
648540858
|
03d6ad289b
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
|
2022-09-01 14:50:28 +08:00 |
|
648540858
|
9f680a2e9e
|
修复bug以及日志按照，错误/sip/数据库 分割
|
2022-08-26 18:03:09 +08:00 |
|
648540858
|
ecf4fbb684
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
# web_src/src/components/Login.vue
|
2022-08-22 16:53:16 +08:00 |
|
648540858
|
5461b8ebf2
|
支持全局异常和统一返回结果，未完待续
|
2022-08-22 16:17:28 +08:00 |
|
648540858
|
116d979d87
|
合并主线
|
2022-08-09 16:58:31 +08:00 |
|
庄梦蝶殇
|
fff3d64f85
|
fix 优化pom依赖，去除几个重复客户端。并改了几个 equals判断不精准的bug
|
2022-07-27 18:31:33 +08:00 |
|
648540858
|
cb845726f6
|
优化代码
|
2022-05-23 10:16:46 +08:00 |
|
648540858
|
5d901b5e3f
|
使用阿里代码规范。规范代码写法
|
2022-05-06 10:12:34 +08:00 |
|
648540858
|
7e755f405d
|
支持国标移动位置订阅，收到新位置发送redis消息;支持通道redis消息拉起第三方推流;云台控制添加ControlPriority字段;处理sql的bug
|
2022-04-01 16:45:29 +08:00 |
|
648540858
|
f99c9cac6a
|
优化通道更新
|
2022-01-13 16:24:37 +08:00 |
|
648540858
|
b445128fb5
|
修复订阅清理请示任务的执行时长
|
2021-11-03 10:30:42 +08:00 |
|
648540858
|
3578c1c040
|
优化登录体验。修复因为流地址导致的录像服务无法识别
|
2021-08-31 09:44:19 +08:00 |
|
648540858
|
9e8cab609d
|
添加角色相关的接口，用户信息添加角色信息
|
2021-08-10 15:42:15 +08:00 |
|
648540858
|
61f5950b4f
|
添加日志存储与查询功能
登录接口返回用户详细信息
|
2021-08-07 14:05:42 +08:00 |
|
648540858
|
96bc081ea9
|
添加用户操作接口
|
2021-08-05 12:35:54 +08:00 |
|
lawrencehj
|
bc37cdd57b
|
修正打字错误
|
2021-07-23 16:58:11 +08:00 |
|
64850858
|
c3271d7407
|
优化鉴权例外， 添加.gitignore
|
2021-07-08 09:26:12 +08:00 |
|
64850858
|
0faa593658
|
规范配置文件，添加接口鉴权的例外接口配置
|
2021-07-06 16:38:31 +08:00 |
|
lawrencehj
|
f92a5da7c2
|
去除多余引用
|
2021-06-22 12:51:56 +08:00 |
|
64850858
|
ad93be12fb
|
添加云端录像功能
|
2021-06-01 17:05:07 +08:00 |
|
panlinlin
|
10ae1bba59
|
增加对zlm使用docker容器的支持
|
2021-04-28 15:10:35 +08:00 |
|
panlinlin
|
39078225f1
|
优化级联时的异常处理
|
2021-04-26 18:38:57 +08:00 |
|
panlinlin
|
689d7c0cc4
|
添加接口鉴权开关
|
2021-04-26 09:47:21 +08:00 |
|
panlinlin
|
41ca4e938d
|
修复打包后静态页面加载异常
|
2021-04-19 11:04:11 +08:00 |
|
lawrencehj
|
a70e327a8e
|
修改用户密码前先验证旧密码，增加安全性
|
2021-04-15 11:42:05 +08:00 |
|
panlinlin
|
cb5849d8a1
|
支持接口鉴权，支持修改密码，
|
2021-04-14 16:33:10 +08:00 |
|