删除不使用的 applet wechatUser

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/constant/SweetConstant.java

@@ -52,20 +52,12 @@ public class SweetConstant {
 
     // 2021草莓音乐节海报活动活动
     public static final String REDIS_KEY_SWEET_STRAWBERRY_POSTER_CLICK = "sweet:strawberryPoster:click:openId:";
-    // 微信用户相关
-    public final static String REDIS_KEY_SWEET_WECHAT_USER_INFO = "sweet:wechatUser:zhengzai:unionId:";
-    public final static String REDIS_KEY_SWEET_WECHAT_USER_INFO_MODERNSKY = "sweet:wechatUser:modernsky:unionId:";
-    public final static String REDIS_KEY_SWEET_WECHAT_USER_UNIONID = "sweet:wechatUser:zhengzai:openId:";
-    public final static String REDIS_KEY_SWEET_WECHAT_USER_UNIONID_MODERNSKY = "sweet:wechatUser:modernsky:openId:";
-    public final static String REDIS_KEY_SWEET_WECHAT_USER_UNIONID_PHONE = "sweet:wechatUser:zhengzai:phone:";
-    public final static String REDIS_KEY_SWEET_WECHAT_USER_UNIONID_PHONE_MODERNSKY = "sweet:wechatUser:modernsky:phone:";
-    public final static String REDIS_KEY_SWEET_WECHAT_USER_UNIONID_UID = "sweet:wechatUser:zhengzai:uid:";
-    public final static String REDIS_KEY_SWEET_WECHAT_USER_UNIONID_UID_MODERNSKY = "sweet:wechatUser:modernsky:uid:";
-    // 微信服务号用户相关 新
+
+    // 微信服务号用户相关
     public final static String REDIS_KEY_SWEET_WECHAT_USERS_UNIONID = "sweet:user:service:unionId:";
     public final static String REDIS_KEY_SWEET_WECHAT_USERS_OPENID = "sweet:user:service:openId:";
     public final static String REDIS_KEY_SWEET_WECHAT_USERS_TYPE = ":type:";
-    // 微信小程序用户相关 新
+    // 微信小程序用户相关
     public final static String REDIS_KEY_SWEET_APPLET_USERS_PHONE = "sweet:user:applet:mobile:";
     public final static String REDIS_KEY_SWEET_APPLET_USERS_UNIONID = "sweet:user:applet:unionid:";
 

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetAppletUser.java

-package com.liquidnet.service.sweet.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 小程序登录记录用户解密后信息表
- * </p>
- *
- * @author jiangxiulong
- * @since 2021-11-08
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class SweetAppletUser implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "mid", type = IdType.AUTO)
-    private Long mid;
-
-    /**
-     * user_id
-     */
-    private String userId;
-
-    /**
-     * openId
-     */
-    @TableField("openId")
-    private String openId;
-
-    /**
-     * unionId
-     */
-    @TableField("unionId")
-    private String unionId;
-
-    /**
-     * 手机号
-     */
-    @TableField("getPhoneNumber")
-    private String getPhoneNumber;
-
-    /**
-     * 手机号
-     */
-    @TableField("getPurePhoneNumber")
-    private String getPurePhoneNumber;
-
-    /**
-     * 地区码
-     */
-    @TableField("getCountryCode")
-    private String getCountryCode;
-
-    /**
-     * 1草莓 2五百里 3mdsk 4正在
-     */
-    private Integer type;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createdAt;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updatedAt;
-
-
-}

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetWechatUser.java

-package com.liquidnet.service.sweet.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 正在现场服务号关注事件储存用户信息表
- * </p>
- *
- * @author jiangxiulong
- * @since 2021-08-03
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class SweetWechatUser implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "mid", type = IdType.AUTO)
-    private Long mid;
-
-    /**
-     * user_id
-     */
-    private String userId;
-
-    /**
-     * adam_user_id
-     */
-    private String adamUserId;
-
-    /**
-     * adam_phone
-     */
-    private String adamPhone;
-
-    /**
-     * openId
-     */
-    @TableField("openId")
-    private String openId;
-
-    /**
-     * unionId
-     */
-    @TableField("unionId")
-    private String unionId;
-
-    /**
-     * 昵称
-     */
-    private String nickname;
-
-    /**
-     * 性别
-     */
-    @TableField("sexDesc")
-    private String sexDesc;
-
-    /**
-     * 性别 男1
-     */
-    private Integer sex;
-
-    /**
-     * 头像
-     */
-    @TableField("headImgUrl")
-    private String headImgUrl;
-
-    /**
-     * zh_CN
-     */
-    private String language;
-
-    /**
-     * 国家
-     */
-    private String country;
-
-    /**
-     * 省
-     */
-    private String province;
-
-    /**
-     * 市
-     */
-    private String city;
-
-    /**
-     * 关注时间
-     */
-    @TableField("subscribeTime")
-    private LocalDateTime subscribeTime;
-
-    /**
-     * ADD_SCENE_SEARCH 关注方式
-     */
-    @TableField("subscribeScene")
-    private String subscribeScene;
-
-    /**
-     * 是否取消关注
-     */
-    private Integer isCancel;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createdAt;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updatedAt;
-
-    private static final SweetWechatUser obj = new SweetWechatUser();
-    public static SweetWechatUser getNew() {
-        try {
-            return (SweetWechatUser) obj.clone();
-        } catch (CloneNotSupportedException e) {
-            return new SweetWechatUser();
-        }
-    }
-
-
-}

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetAppletUserMapper.java

