43 Commits

Author	SHA1	Message	Date
leesam	53199b32f6	适配postgres数据库	2024-04-10 22:16:56 +08:00
leesam	76208975bf	[add]支持其他平台通过ApiKey调用系统相关接口	2024-03-19 16:53:01 +08:00
648540858	2e7c9a7341	Merge branch 'wvp-28181-2.0' into main-dev ... # Conflicts: # pom.xml # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.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/media/zlm/AssistRESTfulUtils.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java # src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java # src/main/resources/all-application.yml # src/main/resources/application-dev.yml	2024-02-07 20:30:37 +08:00
648540858	f8d2b933b1	为每个接口添加调试接口需要的描述	2023-12-26 15:30:24 +08:00
648540858	7c07ae9421	修复文档页面不可用BUG，支持设置认证消息头来方便调用其他接口	2023-12-26 15:03:00 +08:00
648540858	88350873ee	Merge branch 'wvp-28181-2.0' into main-dev ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageHandlerAbstract.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java # src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java	2023-09-11 11:21:50 +08:00
xubinbin	e8b2ca4686	将生成jwt令牌和验证jwt令牌时使用的公钥私钥由固定值修改为每次启动服务时动态生产；剔除jwt token中包含的password和roleId，防止密码泄露。	2023-08-31 16:39:18 +08:00
648540858	91e49745e4	修复心跳异常，支持通道列表，推流列表，拉流代理列表直接查看对应的云端录像，兼容大于INT的ssrc的格式化	2023-08-16 01:55:50 +08:00
648540858	9bd588957a	修复获取pushKey	2023-06-28 20:27:25 +08:00
648540858	30ae9e929f	合并主线	2023-05-25 17:28:57 +08:00
648540858	cf1696e0d6	修复使用jwt后导致的用户管理功能异常	2023-04-15 09:03:41 +08:00
648540858	b4048fbe80	合并开源主线	2023-04-04 09:09:07 +08:00
逐浪人	3fd60f8676	Update UserController.java ... 修复修改密码报错，传递id参数为0的bug	2023-03-22 15:21:22 +08:00
648540858	efbc3a31c0	支持登录返回值中携带token	2023-03-15 22:56:47 +08:00
648540858	5fab97cf7e	支持不同域的前后端分离部署	2023-03-15 19:05:56 +08:00
648540858	95688e400b	初步实现登录返回token	2023-03-13 09:45:00 +08:00
648540858	a7c3cf5316	优化跨域配置，支持同域的前后端分离部署	2023-03-05 09:53:26 +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	c19ad94c3e	优化目录更新，更新失败时只更新收到的内容不重置所有通道和自动拉流	2023-01-15 15:27:47 +08:00
648540858	72e91f693c	修复用户删除失败，#636	2022-10-18 17:35:32 +08:00
648540858	82fd369ce5	Merge branch 'wvp-28181-2.0' ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java	2022-10-17 16:56:13 +08:00
648540858	2f11618199	修复用户删除失败，#636	2022-10-17 14:08:44 +08:00
648540858	2f76fa98bb	Merge branch 'wvp-28181-2.0' ... # Conflicts: # 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	2022-09-08 09:46:35 +08:00
648540858	ec0ec5eb54	修复并发点播时可能出现的rtpServer开启但是还未收到流的情况，编码类型136，137,138默认开启音频通道	2022-09-07 16:18:35 +08:00
648540858	8f7e8efc98	合并主线	2022-08-23 11:48:31 +08:00
648540858	5461b8ebf2	支持全局异常和统一返回结果，未完待续	2022-08-22 16:17:28 +08:00
648540858	1a9e49d9ff	依赖包版本升级	2022-08-19 17:11:51 +08:00
jiang	fc0ad32f81	1.修复新增用户没有pushkey的问题 ... 2.将重置pushkey改为修改pushkey	2022-07-19 18:13:19 +08:00
jiang	c6fbd03276	增加用户管理功能。管理员可以添加删除用户、修改用户密码、重置pushkey	2022-07-18 17:09:35 +08:00
648540858	f6893cf95b	优化设备在线状态	2022-05-11 18:37:24 +08:00
648540858	0a951e876a	添加修改密码失败的提示	2021-10-11 18:19:03 +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
panlinlin	937e591430	解决串流，解决编辑上级平台却新建了的问题	2021-04-15 17:48:52 +08:00
lawrencehj	a70e327a8e	修改用户密码前先验证旧密码，增加安全性	2021-04-15 11:42:05 +08:00
panlinlin	cb5849d8a1	支持接口鉴权，支持修改密码，	2021-04-14 16:33:10 +08:00
panlinlin	123ce171d2	使用数据库用户表代替配置文件	2021-04-13 15:08:09 +08:00
lawrencehj	8b4f7095e2	去除多余引用，修正个别错误	2021-04-13 10:13:36 +08:00
panlinlin	4010ed6c23	统一axios写法	2021-04-12 16:04:04 +08:00
panlinlin	a004a978fa	规范api	2021-04-11 22:32:28 +08:00
lawrencehj	a8603075d4	去除冗余代码，修正编译报警项	2021-02-05 15:15:39 +08:00
panlinlin	ac45e4f6c8	修复登陆的bug	2021-01-13 17:49:19 +08:00