diff --git a/pom.xml b/pom.xml index 95ec750c5..25cb10d63 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.ruoyi ruoyi - 3.6.41.0.2 + 3.6.41.0.3 ruoyi http://www.ruoyi.vip @@ -16,7 +16,7 @@ UTF-8 11 11 - 3.6.41.0.2 + 3.6.41.0.3 UTF-8 UTF-8 1.8 diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml index fe86c9dcc..b9d8b07ee 100644 --- a/ruoyi-api/pom.xml +++ b/ruoyi-api/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml index 8f1cfafeb..157d61d98 100644 --- a/ruoyi-api/ruoyi-api-system/pom.xml +++ b/ruoyi-api/ruoyi-api-system/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-api - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java index f33ae5ddd..e7885f5a4 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java @@ -1,5 +1,6 @@ package com.ruoyi.system.api; +import com.ruoyi.system.api.inner.InnerRemoteUserService; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -20,17 +21,8 @@ import com.ruoyi.system.api.model.LoginUser; * @author ruoyi */ @FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class) -public interface RemoteUserService +public interface RemoteUserService extends InnerRemoteUserService { - /** - * 通过用户ID查询用户信息 - * - * @param userId 用户ID - * @param source 请求来源 - * @return 结果 - */ - @GetMapping("/user/detail/{userId}") - public R infoById(@PathVariable("userId") Long userId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** * 通过用户名查询用户信息 * @@ -41,15 +33,6 @@ public interface RemoteUserService @GetMapping("/user/info/{username}") public R getUserInfo(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); - /** - * 通过手机号查询用户信息 - * - * @param phoneNumber 用户名 - * @param source 请求来源 - * @return 结果 - */ - @GetMapping("/user/info/phoneNumber/{phoneNumber:\\d+}") - public R getUserInfoByPhoneNumber(@PathVariable("phoneNumber") String phoneNumber, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** * 注册用户信息 * diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java index 175c4f87c..1df3178a7 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java @@ -1,5 +1,6 @@ package com.ruoyi.system.api.factory; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; @@ -11,7 +12,7 @@ import com.ruoyi.system.api.model.LoginUser; /** * 用户服务降级处理 - * + * * @author ruoyi */ @Component @@ -25,9 +26,9 @@ public class RemoteUserFallbackFactory implements FallbackFactory infoById(Long userId, String source) - { + public R infoById_Inner(Long userId, @NotNull String source) { return R.fail("获取用户失败:" + throwable.getMessage()); } @@ -37,8 +38,9 @@ public class RemoteUserFallbackFactory implements FallbackFactory getUserInfoByPhoneNumber(String phoneNumber, String source) { + public R getUserInfoByPhoneNumber_Inner(@NotNull String phoneNumber, @NotNull String source) { return R.fail("获取用户失败:" + throwable.getMessage()); } @@ -53,6 +55,12 @@ public class RemoteUserFallbackFactory implements FallbackFactory edit_Inner(@NotNull LoginUser user, @NotNull String source) { + return R.fail("修改用户信息失败:" + throwable.getMessage()); + } }; } } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/inner/InnerRemoteUserService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/inner/InnerRemoteUserService.java new file mode 100644 index 000000000..fb1f670e9 --- /dev/null +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/inner/InnerRemoteUserService.java @@ -0,0 +1,32 @@ +package com.ruoyi.system.api.inner; + +import com.ruoyi.common.core.constant.SecurityConstants; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.system.api.model.LoginUser; +import org.springframework.web.bind.annotation.*; + +public interface InnerRemoteUserService { + /** + * 通过用户ID查询用户信息 + * + * @param userId 用户ID + * @param source 请求来源 + * @return 结果 + */ + @GetMapping("/inner/user/detail/{userId}") + R infoById_Inner(@PathVariable("userId") Long userId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + + /** + * 通过手机号查询用户信息 + * + * @param phoneNumber 用户名 + * @param source 请求来源 + * @return 结果 + */ + @GetMapping("/inner/user/info/phoneNumber/{phoneNumber:\\d+}") + R getUserInfoByPhoneNumber_Inner(@PathVariable("phoneNumber") String phoneNumber, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + @PutMapping("/inner/user") + R edit_Inner(@RequestBody LoginUser user, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); +} \ No newline at end of file diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml index 30fd6f071..13ba8f49e 100644 --- a/ruoyi-auth/pom.xml +++ b/ruoyi-auth/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index a0ff62751..0297c9ec4 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml index 783349d84..1f1f42537 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/ruoyi-common/ruoyi-common-core/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datascope/pom.xml b/ruoyi-common/ruoyi-common-datascope/pom.xml index b99329be8..fa814fd73 100644 --- a/ruoyi-common/ruoyi-common-datascope/pom.xml +++ b/ruoyi-common/ruoyi-common-datascope/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datasource/pom.xml b/ruoyi-common/ruoyi-common-datasource/pom.xml index d90aa8645..252e8c8b3 100644 --- a/ruoyi-common/ruoyi-common-datasource/pom.xml +++ b/ruoyi-common/ruoyi-common-datasource/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/ruoyi-common/ruoyi-common-log/pom.xml index e2f59ecd2..2bbcb2f24 100644 --- a/ruoyi-common/ruoyi-common-log/pom.xml +++ b/ruoyi-common/ruoyi-common-log/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/ruoyi-common/ruoyi-common-redis/pom.xml index e1602ecaf..d87fbf718 100644 --- a/ruoyi-common/ruoyi-common-redis/pom.xml +++ b/ruoyi-common/ruoyi-common-redis/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-common/ruoyi-common-seata/pom.xml b/ruoyi-common/ruoyi-common-seata/pom.xml index 152f6f16c..a60ee02a5 100644 --- a/ruoyi-common/ruoyi-common-seata/pom.xml +++ b/ruoyi-common/ruoyi-common-seata/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml index 4c6fb56b1..523aeba05 100644 --- a/ruoyi-common/ruoyi-common-security/pom.xml +++ b/ruoyi-common/ruoyi-common-security/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-common/ruoyi-common-sensitive/pom.xml b/ruoyi-common/ruoyi-common-sensitive/pom.xml index 7e5e6f43c..c73abba0b 100644 --- a/ruoyi-common/ruoyi-common-sensitive/pom.xml +++ b/ruoyi-common/ruoyi-common-sensitive/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-common/ruoyi-common-swagger/pom.xml b/ruoyi-common/ruoyi-common-swagger/pom.xml index f64414d1d..667b4f57e 100644 --- a/ruoyi-common/ruoyi-common-swagger/pom.xml +++ b/ruoyi-common/ruoyi-common-swagger/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-common - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index 3f7d7d0b7..3f9dc5802 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index 7b88caded..895b774ba 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml index e6c085c68..aa2cf9e60 100644 --- a/ruoyi-modules/ruoyi-file/pom.xml +++ b/ruoyi-modules/ruoyi-file/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml index c4eb39cce..ddb0e8517 100644 --- a/ruoyi-modules/ruoyi-gen/pom.xml +++ b/ruoyi-modules/ruoyi-gen/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml index 54809426f..66a9151a9 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/ruoyi-modules/ruoyi-job/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index b87bff363..6e7e55330 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -5,7 +5,7 @@ com.ruoyi ruoyi-modules - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java index 6aa046b4c..32d2f170c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java @@ -134,48 +134,6 @@ public class SysUserController extends BaseController return R.ok(sysUserVo); } - /** - * 获取当前用户信息 - */ - @InnerAuth - @GetMapping("/info/phoneNumber/{phoneNumber:\\d+}") - public R infoByPhone(@PathVariable("phoneNumber") String phoneNumber) - { - SysUser sysUser = userService.selectUserByPhoneNumber(phoneNumber); - if (StringUtils.isNull(sysUser)) - { - return R.fail("用户名或密码错误"); - } - // 角色集合 - Set roles = permissionService.getRolePermission(sysUser); - // 权限集合 - Set permissions = permissionService.getMenuPermission(sysUser); - LoginUser sysUserVo = new LoginUser(); - sysUserVo.setSysUser(sysUser); - sysUserVo.setRoles(roles); - sysUserVo.setPermissions(permissions); - return R.ok(sysUserVo); - } - - /** - * 根据ID获取用户信息 - */ - @InnerAuth - @GetMapping("/detail/{userId}") - public R infoById(@PathVariable("userId") Long userId) - { - SysUser sysUser = userService.selectUserById(userId); - // 角色集合 - Set roles = permissionService.getRolePermission(sysUser); - // 权限集合 - Set permissions = permissionService.getMenuPermission(sysUser); - LoginUser sysUserVo = new LoginUser(); - sysUserVo.setSysUser(sysUser); - sysUserVo.setRoles(roles); - sysUserVo.setPermissions(permissions); - return R.ok(sysUserVo); - } - /** * 注册用户信息 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt new file mode 100644 index 000000000..e9e2ea31b --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt @@ -0,0 +1,107 @@ +package com.ruoyi.system.controller.inner + +import com.ruoyi.common.core.domain.R +import com.ruoyi.common.core.utils.StringUtils +import com.ruoyi.common.log.annotation.Log +import com.ruoyi.common.log.enums.BusinessType +import com.ruoyi.common.security.annotation.InnerAuth +import com.ruoyi.system.api.domain.SysUser +import com.ruoyi.system.api.model.LoginUser +import com.ruoyi.system.service.ISysDeptService +import com.ruoyi.system.service.ISysPermissionService +import com.ruoyi.system.service.ISysRoleService +import com.ruoyi.system.service.ISysUserService +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.validation.annotation.Validated +import org.springframework.web.bind.annotation.* + +/** + * 用户信息 + * + * @author hsdllcw + */ +@RestController +@RequestMapping("/inner/user") +class InnerSysUserController { + + @Autowired + lateinit var userService: ISysUserService + + @Autowired + lateinit var permissionService: ISysPermissionService + + @Autowired + lateinit var deptService: ISysDeptService + + @Autowired + lateinit var roleService: ISysRoleService + + + /** + * 获取当前用户信息 + */ + @InnerAuth + @GetMapping("/info/phoneNumber/{phoneNumber:\\d+}") + fun infoByPhone(@PathVariable("phoneNumber") phoneNumber: String?): R { + val sysUser: SysUser = userService.selectUserByPhoneNumber(phoneNumber) + if (StringUtils.isNull(sysUser)) { + return R.fail("用户名或密码错误") + } + // 角色集合 + val roles: Set = permissionService.getRolePermission(sysUser) + // 权限集合 + val permissions: Set = permissionService.getMenuPermission(sysUser) + val sysUserVo = LoginUser() + sysUserVo.sysUser = sysUser + sysUserVo.roles = roles + sysUserVo.permissions = permissions + return R.ok(sysUserVo) + } + + /** + * 根据ID获取用户信息 + */ + @InnerAuth + @GetMapping("/detail/{userId}") + fun infoById(@PathVariable("userId") userId: Long?): R { + val sysUser: SysUser = userService.selectUserById(userId) + // 角色集合 + val roles: Set = permissionService.getRolePermission(sysUser) + // 权限集合 + val permissions: Set = permissionService.getMenuPermission(sysUser) + val sysUserVo = LoginUser() + sysUserVo.sysUser = sysUser + sysUserVo.roles = roles + sysUserVo.permissions = permissions + return R.ok(sysUserVo) + } + + /** + * 修改用户 + */ + @InnerAuth + @PutMapping + @Log(title = "用户修改本人信息", businessType = BusinessType.UPDATE) + fun edit(@Validated @RequestBody loginUser: LoginUser): R { + val originUser = userService.selectUserById(loginUser.userid) + val targetUser = loginUser.sysUser + userService.checkUserAllowed(originUser) + userService.checkUserDataScope(originUser.userId) + deptService.checkDeptDataScope(originUser.deptId) + roleService.checkRoleDataScope(*originUser.roleIds) + if (!userService.checkUserNameUnique(targetUser)) { + return error("修改用户'" + targetUser.userName + "'失败，登录账号已存在") + } else if (StringUtils.isNotEmpty(targetUser.phonenumber) && !userService.checkPhoneUnique(targetUser)) { + return error("修改用户'" + targetUser.userName + "'失败，手机号码已存在") + } else if (StringUtils.isNotEmpty(targetUser.email) && !userService.checkEmailUnique(targetUser)) { + return error("修改用户'" + targetUser.userName + "'失败，邮箱账号已存在") + } + originUser.userName = targetUser.userName ?: originUser.userName + originUser.phonenumber = targetUser.phonenumber ?: originUser.phonenumber + originUser.email = targetUser.email ?: originUser.email + originUser.avatar = targetUser.avatar ?: originUser.avatar + originUser.updateBy = originUser.userName + userService.updateUser(originUser) + return R.ok(loginUser) + } +} \ No newline at end of file diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index 77da250b2..c88e4d1a7 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -914,7 +914,7 @@ export default { data() { return { // 版本号 - version: "3.6.41.0.2", + version: "3.6.41.0.3", }; }, methods: { diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml index 246732cb5..f26ffda80 100644 --- a/ruoyi-visual/pom.xml +++ b/ruoyi-visual/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.41.0.2 + 3.6.41.0.3 4.0.0 diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml index b0389af73..4c1e03c31 100644 --- a/ruoyi-visual/ruoyi-monitor/pom.xml +++ b/ruoyi-visual/ruoyi-monitor/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi-visual - 3.6.41.0.2 + 3.6.41.0.3 4.0.0