From 9d19f6b9d6b361d8b93671a553973289b40d9d33 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 22 一月 2021 09:52:11 +0800
Subject: [PATCH] Merge pull request #46 from lawrencehj/wvp-28181-2.0
---
web_src/src/main.js | 22 ++++++
src/main/java/com/genersoft/iot/vmp/vmanager/SseController/SseController.java | 11 ++-
src/main/resources/application-dev.yml | 30 +++++-----
web_src/package.json | 2
web_src/src/components/UiHeader.vue | 3
web_src/package-lock.json | 49 ++++++++++++----
web_src/.postcssrc.js | 6 +
src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEventListener.java | 39 ++++++++----
8 files changed, 112 insertions(+), 50 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEventListener.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEventListener.java
index 1b2f672..2b56326 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEventListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEventListener.java
@@ -4,6 +4,10 @@
import org.springframework.stereotype.Component;
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
import java.io.IOException;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -18,10 +22,10 @@
private final static Logger logger = LoggerFactory.getLogger(AlarmEventListener.class);
- private static SseEmitter emitter = new SseEmitter();
+ private static Map<String, SseEmitter> sseEmitters = new Hashtable<>();
- public void addSseEmitters(SseEmitter sseEmitter) {
- emitter = sseEmitter;
+ public void addSseEmitters(String browserId, SseEmitter sseEmitter) {
+ sseEmitters.put(browserId, sseEmitter);
}
@Override
@@ -30,18 +34,25 @@
logger.debug("璁惧鎶ヨ浜嬩欢瑙﹀彂锛宒eviceId锛�" + event.getAlarmInfo().getDeviceId() + ", "
+ event.getAlarmInfo().getAlarmDescription());
}
- try {
- String msg = "<strong>璁惧缂栫爜锛�</strong> <i>" + event.getAlarmInfo().getDeviceId() + "</i>"
- + "<br><strong>鎶ヨ鎻忚堪锛�</strong> <i>" + event.getAlarmInfo().getAlarmDescription() + "</i>"
- + "<br><strong>鎶ヨ鏃堕棿锛�</strong> <i>" + event.getAlarmInfo().getAlarmTime() + "</i>"
- + "<br><strong>瀹氫綅缁忓害锛�</strong> <i>" + event.getAlarmInfo().getLongitude() + "</i>"
- + "<br><strong>瀹氫綅绾害锛�</strong> <i>" + event.getAlarmInfo().getLatitude() + "</i>";
- emitter.send(msg);
- } catch (IOException e) {
- if (logger.isDebugEnabled()) {
- logger.debug("SSE 閫氶亾宸插叧闂�");
+ String msg = "<strong>璁惧缂栫爜锛�</strong> <i>" + event.getAlarmInfo().getDeviceId() + "</i>"
+ + "<br><strong>鎶ヨ鎻忚堪锛�</strong> <i>" + event.getAlarmInfo().getAlarmDescription() + "</i>"
+ + "<br><strong>鎶ヨ鏃堕棿锛�</strong> <i>" + event.getAlarmInfo().getAlarmTime() + "</i>"
+ + "<br><strong>鎶ヨ浣嶇疆锛�</strong> <i>" + event.getAlarmInfo().getLongitude() + "</i>"
+ + ", <i>" + event.getAlarmInfo().getLatitude() + "</i>";
+
+ for (Iterator<Map.Entry<String, SseEmitter>> it = sseEmitters.entrySet().iterator(); it.hasNext();) {
+ Map.Entry<String, SseEmitter> emitter = it.next();
+ logger.info("鎺ㄩ�佸埌SSE杩炴帴锛屾祻瑙堝櫒ID: " + emitter.getKey());
+ try {
+ emitter.getValue().send(msg);
+ } catch (IOException | IllegalStateException e) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("SSE杩炴帴宸插叧闂�");
+ }
+ // 绉婚櫎宸插叧闂殑杩炴帴
+ it.remove();
+ // e.printStackTrace();
}
- // e.printStackTrace();
}
}
}
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/SEEController/SEEController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/SseController/SseController.java
similarity index 67%
rename from src/main/java/com/genersoft/iot/vmp/vmanager/SEEController/SEEController.java
rename to src/main/java/com/genersoft/iot/vmp/vmanager/SseController/SseController.java
index 689b967..01af4a0 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/SEEController/SEEController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/SseController/SseController.java
@@ -1,9 +1,10 @@
-package com.genersoft.iot.vmp.vmanager.SEEController;
+package com.genersoft.iot.vmp.vmanager.SseController;
import com.genersoft.iot.vmp.gb28181.event.alarm.AlarmEventListener;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
/**
@@ -14,16 +15,16 @@
@Controller
@RequestMapping("/api")
-public class SEEController {
+public class SseController {
@Autowired
AlarmEventListener alarmEventListener;
//璁剧疆鍝嶅簲
@RequestMapping("/emit")
- public SseEmitter emit() {
- SseEmitter sseEmitter = new SseEmitter(0L);
+ public SseEmitter emit(@RequestParam String browserId) {
+ final SseEmitter sseEmitter = new SseEmitter(0L);
try {
- alarmEventListener.addSseEmitters(sseEmitter);
+ alarmEventListener.addSseEmitters(browserId, sseEmitter);
}catch (Exception e){
sseEmitter.completeWithError(e);
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index c235c81..fdcae2e 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -13,12 +13,12 @@
timeout: 10000
# [涓嶅彲鐢╙ jdbc鏁版嵁搴撻厤缃�, 鏆備笉鏀寔
datasource:
- #name: eiot
- #url: jdbc:mysql://127.0.0.1:3306/eiot?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true
- #username:
- #password:
- #type: com.alibaba.druid.pool.DruidDataSource
- #driver-class-name: com.mysql.jdbc.Driver
+ # name: eiot
+ # url: jdbc:mysql://127.0.0.1:3306/eiot?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true
+ # username:
+ # password:
+ # type: com.alibaba.druid.pool.DruidDataSource
+ # driver-class-name: com.mysql.jdbc.Driver
name: eiot
url: jdbc:sqlite::resource:wvp.sqlite
username:
@@ -35,18 +35,18 @@
# 浣滀负28181鏈嶅姟鍣ㄧ殑閰嶇疆
sip:
# [蹇呴』淇敼] 鏈満鐨処P, 蹇呴』鏄綉鍗′笂鐨処P
- ip: 192.168.1.44
+ ip: 192.168.0.100
# [鍙�塢 28181鏈嶅姟鐩戝惉鐨勭鍙�
port: 5060
# 鏍规嵁鍥芥爣6.1.2涓瀹氾紝domain瀹滈噰鐢↖D缁熶竴缂栫爜鐨勫墠鍗佷綅缂栫爜銆傚浗鏍囬檮褰旸涓畾涔夊墠8浣嶄负涓績缂栫爜锛堢敱鐪佺骇銆佸競绾с�佸尯绾с�佸熀灞傜紪鍙风粍鎴愶紝鍙傜収GB/T 2260-2007锛�
# 鍚庝袱浣嶄负琛屼笟缂栫爜锛屽畾涔夊弬鐓ч檮褰旸.3
# 3701020049鏍囪瘑灞变笢娴庡崡鍘嗕笅鍖� 淇℃伅琛屼笟鎺ュ叆
# [鍙�塢
- domain: 3402000000
+ domain: 4401020049
# [鍙�塢
- id: 34020000002000000001
+ id: 44010200492000000001
# [鍙�塢 榛樿璁惧璁よ瘉瀵嗙爜锛屽悗缁墿灞曚娇鐢ㄨ澶囧崟鐙瘑鐮�
- password: 12345678
+ password: admin123
# 鐧婚檰鐨勭敤鎴峰悕瀵嗙爜
auth:
@@ -58,9 +58,9 @@
#zlm鏈嶅姟鍣ㄩ厤缃�
media:
# [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑鍐呯綉IP
- ip: 192.168.1.44
+ ip: 192.168.0.100
# [鍙�塢 zlm鏈嶅姟鍣ㄧ殑鍏綉IP, 鍐呯綉閮ㄧ讲缃┖鍗冲彲
- wanIp:
+ wanIp:
# [鍙�塢 zlm鏈嶅姟鍣ㄧ殑hook鎵�浣跨敤鐨処P, 榛樿浣跨敤sip.ip
hookIp:
# [蹇呴』淇敼] zlm鏈嶅姟鍣ㄧ殑http.port
@@ -70,12 +70,12 @@
# [鍙�塢 zlm鏈嶅姟鍣ㄧ殑hook.admin_params=secret
secret: 035c73f7-bb6b-4889-a715-d9eb2d1925cc
# [鍙�塢 zlm鏈嶅姟鍣ㄧ殑general.streamNoneReaderDelayMS
- streamNoneReaderDelayMS: 600000 # 鏃犱汉瑙傜湅澶氫箙鑷姩鍏抽棴娴�, -1琛ㄧず姘镐笉鑷姩鍏抽棴,鍗� 鍏抽棴鎸夐渶鎷夋祦
+ streamNoneReaderDelayMS: 18000 # 鏃犱汉瑙傜湅澶氫箙鑷姩鍏抽棴娴�, -1琛ㄧず姘镐笉鑷姩鍏抽棴,鍗� 鍏抽棴鎸夐渶鎷夋祦
# [鍙�塢 鑷姩鐐规挱锛� 浣跨敤鍥哄畾娴佸湴鍧�杩涜鎾斁鏃讹紝濡傛灉鏈偣鎾垯鑷姩杩涜鐐规挱, 闇�瑕乺tp.enable=true
- autoApplyPlay: true
+ autoApplyPlay: false
# [鍙�塢 閮ㄥ垎璁惧闇�瑕佹墿灞昐DP锛岄渶瑕佹墦寮�姝よ缃�
seniorSdp: false
- # 鍚敤udp澶氱鍙ｆā寮�, 璇︾粏瑙ｉ噴鍙傝��: https://github.com/xia-chu/ZLMediaKit/wiki/GB28181%E6%8E%A8%E6%B5%81 涓嬬殑楂橀樁浣跨敤
+ # 鍚敤udp澶氱鍙ｆā寮�
rtp:
# [鍙�塢 鏄惁鍚敤udp澶氱鍙ｆā寮�, 寮�鍚悗浼氬湪udpPortRange鑼冨洿鍐呴�夋嫨绔彛鐢ㄤ簬濯掍綋娴佷紶杈�
enable: true
diff --git a/web_src/.postcssrc.js b/web_src/.postcssrc.js
index eee3e92..406b4d2 100644
--- a/web_src/.postcssrc.js
+++ b/web_src/.postcssrc.js
@@ -5,6 +5,10 @@
"postcss-import": {},
"postcss-url": {},
// to edit target browsers: use "browserslist" field in package.json
- "autoprefixer": {}
+ "autoprefixer": {},
+ 'postcss-pxtorem': {
+ rootValue: 24,
+ propList: ['font-size'] // 鍙浆鍖杅ont-size
+ }
}
}
diff --git a/web_src/package-lock.json b/web_src/package-lock.json
index 334f488..fb6278d 100644
--- a/web_src/package-lock.json
+++ b/web_src/package-lock.json
@@ -99,7 +99,6 @@
"version": "3.2.1",
"resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-3.2.1.tgz",
"integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=",
- "dev": true,
"requires": {
"color-convert": "^1.9.0"
}
@@ -1645,7 +1644,6 @@
"version": "2.4.2",
"resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz",
"integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=",
- "dev": true,
"requires": {
"ansi-styles": "^3.2.1",
"escape-string-regexp": "^1.0.5",
@@ -1847,7 +1845,6 @@
"version": "1.9.3",
"resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-1.9.3.tgz",
"integrity": "sha1-u3GFBpDh8TZWfeYp0tVHHe2kweg=",
- "dev": true,
"requires": {
"color-name": "1.1.3"
}
@@ -1855,8 +1852,7 @@
"color-name": {
"version": "1.1.3",
"resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.3.tgz",
- "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
- "dev": true
+ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
},
"color-string": {
"version": "0.3.0",
@@ -3713,8 +3709,7 @@
"escape-string-regexp": {
"version": "1.0.5",
"resolved": "https://registry.npm.taobao.org/escape-string-regexp/download/escape-string-regexp-1.0.5.tgz",
- "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
- "dev": true
+ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
},
"escope": {
"version": "3.6.0",
@@ -4150,6 +4145,11 @@
"locate-path": "^2.0.0"
}
},
+ "fingerprintjs2": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/fingerprintjs2/-/fingerprintjs2-2.1.2.tgz",
+ "integrity": "sha512-ZPsLgjziFRbUb5tXWpEMtWp4XFnzSah8SiNfl3aoURDZ+2zi2tuIOYUULqDBV+Cb6paN+raWT+Q2qpOaCbX/Yw=="
+ },
"flatten": {
"version": "1.0.3",
"resolved": "https://registry.npm.taobao.org/flatten/download/flatten-1.0.3.tgz",
@@ -4403,8 +4403,7 @@
"has-flag": {
"version": "3.0.0",
"resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-3.0.0.tgz",
- "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
- "dev": true
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
},
"has-symbols": {
"version": "1.0.1",
@@ -8437,6 +8436,34 @@
}
}
},
+ "postcss-pxtorem": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/postcss-pxtorem/-/postcss-pxtorem-5.1.1.tgz",
+ "integrity": "sha512-uvgIujL/pn0GbZ+rczESD2orHsbXrrCqi+q9wJO8PCk3ZGCoVVtu5hZTbtk+tbZHZP5UkTfCvqOrTZs9Ncqfsg==",
+ "requires": {
+ "postcss": "^7.0.27"
+ },
+ "dependencies": {
+ "postcss": {
+ "version": "7.0.35",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
+ "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+ "requires": {
+ "chalk": "^2.4.2",
+ "source-map": "^0.6.1",
+ "supports-color": "^6.1.0"
+ }
+ },
+ "supports-color": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+ "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+ "requires": {
+ "has-flag": "^3.0.0"
+ }
+ }
+ }
+ },
"postcss-reduce-idents": {
"version": "2.4.0",
"resolved": "https://registry.npm.taobao.org/postcss-reduce-idents/download/postcss-reduce-idents-2.4.0.tgz?cache=0&sync_timestamp=1599672339373&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-reduce-idents%2Fdownload%2Fpostcss-reduce-idents-2.4.0.tgz",
@@ -9893,8 +9920,7 @@
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz",
- "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
- "dev": true
+ "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM="
},
"source-map-resolve": {
"version": "0.5.3",
@@ -10290,7 +10316,6 @@
"version": "5.5.0",
"resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz?cache=0&sync_timestamp=1598611719015&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-5.5.0.tgz",
"integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=",
- "dev": true,
"requires": {
"has-flag": "^3.0.0"
}
diff --git a/web_src/package.json b/web_src/package.json
index c949393..d99d7bc 100644
--- a/web_src/package.json
+++ b/web_src/package.json
@@ -15,7 +15,9 @@
"core-js": "^2.6.5",
"echarts": "^4.7.0",
"element-ui": "2.10.1",
+ "fingerprintjs2": "^2.1.2",
"moment": "^2.29.1",
+ "postcss-pxtorem": "^5.1.1",
"vue": "^2.6.11",
"vue-clipboard2": "^0.3.1",
"vue-cookies": "^1.7.4",
diff --git a/web_src/src/components/UiHeader.vue b/web_src/src/components/UiHeader.vue
index 17a6880..0537a87 100644
--- a/web_src/src/components/UiHeader.vue
+++ b/web_src/src/components/UiHeader.vue
@@ -33,7 +33,8 @@
sseControl() {
let that = this;
if (this.alarmNotify) {
- this.sseSource = new EventSource('/api/emit');
+ console.log("鐢宠SSE鎺ㄩ�丄PI璋冪敤锛屾祻瑙堝櫒ID: " + this.$browserId);
+ this.sseSource = new EventSource('/api/emit?browserId=' + this.$browserId);
this.sseSource.addEventListener('message', function(evt) {
that.$notify({
title: '鏀跺埌鎶ヨ淇℃伅',
diff --git a/web_src/src/main.js b/web_src/src/main.js
index ae2baee..03bb4a4 100644
--- a/web_src/src/main.js
+++ b/web_src/src/main.js
@@ -8,10 +8,28 @@
import VueCookies from 'vue-cookies';
import echarts from 'echarts';
-import VueClipboard from 'vue-clipboard2'
+import VueClipboard from 'vue-clipboard2';
import { Notification } from 'element-ui';
+import Fingerprint2 from 'fingerprintjs2';
-Vue.use(VueClipboard)
+// 生成唯一ID
+Fingerprint2.get(function(components) {
+ const values = components.map(function(component,index) {
+ if (index === 0) { //把微信浏览器里UA的wifi或4G等网络替换成空,不然切换网络会ID不一样
+ return component.value.replace(/\bNetType\/\w+\b/, '');
+ }
+ return component.value;
+ })
+ //console.log(values) //使用的浏览器信息npm
+ // 生成最终id
+ let port = window.location.port;
+ console.log(port);
+ const fingerPrint = Fingerprint2.x64hash128(values.join(port), 31)
+ Vue.prototype.$browserId = fingerPrint;
+ console.log("唯一标识码：" + fingerPrint);
+});
+
+Vue.use(VueClipboard);
Vue.use(ElementUI);
Vue.use(VueCookies);
Vue.prototype.$axios = axios;
--
Gitblit v1.8.0