zxl
9 天以前 5476f0366c2042d8b3858369fc0c149d57b2fb9f
framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java
@@ -87,8 +87,8 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Token unionLoginCallback(ConnectAuthUser authUser, String uuid) {
        return this.unionLoginCallback(authUser, false);
    public Token unionLoginCallback(ConnectAuthUser authUser, String uuid,boolean encryptTwice) {
        return this.unionLoginCallback(authUser, false,encryptTwice);
    }
    @Override
@@ -196,7 +196,7 @@
            AuthToken authToken = new AuthToken();
            authToken.setUnionId(unionId);
            connectAuthUser.setToken(authToken);
            return this.unionLoginCallback(connectAuthUser, true);
            return this.unionLoginCallback(connectAuthUser, true,true);
        } catch (Exception e) {
            e.printStackTrace();
        }
@@ -259,9 +259,35 @@
            user.setUsername(UuidUtils.getUUID());
            user.setNickName("微信用户");
            user.setPassword(DEFAULT_PASSWORD);
            user.setFace("https://i.loli.net/2020/11/19/LyN6JF7zZRskdIe.png");
            user.setFace("");
            user.setDisabled(Boolean.TRUE);
            memberService.registerHandler(user);
        }
        ConnectAuthUser connectAuthUser = new ConnectAuthUser();
        connectAuthUser.setUuid(openId);
        connectAuthUser.setNickname(user.getNickName());
        connectAuthUser.setAvatar(user.getFace());
        connectAuthUser.setUsername(UuidUtils.getUUID());
        connectAuthUser.setSource(ConnectEnum.WECHAT);
        connectAuthUser.setType(ClientTypeEnum.WECHAT_MP);
        AuthToken authToken = new AuthToken();
        authToken.setUnionId(unionId);
        connectAuthUser.setToken(authToken);
        //发送用户第三方登录消息
        MemberConnectLoginMessage memberConnectLoginMessage = new MemberConnectLoginMessage();
        memberConnectLoginMessage.setMember(user);
        memberConnectLoginMessage.setConnectAuthUser(connectAuthUser);
        String destination =
                rocketmqCustomProperties.getMemberTopic() + ":" + MemberTagsEnum.MEMBER_CONNECT_LOGIN.name();
        //发送用户第三方登录消息
        rocketMQTemplate.asyncSend(destination, JSONUtil.toJsonStr(memberConnectLoginMessage),
                RocketmqSendCallbackBuilder.commonCallback());
        Token token = memberTokenGenerate.createToken(user, Boolean.TRUE);
        return Result.ok().data(token);
    }
@@ -279,7 +305,7 @@
     * @return token
     * @throws NoPermissionException 不允许操作
     */
    private Token unionLoginCallback(ConnectAuthUser authUser, boolean longTerm) {
    private Token unionLoginCallback(ConnectAuthUser authUser, boolean longTerm,boolean encryptTwice) {
        try {
            Member member = null;
@@ -310,14 +336,14 @@
                Connect connect = this.getOne(queryWrapper);
                if (connect == null) {
                    member = memberService.autoRegister(authUser);
                    member = memberService.autoRegister(authUser,encryptTwice);
                } else {
                    //查询会员
                    member = memberService.getById(connect.getUserId());
                    //如果未绑定会员,则把刚才查询到的联合登录表数据删除
                    if (member == null) {
                        this.remove(queryWrapper);
                        member = memberService.autoRegister(authUser);
                        member = memberService.autoRegister(authUser,encryptTwice);
                    }
                }
            }