-package com.liquidnet.service.sweet.mapper;
-
-import com.liquidnet.service.sweet.entity.SweetAppletUser;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 小程序登录记录用户解密后信息表 Mapper 接口
- * </p>
- *
- * @author jiangxiulong
- * @since 2021-11-08
- */
-public interface SweetAppletUserMapper extends BaseMapper<SweetAppletUser> {
-
-}

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetWechatUserMapper.java

-package com.liquidnet.service.sweet.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.liquidnet.service.sweet.entity.SweetWechatUser;
-
-/**
- * <p>
- * 正在现场服务号关注事件储存用户信息表 Mapper 接口
- * </p>
- *
- * @author jiangxiulong
- * @since 2021-08-03
- */
-public interface SweetWechatUserMapper extends BaseMapper<SweetWechatUser> {
-
-}

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/resources/com.liquidnet.service.sweet.mapper/SweetWechatUserMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.liquidnet.service.sweet.mapper.SweetWechatUserMapper">
-
-</mapper>

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/service/impl/SweetWechatTemplateMsgServiceImpl.java

@@ -7,7 +7,6 @@ import com.liquidnet.service.consumer.sweet.config.WechatMpConfigure;
 import com.liquidnet.service.consumer.sweet.utils.RedisDataUtils;
 import com.liquidnet.service.sweet.dto.param.SweetOpenSendMsgParam;
 import com.liquidnet.service.sweet.entity.SweetAppletUsers;
-import com.liquidnet.service.sweet.entity.SweetWechatUser;
 import com.liquidnet.service.sweet.mapper.SweetAppletUsersMapper;
 import com.liquidnet.service.sweet.vo.SweetWechatUsersVo;
 import lombok.extern.slf4j.Slf4j;

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/utils/RedisDataUtils.java

@@ -2,7 +2,6 @@ package com.liquidnet.service.consumer.sweet.utils;
 
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.service.sweet.constant.SweetConstant;
-import com.liquidnet.service.sweet.entity.SweetWechatUser;
 import com.liquidnet.service.sweet.vo.SweetWechatUsersVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/syncRedis/UserDataController.java

@@ -92,14 +92,4 @@ public class UserDataController {
         }
     }
 
-    @GetMapping("appletUser")
-    @ApiOperation("同步小程序用户")
-    public void appletUser() {
-        try {
-            userDataService.appletUser();
-        } catch (Exception e) {
-            log.error("getUser", e);
-        }
-    }
-
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/syncRedis/RedisDataServiceImpl.java

 package com.liquidnet.service.sweet.service.impl.syncRedis;
 
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
-import com.liquidnet.service.adam.dto.vo.admin.AdminUpushVo;
-import com.liquidnet.service.kylin.constant.KylinRedisConst;
-import com.liquidnet.service.kylin.dto.vo.admin.ZhengzaiAppVersionsVo;
-import com.liquidnet.service.kylin.entity.KylinBanners;
-import com.liquidnet.service.sweet.entity.SweetWechatUser;
 import com.liquidnet.service.sweet.param.SweetCityVoteParam;
-import com.liquidnet.service.sweet.vo.SweetAnswerVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisPool;
 
-import java.util.ArrayList;
-import java.util.LinkedList;
 import java.util.Set;
 
 @Service

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/syncRedis/UserDataServiceImpl.java

 package com.liquidnet.service.sweet.service.impl.syncRedis;
 
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
-import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
-import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
-import com.liquidnet.service.feign.adam.api.FeignAdamBaseClient;
 import com.liquidnet.service.sweet.config.WechatMpConfigure;
-import com.liquidnet.service.sweet.entity.SweetAppletUser;
-import com.liquidnet.service.sweet.entity.SweetAppletUsers;
-import com.liquidnet.service.sweet.entity.SweetWechatUsers;
-import com.liquidnet.service.sweet.mapper.SweetAppletUserMapper;
-import com.liquidnet.service.sweet.mapper.SweetAppletUsersMapper;
 import com.liquidnet.service.sweet.mapper.SweetWechatUsersMapper;
 import com.liquidnet.service.sweet.utils.QueueUtils;
 import com.liquidnet.service.sweet.utils.WechatUsersRedisUtils;
-import com.liquidnet.service.sweet.vo.SweetAppletUsersVo;
 import com.liquidnet.service.sweet.vo.SweetWechatUsersVo;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
