From 6091a9cac0ef3236bd05137a5fae9a9cf1913ed4 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 29 四月 2024 16:03:21 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java | 69 +++-------------------------------
1 files changed, 7 insertions(+), 62 deletions(-)
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
index 2e0f357..326e4d0 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
@@ -1,23 +1,11 @@
package com.mes.userinfo.controller;
-import com.mes.entity.request.GeneralRequest;
import com.mes.userinfo.entity.SysUser;
-import com.mes.userinfo.entity.vo.SysUserVO;
import com.mes.userinfo.service.SysUserService;
import com.mes.utils.Result;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-import java.util.Map;
+import org.springframework.web.bind.annotation.*;
/**
* <p>
@@ -27,64 +15,21 @@
* @author zhoush
* @since 2024-04-11
*/
-@Api(description = "鐢ㄦ埛绠＄悊")
@RestController
-@RequestMapping("/sys/user")
+@RequestMapping("/userinfo")
public class SysUserController {
@Autowired
private SysUserService sysUserService;
- @ApiOperation("鐢ㄦ埛鐧诲綍")
@PostMapping("/login")
- public Result<Map<String, String>> login(@RequestBody SysUser user) {
- return Result.success(sysUserService.login(user));
+ public Result login(@RequestBody SysUser user) {
+ return sysUserService.login(user);
}
- @ApiOperation("閫�鍑虹櫥褰�")
- @PostMapping("/logout")
-// @PreAuthorize("hasRole('ROLE_admin')")
- @PreAuthorize("hasAuthority('xt:yh')")
- public Result<String> logout() {
- return Result.success(sysUserService.logout());
+ @GetMapping("/hello")
+ public Result hello() {
+ return Result.success("eyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJlZjMyMjQ4NDcyODE0ZWFlYWRlOTBkYmZjYWFlZmNmZSIsInN1YiI6IjEiLCJpc3MiOiJzZyIsImlhdCI6MTcxMjkwMjI0NCwiZXhwIjoxNzEyOTA1ODQ0fQ.DlJkhkiwjZSqprdLzKaTB3yuyxGukerKeF0FbJK_6HY");
}
-
- @ApiOperation("鏂板鐢ㄦ埛淇℃伅")
- @PostMapping("/saveUser")
-// @PreAuthorize("hasAuthority('sys:user:save')")
- public Result<String> saveUser(@Validated @RequestBody SysUserVO sysUser) {
- return Result.success(sysUserService.saveUser(sysUser));
- }
-
-
- @ApiOperation("鏇存柊鐢ㄦ埛淇℃伅")
- @PostMapping("/updateUser")
-// @PreAuthorize("hasAuthority('sys:user:update')")
- public Result<SysUserVO> updateUser(@Validated @RequestBody SysUserVO sysUser) {
- return Result.success(sysUserService.updateUser(sysUser));
- }
-
- @ApiOperation("閲嶇疆瀵嗙爜")
- @PostMapping("/resetPassword")
-// @PreAuthorize("hasAuthority('sys:user:resetPassword')")
- public Result resetPassword(String userId) {
- return Result.success(sysUserService.resetPassword(Long.parseLong(userId)));
- }
-
-
- @ApiOperation("鑾峰彇鐢ㄦ埛鍒楄〃")
- @PostMapping("/listByUserName")
-// @PreAuthorize("hasAuthority('sys:user:list')")
- public Result<List<SysUserVO>> listByUserName(@RequestBody GeneralRequest request) {
- return Result.success(sysUserService.listByUserName(request));
- }
-
- @ApiOperation("鍒犻櫎鐢ㄦ埛淇℃伅")
- @PostMapping("/deleteUser")
-// @PreAuthorize("hasAuthority('sys:user:delete')")
- public Result<String> deleteUser(@RequestBody List<Long> ids) {
- return Result.success(sysUserService.deleteUser(ids));
- }
-
}
--
Gitblit v1.8.0