From 21495202ffdbb7c7078bf0f738f0736c56220b1d Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Wed, 20 Nov 2024 17:51:00 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E6=96=B0=E5=A2=9E=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1unionId=E6=B3=A8=E5=86=8C=E7=9A=84=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +- pom.xml | 4 +- ruoyi-api/pom.xml | 2 +- ruoyi-api/ruoyi-api-system/pom.xml | 2 +- .../factory/RemoteUserFallbackFactory.java | 16 ++++- .../api/inner/InnerRemoteUserService.java | 25 ++++++- ruoyi-auth/pom.xml | 20 +++--- ruoyi-common/pom.xml | 2 +- ruoyi-common/ruoyi-common-core/pom.xml | 2 +- ruoyi-common/ruoyi-common-datascope/pom.xml | 2 +- ruoyi-common/ruoyi-common-datasource/pom.xml | 2 +- ruoyi-common/ruoyi-common-log/pom.xml | 2 +- ruoyi-common/ruoyi-common-redis/pom.xml | 2 +- ruoyi-common/ruoyi-common-seata/pom.xml | 2 +- ruoyi-common/ruoyi-common-security/pom.xml | 2 +- ruoyi-common/ruoyi-common-sensitive/pom.xml | 2 +- ruoyi-common/ruoyi-common-swagger/pom.xml | 2 +- ruoyi-gateway/pom.xml | 2 +- ruoyi-modules/pom.xml | 2 +- ruoyi-modules/ruoyi-file/pom.xml | 2 +- ruoyi-modules/ruoyi-gen/pom.xml | 2 +- ruoyi-modules/ruoyi-job/pom.xml | 2 +- ruoyi-modules/ruoyi-system/pom.xml | 2 +- .../inner/InnerSysUserController.kt | 47 ++++++++++++ .../com/ruoyi/system/mapper/KSysUserMapper.kt | 28 ++++++++ .../ruoyi/system/service/IKSysUserService.kt | 31 ++++++++ .../service/impl/KSysUserServiceImpl.kt | 46 ++++++++++++ .../mapper/system/KSysUserMapper.xml | 72 +++++++++++++++++++ ruoyi-ui/package.json | 2 +- ruoyi-ui/src/views/index.vue | 4 +- ruoyi-visual/pom.xml | 2 +- ruoyi-visual/ruoyi-monitor/pom.xml | 2 +- 32 files changed, 298 insertions(+), 41 deletions(-) create mode 100644 ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/mapper/KSysUserMapper.kt create mode 100644 ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/IKSysUserService.kt create mode 100644 ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt create mode 100644 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml diff --git a/README.md b/README.md index b7169d7b2..89c5a679a 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@

logo

-

RuoYi v3.6.5

+

RuoYi v3.6.5.0.1

基于 Vue/Element UI 和 Spring Boot/Spring Cloud & Alibaba 前后端分离的分布式微服务架构

- +

