fajiao
/
wvp-GB28181-pro
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 10102f4941 Merge branch 'wvp-28181-2.0' of https://github.com/TristingChen/wvp-GB28181-pro into wvp-28181-2.0 chenjialing 2022-03-01 18:48:14 +0800
  • f797e299f9 Merge branch 'wvp-28181-2.0' of http://git.runjian.com:18080/97180/rujian-wvp-pro into wvp-28181-2.0 chenjialing 2022-03-01 18:41:13 +0800
  • 32e630ef47
         Update mysql.sql SaltFish 2022-03-01 17:56:55 +0800
  • 1ea95d2b87 Merge branch 'wvp-28181-2.0' of https://github.com/648540858/wvp-GB28181-pro into wvp-28181-2.0 648540858 2022-03-01 17:48:21 +0800
  • 4c53b10737 解决对接中遇到的问题 648540858 2022-03-01 17:42:22 +0800
  • 97698ee716
         Merge pull request #346 from TristingChen/log-optimization 648540858 2022-03-01 17:37:19 +0800
  • 347eec086d
         Merge pull request #356 from SaltFish001/wvp-28181-2.0 648540858 2022-03-01 17:36:23 +0800
  • bb1fada32c
         Update StreamPushMapper.java #356 SaltFish 2022-03-01 14:33:04 +0800
  • b1d4123d29
         update sql/mysql.sql. 修改拉流代理缺少“名称”字段问题 随波 2022-02-28 15:34:20 +0000
  • e4e0cde16c
         update src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java. 修改新建拉流代理时不保存“名称”字段问题 随波 2022-02-28 15:31:50 +0000
  • 9c5b1060af 支持删除在线设备 648540858 2022-02-28 17:56:27 +0800
  • 6d454423a2
         rPort 变更了HostAddres也要变 ckb_test 2022-02-28 09:07:02 +0000
  • 0cd86a79c2 修复设备删除 648540858 2022-02-28 10:39:51 +0800
  • e94b99d11c 实现国标录像级联播放，优化点播流程，加快点播速度 648540858 2022-02-27 20:01:31 +0800
  • f65d2730e0
         Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 mrjackwang 2022-02-27 18:09:24 +0800
  • 917e2b577d
         Merge pull request #352 from walkTtalk/wvp-28181-2.0 648540858 2022-02-26 15:38:59 +0800
  • c3c44dbd53 增加拉流代理表name字段 wangyimeng 2022-02-26 11:16:01 +0800
  • 560165b667 增加拉流代理修改功能 wangyimeng 2022-02-26 11:14:56 +0800
  • f97ce3e936 增加拉流代理修改功能 wangyimeng 2022-02-26 11:07:55 +0800
  • f52be30399 Fix issue #347: 修改前端启动报错 #352 walkTtalk 2022-02-26 00:01:35 +0800
  • 10f776678e Merge branch 'wvp-28181-2.0' into wvp-pro-record 648540858 2022-02-25 20:33:38 +0800
  • 7400ace65d 规范数据库，解决bug 648540858 2022-02-25 20:33:02 +0800
  • 0cc0a21206 增加无人观看时关闭zlm拉流 luoshuyue 2022-02-25 15:06:51 +0800
  • ce56d9c0bf 增加获取code为null时的条件 luoshuyue 2022-02-25 15:05:36 +0800
  • b97db305eb 修复了拉流添加国标编码上级级联调取不到视频的bug luoshuyue 2022-02-25 15:04:47 +0800
  • 777f2e2121 日志优化--修改本地配置文件local的mysql连接方式 #346 chenjialing 2022-02-25 09:54:18 +0800
  • e0f8acf09f 添加git的忽略logs chenjialing 2022-02-09 09:37:04 +0800
  • 7852c4fde7 research--local文件 chenjialing 2022-01-09 09:30:50 +0800
  • c8b9e590ef 日志优化--优化本地的日志记录方式，增加druid的sql的日志打印和监控面板，修改druid的配置方式 chenjialing 2022-02-24 19:02:11 +0800
  • c9bfdf2525 实现国标的级联录像查询 648540858 2022-02-24 21:10:34 +0800
  • 00afecac47 Merge branch 'wvp-28181-2.0' into wvp-pro-record 648540858 2022-02-24 17:18:36 +0800
  • a42dda2bd3 规范数据库，添加必要约束，优化通道批量导入功能 648540858 2022-02-24 16:55:06 +0800
  • f199a65948
         判断当前页面协议选择播放连接 #343 SaltFish 2022-02-23 23:58:49 +0800
  • 0191e93768 同步主线 648540858 2022-02-23 21:55:46 +0800
  • f4c03c1808 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-pro-record 648540858 2022-02-22 11:55:23 +0800
  • e861c9dfab Merge remote-tracking branch 'origin/master' into wvp-pro-record 648540858 2022-02-22 11:55:23 +0800
  • 2157bb0270 规范数据库，给各个标设置主键ID 648540858 2022-02-22 11:44:56 +0800
  • 9601ee592a 添加新的控制台页面 ui-optimization 648540858 2022-02-20 19:33:02 +0800
  • 0a44eb8965 增加配置将国标录像与其他录像分开 648540858 2022-02-20 17:33:17 +0800
  • 0b6587b1ad 增加配置将国标录像与其他录像分开 648540858 2022-02-20 17:29:03 +0800
  • 5bcd8495e0 兼容海康不规范的xml，大幅度提高通道分页查询速度，优化节点的保活。 648540858 2022-02-20 16:22:43 +0800
  • b7635ec05d 优化级联通道发送速度 648540858 2022-02-20 16:18:14 +0800
  • 0327d16021 优化级联平台删除 648540858 2022-02-17 15:33:25 +0800
  • 0a32f717a1 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 chenjialing 2022-02-17 09:11:32 +0800
  • 59c79c08e1 修复级联通道回复错误 648540858 2022-02-16 15:13:16 +0800
  • b0d3bf3ed9 添加通道导入实例文件 648540858 2022-02-15 17:52:37 +0800
  • 9442c37ce7 优化级联添加通道流程 648540858 2022-02-15 17:41:09 +0800
  • d4fe0fb325 Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0 648540858 2022-02-15 09:13:16 +0800
  • 5528517471
         Merge pull request #325 from nikmu/wvp-28181-2.0 648540858 2022-02-15 09:13:03 +0800
  • 54df5df031 mapper改用注释方式 #325 朱俊杰 2022-02-14 10:18:00 +0800
  • b663a8ab41 Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0 648540858 2022-02-11 18:01:58 +0800
  • 980052015a 优化列表展示 648540858 2022-02-11 16:46:58 +0800
  • bf66f8f694 推流导入支持添加平台信息与目录信息 648540858 2022-02-11 16:45:06 +0800
  • 59f0210d04
         Merge pull request #324 from SaltFish001/wvp-28181-2.0 648540858 2022-02-11 09:47:26 +0800
  • 37a84e6691 新增实时监控功能 朱俊杰 2022-02-10 14:45:33 +0800
  • 0209dc89c9
         Update MediaServiceImpl.java #324 SaltFish 2022-02-10 10:29:36 +0800
  • b9af49f338 添加git的忽略logs chenjialing 2022-02-09 09:37:04 +0800
  • d07a5680f3 为推流列表增加批量移除功能 648540858 2022-02-07 18:30:43 +0800
  • e0028a87cb 为推流列表增加搜索功能 648540858 2022-02-07 14:12:34 +0800
  • d99092ff19 Merge branch 'wvp-28181-2.0' of https://github.com/648540858/wvp-GB28181-pro into wvp-28181-2.0 chenjialing 2022-02-07 09:00:48 +0800
  • ea85a620d1 添加服务器信息获取能力。 648540858 2022-02-04 21:46:48 +0800
  • d7afcab601 优化媒体服务器配置展示界面 648540858 2022-01-30 16:39:15 +0800
  • 8d5764b9a0 优化信令配置展示界面 648540858 2022-01-30 15:58:15 +0800
  • 646419e4ad #247 648540858 2022-01-28 16:45:12 +0800
  • 8cfff8db97 添加对可能空指针的判断 648540858 2022-01-28 16:30:10 +0800
  • f33c3a3630 添加重启后拉流代理自动恢复 648540858 2022-01-27 18:08:19 +0800
  • 66cadafd1c 优化直播推流的CivilCode 648540858 2022-01-27 17:40:59 +0800
  • b675101380 Merge branch 'wvp-28181-2.0' of https://github.com/648540858/wvp-GB28181-pro into wvp-28181-2.0 chenjialing 2022-01-27 14:56:27 +0800
  • 89db9991a2 2.0.2版本 去除默认的mediaIP 127.0.0.1,避免误导新用户 648540858 2022-01-27 14:25:26 +0800
  • 9b21fba871 解析xml异常时，回复400 648540858 2022-01-27 10:39:08 +0800
  • e728233781 使用log4j-over-slf4j取代log4j避免log4j漏洞 648540858 2022-01-27 10:09:47 +0800
  • f9b8ea6573 Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0 648540858 2022-01-26 11:00:48 +0800
  • 7cb74dbe51
         Merge pull request #317 from nikmu/wvp-28181-2.0 648540858 2022-01-26 10:55:36 +0800
  • 6025c431e4 Merge branch 'wvp-28181-2.0' of https://github.com/648540858/wvp-GB28181-pro into wvp-28181-2.0 chenjialing 2022-01-26 09:14:08 +0800
  • d34be408d6
         update web_src/src/components/dialog/changePassword.vue. lanss 2022-01-25 13:50:22 +0000
  • 75ee368c96 优化默认节点的展示 648540858 2022-01-25 20:21:36 +0800
  • c547851487 优化zlm上线与下线过时通道的移除 648540858 2022-01-25 19:38:04 +0800
  • abc65c6317 优化目录移除时默认目录的选择 648540858 2022-01-25 17:14:10 +0800
  • 08468edd45 移除sqlite支持 648540858 2022-01-25 16:36:55 +0800
  • 5c2d27f75d 兼容mysql5低版本 648540858 2022-01-25 16:23:29 +0800
  • 1dbb559b38 优化文件导入判断 648540858 2022-01-25 15:43:52 +0800
  • 4065703317 添加lombok，分离注册周期事件 #317 朱俊杰 2022-01-25 15:42:11 +0800
  • 94688534f8 移除db 导出的sql文件 648540858 2022-01-25 14:42:46 +0800
  • 5f7fa2784e 修改sql文件 648540858 2022-01-25 12:22:32 +0800
  • 2e60339e0a 修复候选通道查询bug 648540858 2022-01-25 12:20:52 +0800
  • a179a45ac3 优化通道选择是通道的查询 648540858 2022-01-21 18:41:41 +0800
  • 46cf650a86 优化通道选择是通道的查询 648540858 2022-01-21 18:00:15 +0800
  • b6702f7c05 修改mysql脚本 648540858 2022-01-21 16:05:02 +0800
  • 44f3ea8f9b Merge branch 'wvp-28181-2.0' of https://github.com/648540858/wvp-GB28181-pro into wvp-28181-2.0 chenjialing 2022-01-21 15:44:44 +0800
  • 3f5e885e82 目录默认节点被删除时，重置默认节点为根节点 648540858 2022-01-21 14:10:49 +0800
  • d8fa9d6801 Merge branch 'wvp-28181-2.0' of https://github.com/648540858/wvp-GB28181-pro into wvp-28181-2.0 chenjialing 2022-01-20 18:10:14 +0800
  • 7d88827415 处理服务重启或设备重新上线时的订阅，优化通道导入重复的处理 648540858 2022-01-20 16:48:30 +0800
  • c5ddf59858 修改readme 648540858 2022-01-19 17:40:03 +0800
  • bc710b6f1b 添加脚本来源 648540858 2022-01-19 15:10:01 +0800
  • 6ba8ab22b5 修复推流生成通道未通知上级平台的问题，添加注册时清楚脏数据。 648540858 2022-01-19 15:08:13 +0800
  • e8090bc84c 修复bug与目录订阅添加最小值60 648540858 2022-01-19 10:23:52 +0800
  • 9be861abcc 修复bug与修改通道名 648540858 2022-01-18 16:37:11 +0800
  • 59e3a280d6 去除目录通知多余的信息 648540858 2022-01-17 17:42:09 +0800
  • baef2dd13d 优化级联选择通道页面目录Id在各个模块间的传递方式 648540858 2022-01-17 17:19:47 +0800
  • fa346513db 优化级联选择通道页面添加方式 648540858 2022-01-17 16:46:28 +0800