@@ -42,15 +32,6 @@ public class UserDataServiceImpl {
     @Autowired
     private QueueUtils queueUtils;
 
-    @Autowired
-    SweetAppletUserMapper sweetAppletUserMapper;
-
-    @Autowired
-    private FeignAdamBaseClient feignAdamBaseClient;
-
-    @Autowired
-    private SweetAppletUsersMapper appletUsersMapper;
-
     @Autowired
     SweetWechatUsersMapper sweetWechatUsersMapper;
 
@@ -193,7 +174,7 @@ public class UserDataServiceImpl {
         }
     }
 
-    public void appletUser() {
+    /*public void appletUser() {
         int size = 1000;
         // 获取总记录数
         Integer count = sweetAppletUserMapper.selectCount(Wrappers.lambdaQuery(SweetAppletUser.class));
@@ -219,7 +200,7 @@ public class UserDataServiceImpl {
                         queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_WECHAT_USER_INSERT.getKey(),
                                 SqlMapping.gets(sqlsA, sqlsDataA));
 
-                        /*SweetAppletUsers sweetAppletUsers1 = new SweetAppletUsers();
+                        *//*SweetAppletUsers sweetAppletUsers1 = new SweetAppletUsers();
                         sweetAppletUsers1.setAppletUserId(info.getUserId());
                         sweetAppletUsers1.setUserId(userId);
                         sweetAppletUsers1.setOpenId(info.getOpenId());
@@ -228,7 +209,7 @@ public class UserDataServiceImpl {
                         sweetAppletUsers1.setPurePhoneNumber(info.getGetPurePhoneNumber());
                         sweetAppletUsers1.setCountryCode(info.getGetCountryCode());
                         sweetAppletUsers1.setType(info.getType());
-                        appletUsersMapper.insert(sweetAppletUsers1);*/
+                        appletUsersMapper.insert(sweetAppletUsers1);*//*
 
                         SweetAppletUsersVo sweetAppletUsersVo = SweetAppletUsersVo.getNew();
                         sweetAppletUsersVo.setAppletUserId(info.getUserId());
@@ -246,6 +227,6 @@ public class UserDataServiceImpl {
                 }
             }
         }
-    }
+    }*/
 
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java

@@ -511,58 +511,6 @@ public class RedisDataUtils {
         }
     }
 
-
-    // wechat user 摩登
-    public void setSweetWechatUser(SweetWechatUser sweetWechatUser) {
-        String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USER_INFO.concat(sweetWechatUser.getUnionId());
-        String redisKeyUnid = SweetConstant.REDIS_KEY_SWEET_WECHAT_USER_UNIONID.concat(sweetWechatUser.getOpenId());
-        redisUtil.set(redisKey, sweetWechatUser);
-        redisUtil.set(redisKeyUnid, sweetWechatUser.getUnionId());
-    }
-
-    public void setUnionIdByPhone(String phone, String unionId) {
-        String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USER_UNIONID_PHONE.concat(phone);
-        redisUtil.set(redisKey, unionId);
-    }
-
-    public void setUnionIdByUserId(String userId, String unionId) {
-        String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USER_UNIONID_UID.concat(userId);
-        redisUtil.set(redisKey, unionId);
-    }
-
-    public void setUnionIdByPhoneSky(String phone, String unionId) {
-        String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USER_UNIONID_PHONE_MODERNSKY.concat(phone);
-        redisUtil.set(redisKey, unionId);
-    }
-
-    public void setUnionIdByUserIdSky(String userId, String unionId) {
-        String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USER_UNIONID_UID_MODERNSKY.concat(userId);
-        redisUtil.set(redisKey, unionId);
-    }
-
-    public SweetWechatUser getSweetWechatUser(String unionid) {
-        if (unionid.isEmpty()) {
-            return null;
-        }
-        String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USER_INFO.concat(unionid);
-        return (SweetWechatUser) redisUtil.get(redisKey);
-    }
-
-    public void setSweetWechatUserModernsky(SweetWechatUser sweetWechatUser) {
-        String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USER_INFO_MODERNSKY.concat(sweetWechatUser.getUnionId());
-        String redisKeyUnid = SweetConstant.REDIS_KEY_SWEET_WECHAT_USER_UNIONID_MODERNSKY.concat(sweetWechatUser.getOpenId());
-        redisUtil.set(redisKey, sweetWechatUser);
-        redisUtil.set(redisKeyUnid, sweetWechatUser.getUnionId());
-    }
-
-    public SweetWechatUser getSweetWechatUserModernsky(String unionid) {
-        if (unionid.isEmpty()) {
-            return null;
-        }
-        String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USER_INFO_MODERNSKY.concat(unionid);
-        return (SweetWechatUser) redisUtil.get(redisKey);
-    }
-
     // 积分抽奖活动
     public List<IntegralActivityVo> getIntegralActivityList() {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_LIST;