diff --git a/pom.xml b/pom.xml index 4ebfd012c..3ebc33615 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,14 @@ com.ruoyi ruoyi - 3.6.5 + 3.6.5.0.1 ruoyi http://www.ruoyi.vip 若依微服务系统 - 3.6.5 + 3.6.5.0.1 UTF-8 UTF-8 1.8 diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml index d60796c12..225a00d3d 100644 --- a/ruoyi-api/pom.xml +++ b/ruoyi-api/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml index b9e91238e..c03710ff1 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.5 + 3.6.5.0.1 4.0.0 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 594b7da64..7f16c270f 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 @@ -11,6 +11,8 @@ import com.ruoyi.system.api.RemoteUserService; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.model.LoginUser; +import java.util.Map; + /** * 用户服务降级处理 * @@ -29,7 +31,12 @@ public class RemoteUserFallbackFactory implements FallbackFactory infoById_Inner(Long userId, @NotNull String source) { + public R getById_Inner(Long userId, @NotNull String source) { + return R.fail("获取用户失败:" + throwable.getMessage()); + } + + @Override + public R getByWxUnionId_Inner(String unionid, String source) { return R.fail("获取用户失败:" + throwable.getMessage()); } @@ -41,7 +48,7 @@ public class RemoteUserFallbackFactory implements FallbackFactory getUserInfoByPhoneNumber_Inner(@NotNull String phoneNumber, @NotNull String source) { + public R getByPhoneNumber_Inner(@NotNull String phoneNumber, @NotNull String source) { return R.fail("获取用户失败:" + throwable.getMessage()); } @@ -67,6 +74,11 @@ public class RemoteUserFallbackFactory implements FallbackFactory edit_Inner(@NotNull LoginUser user, @NotNull String source) { return R.fail("修改用户信息失败:" + throwable.getMessage()); } + + @Override + public R registerUserByWxUnionId_Inner(Map params, 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 index f1856d682..64b9b75ef 100644 --- 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 @@ -7,6 +7,8 @@ import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.model.LoginUser; import org.springframework.web.bind.annotation.*; +import java.util.Map; + public interface InnerRemoteUserService { /** * 通过用户ID查询用户信息 @@ -16,8 +18,17 @@ public interface InnerRemoteUserService { * @return 结果 */ @GetMapping("/inner/user/detail/{userId}") - R infoById_Inner(@PathVariable("userId") Long userId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + R getById_Inner(@PathVariable("userId") Long userId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + /** + * 通过用户ID查询用户信息 + * + * @param unionid 用户微信unionid + * @param source 请求来源 + * @return 结果 + */ + @GetMapping("/inner/user/detail/wx/unionid/{unionid}") + R getByWxUnionId_Inner(@PathVariable("unionid") String unionid, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** * 通过手机号查询用户信息 @@ -27,7 +38,7 @@ public interface InnerRemoteUserService { * @return 结果 */ @GetMapping("/inner/user/info/phoneNumber/{phoneNumber:\\d+}") - R getUserInfoByPhoneNumber_Inner(@PathVariable("phoneNumber") String phoneNumber, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + R getByPhoneNumber_Inner(@PathVariable("phoneNumber") String phoneNumber, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** * 通过手机号查询用户信息 @@ -41,4 +52,14 @@ public interface InnerRemoteUserService { @PutMapping("/inner/user") R edit_Inner(@RequestBody LoginUser user, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + /** + * 注册用户信息 + * + * @param params 包含微信unionId和deptId + * @param source 请求来源 + * @return 结果 + */ + @PostMapping("/inner/user/register/wx/unionid") + public R registerUserByWxUnionId_Inner(@RequestBody Map params, @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 912b1c8ed..689bbeb2f 100644 --- a/ruoyi-auth/pom.xml +++ b/ruoyi-auth/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5 + 3.6.5.0.1 4.0.0 @@ -15,45 +15,45 @@ - + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery - + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config - + com.alibaba.cloud spring-cloud-starter-alibaba-sentinel - + org.springframework.boot spring-boot-starter-web - + org.springframework.boot spring-boot-starter-actuator - + com.ruoyi ruoyi-common-security - + - + ${project.artifactId} @@ -70,5 +70,5 @@ - + diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 5ce394cbf..8f5c6ecb2 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml index 811b69c6c..069fd60ee 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.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datascope/pom.xml b/ruoyi-common/ruoyi-common-datascope/pom.xml index d11529688..486f7e672 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.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datasource/pom.xml b/ruoyi-common/ruoyi-common-datasource/pom.xml index f75526c16..5b33800ab 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.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/ruoyi-common/ruoyi-common-log/pom.xml index f954fc501..b4300ab6c 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.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/ruoyi-common/ruoyi-common-redis/pom.xml index 3c45b6083..385246698 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.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-common/ruoyi-common-seata/pom.xml b/ruoyi-common/ruoyi-common-seata/pom.xml index 0fcf19a69..f4c25c212 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.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml index 487a130fb..d54ee21fb 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.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-common/ruoyi-common-sensitive/pom.xml b/ruoyi-common/ruoyi-common-sensitive/pom.xml index 82ce3cff8..7e0b95126 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.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-common/ruoyi-common-swagger/pom.xml b/ruoyi-common/ruoyi-common-swagger/pom.xml index dd1190712..632196719 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.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index 0b5fb3f66..8de0895bd 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index 6e6b96d6d..f19d771b0 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml index b4d5c62f8..197718ac1 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.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml index c6c0bf4f4..deb0d0459 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.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml index a6f1a1b79..6a8f8b5f3 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.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index d4bffdc6b..426bf0b6a 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.5 + 3.6.5.0.1 4.0.0 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 index f0b9088bb..2da4cca09 100644 --- 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 @@ -11,6 +11,8 @@ import com.ruoyi.common.security.annotation.InnerAuth import com.ruoyi.common.security.service.TokenService import com.ruoyi.system.api.domain.SysUser import com.ruoyi.system.api.model.LoginUser +import com.ruoyi.system.service.IKSysUserService +import com.ruoyi.system.service.ISysConfigService import com.ruoyi.system.service.ISysPermissionService import com.ruoyi.system.service.ISysUserService import org.springframework.beans.factory.annotation.Autowired @@ -29,12 +31,18 @@ open class InnerSysUserController : BaseController() { @Autowired open lateinit var userService: ISysUserService + @Autowired + open lateinit var kSysUserService: IKSysUserService + @Autowired open lateinit var permissionService: ISysPermissionService @Autowired open lateinit var tokenService: TokenService + @Autowired + open lateinit var configService: ISysConfigService + /** * 获取当前用户信息 @@ -84,6 +92,27 @@ open class InnerSysUserController : BaseController() { return R.ok(sysUserVo) } + /** + * 根据微信unionid获取用户信息 + */ + @InnerAuth + @GetMapping("/detail/wx/unionid/{unionid}") + fun infoByWxUnionId(@PathVariable("unionid") unionid: String): R { + val sysUser = kSysUserService.selectUserByWxUnionId(unionid) + if (StringUtils.isNull(sysUser)) { + return R.fail("wx_unionid错误") + } + // 角色集合 + 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) + } + /** * 修改用户 */ @@ -112,4 +141,22 @@ open class InnerSysUserController : BaseController() { tokenService.setLoginUser(loginUser) return success(loginUser) } + + /** + * 注册用户信息 + */ + @InnerAuth + @PostMapping("/register/wx/unionid") + fun registerUserByWxUnionId(@RequestBody params: Map): R { + if (!("true" == configService.selectConfigByKey("sys.account.registerUser"))) { + return R.fail("当前系统没有开启注册功能！") + } + val unionid = params.get("unionId") + val deptId = params.get("deptId")?.toLong() + if (unionid == null) return R.fail("微信unionid不存在无法注册") + if (!kSysUserService.checkWxUnionIdUnique(unionid)) { + return R.fail("保存用户'$unionid'失败，注册账号已存在") + } + return R.ok(kSysUserService.registerUserByWxUnionId(unionid, deptId)) + } } \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/mapper/KSysUserMapper.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/mapper/KSysUserMapper.kt new file mode 100644 index 000000000..e784b2d00 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/mapper/KSysUserMapper.kt @@ -0,0 +1,28 @@ +package com.ruoyi.system.mapper + +import com.ruoyi.system.api.domain.SysUser + +/** + * 用户表 数据层 + * + * @author hsdllcw + */ +interface KSysUserMapper { + /** + * 通过用户名查询用户 + * + * @param wxUnionId 微信unionid + * @return 用户对象信息 + */ + fun selectUserByWxUnionId(wxUnionId: String): SysUser? + + /** + * 校验微信unionid是否唯一 + * + * @param wxUnionId 微信unionid + * @return 结果 + */ + fun checkWxUnionIdUnique(wxUnionId: String): SysUser? + + fun insert(params: Map): Int +} \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/IKSysUserService.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/IKSysUserService.kt new file mode 100644 index 000000000..9e5d20c74 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/IKSysUserService.kt @@ -0,0 +1,31 @@ +package com.ruoyi.system.service + +import com.ruoyi.system.api.domain.SysUser + +interface IKSysUserService { + fun getISysUserService(): ISysUserService + + /** + * 通过微信unionid查询用户 + * + * @param wxUnionId 微信unionid + * @return 用户对象信息 + */ + fun selectUserByWxUnionId(wxUnionId: String): SysUser? + + /** + * 校验微信unionid是否唯一 + * + * @param wxUnionId 微信unionid + * @return 用户对象信息 + */ + fun checkWxUnionIdUnique(wxUnionId: String): Boolean + + /** + * 注册用户信息 + * + * @param wxUnionId 微信unionId + * @return 结果 + */ + fun registerUserByWxUnionId(wxUnionId: String, deptId: Long?): Boolean +} \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt new file mode 100644 index 000000000..6ecefb287 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt @@ -0,0 +1,46 @@ +package com.ruoyi.system.service.impl + +import com.ruoyi.common.core.constant.UserConstants +import com.ruoyi.common.core.utils.uuid.IdUtils +import com.ruoyi.common.security.utils.SecurityUtils +import com.ruoyi.system.api.domain.SysUser +import com.ruoyi.system.mapper.KSysUserMapper +import com.ruoyi.system.service.IKSysUserService +import com.ruoyi.system.service.ISysUserService +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.stereotype.Service + +@Service +open class KSysUserServiceImpl : IKSysUserService { + @Autowired + lateinit var sysUserService: ISysUserService + + @Autowired + lateinit var kSysUserMapper: KSysUserMapper + override fun getISysUserService() = sysUserService + override fun selectUserByWxUnionId(wxUnionId: String) = kSysUserMapper.selectUserByWxUnionId(wxUnionId) + override fun checkWxUnionIdUnique(wxUnionId: String) = + kSysUserMapper.checkWxUnionIdUnique(wxUnionId)?.run { UserConstants.NOT_UNIQUE } ?: UserConstants.UNIQUE + + /** + * 注册用户信息 + * + * @param wxUnionId 微信unionId + * @return 结果 + */ + override fun registerUserByWxUnionId(wxUnionId: String, deptId: Long?): Boolean { + val user = SysUser().apply { + userName = IdUtils.randomUUID().replace("-".toRegex(), "").substring(0, 30) + nickName = "嘉迪微信用户" + password = SecurityUtils.encryptPassword(IdUtils.randomUUID()) + this.deptId = deptId + } + return sysUserService.registerUser(user).apply { + sysUserService.selectUserByUserName(user.userName) + kSysUserMapper.insert(mapOf( + "userId" to user.userId, + "wxUnionId" to wxUnionId, + )) + } + } +} \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml new file mode 100644 index 000000000..9444eed27 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, + d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, + r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status + from sys_user u + left join sys_user_account ua on ua.user_id=u.user_id + left join sys_dept d on u.dept_id = d.dept_id + left join sys_user_role ur on u.user_id = ur.user_id + left join sys_role r on r.role_id = ur.role_id + + + + + + + + insert into sys_user_account(user_id, wx_unionid) values (#{userId},#{wxUnionId}) + + \ No newline at end of file diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index afcba4909..8df9c8dd8 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "3.6.5", + "version": "3.6.5.0.1", "description": "若依管理系统", "author": "若依", "license": "MIT", diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index 8038d09f5..146df04b5 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -145,7 +145,7 @@ 更新日志 - +
  1. 使用SpringDoc代替Swagger
  2. 菜单管理新增路由名称
    3. @@ -946,7 +946,7 @@ export default { data() { return { // 版本号 - version: "3.6.5", + version: "3.6.5.0.1", }; }, methods: { diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml index a927b0d95..f5b61dfeb 100644 --- a/ruoyi-visual/pom.xml +++ b/ruoyi-visual/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5 + 3.6.5.0.1 4.0.0 diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml index 22cbead5a..9bc245f74 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.5 + 3.6.5.0.1 4.0.0