From efbc3a31c07e87f4d74b1fbbc28c3ab16aaa650a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 15 三月 2023 22:56:47 +0800
Subject: [PATCH] 支持登录返回值中携带token
---
src/main/java/com/genersoft/iot/vmp/conf/security/AnonymousAuthenticationEntryPoint.java | 1
doc/_content/introduction/deployment.md | 23 +++++++++--
src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java | 23 ++---------
src/main/java/com/genersoft/iot/vmp/conf/security/dto/LoginUser.java | 9 ++++
README.md | 5 +-
5 files changed, 35 insertions(+), 26 deletions(-)
diff --git a/README.md b/README.md
index eb6859b..bb81611 100644
--- a/README.md
+++ b/README.md
@@ -99,15 +99,16 @@
- [X] 鏀寔鎺ュ彛閴存潈
- [X] 浜戠褰曞儚锛屾帹娴�/浠ｇ悊/鍥芥爣瑙嗛鍧囧彲浠ュ綍鍒跺湪浜戠鏈嶅姟鍣紝鏀寔棰勮鍜屼笅杞�
- [X] 鏀寔鎵撳寘鍙墽琛宩ar鍜寃ar
+- [X] 鏀寔璺ㄥ煙璇锋眰锛屾敮鎸佸墠鍚庣鍒嗙閮ㄧ讲
# 閬囧埌闂濡備綍瑙ｅ喅
鍥芥爣鏈�楹荤儲鐨勫湴鏂瑰湪浜庤澶囩殑鍏煎鎬э紝鎵�浠ラ渶瑕佸ぇ閲忕殑璁惧鏉ユ祴璇曪紝鐩墠浣滆�呮墜閲岀殑璁惧鏈夐檺锛屽啀鍔犱笂浣滆�呮按骞虫湁闄愶紝鎵�浠ラ亣鍒伴棶棰樺湪鎵�闅惧厤锛�
-1. 鏌ョ湅wiki锛屼粩缁嗙殑闃呰鍙互甯綘閬垮厤鍑犱箮鎵�鏈夌殑闂
+1. 鏌ョ湅鏂囨。缃戠珯锛屼粩缁嗙殑闃呰鍙互甯綘閬垮厤鍑犱箮鎵�鏈夌殑闂
2. 鎼滅储issues锛岃繖閲屾湁澶ч儴鍒嗙殑绛旀
3. 鍔燪Q缇わ紙901799015锛夛紝杩欓噷鏈夊ぇ閲忕儹蹇冪殑灏忎紮浼达紝浣嗘槸鍓嶆彁鏂板笇鏈涗綘宸茬粡浠旂粏闃呰浜唚iki鍜屾悳绱簡issues銆�
4. 浣犲彲浠ヨ浣滆�呬负浣犺В绛旓紝浣嗘槸鎴戜笉鏄厤璐圭殑銆�
-5. 浣犲彲浠ユ妸閬囧埌闂鐨勮澶囧瘎缁欐垜锛屽彲浠ユ洿瀹规槗鐨勫鐜伴棶棰樸��
+5. 浣犲彲浠ユ妸閬囧埌闂鐨勮澶囧瘎缁欐垜锛屽彲浠ユ洿瀹规槗鐨勫吋瀹硅澶囧拰瑙ｅ喅闂銆�
# 浣跨敤甯姪
QQ缇�: 901799015, ZLM浣跨敤鏂囨。[https://github.com/ZLMediaKit/ZLMediaKit](https://github.com/ZLMediaKit/ZLMediaKit)
diff --git a/doc/_content/introduction/deployment.md b/doc/_content/introduction/deployment.md
index 0ee803d..804c9fc 100644
--- a/doc/_content/introduction/deployment.md
+++ b/doc/_content/introduction/deployment.md
@@ -21,19 +21,34 @@
4. WVP-PRO涓嶼LM鏀寔鍒嗗紑閮ㄧ讲锛屼絾鏄痺vp-pro-assist蹇呴』涓巣lm閮ㄧ讲鍦ㄥ悓涓�鍙颁富鏈�;
5. 鐢熶骇鐜鎸夐渶寮�鏀剧鍙ｏ紝浣嗘槸寤鸿淇敼榛樿绔彛锛屽挨鍏舵槸5060绔彛锛屾槗鍙楀埌鏀诲嚮;
6. zlm浣跨敤docker閮ㄧ讲鐨勬儏鍐碉紝瑕佹眰绔彛鏄犲皠涓�鑷达紝姣斿鏄犲皠5060,搴斿皢澶栭儴绔彛涔熸槧灏勪负5060绔彛;
-7. 鍚姩鏈嶅姟锛屼互linux涓轰緥
-**鍚姩WVP-PRO**
-jar鍖咃細
+7. 鍚姩鏈嶅姟锛屼互linux涓轰緥
+### 鍚姩WVP-PRO
+**jar鍖咃細**
```shell
nohup java -jar wvp-pro-*.jar &
```
-war鍖咃細
+**war鍖咃細**
涓嬭浇Tomcat鍚庡皢war鍖呮斁鍏ebapps涓紝鍚姩Tomcat浠ヨВ鍘媤ar鍖咃紝鍋滄Tomcat鍚庯紝鍒犻櫎ROOT鐩綍浠ュ強war鍖咃紝灏嗚В鍘嬪悗鐨剋ar鍖呯洰褰曢噸鍛藉悕涓篟OOT锛屽皢閰嶇疆鏂囦欢涓殑Server.port閰嶇疆涓轰笌Tomcat绔彛涓�鑷�
鐒跺悗鍚姩Tomcat銆�
**鍚姩ZLM**
```shell
nohup ./MediaServer -d -m 3 &
```
+### 鍓嶅悗绔垎绂婚儴缃�
+鍓嶅悗绔儴缃茬洰鍓嶅湪鏈�鏂扮殑鐗堟湰宸茬粡鏀寔锛岃浣跨敤3鏈�15鏃ヤ箣鍚庣殑鐗堟湰閮ㄧ讲
+鍓嶇缂栬瘧鍚庣殑鏂囦欢鍦╜src/main/resources/static`涓紝灏嗘鐩綍涓嬬殑鏂囦欢閮ㄧ讲銆�
+鍓嶅悗绔垎绂婚儴缃叉渶澶х殑闂鏄法鍩熺殑瑙ｅ喅锛屼箣鍓嶇増鏈娇鐢╟ookie瀹屾垚鐧诲綍娴佺▼锛岃�宑ookie鏄笉鍙互鍦ㄥ鏉傝法鍩熶腑浣跨敤鐨勩�傛墍浠ュ綋鍓嶇増鏈娇鐢↗WT鐢熸垚鐨凾OKEN浣滀负璁よ瘉鍑嵁锛�
+閮ㄧ讲鍓嶇鍚庨渶瑕佸湪wvp涓厤缃墠绔闂殑鍦板潃浠ュ畬鎴愯法鍩熸祦绋嬨��
+鍔犲叆浣犵殑鏈嶅姟鏈夊叕缃戝煙鍚嶄负xxx.com锛屽叕缃慖P涓�11.11.11.11锛� 閭ｄ箞浣犲彲浠ュ湪wvp涓繖鏍烽厤缃細
+```yaml
+user-settings:
+ # 璺ㄥ煙閰嶇疆锛岄厤缃綘璁块棶鍓嶇椤甸潰鐨勫湴鍧�鍗冲彲锛� 鍙互閰嶇疆澶氫釜
+ allowed-origins:
+ - http://xxx.com:8008
+ - http://11.11.11.11:8008
+```
+閰嶇疆涓嶆槸蹇呴』鐨勶紝浣犱娇鐢ㄥ摢涓猧p/鍩熷悕璁块棶灏遍厤缃摢涓嵆鍙�備慨鏀归厤缃悗閲嶅惎wvp浠ヤ娇閰嶇疆鐢熸晥銆�
+
[鎺ュ叆璁惧](./_content/ability/device.md)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/security/AnonymousAuthenticationEntryPoint.java b/src/main/java/com/genersoft/iot/vmp/conf/security/AnonymousAuthenticationEntryPoint.java
index 3f70b79..7d617cc 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/security/AnonymousAuthenticationEntryPoint.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/security/AnonymousAuthenticationEntryPoint.java
@@ -22,7 +22,6 @@
@Override
public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException e) {
- System.err.println(e.getMessage());
String jwt = request.getHeader(JwtUtils.getHeader());
JwtUser jwtUser = JwtUtils.verifyToken(jwt);
String username = jwtUser.getUserName();
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/security/dto/LoginUser.java b/src/main/java/com/genersoft/iot/vmp/conf/security/dto/LoginUser.java
index 45e03bc..61bd6fa 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/security/dto/LoginUser.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/security/dto/LoginUser.java
@@ -19,6 +19,8 @@
*/
private User user;
+ private String accessToken;
+
/**
* 鐧诲綍鏃堕棿
@@ -99,4 +101,11 @@
}
+ public String getAccessToken() {
+ return accessToken;
+ }
+
+ public void setAccessToken(String accessToken) {
+ this.accessToken = accessToken;
+ }
}
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 035f380..d23b03c 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
@@ -42,7 +42,9 @@
@GetMapping("/login")
@PostMapping("/login")
- @Operation(summary = "鐧诲綍")
+ @Operation(summary = "鐧诲綍", description = "鐧诲綍鎴愬姛鍚庤繑鍥濧ccessToken锛� 鍙互浠庤繑鍥炲�艰幏鍙栧埌涔熷彲浠ヤ粠鍝嶅簲澶翠腑鑾峰彇鍒帮紝" +
+ "鍚庣画鐨勮姹傞渶瑕佹坊鍔犺姹傚ご 'access-token'鎴栬�呮斁鍦ㄥ弬鏁伴噷")
+
@Parameter(name = "username", description = "鐢ㄦ埛鍚�", required = true)
@Parameter(name = "password", description = "瀵嗙爜锛�32浣峬d5鍔犲瘑锛�", required = true)
public LoginUser login(HttpServletRequest request, HttpServletResponse response, @RequestParam String username, @RequestParam String password){
@@ -57,28 +59,11 @@
}else {
String jwt = JwtUtils.createToken(username, password);
response.setHeader(JwtUtils.getHeader(), jwt);
+ user.setAccessToken(jwt);
}
return user;
}
-// @GetMapping("/logout")
-// @PostMapping("/logout")
-// @Operation(summary = "鐧诲嚭")
-// public LoginUser logout(){
-// LoginUser user;
-// try {
-// user = SecurityUtils.login(username, password, authenticationManager);
-// } catch (AuthenticationException e) {
-// throw new ControllerException(ErrorCode.ERROR100.getCode(), e.getMessage());
-// }
-// if (user == null) {
-// throw new ControllerException(ErrorCode.ERROR100.getCode(), "鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒");
-// }else {
-// String jwt = JwtUtils.createToken(username, password);
-// response.setHeader(JwtUtils.getHeader(), jwt);
-// }
-// return user;
-// }
@PostMapping("/changePassword")
@Operation(summary = "淇敼瀵嗙爜")
--
Gitblit v1.8.0