Commit Graph

Select branches

Hide Pull Requests

2.6.3

2.6.4

2.6.5

2.6.6

2.6.7

2.6.8

2.6.9

2.7.0

2.7.1

2.7.1-多对一语音对讲

2.7.2

dev/abl支持

dev/多线程性能优化

dev/数据库统合

master

sip

结构优化

#1

#10

#1012

#1017

#1019

#1023

#1024

#1028

#1036

#1043

#1044

#1045

#1048

#1055

#1057

#1059

#1067

#1070

#1071

#1077

#1082

#1094

#1095

#1096

#1097

#110

#1102

#1105

#1119

#113

#1132

#1137

#1138

#1140

#1146

#115

#1188

#12

#1205

#1209

#1217

#1219

#1230

#1234

#1242

#1270

#1288

#1289

#129

#13

#1336

#1340

#136

#1371

#1380

#1384

#1389

#14

#1400

#1411

#1412

#1414

#1421

#1432

#1450

#1453

#1455

#148

#1489

#1492

#15

#151

#1524

#1533

#1548

#1554

#1555

#1557

#1559

#1560

#1565

#1581

#1587

#1601

#1624

#1625

#1626

#1630

#1630

#1641

#1642

#1645

#1647

#1651

#1652

#1653

#1669

#1670

#1671

#1675

#1677

#1682

#1684

#1694

#1699

#1712

#1719

#1721

#1733

#1734

#1735

#174

#1742

#1747

#175

#1754

#1754

#1759

#1760

#1762

#1762

#183

#184

#2

#200

#212

#217

#226

#231

#232

#243

#249

#250

#259

#276

#29

#294

#295

#30

#31

#311

#317

#32

#324

#325

#33

#34

#343

#346

#35

#352

#353

#356

#358

#359

#360

#365

#367

#375

#379

#38

#386

#387

#388

#392

#399

#403

#413

#419

#42

#423

#426

#427

#43

#437

#439

#441

#442

#443

#444

#446

#447

#448

#449

#45

#451

#452

#457

#458

#459

#46

#461

#462

#468

#47

#473

#478

#480

#484

#486

#487

#490

#491

#492

#497

#499

#504

#517

#52

#524

#527

#53

#530

#542

#549

#556

#567

#568

#570

#578

#58

#59

#590

#608

#609

#610

#611

#620

#621

#625

#626

#627

#63

#632

#64

#640

#641

#643

#644

#645

#646

#647

#655

#658

#660

#661

#662

#67

#673

#678

#679

#685

#689

#691

#695

#698

#706

#707

#711

#713

#72

#724

#729

#730

#731

#735

#736

#738

#739

#74

#741

#742

#743

#744

#750

#750

#751

#752

#753

#76

#760

#763

#764

#765

#771

#774

#778

#783

#785

#786

#787

#80

#800

#810

#817

#827

#829

#833

#836

#837

#84

#844

#845

#847

#852

#869

#87

#872

#876

#878

#887

#889

#893

#894

#90

#908

#911

#93

#939

#948

#952

#955

#956

#957

#964

#965

#968

#976

#978

#981

#989

#993

#996

#999

v1.0

Mono Color

• 0993bedb46
  !11 修改内存泄露 Merge pull request !11 from ydpd/wvp-28181-2.0 panll 2022-03-02 06:26:54 +0000
• bbb808d83f
  !9 update sql/mysql.sql. Merge pull request !9 from 随波/N/A panll 2022-03-02 06:25:19 +0000
• ae83bd6d06
  !8 update src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java. Merge pull request !8 from 随波/N/A panll 2022-03-02 06:24:26 +0000
• 94af90fa14
  !7 rPort 变更了HostAddres也要变 Merge pull request !7 from ckb_test/N/A panll 2022-03-02 06:23:31 +0000
• 1dcdbc3742 Merge branch 'wvp-28181-2.0' into wvp-pro-record 648540858 2022-03-02 12:52:37 +0800
• f5640fddb7 优化国标级联的目录订阅 648540858 2022-03-02 11:48:20 +0800
• e42a0a50ca
  Update mysql.sql SaltFish 2022-03-02 11:37:04 +0800
• 8f9a530296
  Merge pull request #360 from TristingChen/alarm-test 648540858 2022-03-02 09:22:20 +0800
• fe0b5c33f9 告警信息上报过程中，AlarmType存储失败的解决 chenjialing 2022-03-02 09:18:17 +0800
• 86f87c4665 修改内存泄露 ydpd 2022-03-02 00:24:14 +0800
• e66b839659 修改内存泄露 ydpd 2022-03-02 00:02:03 +0800
• 29191373aa Merge branch 'wvp-28181-2.0' into wvp-pro-record 648540858 2022-03-01 22:07:01 +0800
• 298d104fec 优化配置文件与日志 648540858 2022-03-01 21:59:31 +0800
• 41a31a9111 告警信息上报过程中，AlarmType存储失败的解决 chenjialing 2022-03-01 18:50:58 +0800
• 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 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
• 6d2291a569 切换使用rtc播放器 648540858 2022-02-26 07:49:44 +0800
• f52be30399 Fix issue #347: 修改前端启动报错 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连接方式 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
  判断当前页面协议选择播放连接 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
• 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改用注释方式 朱俊杰 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 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，分离注册周期事件 朱俊杰 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