From 8d8cffca7113204a64e214e9db530fbb41a2a6e2 Mon Sep 17 00:00:00 2001 From: "pikachu1995@126.com" Date: Thu, 2 Mar 2023 10:45:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E9=9B=86=E6=88=90unionID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../connect/ConnectBuyerWebController.java | 16 +- config/application.yml | 28 +-- .../lili/event/MemberConnectLoginEvent.java | 21 ++ .../cn/lili/event/impl/MemberExecute.java | 26 +- .../lili/listener/MemberMessageListener.java | 21 +- .../connect/config/ConnectAuthEnum.java | 5 +- .../connect/entity/dto/ConnectAuthUser.java | 15 ++ .../entity/dto/MemberConnectLoginMessage.java | 14 ++ .../connect/entity/enums/ConnectEnum.java | 2 - .../connect/entity/enums/SourceEnum.java | 24 ++ .../request/BaseAuthWeChatPCRequest.java | 6 +- .../request/BaseAuthWeChatRequest.java | 6 +- .../connect/service/ConnectService.java | 32 +-- .../serviceimpl/ConnectServiceImpl.java | 223 ++++++++---------- .../modules/connect/util/ConnectUtil.java | 17 +- .../modules/member/service/MemberService.java | 15 +- .../member/serviceimpl/MemberServiceImpl.java | 112 ++++----- .../cn/lili/rocketmq/tags/MemberTagsEnum.java | 6 +- 18 files changed, 323 insertions(+), 266 deletions(-) create mode 100644 consumer/src/main/java/cn/lili/event/MemberConnectLoginEvent.java create mode 100644 framework/src/main/java/cn/lili/modules/connect/entity/dto/MemberConnectLoginMessage.java create mode 100644 framework/src/main/java/cn/lili/modules/connect/entity/enums/SourceEnum.java diff --git a/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java b/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java index fa99b2fe..af2eec2b 100644 --- a/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java +++ b/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java @@ -47,7 +47,7 @@ public class ConnectBuyerWebController { @GetMapping("/login/web/{type}") - @ApiOperation(value = "WEB信任登录授权") + @ApiOperation(value = "WEB信任登录授权,包含PC、WAP") @ApiImplicitParams({ @ApiImplicitParam(name = "type", value = "登录方式:QQ,微信,微信_PC", allowableValues = "QQ,WECHAT,WECHAT_PC", paramType = "path") @@ -75,12 +75,12 @@ public class ConnectBuyerWebController { return connectUtil.getResult(state); } - @GetMapping("/register/auto") - @ApiOperation(value = "WEB信任登录授权") - public ResultMessage webAuthorize() { - Token token = memberService.autoRegister(); - return ResultUtil.data(token); - } +// @GetMapping("/register/auto") +// @ApiOperation(value = "WEB信任登录授权") +// public ResultMessage webAuthorize() { +// Token token = memberService.autoRegister(); +// return ResultUtil.data(token); +// } @ApiOperation(value = "unionID登录") @ApiImplicitParams({ @@ -92,7 +92,7 @@ public class ConnectBuyerWebController { @GetMapping("/app/login") public ResultMessage unionLogin(ConnectAuthUser authUser, @RequestHeader("uuid") String uuid) { try { - return ResultUtil.data(connectService.appLoginCallback(authUser, uuid)); + return ResultUtil.data(connectService.unionLoginCallback(authUser, uuid)); } catch (Exception e) { log.error("unionID登录错误", e); } diff --git a/config/application.yml b/config/application.yml index 201f837f..4e5c9dac 100644 --- a/config/application.yml +++ b/config/application.yml @@ -24,13 +24,13 @@ spring: boot: admin: client: - url: http://192.168.0.116:8000 + url: http://192.168.0.108:8000 cache: type: redis # Redis redis: - host: 127.0.0.1 - port: 6379 + host: 192.168.0.108 + port: 30379 password: lilishop lettuce: pool: @@ -60,7 +60,7 @@ spring: default-datasource: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/lilishop?useUnicode=true&characterEncoding=utf-8&useSSL=false&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://192.168.0.108:30306/kuaidi100?useUnicode=true&characterEncoding=utf-8&useSSL=false&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root password: lilishop maxActive: 50 @@ -241,16 +241,16 @@ lili: sk: zhNKVrJK6UPOhqIjn8AQvG37b9sz6 #域名 domain: - pc: http://192.168.0.116:8888 - wap: http://192.168.0.116:8888 - seller: http://192.168.0.116:8888 - admin: http://192.168.0.116:8888 + pc: http://192.168.0.108:8888 + wap: http://192.168.0.108:8888 + seller: http://192.168.0.108:8888 + admin: http://192.168.0.108:8888 #api地址 api: buyer: https://z171l91606.51mypc.cn - base: http://192.168.0.116:8888 - manager: http://192.168.0.116:8888 - seller: http://192.168.0.116:8888 + base: http://192.168.0.108:8888 + manager: http://192.168.0.108:8888 + seller: http://192.168.0.108:8888 # jwt 细节设定 jwt-setting: @@ -269,7 +269,7 @@ lili: data: elasticsearch: cluster-name: elasticsearch - cluster-nodes: 127.0.0.1:9200 + cluster-nodes: 192.168.0.108:30920 index: number-of-replicas: 0 number-of-shards: 3 @@ -301,7 +301,7 @@ lili: after-sale-topic: lili_after_sale_topic after-sale-group: lili_after_sale_group rocketmq: - name-server: 127.0.0.1:9876 + name-server: 192.168.0.108:30876 isVIPChannel: false producer: group: lili_group @@ -310,7 +310,7 @@ rocketmq: xxl: job: admin: - addresses: http://127.0.0.1:9001/xxl-job-admin + addresses: http://192.168.0.108:9001/xxl-job-admin executor: appname: xxl-job-executor-lilishop address: diff --git a/consumer/src/main/java/cn/lili/event/MemberConnectLoginEvent.java b/consumer/src/main/java/cn/lili/event/MemberConnectLoginEvent.java new file mode 100644 index 00000000..b103e214 --- /dev/null +++ b/consumer/src/main/java/cn/lili/event/MemberConnectLoginEvent.java @@ -0,0 +1,21 @@ +package cn.lili.event; + +import cn.lili.modules.connect.entity.dto.ConnectAuthUser; +import cn.lili.modules.member.entity.dos.Member; + +/** + * 会员联合登录消息 + * + * @author Chopper + * @since 2020/11/17 7:13 下午 + */ +public interface MemberConnectLoginEvent { + + /** + * 会员联合登录 + * + * @param member 会员 + * @param authUser 第三方登录 + */ + void memberConnectLogin(Member member, ConnectAuthUser authUser); +} diff --git a/consumer/src/main/java/cn/lili/event/impl/MemberExecute.java b/consumer/src/main/java/cn/lili/event/impl/MemberExecute.java index 57e4c2fb..6fc02177 100644 --- a/consumer/src/main/java/cn/lili/event/impl/MemberExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/MemberExecute.java @@ -1,25 +1,49 @@ package cn.lili.event.impl; +import cn.hutool.core.util.StrUtil; +import cn.lili.event.MemberConnectLoginEvent; import cn.lili.event.MemberLoginEvent; +import cn.lili.modules.connect.entity.dto.ConnectAuthUser; +import cn.lili.modules.connect.service.ConnectService; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.service.MemberService; +import cn.lili.modules.system.service.SettingService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** * 会员自身业务 + * 会员登录，会员第三方登录 * * @author Chopper * @version v1.0 * 2022-01-11 11:08 */ @Service -public class MemberExecute implements MemberLoginEvent { +public class MemberExecute implements MemberLoginEvent, MemberConnectLoginEvent { @Autowired private MemberService memberService; + @Autowired + private ConnectService connectService; + @Autowired + private SettingService settingService; @Override public void memberLogin(Member member) { memberService.updateMemberLoginTime(member.getId()); } + + @Override + public void memberConnectLogin(Member member, ConnectAuthUser authUser) { + + //保存UnionID + if (StrUtil.isNotBlank(authUser.getToken().getUnionId())) { + connectService.loginBindUser(member.getId(), authUser.getToken().getUnionId(), authUser.getType()); + } + //保存OpenID + if (StrUtil.isNotBlank(authUser.getUuid())) { + connectService.loginBindUser(member.getId(), authUser.getUuid(), authUser.getType()); + } + + } } diff --git a/consumer/src/main/java/cn/lili/listener/MemberMessageListener.java b/consumer/src/main/java/cn/lili/listener/MemberMessageListener.java index 2e384744..05a928c7 100644 --- a/consumer/src/main/java/cn/lili/listener/MemberMessageListener.java +++ b/consumer/src/main/java/cn/lili/listener/MemberMessageListener.java @@ -3,6 +3,7 @@ package cn.lili.listener; import cn.hutool.json.JSONUtil; import cn.lili.event.*; import cn.lili.event.impl.ImTalkExecute; +import cn.lili.modules.connect.entity.dto.MemberConnectLoginMessage; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.entity.dos.MemberSign; import cn.lili.modules.member.entity.dto.MemberPointMessage; @@ -55,10 +56,10 @@ public class MemberMessageListener implements RocketMQListener { */ @Autowired private List memberLoginEvents; - @Autowired private List memberInfoChangeEvents; - + @Autowired + private List memberConnectLoginEvents; @Override public void onMessage(MessageExt messageExt) { @@ -77,7 +78,7 @@ public class MemberMessageListener implements RocketMQListener { } } break; - + //用户登录 case MEMBER_LOGIN: for (MemberLoginEvent memberLoginEvent : memberLoginEvents) { @@ -139,6 +140,20 @@ public class MemberMessageListener implements RocketMQListener { } } break; + //用户第三方登录 + case MEMBER_CONNECT_LOGIN: + for (MemberConnectLoginEvent memberConnectLoginEvent : memberConnectLoginEvents) { + try { + MemberConnectLoginMessage memberConnectLoginMessage = JSONUtil.toBean(new String(messageExt.getBody()), MemberConnectLoginMessage.class); + memberConnectLoginEvent.memberConnectLogin(memberConnectLoginMessage.getMember(), memberConnectLoginMessage.getConnectAuthUser()); + } catch (Exception e) { + log.error("会员{},在{}业务中，状态修改事件执行异常", + new String(messageExt.getBody()), + memberConnectLoginEvent.getClass().getName(), + e); + } + } + break; default: break; } diff --git a/framework/src/main/java/cn/lili/modules/connect/config/ConnectAuthEnum.java b/framework/src/main/java/cn/lili/modules/connect/config/ConnectAuthEnum.java index 1e6facdb..201c49b2 100644 --- a/framework/src/main/java/cn/lili/modules/connect/config/ConnectAuthEnum.java +++ b/framework/src/main/java/cn/lili/modules/connect/config/ConnectAuthEnum.java @@ -11,9 +11,9 @@ package cn.lili.modules.connect.config; public enum ConnectAuthEnum implements ConnectAuth { /** - * 微信开放平台 + * 微信公众号登录 */ - WECHAT { + WECHAT_WAP { @Override public String authorize() { return "https://open.weixin.qq.com/connect/oauth2/authorize"; @@ -32,6 +32,7 @@ public enum ConnectAuthEnum implements ConnectAuth { /** * 微信开放平台 + * 微信PC登录 */ WECHAT_PC { @Override diff --git a/framework/src/main/java/cn/lili/modules/connect/entity/dto/ConnectAuthUser.java b/framework/src/main/java/cn/lili/modules/connect/entity/dto/ConnectAuthUser.java index d9e5522d..66373c55 100644 --- a/framework/src/main/java/cn/lili/modules/connect/entity/dto/ConnectAuthUser.java +++ b/framework/src/main/java/cn/lili/modules/connect/entity/dto/ConnectAuthUser.java @@ -67,6 +67,16 @@ public class ConnectAuthUser implements Serializable { * 用户来源 */ private String source; + /** + * 用户来源 + * 例如：微信、支付宝、微博 + */ + private String source1; + /** + * 类型 + * 例如：PC、WAP、小程序 + */ + private String type; /** * 用户授权的token信息 */ @@ -81,4 +91,9 @@ public class ConnectAuthUser implements Serializable { */ private ConnectAuthEnum connectEnum; + /** + * 手机号 + */ + private String phone; + } diff --git a/framework/src/main/java/cn/lili/modules/connect/entity/dto/MemberConnectLoginMessage.java b/framework/src/main/java/cn/lili/modules/connect/entity/dto/MemberConnectLoginMessage.java new file mode 100644 index 00000000..4e7198fd --- /dev/null +++ b/framework/src/main/java/cn/lili/modules/connect/entity/dto/MemberConnectLoginMessage.java @@ -0,0 +1,14 @@ +package cn.lili.modules.connect.entity.dto; + +import cn.lili.modules.member.entity.dos.Member; +import lombok.Data; + +/** + * 会员联合登录消息 + */ +@Data +public class MemberConnectLoginMessage { + + private Member member; + private ConnectAuthUser connectAuthUser; +} diff --git a/framework/src/main/java/cn/lili/modules/connect/entity/enums/ConnectEnum.java b/framework/src/main/java/cn/lili/modules/connect/entity/enums/ConnectEnum.java index 04d17aab..162bac7a 100644 --- a/framework/src/main/java/cn/lili/modules/connect/entity/enums/ConnectEnum.java +++ b/framework/src/main/java/cn/lili/modules/connect/entity/enums/ConnectEnum.java @@ -15,8 +15,6 @@ public enum ConnectEnum { WEIBO("微博联合登录"), //只存放unionid WECHAT("微信联合登录"), - WECHAT_OPEN_ID("微信openid登录"), - WECHAT_MP_OPEN_ID("微信openid登录"), ALIPAY("支付宝登录"), APPLE("苹果登录"); diff --git a/framework/src/main/java/cn/lili/modules/connect/entity/enums/SourceEnum.java b/framework/src/main/java/cn/lili/modules/connect/entity/enums/SourceEnum.java new file mode 100644 index 00000000..685468f7 --- /dev/null +++ b/framework/src/main/java/cn/lili/modules/connect/entity/enums/SourceEnum.java @@ -0,0 +1,24 @@ +package cn.lili.modules.connect.entity.enums; + +/** + * 联合登陆-渠道枚举 + * + * @author Chopper + * @version v4.0 + * @since 2020/11/25 18:20 + */ +public enum SourceEnum { + + WECHAT_PC_OPEN_ID("微信PC应用 openid登录"), + WECHAT_OFFIACCOUNT_OPEN_ID("微信公众号 openid登录"), + WECHAT_MP_OPEN_ID("微信小程序 openid登录"), + WECHAT_APP_OPEN_ID("微信APP openid登录"), + ; + + + private final String description; + + SourceEnum(String description) { + this.description = description; + } +} diff --git a/framework/src/main/java/cn/lili/modules/connect/request/BaseAuthWeChatPCRequest.java b/framework/src/main/java/cn/lili/modules/connect/request/BaseAuthWeChatPCRequest.java index 5d0bfd0c..615fee93 100644 --- a/framework/src/main/java/cn/lili/modules/connect/request/BaseAuthWeChatPCRequest.java +++ b/framework/src/main/java/cn/lili/modules/connect/request/BaseAuthWeChatPCRequest.java @@ -10,6 +10,8 @@ import cn.lili.modules.connect.entity.dto.AuthToken; import cn.lili.modules.connect.entity.dto.ConnectAuthUser; import cn.lili.modules.connect.entity.enums.AuthResponseStatus; import cn.lili.modules.connect.entity.enums.AuthUserGender; +import cn.lili.modules.connect.entity.enums.ConnectEnum; +import cn.lili.modules.connect.entity.enums.SourceEnum; import cn.lili.modules.connect.exception.AuthException; import cn.lili.common.utils.HttpUtils; import com.alibaba.fastjson.JSONObject; @@ -56,10 +58,12 @@ public class BaseAuthWeChatPCRequest extends BaseAuthRequest { .nickname(object.getString("nickname")) .avatar(object.getString("headimgurl")) .location(location) - .uuid(authToken.getUnionId()) + .uuid(authToken.getOpenId()) .gender(AuthUserGender.getWechatRealGender(object.getString("sex"))) .token(authToken) .source(source.toString()) + .source1(ConnectEnum.WECHAT.name()) + .type(SourceEnum.WECHAT_PC_OPEN_ID.name()) .build(); } diff --git a/framework/src/main/java/cn/lili/modules/connect/request/BaseAuthWeChatRequest.java b/framework/src/main/java/cn/lili/modules/connect/request/BaseAuthWeChatRequest.java index eb146d7c..f703f937 100644 --- a/framework/src/main/java/cn/lili/modules/connect/request/BaseAuthWeChatRequest.java +++ b/framework/src/main/java/cn/lili/modules/connect/request/BaseAuthWeChatRequest.java @@ -10,6 +10,8 @@ import cn.lili.modules.connect.entity.dto.AuthToken; import cn.lili.modules.connect.entity.dto.ConnectAuthUser; import cn.lili.modules.connect.entity.enums.AuthResponseStatus; import cn.lili.modules.connect.entity.enums.AuthUserGender; +import cn.lili.modules.connect.entity.enums.ConnectEnum; +import cn.lili.modules.connect.entity.enums.SourceEnum; import cn.lili.modules.connect.exception.AuthException; import cn.lili.modules.connect.util.GlobalAuthUtils; import cn.lili.common.utils.HttpUtils; @@ -23,7 +25,7 @@ import com.alibaba.fastjson.JSONObject; */ public class BaseAuthWeChatRequest extends BaseAuthRequest { public BaseAuthWeChatRequest(AuthConfig config, Cache cache) { - super(config, ConnectAuthEnum.WECHAT, cache); + super(config, ConnectAuthEnum.WECHAT_WAP, cache); } /** @@ -62,6 +64,8 @@ public class BaseAuthWeChatRequest extends BaseAuthRequest { .gender(AuthUserGender.getWechatRealGender(object.getString("sex"))) .token(authToken) .source(source.toString()) + .source1(ConnectEnum.WECHAT.name()) + .type(SourceEnum.WECHAT_OFFIACCOUNT_OPEN_ID.name()) .build(); } diff --git a/framework/src/main/java/cn/lili/modules/connect/service/ConnectService.java b/framework/src/main/java/cn/lili/modules/connect/service/ConnectService.java index 9aef44aa..94fc5694 100644 --- a/framework/src/main/java/cn/lili/modules/connect/service/ConnectService.java +++ b/framework/src/main/java/cn/lili/modules/connect/service/ConnectService.java @@ -28,27 +28,14 @@ public interface ConnectService extends IService { */ String CONNECT_TYPE = "CONNECT_TYPE"; - /** - * 联合登陆 - * - * @param type 类型 - * @param unionid unionid - * @param longTerm 是否长时间有效 - * @param uuid UUID - * @return token - * @throws NoPermissionException 不允许操作 - */ - Token unionLoginCallback(String type, String unionid, String uuid, boolean longTerm) throws NoPermissionException; - /** * 联合登陆对象直接登录 * - * @param type 第三方登录类型 * @param authUser 第三方登录返回封装类 * @param uuid 用户uuid * @return token */ - Token unionLoginCallback(String type, ConnectAuthUser authUser, String uuid); + Token unionLoginCallback(ConnectAuthUser authUser, String uuid); /** * 绑定 @@ -86,15 +73,6 @@ public interface ConnectService extends IService { return CachePrefix.CONNECT_AUTH.getPrefix() + type + uuid; } - /** - * app联合登录 回调 - * - * @param authUser 登录对象 - * @param uuid uuid - * @return token - */ - Token appLoginCallback(ConnectAuthUser authUser, String uuid); - /** * 微信一键登录 @@ -119,4 +97,12 @@ public interface ConnectService extends IService { * @param userId 会员id */ void deleteByMemberId(String userId); + + /** + * 绑定第三方平台用户 + * @param userId 用户ID + * @param unionId 第三方平台用户ID + * @param type 平台类型 + */ + void loginBindUser(String userId, String unionId, String type); } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java b/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java index 3b7a9577..e8888c9a 100644 --- a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java @@ -18,6 +18,7 @@ import cn.lili.common.utils.CookieUtil; import cn.lili.common.utils.HttpUtils; import cn.lili.modules.connect.entity.Connect; import cn.lili.modules.connect.entity.dto.ConnectAuthUser; +import cn.lili.modules.connect.entity.dto.MemberConnectLoginMessage; import cn.lili.modules.connect.entity.dto.WechatMPLoginParams; import cn.lili.modules.connect.entity.enums.ConnectEnum; import cn.lili.modules.connect.mapper.ConnectMapper; @@ -31,10 +32,13 @@ import cn.lili.modules.system.entity.dto.connect.WechatConnectSetting; import cn.lili.modules.system.entity.dto.connect.dto.WechatConnectSettingItem; import cn.lili.modules.system.entity.enums.SettingEnum; import cn.lili.modules.system.service.SettingService; +import cn.lili.rocketmq.RocketmqSendCallbackBuilder; +import cn.lili.rocketmq.tags.GoodsTagsEnum; import cn.lili.rocketmq.tags.MemberTagsEnum; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; +import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationEventPublisher; @@ -71,65 +75,21 @@ public class ConnectServiceImpl extends ServiceImpl impl @Autowired private Cache cache; /** - * RocketMQ 配置 + * RocketMQ + */ + @Autowired + private RocketMQTemplate rocketMQTemplate; + /** + * RocketMQ配置 */ @Autowired private RocketmqCustomProperties rocketmqCustomProperties; - @Autowired - private ApplicationEventPublisher applicationEventPublisher; - @Override @Transactional(rollbackFor = Exception.class) - public Token unionLoginCallback(String type, String unionid, String uuid, boolean longTerm) throws NoPermissionException { + public Token unionLoginCallback(ConnectAuthUser authUser, String uuid) { - try { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(Connect::getUnionId, unionid); - queryWrapper.eq(Connect::getUnionType, type); - //查询绑定关系 - Connect connect = this.getOne(queryWrapper); - if (connect == null) { - throw new NoPermissionException("未绑定用户"); - } - //查询会员 - Member member = memberService.getById(connect.getUserId()); - //如果未绑定会员，则把刚才查询到的联合登录表数据删除 - if (member == null) { - this.remove(queryWrapper); - throw new NoPermissionException("未绑定用户"); - } - return memberTokenGenerate.createToken(member, longTerm); - } catch (NoPermissionException e) { - log.error("联合登陆失败：", e); - throw e; - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Token unionLoginCallback(String type, ConnectAuthUser authUser, String uuid) { - - Token token; - try { - token = this.unionLoginCallback(type, authUser.getUuid(), uuid, false); - } catch (NoPermissionException e) { - if (AUTO_REGION) { - token = memberService.autoRegister(authUser); - return token; - } else { - //写入cookie - CookieUtil.addCookie(CONNECT_COOKIE, uuid, 1800, ThreadContextHolder.getHttpResponse()); - CookieUtil.addCookie(CONNECT_TYPE, type, 1800, ThreadContextHolder.getHttpResponse()); - //自动登录失败，则把信息缓存起来 - cache.put(ConnectService.cacheKey(type, uuid), authUser, 30L, TimeUnit.MINUTES); - throw new ServiceException(ResultCode.USER_NOT_BINDING); - } - } catch (Exception e) { - log.error("联合登陆异常：", e); - throw new ServiceException(ResultCode.ERROR); - } - return token; + return this.unionLoginCallback(authUser, false); } @Override @@ -137,6 +97,8 @@ public class ConnectServiceImpl extends ServiceImpl impl AuthUser authUser = Objects.requireNonNull(UserContext.getCurrentUser()); Connect connect = new Connect(authUser.getId(), unionId, type); this.save(connect); + + } @Override @@ -161,16 +123,6 @@ public class ConnectServiceImpl extends ServiceImpl impl return keys; } - @Override - @Transactional(rollbackFor = Exception.class) - public Token appLoginCallback(ConnectAuthUser authUser, String uuid) { - try { - return this.unionLoginCallback(authUser.getSource(), authUser.getUuid(), uuid, true); - } catch (NoPermissionException e) { - return memberService.autoRegister(authUser); - } - } - @Override @Transactional @@ -226,40 +178,24 @@ public class ConnectServiceImpl extends ServiceImpl impl */ @Transactional(rollbackFor = Exception.class) public Token phoneMpBindAndLogin(String sessionKey, WechatMPLoginParams params, String openId, String unionId) { - String encryptedData = params.getEncryptedData(); - String iv = params.getIv(); - JSONObject userInfo = this.getUserInfo(encryptedData, sessionKey, iv); - log.info("联合登陆返回：{}", userInfo.toString()); - String phone = (String) userInfo.get("purePhoneNumber"); + try { + String encryptedData = params.getEncryptedData(); + String iv = params.getIv(); + JSONObject userInfo = this.getUserInfo(encryptedData, sessionKey, iv); + log.info("联合登陆返回：{}", userInfo.toString()); + String phone = (String) userInfo.get("purePhoneNumber"); - //手机号登录 - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(Member::getMobile, phone); - Member member = memberService.getOne(lambdaQueryWrapper); - //如果不存在会员，则进行绑定微信openid 和 unionid，并且登录 - if (member != null) { - bindMpMember(openId, unionId, member); - return memberTokenGenerate.createToken(member, true); + ConnectAuthUser connectAuthUser = new ConnectAuthUser(); + connectAuthUser.setUuid(openId); + connectAuthUser.setNickname(params.getNickName()); + connectAuthUser.setAvatar(params.getImage()); + connectAuthUser.setUsername("m" + phone); + connectAuthUser.setPhone(phone); + return this.unionLoginCallback(connectAuthUser, true); + } catch (Exception e) { + e.printStackTrace(); } - - //如果没有会员，则根据手机号注册会员 - Member newMember = new Member("m" + phone, "111111", phone, params.getNickName(), params.getImage()); - memberService.save(newMember); - newMember = memberService.findByUsername(newMember.getUsername()); - - //判定有没有邀请人并且写入 - UserContext.settingInviter(newMember.getId(), cache); - - bindMpMember(openId, unionId, newMember); - - - //判定有没有邀请人并且写入 - UserContext.settingInviter(newMember.getId(), cache); - - - // 发送会员注册信息 - applicationEventPublisher.publishEvent(new TransactionCommitSendMQEvent("new member register", rocketmqCustomProperties.getMemberTopic(), MemberTagsEnum.MEMBER_REGISTER.name(), newMember)); - return memberTokenGenerate.createToken(newMember, true); + return null; } @Override @@ -280,47 +216,72 @@ public class ConnectServiceImpl extends ServiceImpl impl } /** - * 会员绑定 绑定微信小程序 - *

- * 如果openid 已经绑定其他账号，则这里不作处理，如果未绑定，则绑定最新的会员 - * 这样，微信小程序注册之后，其他app 公众号页面，都可以实现绑定自动登录功能 - *

+ * 成功登录，则检测cookie中的信息，进行会员绑定 * - * @param openId 微信openid - * @param unionId 微信unionid - * @param member 会员 + * @param userId 用户ID + * @param unionId 第三方用户ID + * @param type 类型 */ - private void bindMpMember(String openId, String unionId, Member member) { - - - //如果unionid 不为空 则为账号绑定unionid - if (CharSequenceUtil.isNotEmpty(unionId)) { - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper(); - lambdaQueryWrapper.eq(Connect::getUnionId, unionId); - lambdaQueryWrapper.eq(Connect::getUnionType, ConnectEnum.WECHAT.name()); - List connects = this.list(lambdaQueryWrapper); - if (connects.isEmpty()) { - Connect connect = new Connect(); - connect.setUnionId(unionId); - connect.setUserId(member.getId()); - connect.setUnionType(ConnectEnum.WECHAT.name()); - this.save(connect); - } - }//如果openid 不为空 则为账号绑定openid - if (CharSequenceUtil.isNotEmpty(openId)) { - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(Connect::getUnionId, openId); - lambdaQueryWrapper.eq(Connect::getUnionType, ConnectEnum.WECHAT_MP_OPEN_ID.name()); - List connects = this.list(lambdaQueryWrapper); - if (connects.isEmpty()) { - Connect connect = new Connect(); - connect.setUnionId(openId); - connect.setUserId(member.getId()); - connect.setUnionType(ConnectEnum.WECHAT_MP_OPEN_ID.name()); - this.save(connect); - } + @Override + public void loginBindUser(String userId, String unionId, String type) { + Connect connect = this.queryConnect( + ConnectQueryDTO.builder().unionId(unionId).unionType(type).build() + ); + if (connect == null) { + connect = new Connect(userId, unionId, type); + this.save(connect); } + } + + /** + * 第三方联合登陆 + * 1.判断是否使用开放平台 + * 1.1如果使用开放平台则使用UnionId进行登录 + * 1.2如果不适用开放平台则使用OpenId进行登录 + *

+ * 2.用户登录后判断绑定OpenId + * + * @param authUser 第三方登录封装类 + * @param longTerm 是否长时间有效 + * @return token + * @throws NoPermissionException 不允许操作 + */ + private Token unionLoginCallback(ConnectAuthUser authUser, boolean longTerm) { + + //使用UnionId登录 + try { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(Connect::getUnionId, authUser.getToken().getUnionId()) + .eq(Connect::getUnionType, authUser.getSource1()); + //查询绑定关系 + Connect connect = this.getOne(queryWrapper); + Member member = new Member(); + if (connect == null) { + member = memberService.autoRegister(authUser); + } else { + //查询会员 + member = memberService.getById(connect.getUserId()); + //如果未绑定会员，则把刚才查询到的联合登录表数据删除 + if (member == null) { + this.remove(queryWrapper); + member = memberService.autoRegister(authUser); + } + } + + //发送用户第三方登录消息 + MemberConnectLoginMessage memberConnectLoginMessage = new MemberConnectLoginMessage(); + memberConnectLoginMessage.setMember(member); + memberConnectLoginMessage.setConnectAuthUser(authUser); + String destination = rocketmqCustomProperties.getMemberTopic() + ":" + MemberTagsEnum.MEMBER_CONNECT_LOGIN.name(); + //发送用户第三方登录消息 + rocketMQTemplate.asyncSend(destination, JSONUtil.toJsonStr(memberConnectLoginMessage), RocketmqSendCallbackBuilder.commonCallback()); + + return memberTokenGenerate.createToken(member, longTerm); + } catch (Exception e) { + log.error("联合登陆失败：", e); + throw e; + } } /** diff --git a/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java b/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java index 272ad84e..6c79c608 100644 --- a/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java +++ b/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java @@ -66,6 +66,7 @@ public class ConnectUtil { /** * 回调地址获取 + * * @param connectAuthEnum 用户枚举 * @return 回调地址 */ @@ -75,9 +76,11 @@ public class ConnectUtil { /** * 登录回调 + * 此方法处理第三方登录回调 + * 场景：PC、WAP(微信公众号) * - * @param type - * @param callback + * @param type 类型 + * @param callback 回调参数 * @param httpServletResponse * @param httpServletRequest * @throws IOException @@ -89,9 +92,8 @@ public class ConnectUtil { //联合登陆处理，如果响应正常，则录入响应结果到redis if (response.ok()) { ConnectAuthUser authUser = response.getData(); - Token token; try { - token = connectService.unionLoginCallback(type, authUser, callback.getState()); + Token token = connectService.unionLoginCallback(authUser, callback.getState()); resultMessage = ResultUtil.data(token); } catch (ServiceException e) { throw new ServiceException(ResultCode.ERROR, e.getMessage()); @@ -112,7 +114,7 @@ public class ConnectUtil { try { httpServletResponse.sendRedirect(url); } catch (Exception e) { - log.error("登录回调错误",e); + log.error("登录回调错误", e); } } @@ -145,7 +147,7 @@ public class ConnectUtil { } AuthRequest authRequest = null; switch (authInterface) { - case WECHAT: { + case WECHAT_WAP: { //寻找配置 Setting setting = settingService.get(SettingEnum.WECHAT_CONNECT.name()); WechatConnectSetting wechatConnectSetting = JSONUtil.toBean(setting.getSettingValue(), WechatConnectSetting.class); @@ -165,6 +167,7 @@ public class ConnectUtil { //寻找配置 Setting setting = settingService.get(SettingEnum.WECHAT_CONNECT.name()); WechatConnectSetting wechatConnectSetting = JSONUtil.toBean(setting.getSettingValue(), WechatConnectSetting.class); + for (WechatConnectSettingItem wechatConnectSettingItem : wechatConnectSetting.getWechatConnectSettingItems()) { if (wechatConnectSettingItem.getClientType().equals(ClientTypeEnum.PC.name())) { authRequest = new BaseAuthWeChatPCRequest(AuthConfig.builder() @@ -178,10 +181,10 @@ public class ConnectUtil { break; } case QQ: - //寻找配置 Setting setting = settingService.get(SettingEnum.QQ_CONNECT.name()); QQConnectSetting qqConnectSetting = JSONUtil.toBean(setting.getSettingValue(), QQConnectSetting.class); + for (QQConnectSettingItem qqConnectSettingItem : qqConnectSetting.getQqConnectSettingItemList()) { if (qqConnectSettingItem.getClientType().equals(ClientTypeEnum.PC.name())) { authRequest = new BaseAuthQQRequest(AuthConfig.builder() diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberService.java index 1b1d8be8..c5eb52a1 100644 --- a/framework/src/main/java/cn/lili/modules/member/service/MemberService.java +++ b/framework/src/main/java/cn/lili/modules/member/service/MemberService.java @@ -15,6 +15,7 @@ import cn.lili.modules.member.entity.vo.QRLoginResultVo; import cn.lili.modules.member.entity.vo.QRCodeLoginSessionVo; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import org.elasticsearch.monitor.os.OsStats; import java.util.List; import java.util.Map; @@ -175,12 +176,12 @@ public interface MemberService extends IService { IPage getMemberPage(MemberSearchVO memberSearchVO, PageVO page); - /** - * 一键注册会员 - * - * @return - */ - Token autoRegister(); +// /** +// * 一键注册会员 +// * +// * @return +// */ +// Token autoRegister(); /** * 一键注册会员 @@ -188,7 +189,7 @@ public interface MemberService extends IService { * @param authUser 联合登录用户 * @return Token */ - Token autoRegister(ConnectAuthUser authUser); + Member autoRegister(ConnectAuthUser authUser); /** * 刷新token diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java index 4060e39c..6031e508 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java @@ -224,7 +224,7 @@ public class MemberServiceImpl extends ServiceImpl impleme @Override @Transactional - public Token autoRegister(ConnectAuthUser authUser) { + public Member autoRegister(ConnectAuthUser authUser) { if (CharSequenceUtil.isEmpty(authUser.getNickname())) { authUser.setNickname("临时昵称"); @@ -236,11 +236,11 @@ public class MemberServiceImpl extends ServiceImpl impleme String username = UuidUtils.getUUID(); Member member = new Member(username, UuidUtils.getUUID(), authUser.getAvatar(), authUser.getNickname(), authUser.getGender() != null ? Convert.toInt(authUser.getGender().getCode()) : 0); - registerHandler(member); member.setPassword(DEFAULT_PASSWORD); - //绑定登录方式 - loginBindUser(member, authUser.getUuid(), authUser.getSource()); - return memberTokenGenerate.createToken(member, false); + // 发送会员注册信息 + registerHandler(member); + + return member; } catch (ServiceException e) { log.error("自动注册服务抛出异常：", e); throw e; @@ -250,12 +250,12 @@ public class MemberServiceImpl extends ServiceImpl impleme } } - @Override - @Transactional - public Token autoRegister() { - ConnectAuthUser connectAuthUser = this.checkConnectUser(); - return this.autoRegister(connectAuthUser); - } +// @Override +// @Transactional +// public Token autoRegister() { +// ConnectAuthUser connectAuthUser = this.checkConnectUser(); +// return this.autoRegister(connectAuthUser); +// } @Override public Token refreshToken(String refreshToken) { @@ -293,7 +293,6 @@ public class MemberServiceImpl extends ServiceImpl impleme //保存会员 this.save(member); - // 发送会员注册信息 applicationEventPublisher.publishEvent(new TransactionCommitSendMQEvent("new member register", rocketmqCustomProperties.getMemberTopic(), MemberTagsEnum.MEMBER_REGISTER.name(), member)); } @@ -557,23 +556,6 @@ public class MemberServiceImpl extends ServiceImpl impleme return null; } - /** - * 成功登录，则检测cookie中的信息，进行会员绑定 - * - * @param member 会员 - * @param unionId unionId - * @param type 状态 - */ - private void loginBindUser(Member member, String unionId, String type) { - Connect connect = connectService.queryConnect( - ConnectQueryDTO.builder().unionId(unionId).unionType(type).build() - ); - if (connect == null) { - connect = new Connect(member.getId(), unionId, type); - connectService.save(connect); - } - } - /** * 成功登录，则检测cookie中的信息，进行会员绑定 * @@ -612,42 +594,42 @@ public class MemberServiceImpl extends ServiceImpl impleme } - /** - * 检测是否可以绑定第三方联合登陆 - * 返回null原因 - * 包含原因1：redis中已经没有联合登陆信息 2：已绑定其他账号 - * - * @return 返回对象则代表可以进行绑定第三方会员，返回null则表示联合登陆无法继续 - */ - private ConnectAuthUser checkConnectUser() { - //获取cookie存储的信息 - String uuid = CookieUtil.getCookie(ConnectService.CONNECT_COOKIE, ThreadContextHolder.getHttpRequest()); - String connectType = CookieUtil.getCookie(ConnectService.CONNECT_TYPE, ThreadContextHolder.getHttpRequest()); - - //如果联合登陆存储了信息 - if (CharSequenceUtil.isNotEmpty(uuid) && CharSequenceUtil.isNotEmpty(connectType)) { - //枚举 联合登陆类型获取 - ConnectAuthEnum authInterface = ConnectAuthEnum.valueOf(connectType); - - ConnectAuthUser connectAuthUser = getConnectAuthUser(uuid, connectType); - if (connectAuthUser == null) { - throw new ServiceException(ResultCode.USER_OVERDUE_CONNECT_ERROR); - } - //检测是否已经绑定过用户 - Connect connect = connectService.queryConnect( - ConnectQueryDTO.builder().unionType(connectType).unionId(connectAuthUser.getUuid()).build() - ); - //没有关联则返回true，表示可以继续绑定 - if (connect == null) { - connectAuthUser.setConnectEnum(authInterface); - return connectAuthUser; - } else { - throw new ServiceException(ResultCode.USER_CONNECT_BANDING_ERROR); - } - } else { - throw new ServiceException(ResultCode.USER_CONNECT_NOT_EXIST_ERROR); - } - } +// /** +// * 检测是否可以绑定第三方联合登陆 +// * 返回null原因 +// * 包含原因1：redis中已经没有联合登陆信息 2：已绑定其他账号 +// * +// * @return 返回对象则代表可以进行绑定第三方会员，返回null则表示联合登陆无法继续 +// */ +// private ConnectAuthUser checkConnectUser() { +// //获取cookie存储的信息 +// String uuid = CookieUtil.getCookie(ConnectService.CONNECT_COOKIE, ThreadContextHolder.getHttpRequest()); +// String connectType = CookieUtil.getCookie(ConnectService.CONNECT_TYPE, ThreadContextHolder.getHttpRequest()); +// +// //如果联合登陆存储了信息 +// if (CharSequenceUtil.isNotEmpty(uuid) && CharSequenceUtil.isNotEmpty(connectType)) { +// //枚举 联合登陆类型获取 +// ConnectAuthEnum authInterface = ConnectAuthEnum.valueOf(connectType); +// +// ConnectAuthUser connectAuthUser = getConnectAuthUser(uuid, connectType); +// if (connectAuthUser == null) { +// throw new ServiceException(ResultCode.USER_OVERDUE_CONNECT_ERROR); +// } +// //检测是否已经绑定过用户 +// Connect connect = connectService.queryConnect( +// ConnectQueryDTO.builder().unionType(connectType).unionId(connectAuthUser.getUuid()).build() +// ); +// //没有关联则返回true，表示可以继续绑定 +// if (connect == null) { +// connectAuthUser.setConnectEnum(authInterface); +// return connectAuthUser; +// } else { +// throw new ServiceException(ResultCode.USER_CONNECT_BANDING_ERROR); +// } +// } else { +// throw new ServiceException(ResultCode.USER_CONNECT_NOT_EXIST_ERROR); +// } +// } @Override public long getMemberNum(MemberSearchVO memberSearchVO) { diff --git a/framework/src/main/java/cn/lili/rocketmq/tags/MemberTagsEnum.java b/framework/src/main/java/cn/lili/rocketmq/tags/MemberTagsEnum.java index bda332b7..2781da0a 100644 --- a/framework/src/main/java/cn/lili/rocketmq/tags/MemberTagsEnum.java +++ b/framework/src/main/java/cn/lili/rocketmq/tags/MemberTagsEnum.java @@ -30,7 +30,11 @@ public enum MemberTagsEnum { /** * 会员积分变动 */ - MEMBER_POINT_CHANGE("会员积分变动"); + MEMBER_POINT_CHANGE("会员积分变动"), + /** + * 会员使用联合登录 + */ + MEMBER_CONNECT_LOGIN("会员使用联合登录"); private final String description;