From 07b182da98ac54fffa8f36b8db27d6212e1e0bf7 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 26 十二月 2023 15:38:40 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into feature/record
---
src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
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 b6f9183..9d55206 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
@@ -14,6 +14,7 @@
import com.github.pagehelper.PageInfo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AuthenticationManager;
@@ -66,7 +67,7 @@
@PostMapping("/changePassword")
- @Operation(summary = "淇敼瀵嗙爜")
+ @Operation(summary = "淇敼瀵嗙爜", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "username", description = "鐢ㄦ埛鍚�", required = true)
@Parameter(name = "oldpassword", description = "鏃у瘑鐮侊紙宸瞞d5鍔犲瘑鐨勫瘑鐮侊級", required = true)
@Parameter(name = "password", description = "鏂板瘑鐮侊紙鏈猰d5鍔犲瘑鐨勫瘑鐮侊級", required = true)
@@ -95,7 +96,7 @@
@PostMapping("/add")
- @Operation(summary = "娣诲姞鐢ㄦ埛")
+ @Operation(summary = "娣诲姞鐢ㄦ埛", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "username", description = "鐢ㄦ埛鍚�", required = true)
@Parameter(name = "password", description = "瀵嗙爜锛堟湭md5鍔犲瘑鐨勫瘑鐮侊級", required = true)
@Parameter(name = "roleId", description = "瑙掕壊ID", required = true)
@@ -131,7 +132,7 @@
}
@DeleteMapping("/delete")
- @Operation(summary = "鍒犻櫎鐢ㄦ埛")
+ @Operation(summary = "鍒犻櫎鐢ㄦ埛", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "id", description = "鐢ㄦ埛Id", required = true)
public void delete(@RequestParam Integer id){
// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
@@ -147,7 +148,7 @@
}
@GetMapping("/all")
- @Operation(summary = "鏌ヨ鐢ㄦ埛")
+ @Operation(summary = "鏌ヨ鐢ㄦ埛", security = @SecurityRequirement(name = JwtUtils.HEADER))
public List<User> all(){
// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
return userService.getAllUsers();
@@ -161,7 +162,7 @@
* @return 鍒嗛〉鐢ㄦ埛鍒楄〃
*/
@GetMapping("/users")
- @Operation(summary = "鍒嗛〉鏌ヨ鐢ㄦ埛")
+ @Operation(summary = "鍒嗛〉鏌ヨ鐢ㄦ埛", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "page", description = "褰撳墠椤�", required = true)
@Parameter(name = "count", description = "姣忛〉鏌ヨ鏁伴噺", required = true)
public PageInfo<User> users(int page, int count) {
@@ -169,7 +170,7 @@
}
@RequestMapping("/changePushKey")
- @Operation(summary = "淇敼pushkey")
+ @Operation(summary = "淇敼pushkey", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "userId", description = "鐢ㄦ埛Id", required = true)
@Parameter(name = "pushKey", description = "鏂扮殑pushKey", required = true)
public void changePushKey(@RequestParam Integer userId,@RequestParam String pushKey) {
@@ -187,7 +188,7 @@
}
@PostMapping("/changePasswordForAdmin")
- @Operation(summary = "绠＄悊鍛樹慨鏀规櫘閫氱敤鎴峰瘑鐮�")
+ @Operation(summary = "绠＄悊鍛樹慨鏀规櫘閫氱敤鎴峰瘑鐮�", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "adminId", description = "绠＄悊鍛榠d", required = true)
@Parameter(name = "userId", description = "鐢ㄦ埛id", required = true)
@Parameter(name = "password", description = "鏂板瘑鐮侊紙鏈猰d5鍔犲瘑鐨勫瘑鐮侊級", required = true)
--
Gitblit v1.8.0