From 7a49bcc5e561df7a9b65266a57a9c0896c0fd3d0 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 10 五月 2023 13:48:56 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
index 92a641f..6060ef6 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/sys/SysUserController.java
@@ -64,8 +64,6 @@
@Autowired
private ISysConfigService configService;
-
-
/**
* 获取用户列表
*/
@@ -146,7 +144,7 @@
{
return R.fail("保存用户'" + username + "'失败，注册账号已存在");
}
- return R.ok(userService.registerUser(sysUser));
+ return R.ok(userService.registerUser(sysUser)!=null);
}
/**
@@ -352,24 +350,24 @@
* @date 2023/4/30 15:36
* @version 1.0
*/
- @InnerAuth
- @PostMapping("/user/getSysUser")
+ @PostMapping("/getSysUser")
public R<SysUser> getSysUser(@RequestBody Long userId){
+ logger.info("userId"+userId);
SysUser sysUser = userService.selectUserById(userId);
+ logger.info("sysUser"+sysUser.toString());
return R.ok(sysUser);
}
/**
- * @description: 更新用户手机
+ * @description: 注册新用户
* @author jqs34
* @date 2023/4/30 15:32
* @version 1.0
*/
- @InnerAuth
- @PostMapping("/user/registerUser")
- public R registerUser(@RequestBody SysUser sysUser){
+ @PostMapping("/registerUser")
+ public R<SysUser> registerUser(@RequestBody SysUser sysUser){
userService.registerUser(sysUser);
- return R.ok();
+ return R.ok(sysUser);
}
@@ -380,8 +378,7 @@
* @date 2023/4/30 15:32
* @version 1.0
*/
- @InnerAuth
- @PostMapping("/user/updateUserMobile")
+ @PostMapping("/updateUserMobile")
public R updateUserMobile(@RequestBody SysUser sysUser){
userService.updateUserMobile(sysUser);
return R.ok();
@@ -392,8 +389,7 @@
* @param appEditUserDto
* @return
*/
- @InnerAuth
- @PostMapping("/user/editUserInfo")
+ @PostMapping("/editUserInfo")
public R editUserInfo(@RequestBody AppEditUserDto appEditUserDto){
userService.editUserInfo(appEditUserDto);
return R.ok();
--
Gitblit v1.7.1