From 0a951e876abf952e7f65a68c5147a5a18e261d64 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 11 十月 2021 18:19:03 +0800
Subject: [PATCH] 添加修改密码失败的提示
---
web_src/src/components/dialog/changePassword.vue | 6 ++++++
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java | 2 +-
src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java | 6 +++++-
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
index 33ad2ba..51c5979 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
@@ -95,7 +95,7 @@
streamInfoResult.setHttps_ts(String.format("https://%s:%s/%s/%s.live.ts", addr, mediaInfo.getHttpSSlPort(), app, stream));
streamInfoResult.setWss_ts(String.format("wss://%s:%s/%s/%s.live.ts", addr, mediaInfo.getHttpSSlPort(), app, stream));
streamInfoResult.setWss_ts(String.format("wss://%s:%s/%s/%s.live.ts", addr, mediaInfo.getHttpSSlPort(), app, stream));
- streamInfoResult.setRtc(String.format("http://%s:%s/index/api/webrtc?app=%s&stream=%s&type=play", mediaInfo.getStreamIp(), mediaInfo.getHttpSSlPort(), app, stream));
+ streamInfoResult.setRtc(String.format("https://%s:%s/index/api/webrtc?app=%s&stream=%s&type=play", mediaInfo.getStreamIp(), mediaInfo.getHttpSSlPort(), app, stream));
}
streamInfoResult.setTracks(tracks);
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
index 756fecd..17fe2fb 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
@@ -76,7 +76,11 @@
@PostMapping("/changePassword")
public String changePassword(@RequestParam String oldPassword, @RequestParam String password){
// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
- String username = SecurityUtils.getUserInfo().getUsername();
+ LoginUser userInfo = SecurityUtils.getUserInfo();
+ if (userInfo== null) {
+ return "fail";
+ }
+ String username = userInfo.getUsername();
LoginUser user = null;
try {
user = SecurityUtils.login(username, oldPassword, authenticationManager);
diff --git a/web_src/src/components/dialog/changePassword.vue b/web_src/src/components/dialog/changePassword.vue
index eade6a8..a95736f 100644
--- a/web_src/src/components/dialog/changePassword.vue
+++ b/web_src/src/components/dialog/changePassword.vue
@@ -106,6 +106,12 @@
this.$router.push('/login');
this.sseSource.close();
},800)
+ }else {
+ this.$message({
+ showClose: true,
+ message: '淇敼瀵嗙爜澶辫触锛屾槸鍚﹀凡鐧诲綍锛堟帴鍙ｉ壌鏉冨叧闂棤娉曚慨鏀瑰瘑鐮侊級',
+ type: 'error'
+ });
}
}).catch((error)=> {
console.error(error)
--
Gitblit v1.8.0