diff --git a/README.md b/README.md index b9af7750e..a307fd679 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@

logo

-

RuoYi v3.6.5.0.6

+

RuoYi v3.6.5.0.7

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

- +

diff --git a/pom.xml b/pom.xml index 77b588e2e..9ca9cad36 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,14 @@ com.ruoyi ruoyi - 3.6.5.0.6 + 3.6.5.0.7 ruoyi http://www.ruoyi.vip 若依微服务系统 - 3.6.5.0.6 + 3.6.5.0.7 UTF-8 UTF-8 1.8 diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml index eb706cb6c..7b8c5a3b6 100644 --- a/ruoyi-api/pom.xml +++ b/ruoyi-api/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml index 3686d75a8..6b999b656 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.0.6 + 3.6.5.0.7 4.0.0 @@ -22,7 +22,17 @@ com.ruoyi ruoyi-common-core - + + com.zkjiadi + zkjiadi-mall-api + 1.0.6 + + + com.squareup.okhttp3 + okhttp + + + 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 7f16c270f..b0f78812f 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,6 +1,7 @@ package com.ruoyi.system.api.factory; import com.github.pagehelper.Page; +import com.ruoyi.system.api.domain.KSysUserAccount; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -11,8 +12,6 @@ import com.ruoyi.system.api.RemoteUserService; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.model.LoginUser; -import java.util.Map; - /** * 用户服务降级处理 * @@ -76,7 +75,7 @@ public class RemoteUserFallbackFactory implements FallbackFactory registerUserByWxUnionId_Inner(Map params, String source) { + public R registerUserBySysUserAccount_Inner(KSysUserAccount sysUserAccount, Long deptId, 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 64b9b75ef..e6f0d6f02 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 @@ -3,6 +3,7 @@ package com.ruoyi.system.api.inner; import com.github.pagehelper.Page; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.domain.R; +import com.ruoyi.system.api.domain.KSysUserAccount; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.model.LoginUser; import org.springframework.web.bind.annotation.*; @@ -18,17 +19,17 @@ public interface InnerRemoteUserService { * @return 结果 */ @GetMapping("/inner/user/detail/{userId}") - R getById_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 请求来源 + * @param source 请求来源 * @return 结果 */ @GetMapping("/inner/user/detail/wx/unionid/{unionid}") - R getByWxUnionId_Inner(@PathVariable("unionid") String unionid, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + R getByWxUnionId_Inner(@PathVariable("unionid") String unionid, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** * 通过手机号查询用户信息 @@ -56,10 +57,11 @@ public interface InnerRemoteUserService { /** * 注册用户信息 * - * @param params 包含微信unionId和deptId + * @param sysUserAccount 包含微信unionId + * @param deptId 包含部门ID * @param source 请求来源 * @return 结果 */ - @PostMapping("/inner/user/register/wx/unionid") - public R registerUserByWxUnionId_Inner(@RequestBody Map params, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + @PostMapping("/inner/user/register/dept/{deptId}/wx/unionid") + public R registerUserBySysUserAccount_Inner(@RequestBody KSysUserAccount sysUserAccount,@PathVariable Long deptId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); } \ No newline at end of file diff --git a/ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/domain/KSysUserAccount.kt b/ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/domain/KSysUserAccount.kt index e96b447aa..7da28c373 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/domain/KSysUserAccount.kt +++ b/ruoyi-api/ruoyi-api-system/src/main/kotlin/com/ruoyi/system/api/domain/KSysUserAccount.kt @@ -1,9 +1,21 @@ package com.ruoyi.system.api.domain -class KSysUserAccount { +import com.cyl.manager.ums.domain.entity.MemberWechat + +open class KSysUserAccount : MemberWechat() { /** 用户ID */ - var userId: Long? = null + open var userId: Long? = null + set(value) { + memberId = value + field = value + } + get() = memberId /** 微信UnionId */ - var wxUnionId: String? = null + open var wxUnionId: String? = null + set(value) { + unionid = value + field = value + } + get() = unionid } \ No newline at end of file diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml index c8d82173b..dd45508a7 100644 --- a/ruoyi-auth/pom.xml +++ b/ruoyi-auth/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 50ea1ab4f..63885a052 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml index c7c62fa22..fd038fe38 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.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datascope/pom.xml b/ruoyi-common/ruoyi-common-datascope/pom.xml index 695d6f8fd..1778e91c9 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.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-common/ruoyi-common-datasource/pom.xml b/ruoyi-common/ruoyi-common-datasource/pom.xml index 5fba98f43..a98ebbc83 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.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/ruoyi-common/ruoyi-common-log/pom.xml index 05c885e4a..cef3064fd 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.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/ruoyi-common/ruoyi-common-redis/pom.xml index db637f8ce..e5f803291 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.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-common/ruoyi-common-seata/pom.xml b/ruoyi-common/ruoyi-common-seata/pom.xml index 358bb694a..7e18a1a20 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.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml index 07701b78b..95987a444 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.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-common/ruoyi-common-sensitive/pom.xml b/ruoyi-common/ruoyi-common-sensitive/pom.xml index 555045b59..7f1969ba5 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.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-common/ruoyi-common-swagger/pom.xml b/ruoyi-common/ruoyi-common-swagger/pom.xml index 50370fa98..5ab310fa2 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.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index bd3c15cef..88d448f48 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index 736a77870..cb7865309 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml index da42c57e8..d4146a624 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.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml index 750565011..483abb6fa 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.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml index e1ff46dc1..ca538b373 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.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index c354f8f31..f8bec3915 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.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index 06105b4c9..a85101f9a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -7,6 +7,7 @@ import java.util.stream.Collectors; import javax.validation.Validator; import com.github.pagehelper.Page; +import com.ruoyi.system.api.domain.KSysUserAccount; import com.ruoyi.system.service.IKSysUserService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,7 +38,7 @@ import com.ruoyi.system.service.ISysUserService; /** * 用户 业务层处理 - * + * * @author ruoyi */ @Service @@ -74,7 +75,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 根据条件分页查询用户列表 - * + * * @param user 用户信息 * @return 用户信息集合信息 */ @@ -87,7 +88,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 根据条件分页查询已分配用户角色列表 - * + * * @param user 用户信息 * @return 用户信息集合信息 */ @@ -100,7 +101,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 根据条件分页查询未分配用户角色列表 - * + * * @param user 用户信息 * @return 用户信息集合信息 */ @@ -113,7 +114,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 通过用户名查询用户 - * + * * @param userName 用户名 * @return 用户对象信息 */ @@ -147,7 +148,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 通过用户ID查询用户 - * + * * @param userId 用户ID * @return 用户对象信息 */ @@ -159,7 +160,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 查询用户所属角色组 - * + * * @param userName 用户名 * @return 结果 */ @@ -176,7 +177,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 查询用户所属岗位组 - * + * * @param userName 用户名 * @return 结果 */ @@ -193,7 +194,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 校验用户名称是否唯一 - * + * * @param user 用户信息 * @return 结果 */ @@ -247,7 +248,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 校验用户是否允许操作 - * + * * @param user 用户信息 */ @Override @@ -261,7 +262,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 校验用户是否有数据权限 - * + * * @param userId 用户id */ @Override @@ -281,7 +282,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 新增保存用户信息 - * + * * @param user 用户信息 * @return 结果 */ @@ -300,7 +301,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 注册用户信息 - * + * * @param user 用户信息 * @return 结果 */ @@ -312,14 +313,13 @@ public class SysUserServiceImpl implements ISysUserService /** * 修改保存用户信息 - * + * * @param user 用户信息 * @return 结果 */ @Override @Transactional(rollbackFor = Exception.class) - public int updateUser(SysUser user) - { + public int updateUser(SysUser user) { Long userId = user.getUserId(); // 删除用户与角色关联 userRoleMapper.deleteUserRoleByUserId(userId); @@ -331,9 +331,11 @@ public class SysUserServiceImpl implements ISysUserService insertUserPost(user); // 重绑定微信信息 if (Objects.nonNull(user.getSysUserAccount())) { - kSysUserService.unBindWxUnionIdByUserId(userId); + KSysUserAccount sysUserAccount = new KSysUserAccount(); + sysUserAccount.setUserId(userId); + kSysUserService.updateSysUserAccount(sysUserAccount); if (Objects.nonNull(user.getSysUserAccount().getWxUnionId())) { - kSysUserService.bindWxUnionIdByUserId(userId, user.getSysUserAccount().getWxUnionId()); + kSysUserService.updateSysUserAccount(user.getSysUserAccount()); } } return userMapper.updateUser(user); @@ -341,7 +343,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 用户授权角色 - * + * * @param userId 用户ID * @param roleIds 角色组 */ @@ -355,7 +357,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 修改用户状态 - * + * * @param user 用户信息 * @return 结果 */ @@ -367,7 +369,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 修改用户基本信息 - * + * * @param user 用户信息 * @return 结果 */ @@ -379,7 +381,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 修改用户头像 - * + * * @param userName 用户名 * @param avatar 头像地址 * @return 结果 @@ -392,7 +394,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 重置用户密码 - * + * * @param user 用户信息 * @return 结果 */ @@ -404,7 +406,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 重置用户密码 - * + * * @param userName 用户名 * @param password 密码 * @return 结果 @@ -417,7 +419,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 新增用户角色信息 - * + * * @param user 用户对象 */ public void insertUserRole(SysUser user) @@ -427,7 +429,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 新增用户岗位信息 - * + * * @param user 用户对象 */ public void insertUserPost(SysUser user) @@ -450,7 +452,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 新增用户角色信息 - * + * * @param userId 用户ID * @param roleIds 角色组 */ @@ -473,7 +475,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 通过用户ID删除用户 - * + * * @param userId 用户ID * @return 结果 */ @@ -490,7 +492,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 批量删除用户信息 - * + * * @param userIds 需要删除的用户ID * @return 结果 */ @@ -512,7 +514,7 @@ public class SysUserServiceImpl implements ISysUserService /** * 导入用户数据 - * + * * @param userList 用户数据列表 * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据 * @param operName 操作用户 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 6e53b6e57..d3be5411c 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 @@ -10,6 +10,7 @@ import com.ruoyi.common.log.annotation.Log import com.ruoyi.common.log.enums.BusinessType import com.ruoyi.common.security.annotation.InnerAuth import com.ruoyi.common.security.service.TokenService +import com.ruoyi.system.api.domain.KSysUserAccount import com.ruoyi.system.api.domain.SysUser import com.ruoyi.system.api.model.LoginUser import com.ruoyi.system.service.IKSysUserService @@ -150,17 +151,15 @@ open class InnerSysUserController : BaseController() { * 注册用户信息 */ @InnerAuth - @PostMapping("/register/wx/unionid") - fun registerUserByWxUnionId(@RequestBody params: Map): R { - if (!("true" == configService.selectConfigByKey("sys.account.registerUser"))) { + @PostMapping("/register/dept/{deptId}/wx/unionid") + fun registerUserBySysUserAccount(@RequestBody sysUserAccount: KSysUserAccount, @PathVariable deptId: Long): 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'失败，注册账号已存在") + if (sysUserAccount.wxUnionId == null) return R.fail("微信unionid不存在无法注册") + if (!kSysUserService.checkWxUnionIdUnique(sysUserAccount.wxUnionId!!)) { + return R.fail("保存用户'$sysUserAccount.wxUnionId'失败，注册账号已存在") } - return R.ok(kSysUserService.registerUserByWxUnionId(unionid, deptId)) + return R.ok(kSysUserService.registerUserBySysUserAccount(sysUserAccount, 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 index 4636c3591..fd57b87cb 100644 --- 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 @@ -32,7 +32,9 @@ interface KSysUserMapper { */ fun checkWxUnionIdUnique(wxUnionId: String): SysUser? - fun insertSysUserAccount(params: Map): Int + fun insertSysUserAccount(sysUserAccount: KSysUserAccount): Int - fun updateSysUserAccount(params: Map): Int + fun updateSysUserAccount(sysUserAccount: KSysUserAccount): Int + + fun unBindWxUnionIdByUserId(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 index 262bf29e0..7c1c77b49 100644 --- 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 @@ -33,14 +33,14 @@ interface IKSysUserService { /** * 注册用户信息 * - * @param wxUnionId 微信unionId + * @param sysUserAccount 包含微信unionId * @return 结果 */ - fun registerUserByWxUnionId(wxUnionId: String, deptId: Long?): Boolean + fun registerUserBySysUserAccount(sysUserAccount: KSysUserAccount, deptId: Long): Boolean /** * 绑定微信 */ - fun bindWxUnionIdByUserId(userId: Long,wxUnionId: String): Int + fun updateSysUserAccount(sysUserAccount: KSysUserAccount): Int /** * 解绑微信 */ 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 index 6df0d2d6b..c33c39c88 100644 --- 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 @@ -3,6 +3,7 @@ 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.KSysUserAccount import com.ruoyi.system.api.domain.SysUser import com.ruoyi.system.mapper.KSysUserMapper import com.ruoyi.system.service.IKSysUserService @@ -28,10 +29,11 @@ open class KSysUserServiceImpl : IKSysUserService { /** * 注册用户信息 * - * @param wxUnionId 微信unionId + * @param sysUserAccount 包含微信unionId + * @param deptId 部门ID * @return 结果 */ - override fun registerUserByWxUnionId(wxUnionId: String, deptId: Long?): Boolean { + override fun registerUserBySysUserAccount(sysUserAccount: KSysUserAccount, deptId: Long): Boolean { val user = SysUser().apply { userName = IdUtils.randomUUID().replace("-".toRegex(), "").substring(0, 30) nickName = "嘉迪微信用户" @@ -40,34 +42,16 @@ open class KSysUserServiceImpl : IKSysUserService { } return sysUserService.registerUser(user).apply { sysUserService.selectUserByUserName(user.userName) - kSysUserMapper.insertSysUserAccount( - mapOf( - "userId" to user.userId, - "wxUnionId" to wxUnionId, - ) - ) + kSysUserMapper.insertSysUserAccount(sysUserAccount) } } - override fun bindWxUnionIdByUserId(userId: Long, wxUnionId: String): Int { - if (this.selectUserById(userId) != null) - return kSysUserMapper.updateSysUserAccount( - mapOf( - "userId" to userId, - "wxUnionId" to wxUnionId, - ) - ) - else - return kSysUserMapper.insertSysUserAccount( - mapOf( - "userId" to userId, - "wxUnionId" to wxUnionId, - ) - ) + override fun updateSysUserAccount(sysUserAccount: KSysUserAccount): Int { + return kSysUserMapper.updateSysUserAccount(sysUserAccount) } override fun unBindWxUnionIdByUserId(userId: Long): Int { - return kSysUserMapper.updateSysUserAccount( + return kSysUserMapper.unBindWxUnionIdByUserId( mapOf( "userId" to userId, "wxUnionId" to null, 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 index fa7a75e10..c6db0301b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml @@ -1,84 +1,152 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - + - - - - - - + + + + + + - - - 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, - umw.unionid + + + 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, + umw.unionid from sys_user u - left join ums_member_wechat umw on umw.member_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 + left join ums_member_wechat umw on umw.member_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 ums_member_wechat(member_id, unionid) values (#{userId},#{wxUnionId}) + + insert into ums_member_wechat(member_id, unionid, openid, routine_openid, groupid, tagid_list, subscribe, + subscribe_time, session_key, access_token, expires_in, refresh_token, expire_time) + values (#{userId}, #{wxUnionId}, #{openid}, #{routineOpenid}, #{groupid}, #{tagidList}, #{subscribe}, + #{subscribeTime}, #{sessionKey}, #{accessToken}, #{expiresIn}, #{refreshToken}, #{expireTime}) - - update ums_member_wechat set unionid = #{wxUnionId} where member_id = #{userId} + + update ums_member_wechat + set unionid = #{wxUnionId}, + openid = #{openid}, + routine_openid = #{routineOpenid}, + groupid = #{groupid}, + tagid_list = #{tagidList}, + subscribe = #{subscribe}, + subscribe_time = #{subscribeTime}, + session_key = #{sessionKey}, + access_token = #{accessToken}, + expires_in = #{expiresIn}, + refresh_token = #{refreshToken}, + expire_time = #{expireTime} + where member_id = #{userId} + + + update ums_member_wechat + set unionid = #{wxUnionId} + where member_id = #{userId} \ No newline at end of file diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index 93081e3ae..50383328b 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -108,7 +108,7 @@ 更新日志 - +
  1. 使用SpringDoc代替Swagger
  2. 菜单管理新增路由名称
    3. @@ -909,7 +909,7 @@ export default { data() { return { // 版本号 - version: "3.6.5.0.6", + version: "3.6.5.0.7", }; }, methods: { diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml index 287a9bf14..cabc16a20 100644 --- a/ruoyi-visual/pom.xml +++ b/ruoyi-visual/pom.xml @@ -4,7 +4,7 @@ com.ruoyi ruoyi - 3.6.5.0.6 + 3.6.5.0.7 4.0.0 diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml index 4df90d0b5..9f982940e 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.0.6 + 3.6.5.0.7 4.0.0