6b3732b8c4
Merge branch '2.6.8' into wvp-28181-2.0
...
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
# src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
# src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
# src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
# src/main/resources/all-application.yml
# web_src/package-lock.json
2023-06-19 20:19:31 +08:00
8942ab0112
优化国标级联的目录创建以及推送规则，优化接收目录规则，更加规范
2023-06-19 18:42:36 +08:00
652489b47e
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
...
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
2023-06-15 11:10:20 +08:00
15df08964b
新增设备主子码流选择，默认为不开启
2023-06-15 11:00:29 +08:00
5b8ffd5b61
修复前端空指针异常 #831
2023-06-14 18:14:40 +08:00
1bdc0621b8
feat:删除拉流代理时，提示是否确认删除，防止误删
2023-06-09 15:50:33 +08:00
a2d93fce81
fix:修复拉流代理配置展示问题:音频、录制、无人观看
2023-06-09 15:19:18 +08:00
a45fab423b
修复国标级联语音对讲
2023-06-05 15:01:20 +08:00
2ef4111297
修复拉流代理的ffmpeg代理方式
2023-06-05 10:28:11 +08:00
6bbac849b3
修复设备列表状态显示
2023-05-29 15:24:18 +08:00
d0083447bb
修复地图页面云台状态显示以及状态显示
2023-05-29 15:16:44 +08:00
30ae9e929f
合并主线
2023-05-25 17:28:57 +08:00
ccecda7859
Merge pull request #845 from 648540858/wvp-28181-2.0-test
...
Wvp 28181 2.0 test
2023-05-09 17:56:29 +08:00
21258d6ba3
优化录像下载页面
2023-05-09 17:54:36 +08:00
a2da81f79a
支持级联国标录像下载
2023-05-09 17:31:58 +08:00
98bd8913e7
fix(通道快照): 修复前后端分离部署后通道快照不显示的问题
2023-05-08 16:15:50 +08:00
8ef5e2618d
解决国标设备-通道-设备录像处的视频下载问题
2023-04-27 17:39:45 +08:00
c561dda269
创建回调函数时，不可带上括号，否则会在调用此语句时，立即执行一次回调函数
2023-04-27 16:26:29 +08:00
ea3f899593
fix `Notification is not defined` on Android Webview or under ios16.4
...
如果没有这一行import,那么使用的会是Notification Web API,这在部分场景下是不支持的,具体见[Notification浏览器兼容性](https://developer.mozilla.org/zh-CN/docs/Web/API/Notification#%E6%B5%8F%E8%A7%88%E5%99%A8%E5%85%BC%E5%AE%B9%E6%80%A7 )
比如在一些使用Android Webview的浏览器或部分ios系统上会导致报错而白屏
在此处应该为使用`element-ui`的Notification组件(下面有用到注册为element-ui的Notification全局属性$notify)
2023-04-23 17:08:53 +08:00
0f3898910c
收流时设置re_use_port参数解决端口关闭快速打开造成的端口未释放问题， 支持点播的tcp主动
2023-04-19 16:21:28 +08:00
d46fc9de82
优化下级平台自定义ssrc的情况，优化国标录像下载流程
2023-04-14 14:59:22 +08:00
b4048fbe80
合并开源主线
2023-04-04 09:09:07 +08:00
2e5d94181a
支持修改页面展示的sip ip
2023-03-31 08:56:54 +08:00
58d1f0ea16
修复云端录像界面
2023-03-27 15:47:04 +08:00
3b1516afe5
优化录像配置。不再使用zlm默认的http服务器
2023-03-25 18:40:29 +08:00
4f22994cdb
优化国标级联的更新
2023-03-25 10:04:57 +08:00
f210952ed2
优化国标级联中的通道全部导入
2023-03-22 15:21:22 +08:00
219f863191
fix(国标设备): 修复设备列表云台类型不显示的问题
2023-03-22 15:21:22 +08:00
aac3e95159
perf(jessibuca): 优化 videoInfo 重复 log 的问题
2023-03-22 15:21:22 +08:00
0f3f3c077b
修复添加zlm节点使用默认值的问题 #781
2023-03-22 15:21:22 +08:00
455e58f866
优化合并对讲broadcast级联模式
2023-03-21 14:21:45 +08:00
6b1d966255
优化合并对讲broadcast级联模式
2023-03-21 10:27:07 +08:00
4362a5b499
主线合并对讲broadcast级联模式
2023-03-20 15:42:59 +08:00
26bdf2e776
Merge branch '级联' into main-dev
...
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/IPlayService.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
2023-03-20 15:31:43 +08:00
039fbf7e24
Merge branch 'talk' into main-dev
...
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/redis/RedisConfig.java
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
2023-03-20 14:32:53 +08:00
a000ed6062
完善talk模式
2023-03-20 14:20:28 +08:00
22a205e8fc
优化异常处理
2023-03-17 14:02:16 +08:00
c3ce2bc5d0
优化异常处理以及级联设备状态查询
2023-03-17 13:22:05 +08:00
2bf07305aa
Merge branch 'wvp-28181-2.0' into wvp-jwt-token
...
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
# src/main/resources/all-application.yml
2023-03-15 22:58:28 +08:00
be6666db03
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
2023-03-15 22:57:20 +08:00
5fab97cf7e
支持不同域的前后端分离部署
2023-03-15 19:05:56 +08:00
943f95ba8c
增加消息通道配置，可以通道redis在wvp上下级之间发送消息
2023-03-14 14:02:33 +08:00
84595e0c84
perf(jessibuca): 升级 jessibuca 2023-03-8 v3.1.28 版本, 修改 jessibuca 参数使用硬解码优化播放黑屏问题, https 环境下使用 WCS 硬解码, http 环境下使用 MSE 硬解码, H265 视频自动使用 wasm 软解码
2023-03-13 17:53:50 +08:00
bdcd006a7e
fix(jessibuca): 修复 jessibuca 组件截图报错的问题
2023-03-13 17:42:39 +08:00
a7c3cf5316
优化跨域配置，支持同域的前后端分离部署
2023-03-05 09:53:26 +08:00
420dbce900
Merge branch 'main' into 级联
...
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
2023-02-22 18:14:53 +08:00
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
342361cef8
Update CloudRecordDetail.vue
...
修复 download.html 找不到 的问题，它被 assist放在www目录不是 recored目录
2023-02-11 22:08:51 +08:00
197f80581b
Merge branch 'main' into main2
...
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
2023-02-10 16:25:33 +08:00
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
ec95a42985
Merge branch 'main' into main2
...
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/resources/all-application.yml
# web_src/src/components/dialog/devicePlayer.vue
2023-02-10 15:54:42 +08:00
6484f52e46
同时支持打包为Jar和War
2023-02-07 20:59:33 +08:00
922a9e8b32
修复语音对讲返回的地址
2023-02-07 14:52:33 +08:00
c226deacff
修复语音对讲发送页
2023-02-07 10:04:15 +08:00
2b1f7a4739
Merge branch 'wvp-28181-2.0' into fix-269
2023-02-01 10:56:40 +08:00
dea44dcd78
Merge branch 'wvp-28181-2.0'
...
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
# src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# src/main/resources/all-application.yml
# web_src/src/components/dialog/devicePlayer.vue
2023-01-13 16:21:17 +08:00
d4fdea3df9
修复国标录像查询ui
2023-01-11 10:43:56 +08:00
72a1f12208
优化国标录像UI
2023-01-10 14:01:03 +08:00
8b0662ebfe
优化国标录像下载错误提示
2023-01-10 11:36:54 +08:00
9b9a13ab36
国标录像UI重构
2023-01-09 16:31:51 +08:00
aa71a33c38
[ fix bug ] 修复分屏播放无效的问题,这是一个json解析错误
2022-12-26 11:36:31 +08:00
4b827f3897
级联语音对讲部分
2022-12-13 11:57:07 +08:00
131ea77669
接口使用旧的stream信息，支持使用远程ip端口做为回复的地址而不是使用sip中的地址
2022-12-06 10:33:43 +08:00
2d8f57f3c9
fix(devicePlayer): 修复设备视频播放页 RTCS 地址显示错误的问题
2022-11-30 16:29:30 +08:00
6c9d6f0054
Merge branch 'wvp-28181-2.0'
...
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisAlarmMsgListener.java
2022-11-29 13:16:20 +08:00
f89491ada3
修复单端口模式下ssrc的释放 #667
2022-11-25 14:38:46 +08:00
d7623b5ca8
Merge branch 'wvp-28181-2.0'
...
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/service/bean/RequestSendItemMsg.java
2022-11-25 10:57:53 +08:00
fa2ccb4ec8
修复协议端口配置不全导致前端播放页面无法弹出的问题
2022-11-25 10:50:16 +08:00
12fa3b4c8d
Merge branch 'wvp-28181-2.0'
...
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
2022-11-23 09:57:17 +08:00
8ea6e192d9
优化拉流代理表单以及逻辑
2022-11-22 17:17:35 +08:00
1469971102
支持配置设备上线时自动更新查询通道，修复通道刷新进度展示
2022-11-22 15:02:25 +08:00
1983b8b0a7
国标级联->选择通道支持移除目前下所有以及全部添加到目录下
2022-11-22 12:55:29 +08:00
ecf84bb0f1
合并主线
2022-11-18 21:52:02 +08:00
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
d340a37a00
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network
...
# Conflicts:
# 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/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
2022-11-17 11:31:30 +08:00
694076dc8c
优化国标级联发流并发能力
2022-11-16 09:39:27 +08:00
96bb3814f6
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network
...
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
# src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
# web_src/src/components/dialog/devicePlayer.vue
# web_src/src/components/live.vue
2022-11-08 20:43:25 +08:00
d040254430
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
2022-11-08 20:04:23 +08:00
f4ee7271e7
Merge pull request #661 from xiaoQQya/wvp-28181-2.0
...
修复分屏监控与视频播放页在 HTTPS 环境下无法播放的问题
2022-11-08 20:03:01 +08:00
4c8e2beb4d
优化hook处理速度
2022-11-08 19:58:36 +08:00
aae7c80fd5
fix(live): 修复分屏监控 HTTPS 环境下无法播放的问题
2022-11-05 12:50:26 +08:00
189b6044b4
fix(devicePlayer): 修复设备视频播放页 HTTPS 环境下 WebRTC 无法播放的问题
2022-11-05 11:46:39 +08:00
3e71e0bdf1
perf(rtcPlayer): 修改控制台 log 级别
2022-11-05 11:35:01 +08:00
0815b8e130
my
2022-11-04 17:35:43 +08:00
aed45e0f0d
优化多网卡
2022-10-28 16:40:12 +08:00
0f0ece2401
设备编辑增加收流IP
2022-10-25 10:17:59 +08:00
958474c646
首页改造完成,添加系统信息
2022-10-24 18:14:31 +08:00
ca891f367c
首页改造完成,待添加系统信息
2022-10-24 15:20:35 +08:00
3ffe205082
首页改造,完成cpu,内存,网络图
2022-10-20 18:03:40 +08:00
b6bcb5f2f4
隐藏liveplayer
2022-10-19 10:28:51 +08:00
b64d701f37
隐藏liveplayer
2022-10-19 10:07:47 +08:00
c5b16e058d
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
...
# Conflicts:
# sql/mysql.sql
2022-10-19 10:04:04 +08:00
b0d0d30781
修改云端录像选择节点流媒体path不修改的bug
...
device表增加的mediaServerId字段丢失，重新添加
2022-10-18 20:18:51 +08:00
55b53caef1
支持手动添加，为设备设置单独的密码
2022-10-18 17:35:44 +08:00
688e222dcc
优化按需拉流配置，拉流代理支持按需拉流
2022-10-18 17:35:32 +08:00
3c52a16e5f
支持手动添加，为设备设置单独的密码
2022-10-18 17:02:05 +08:00
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
7918f03734
优化按需拉流配置，拉流代理支持按需拉流
2022-10-17 16:38:28 +08:00
6bfd48776d
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/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
2022-10-17 12:45:56 +08:00
4f2191dc9f
增加liveplayer播放器
2022-10-17 10:30:44 +08:00
dabee4ed7d
增加指定流媒体收流功能
2022-10-15 20:57:24 +08:00
06bbe3fe01
添加第二种语音对讲实现
2022-09-29 16:27:59 +08:00
d7a1b94f90
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/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/message/response/cmd/BroadcastResponseMessageHandler.java
2022-09-24 21:04:58 +08:00
710600db6f
优化sip消息，去除自动dialog创建
2022-09-21 18:18:37 +08:00
1ee56d50d8
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
2022-09-16 18:04:13 +08:00
692f716788
优化点播时RtpServer为正常关闭的问题
2022-09-16 18:02:56 +08:00
ab74d1cff9
Merge branch 'wvp-28181-2.0'
...
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
2022-09-14 20:51:21 +08:00
12571e0db1
修复下载录像失败问题
2022-09-14 14:32:22 +08:00
221f99c764
优化sip消息
2022-09-09 17:06:19 +08:00
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
3884e9a56a
1.根据redis消息更新推流列表时同时更新在线状态
...
2.推流列表的模板增加在线状态
2022-09-07 15:56:48 +08:00
e7bdcc1f8d
修复选择通道时默认节点显示错误的问题
2022-09-06 16:31:28 +08:00
d5e8aa62a1
添加对海康平台录像回放的兼容，修复录像信息发送失败, 级联平台支持开启rtcp保活
2022-09-05 17:10:21 +08:00
aa6bce35c7
Merge branch 'wvp-28181-2.0'
...
# Conflicts:
# 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/service/impl/MediaServiceImpl.java
2022-09-05 09:44:24 +08:00
cfe9c762d6
修复前端播放
2022-09-05 09:40:14 +08:00
3146e63fc0
优化异常处理
2022-09-01 17:53:00 +08:00
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
703c2e292a
云端录像详情页添加返回按钮
2022-08-31 18:07:53 +08:00
2de4c322f6
去除对redis key过期事件的使用；重构国标级联的注册保活
2022-08-31 11:29:13 +08:00
9f680a2e9e
修复bug以及日志按照，错误/sip/数据库 分割
2022-08-26 18:03:09 +08:00
8f7e8efc98
合并主线
2022-08-23 11:48:31 +08:00
020f9ea8a0
Merge branch 'wvp-28181-2.0'
...
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
2022-08-23 11:01:53 +08:00
f24b6fa13f
优化国标录像的异常判断
2022-08-23 11:00:46 +08:00
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
042b28b2d6
支持全局异常和统一返回结果
2022-08-22 16:17:28 +08:00
5461b8ebf2
支持全局异常和统一返回结果，未完待续
2022-08-22 16:17:28 +08:00
116d979d87
合并主线
2022-08-09 16:58:31 +08:00
8b0ff3767b
Merge branch 'wvp-28181-2.0'
...
# Conflicts:
# sql/update.sql
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.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/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
2022-08-09 14:41:21 +08:00
3b5a37c270
前端显示媒体服务器配置时报错修复
2022-08-06 11:27:02 +08:00
3adc81764c
优化用户表单
2022-08-05 17:27:18 +08:00
d94ceb4fed
去除点播界面双loading
2022-08-05 17:20:26 +08:00
231582eb77
推流列表增加经纬度的添加
2022-08-05 17:10:53 +08:00
d09d8f11f0
修改‘修改pushkey’窗口的标题提示文案
2022-08-04 17:01:31 +08:00
f93a0d599e
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
2022-08-02 15:32:15 +08:00
5e4a673ecc
修复视频播放点击音量报错 #557，修复编解码信息获取失败
2022-08-01 14:33:51 +08:00
2a5c12746b
修复首页未获取到zlm消息时发送错误消息的bug
2022-08-01 09:32:39 +08:00
a59095db0c
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
2022-07-29 15:16:39 +08:00
b957ab61c7
bug修复
2022-07-26 11:43:56 +08:00
c77c1a956c
修复推流推流状态提示
2022-07-25 11:17:46 +08:00
91dc4566a2
修复级联无通道时更新停止在等待更新的问题
2022-07-25 09:44:43 +08:00
e29d94c83f
增加推流添加功能，修复级联目录推送
2022-07-22 16:02:14 +08:00
8d87741dea
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
2022-07-20 13:51:30 +08:00
a51b411101
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
2022-07-19 18:13:42 +08:00
fc0ad32f81
1.修复新增用户没有pushkey的问题
...
2.将重置pushkey改为修改pushkey
2022-07-19 18:13:19 +08:00
9e397ba9f6
移除共享所有直播流功能
2022-07-19 17:46:16 +08:00
7f5a18d6b5
优化推流列表
2022-07-19 16:37:34 +08:00
4a43d04020
修复推流导入模板
2022-07-19 15:27:33 +08:00
03864ae46f
修复用户查询sql错误
2022-07-19 11:13:46 +08:00
1002150b2a
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
2022-07-18 17:15:33 +08:00
c6fbd03276
增加用户管理功能。管理员可以添加删除用户、修改用户密码、重置pushkey
2022-07-18 17:09:35 +08:00
4451994959
优化国标级联目录订阅通知以及目录查询回复
2022-07-17 23:17:36 +08:00
cfed860667
合并主线
2022-07-12 16:54:58 +08:00
66e6756909
Merge remote-tracking branch 'origin/wvp-28181-2.0' into liujie-20220712
...
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/IMediaService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
2022-07-12 16:28:51 +08:00
74d97734ba
修复获取推流播放地址接口
2022-07-11 17:34:22 +08:00
afbec28906
增加推流鉴权。保护服务安全
2022-07-11 16:21:01 +08:00
5e724cc062
Merge branch 'wvp-28181-2.0' of https://github.com/mrjackwang/wvp-GB28181-pro into wvp-28181-2.0
2022-07-06 15:33:43 +08:00
d7c293c867
界面优化
2022-07-06 10:18:56 +08:00
8aa0bdf539
数据库优化
2022-07-06 09:44:37 +08:00
10cb58391a
修复轨迹的储存与查询展示
2022-07-04 01:08:26 +08:00
5364db2982
优化对讲逻辑
2022-07-03 22:27:04 +08:00
7609d7836c
优化对讲逻辑
2022-07-03 16:23:31 +08:00
e78c402a24
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
...
# Conflicts:
# sql/mysql.sql
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
2022-07-03 10:32:33 +08:00
f5fcc79a2c
优化国标树型展示
2022-07-03 07:40:54 +08:00
72c1b36d6d
优化对讲逻辑
2022-07-03 00:44:36 +08:00
b6c97528ae
添加界面停止逻辑
2022-07-01 18:36:35 +08:00
07956b48df
添加界面优化接口
2022-07-01 18:26:35 +08:00
1d1f174852
合并主线
2022-06-27 14:40:07 +08:00
26739237e2
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
...
# Conflicts:
# sql/update.sql
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.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/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# web_src/src/components/dialog/deviceEdit.vue
# web_src/src/components/dialog/devicePlayer.vue
2022-06-27 10:16:21 +08:00
038d360dd4
Merge remote-tracking branch 'origin/rtc' into commercial
...
# Conflicts:
# web_src/src/components/dialog/devicePlayer.vue
2022-06-27 09:38:59 +08:00
c2faa8c3ce
显示效果优化
2022-06-15 16:04:36 +08:00
f7006e4881
修复播放中zlm离线导致的bye发送失败
2022-06-15 14:55:33 +08:00
a9c4638c94
修复通道列表修改分页大小无效
2022-06-15 11:02:19 +08:00
5fae9a7b34
优化列表展示效果
2022-06-15 10:40:45 +08:00
c801ee6218
调整页面样式
2022-06-14 23:16:58 +08:00
31a8e6ea89
优化位置信息展示
2022-06-14 17:46:53 +08:00
c022213972
设备支持设置地理坐标系，并将级联输出坐标系统一为wgs84
2022-06-14 17:00:24 +08:00
e0344ccf97
国标级联推送推流 支持多wvp间自动选择与推送
2022-06-14 14:37:34 +08:00
c827d1518b
#510 jessibuca分屏监控异常
2022-06-13 23:02:53 +08:00
cba2e6b90b
优化wasm播放器内存占用问题
2022-06-04 23:18:01 +08:00
9ae0691c80
优化快照的存储与显示
2022-06-02 10:55:41 +08:00
cf35daeb98
优化大数据下的设备树加载
2022-05-31 15:54:39 +08:00
dc6769664e
兼容不规范的时间格式iso8601格式；升级fastjson版本
2022-05-26 12:10:46 +08:00
7a917ee50a
修复国标录像播放
2022-05-23 10:50:29 +08:00
3aa2665fb2
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
2022-05-23 09:15:59 +08:00
6fa9dae824
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
2022-05-18 18:13:59 +08:00
9ef1a0277b
更新jessibuca播放器
2022-05-18 15:36:33 +08:00
549bdfdd6a
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
2022-05-18 11:20:13 +08:00
ff83f2c7c8
优化播放页面
2022-05-18 10:42:27 +08:00
17f219d351
优化播放页面
2022-05-18 10:01:58 +08:00
b9ffcd1d38
修复播放页面
2022-05-18 09:57:36 +08:00
3051fc82ee
添加直接支持切换多种开源播放器
2022-05-18 09:49:25 +08:00
1d753b48c0
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
2022-05-17 11:53:42 +08:00
bfb3b4ea13
播放页面显示所有流地址
2022-05-16 17:49:44 +08:00
39efda779f
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
...
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
2022-05-16 11:47:17 +08:00
98e6cf5bae
优化海康录像下载
2022-05-13 21:05:33 +08:00
4d3f0a8d79
优化海康国标录像播放的控制
2022-05-13 15:41:50 +08:00
1757203202
支持海康摄像头国标录像查看播放
2022-05-13 15:32:30 +08:00
ec749de7c1
#470
2022-05-12 18:17:15 +08:00
9fa739ac02
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
2022-05-12 10:54:46 +08:00
f6893cf95b
优化设备在线状态
2022-05-11 18:37:24 +08:00
c2aaae9325
初步实现语音喊话
2022-05-09 18:15:30 +08:00
ec8ab540f8
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
2022-05-07 17:42:31 +08:00
ca16a79255
添加语音发送通道和语音接收通道字段
2022-05-07 09:52:02 +08:00
afe2450a14
优化地图功能的开关
2022-05-06 16:01:36 +08:00
04f938ef62
Merge branch 'wvp-28181-2.0' of https://github.com/648540858/wvp-GB28181-pro into wvp-28181-2.0
...
# Conflicts:
# bootstrap.sh
# web_src/package-lock.json
# web_src/static/js/jessibuca/decoder.wasm
2022-05-06 12:19:44 +08:00
c8831bc58f
更新同步wvp
2022-05-06 11:56:29 +08:00
bfaa519e49
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
2022-05-06 10:59:33 +08:00
ff3c30f32e
优化收到心跳设置设备上线的逻辑
2022-05-05 14:26:42 +08:00
c592740efa
升级shelljs，解决较高版本node打包时的警告
2022-05-01 21:33:56 +08:00
db865cc9cc
#453
2022-04-28 18:18:09 +08:00
c4a2854e1b
修复添加/修改节点页面的BUG
2022-04-28 17:58:47 +08:00
e0d641064a
多屏界面，切换分屏数时播放器正确调整尺寸
2022-04-28 14:23:17 +08:00
35b3d7618d
修复多屏播放时播放器样式错位
2022-04-28 13:40:26 +08:00
363606d845
优化级联目录发送
2022-04-26 18:29:47 +08:00
9ce22eba3c
行政区划作为级联数据的处理,修复设备树的显示
2022-04-26 17:24:41 +08:00
5c1a5f7931
优化播放器尺寸调节逻辑：
...
1.播放器不会大于屏幕高度
2.增加灰色背景色区分播放区域
3.播放器居中
2022-04-26 15:03:44 +08:00
b81660536c
live页面,删除一个不再使用的一些变量和函数
2022-04-24 00:36:18 +08:00
6e7cd084ee
live页面适配palyer组件的修改
2022-04-24 00:30:31 +08:00
44b7f67a20
在1e2d207aea24b5956d5ece95ed4a9db0f59f34d7这个版本中，作者删除了initData函数，但是忘记删除mounted中的this.mounted() 导致console报错
2022-04-23 23:54:49 +08:00
6e4fc1e79b
1.修正了播放地址无法正常播放视频的问题，包含两个错误：
...
1.1修正播放器界面路由（此页面不需要layout边框，之前已经修复但在地图代码合并时又被错误覆盖）
1.2修正播放器id属性，此属性现在不需要父级组件传入（这是之前导致独立播放页面失效的主要原因）
2.调整滚动条美化样式到app.vue中，使其真正全局生效
2022-04-23 23:34:36 +08:00
e7ab983f94
动态计算播放器尺寸，保持16：9比例，避免出现黑框或固定大小无法缩放
2022-04-23 11:34:43 +08:00
33eec2b68f
动态计算播放器尺寸，保持16：9比例，避免出现黑框或固定大小无法缩放
2022-04-23 11:20:00 +08:00
2bc43f4262
添加注释
2022-04-22 17:00:33 +08:00
92421b46cc
支持关闭地图功能，添加授权声明
2022-04-22 16:55:46 +08:00
1e2d207aea
添加优化后的地图页面，完全一处百度地图相关的api
2022-04-22 16:21:05 +08:00
190fc62b72
Merge remote-tracking branch 'origin/wvp-28181-2.0' into map
...
# Conflicts:
# web_src/src/components/UiHeader.vue
# web_src/src/components/devicePosition.vue
# web_src/src/components/live.vue
# web_src/src/router/index.js
2022-04-21 13:01:02 +08:00
2735a7a98b
全局样式适配三个隐藏页面
2022-04-21 12:45:27 +08:00
5623b5ee0f
通道页适配全局样式
2022-04-21 12:39:09 +08:00
fb843d41c1
1.重构全局页面结构，从之前每个页面独立绘制改为路由嵌套
...
2.全局页面样式优化，如滚动条、标题栏等
2022-04-21 12:33:10 +08:00
d7bfd9bfa7
Merge remote-tracking branch 'origin/wvp-28181-2.0' into map
2022-04-21 10:30:46 +08:00
3def634a27
修复实时监控页面，左侧菜单越界显示问题
2022-04-21 10:11:08 +08:00
4dcc7df555
修复前端一处v-for没有key的警告
2022-04-21 10:03:21 +08:00
f7236c4a90
添加公共组件设备树
2022-04-20 18:21:18 +08:00
088419b4d8
Merge remote-tracking branch 'origin/wvp-28181-2.0' into map
2022-04-20 09:38:09 +08:00
4d975c21da
优化国标级联目录推送，支持zlm新特性ssrc校验
2022-04-19 11:52:03 +08:00
91515f1b05
添加行政区划功能，修复目录发送数量统计的BUG
2022-04-18 17:38:49 +08:00
93d69d5476
添加国标级联目录分组分组加快通道传输速度
2022-04-18 16:16:49 +08:00
c1f6401598
修复级联编辑页面开关的重置
2022-04-18 11:45:53 +08:00
d36920c699
添加自动拉起未推流设备的控制开关
2022-04-18 10:52:38 +08:00
0dc1807f62
优化通道同步添加对SN的判断，精简代码
2022-04-17 19:48:05 +08:00
40a806329c
Merge remote-tracking branch 'origin/wvp-28181-2.0' into map
...
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/event/subscribe/SubscribeListenerForPlatform.java
2022-04-15 09:37:33 +08:00
3955e6ed53
异步通道刷新，优化ui效果
2022-04-12 21:06:21 +08:00
c2e2e24551
优化通道刷新
2022-04-12 11:04:08 +08:00
ba8633e99a
优化地图-添加地图页面以及设备树
2022-04-08 18:09:23 +08:00
f10b458fc9
优化订阅信息的发送与取消订阅
2022-04-08 14:44:49 +08:00
3eef73ecb6
修复实时监控无法播放问题 #427
2022-04-02 18:19:12 +08:00
7e755f405d
支持国标移动位置订阅，收到新位置发送redis消息;支持通道redis消息拉起第三方推流;云台控制添加ControlPriority字段;处理sql的bug
2022-04-01 16:45:29 +08:00
ee490f5b93
Merge pull request #413 from mk1990/wvp-28181-2.0
...
修改前端control.vue和DeviceList.vue控制台错误和警告
2022-03-29 17:15:24 +08:00
0de634cdf7
补充缺失的文件
2022-03-29 12:17:54 +08:00
52cd02de51
更新播放器
2022-03-28 15:26:48 +08:00
a1b6e56427
1. 修改control.vue 报Invalid prop: type check failed for prop "column". Expected Number with value 1, got String with value "1".
...
2. 修改control.vue Error: [vue-clipboards] Invalid value. Please use a valid value.
3. 修改DeviceList.vue 刷新时报
[Vue warn]: Avoid mutating a prop directly since the value will be overwritten whenever the parent component re-renders. Instead, use a data or computed property based on the prop's value. Prop being mutated: "loading"
2022-03-28 10:11:13 +08:00
7d9cc96ef5
优化国标录像下载，添加进度条以及自动合并文件下载，需要结合新版assist服务使用。
2022-03-25 16:05:14 +08:00
59ef6e67d3
统一国标设备与级联平台字符集的使用
2022-03-17 10:29:49 +08:00
691313b778
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
2022-03-16 08:54:31 +08:00
d21a00418e
修复推流关联平台的bug
2022-03-15 16:58:50 +08:00
42901d0374
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
2022-03-15 10:28:23 +08:00
28b1ed8b0d
修复使用ffmpeg拉流代理时ffmpeg cmd模板空白的bug
2022-03-15 09:45:11 +08:00
354a39961a
优化点播, 级联点播级联录像。级联列表显示订阅状态
2022-03-14 18:24:30 +08:00
1cb2b2cc5f
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
2022-03-10 21:00:42 +08:00
ec97c6a7d0
修复云端录像播放和下载路径错误的问题
2022-03-10 11:33:51 +08:00
21506440d2
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
2022-03-07 09:01:14 +08:00
cbea5f64c9
修改3个小bug
2022-03-05 17:05:05 +08:00
bb50a24314
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
2022-03-04 20:37:17 +08:00
cadd0ee038
Merge remote-tracking branch 'origin/wvp-pro-record' into wvp-28181-2.0
...
# Conflicts:
# web_src/src/components/control.vue
2022-03-04 15:29:56 +08:00
e5370bbd6e
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
2022-03-03 19:52:16 +08:00
2eb1ca2d94
国标录像支持多端同时播放
2022-03-03 15:57:28 +08:00
128ccc7ff7
!6 update web_src/src/components/dialog/changePassword.vue.
...
Merge pull request !6 from lanss/N/A
2022-03-02 06:27:57 +00:00
1ea95d2b87
Merge branch 'wvp-28181-2.0' of https://github.com/648540858/wvp-GB28181-pro into wvp-28181-2.0
2022-03-01 17:48:21 +08:00
9c5b1060af
支持删除在线设备
2022-02-28 17:56:27 +08:00
f65d2730e0
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
2022-02-27 18:09:24 +08:00
560165b667
增加拉流代理修改功能
2022-02-26 11:14:56 +08:00
6d2291a569
切换使用rtc播放器
2022-02-26 07:49:44 +08:00
f52be30399
Fix issue #347 : 修改前端启动报错
2022-02-26 00:01:35 +08:00
7400ace65d
规范数据库，解决bug
2022-02-25 20:33:02 +08:00
0191e93768
同步主线
2022-02-23 21:55:46 +08:00
2157bb0270
规范数据库，给各个标设置主键ID
2022-02-22 11:44:56 +08:00
5bcd8495e0
兼容海康不规范的xml，大幅度提高通道分页查询速度，优化节点的保活。
2022-02-20 16:22:43 +08:00
0327d16021
优化级联平台删除
2022-02-17 15:33:25 +08:00
b0d3bf3ed9
添加通道导入实例文件
2022-02-15 17:52:37 +08:00
9442c37ce7
优化级联添加通道流程
2022-02-15 17:41:09 +08:00
d4fe0fb325
Merge remote-tracking branch 'github/wvp-28181-2.0' into wvp-28181-2.0
2022-02-15 09:13:16 +08:00
980052015a
优化列表展示
2022-02-11 16:46:58 +08:00
bf66f8f694
推流导入支持添加平台信息与目录信息
2022-02-11 16:45:06 +08:00
37a84e6691
新增实时监控功能
...
左边是设备通道树，右边是分屏预览
2022-02-10 14:45:33 +08:00
d07a5680f3
为推流列表增加批量移除功能
2022-02-07 18:30:43 +08:00
e0028a87cb
为推流列表增加搜索功能
2022-02-07 14:12:34 +08:00
d7afcab601
优化媒体服务器配置展示界面
2022-01-30 16:39:15 +08:00
8d5764b9a0
优化信令配置展示界面
2022-01-30 15:58:15 +08:00
f33c3a3630
添加重启后拉流代理自动恢复
2022-01-27 18:08:19 +08:00
d34be408d6
update web_src/src/components/dialog/changePassword.vue.
2022-01-25 13:50:22 +00:00
75ee368c96
优化默认节点的展示
2022-01-25 20:21:36 +08:00
abc65c6317
优化目录移除时默认目录的选择
2022-01-25 17:14:10 +08:00
2e60339e0a
修复候选通道查询bug
2022-01-25 12:20:52 +08:00
46cf650a86
优化通道选择是通道的查询
2022-01-21 18:00:15 +08:00
b6702f7c05
修改mysql脚本
2022-01-21 16:05:02 +08:00
3f5e885e82
目录默认节点被删除时，重置默认节点为根节点
2022-01-21 14:10:49 +08:00
7d88827415
处理服务重启或设备重新上线时的订阅，优化通道导入重复的处理
2022-01-20 16:48:30 +08:00
e8090bc84c
修复bug与目录订阅添加最小值60
2022-01-19 10:23:52 +08:00
baef2dd13d
优化级联选择通道页面目录Id在各个模块间的传递方式
2022-01-17 17:19:47 +08:00
fa346513db
优化级联选择通道页面添加方式
2022-01-17 16:46:28 +08:00
648540858
‘sxh’
winfed
xiaoQQya
wangjunyi
Kairlec
逐浪人
Lyon1994
唐嗣成
XiaoQiTong
wenyanjun
jiang
zouyaoji
mrjackwang
wangyimeng
hotcoffie
xiaoxie
648540858
mk1990
dengming
李防
panll
walkTtalk
朱俊杰
lanss