From a8108748fe1422b4fa821b243a369099a572dd3e Mon Sep 17 00:00:00 2001 From: Lawrence <1934378145@qq.com> Date: Mon, 11 Jan 2021 23:29:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=9D=9E=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E7=AB=AF=E5=8F=A3=E6=97=A0=E6=B3=95Send=20Bye?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java index b3447f95..e12483f7 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java @@ -531,7 +531,10 @@ public class SIPCommander implements ISIPCommander { Pattern p = Pattern.compile("(\\d+\\.\\d+\\.\\d+\\.\\d+)\\:(\\d+)"); Matcher matcher = p.matcher(vh); if (matcher.find()) { - byeURI.setHost(matcher.group(1)); + String ip = matcher.group(1); + byeURI.setHost(ip); + String port = matcher.group(2); + byeURI.setPort(Integer.parseInt(port)); } ViaHeader viaHeader = (ViaHeader) byeRequest.getHeader(ViaHeader.NAME); String protocol = viaHeader.getTransport().toUpperCase(); From 92e9a3b91c06ad22deeb1ca5505b8b57ee8825ea Mon Sep 17 00:00:00 2001 From: Lawrence <1934378145@qq.com> Date: Tue, 12 Jan 2021 13:08:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=BF=9B=E4=B8=80=E6=AD=A5=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=BD=95=E5=83=8F=E5=88=97=E8=A1=A8=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=AE=97=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../transmit/request/impl/MessageRequestProcessor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java index c5ae4f5d..fbdc7e26 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java @@ -342,7 +342,7 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor { try { // 回复200 OK responseAck(evt); - String seqNo = String.valueOf(System.currentTimeMillis()); + String uuid = UUID.randomUUID().toString().replace("-", ""); RecordInfo recordInfo = new RecordInfo(); Element rootElement = getRootElement(evt); Element deviceIdElement = rootElement.element("DeviceID"); @@ -398,7 +398,7 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor { // 为防止连续请求该设备的录像数据，返回数据错乱，特增加sn进行区分 String cacheKey = CACHE_RECORDINFO_KEY + deviceId + sn; - redis.set(cacheKey + "_" + seqNo, recordList, 90); + redis.set(cacheKey + "_" + uuid, recordList, 90); List cacheKeys = redis.scan(cacheKey + "_*"); List totalRecordList = new ArrayList(); for (int i = 0; i < cacheKeys.size(); i++) { From ac45e4f6c81150dadbaef1786e05c9fd681d46ce Mon Sep 17 00:00:00 2001 From: panlinlin <648540858@qq.com> Date: Wed, 13 Jan 2021 17:49:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BB=E9=99=86?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/vmp/vmanager/user/UserController.java | 35 +++++++++++++++++++ .../genersoft/iot/vmp/web/AuthController.java | 8 ++--- web_src/package-lock.json | 5 +++ web_src/package.json | 1 + web_src/src/components/Login.vue | 12 +++++-- web_src/src/main.js | 4 +++ 6 files changed, 58 insertions(+), 7 deletions(-) create mode 100644 src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java new file mode 100644 index 00000000..12ade38d --- /dev/null +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java @@ -0,0 +1,35 @@ +package com.genersoft.iot.vmp.vmanager.user; + +import com.genersoft.iot.vmp.vmanager.play.PlayController; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@CrossOrigin +@RestController +@RequestMapping("/api") +public class UserController { + + private final static Logger logger = LoggerFactory.getLogger(UserController.class); + + + @Value("${auth.username}") + private String usernameConfig; + + @Value("${auth.password}") + private String passwordConfig; + + @RequestMapping("/user/login") + public String login(String username, String password){ + if (!StringUtils.isEmpty(username) && username.equals(usernameConfig) + && !StringUtils.isEmpty(password) && password.equals(passwordConfig)) { + return "success"; + }else { + return "fail"; + } + } +} diff --git a/src/main/java/com/genersoft/iot/vmp/web/AuthController.java b/src/main/java/com/genersoft/iot/vmp/web/AuthController.java index 50e4da13..8fd66ca6 100644 --- a/src/main/java/com/genersoft/iot/vmp/web/AuthController.java +++ b/src/main/java/com/genersoft/iot/vmp/web/AuthController.java @@ -19,12 +19,12 @@ public class AuthController { private String password; @RequestMapping("/login") - public Object devices(String username, String password){ - if (!StringUtils.isEmpty(username) && username.equals(username) - && !StringUtils.isEmpty(password) && password.equals(password)) { + public String devices(String name, String passwd){ + if (!StringUtils.isEmpty(name) && name.equals(username) + && !StringUtils.isEmpty(passwd) && passwd.equals(password)) { return "success"; }else { - return "fait"; + return "fail"; } } } diff --git a/web_src/package-lock.json b/web_src/package-lock.json index 334f488a..f4cd2be6 100644 --- a/web_src/package-lock.json +++ b/web_src/package-lock.json @@ -5175,6 +5175,11 @@ "integrity": "sha1-9OaGxd4eofhn28rT1G2WlCjfmMQ=", "dev": true }, + "js-md5": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.7.3.tgz", + "integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ==" + }, "js-tokens": { "version": "3.0.2", "resolved": "https://registry.npm.taobao.org/js-tokens/download/js-tokens-3.0.2.tgz", diff --git a/web_src/package.json b/web_src/package.json index c949393a..9f21ee9c 100644 --- a/web_src/package.json +++ b/web_src/package.json @@ -15,6 +15,7 @@ "core-js": "^2.6.5", "echarts": "^4.7.0", "element-ui": "2.10.1", + "js-md5": "^0.7.3", "moment": "^2.29.1", "vue": "^2.6.11", "vue-clipboard2": "^0.3.1", diff --git a/web_src/src/components/Login.vue b/web_src/src/components/Login.vue index f047c5db..acf286eb 100644 --- a/web_src/src/components/Login.vue +++ b/web_src/src/components/Login.vue @@ -18,7 +18,6 @@