diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/GiteeLoginHandler.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/GiteeLoginHandler.java index 863d64b4b..150f1f58f 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/GiteeLoginHandler.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/GiteeLoginHandler.java @@ -17,7 +17,6 @@ package com.pig4cloud.pigx.admin.handler; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.URLUtil; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONObject; @@ -36,7 +35,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import java.util.HashMap; -import java.util.List; /** * @author lengleng @@ -107,17 +105,6 @@ public class GiteeLoginHandler extends AbstractLoginHandler { */ @Override public Boolean bind(SysUser user, String identify) { - List userList = sysUserService - .list(Wrappers.query().lambda().eq(SysUser::getGiteeLogin, identify)); - - // 先把原有绑定关系去除,设置绑定为NULL - if (CollUtil.isNotEmpty(userList)) { - SysUser condition = new SysUser(); - condition.setGiteeLogin(identify); - sysUserService.update(null, Wrappers.lambdaUpdate(condition).set(SysUser::getGiteeLogin, null)); - log.info("码云账号 {} 更换账号绑定", identify); - } - user.setGiteeLogin(identify); sysUserService.updateById(user); return true; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/MiniAppLoginHandler.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/MiniAppLoginHandler.java index ef7f66de4..b29127eba 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/MiniAppLoginHandler.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/MiniAppLoginHandler.java @@ -17,7 +17,6 @@ package com.pig4cloud.pigx.admin.handler; -import cn.hutool.core.collection.CollUtil; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -33,8 +32,6 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import java.util.List; - /** * @author lengleng * @date 2019年11月02日 @@ -96,20 +93,9 @@ public class MiniAppLoginHandler extends AbstractLoginHandler { */ @Override public Boolean bind(SysUser user, String identify) { - List userList = sysUserService - .list(Wrappers.query().lambda().eq(SysUser::getMiniOpenid, identify)); - - // 先把原有绑定关系去除,设置绑定为NULL - if (CollUtil.isNotEmpty(userList)) { - SysUser condition = new SysUser(); - condition.setMiniOpenid(identify); - sysUserService.update(null, Wrappers.lambdaUpdate(condition).set(SysUser::getMiniOpenid, null)); - log.info("小程序账号 {} 更换账号绑定", identify); - } - user.setMiniOpenid(identify); sysUserService.updateById(user); - return null; + return true; } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/OscChinaLoginHandler.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/OscChinaLoginHandler.java index 112fff215..4e450bb9f 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/OscChinaLoginHandler.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/OscChinaLoginHandler.java @@ -17,7 +17,6 @@ package com.pig4cloud.pigx.admin.handler; -import cn.hutool.core.collection.CollUtil; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; @@ -35,7 +34,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import java.util.HashMap; -import java.util.List; import java.util.Map; /** @@ -115,20 +113,9 @@ public class OscChinaLoginHandler extends AbstractLoginHandler { */ @Override public Boolean bind(SysUser user, String identify) { - List userList = sysUserService - .list(Wrappers.query().lambda().eq(SysUser::getOscId, identify)); - - // 先把原有绑定关系去除,设置绑定为NULL - if (CollUtil.isNotEmpty(userList)) { - SysUser condition = new SysUser(); - condition.setOscId(identify); - sysUserService.update(null, Wrappers.lambdaUpdate(condition).set(SysUser::getOscId, null)); - log.info("开源中国账号 {} 更换账号绑定", identify); - } - user.setOscId(identify); sysUserService.updateById(user); - return null; + return true; } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/SmsLoginHandler.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/SmsLoginHandler.java index acb147f7b..19deb1898 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/SmsLoginHandler.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/SmsLoginHandler.java @@ -72,7 +72,7 @@ public class SmsLoginHandler extends AbstractLoginHandler { public Boolean bind(SysUser user, String identify) { user.setPhone(identify); sysUserService.updateById(user); - return null; + return true; } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/TencentLoginHandler.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/TencentLoginHandler.java index a9b971287..19ea6ec29 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/TencentLoginHandler.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/TencentLoginHandler.java @@ -17,7 +17,6 @@ package com.pig4cloud.pigx.admin.handler; -import cn.hutool.core.collection.CollUtil; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; @@ -34,8 +33,6 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import java.util.List; - /** * @author lengleng * @date 2018/11/18 @@ -102,20 +99,9 @@ public class TencentLoginHandler extends AbstractLoginHandler { */ @Override public Boolean bind(SysUser user, String identify) { - List userList = sysUserService - .list(Wrappers.query().lambda().eq(SysUser::getQqOpenid, identify)); - - // 先把原有绑定关系去除,设置绑定为NULL - if (CollUtil.isNotEmpty(userList)) { - SysUser condition = new SysUser(); - condition.setQqOpenid(identify); - sysUserService.update(null, Wrappers.lambdaUpdate(condition).set(SysUser::getQqOpenid, null)); - log.info("QQ账号 {} 更换账号绑定", identify); - } - user.setQqOpenid(identify); sysUserService.updateById(user); - return null; + return true; } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/WeChatLoginHandler.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/WeChatLoginHandler.java index 16cb96970..c661f0d42 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/WeChatLoginHandler.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/WeChatLoginHandler.java @@ -17,7 +17,6 @@ package com.pig4cloud.pigx.admin.handler; -import cn.hutool.core.collection.CollUtil; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -33,8 +32,6 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import java.util.List; - /** * @author lengleng * @date 2018/11/18 @@ -94,20 +91,9 @@ public class WeChatLoginHandler extends AbstractLoginHandler { */ @Override public Boolean bind(SysUser user, String identify) { - List userList = sysUserService - .list(Wrappers.query().lambda().eq(SysUser::getWxOpenid, identify)); - - // 先把原有绑定关系去除,设置绑定为NULL - if (CollUtil.isNotEmpty(userList)) { - SysUser condition = new SysUser(); - condition.setWxOpenid(identify); - sysUserService.update(null, Wrappers.lambdaUpdate(condition).set(SysUser::getWxOpenid, null)); - log.info("微信账号 {} 更换账号绑定", identify); - } - user.setWxOpenid(identify); sysUserService.updateById(user); - return null; + return true; } }