Merge branch 'baseEntity' into contactIsolate

# Conflicts:
#	src/main/java/cn/quantgroup/xyqb/entity/Contact.java
#	src/main/java/cn/quantgroup/xyqb/service/user/impl/ContactServiceImpl.java

src/main/java/cn/quantgroup/xyqb/config/mq/RegisterMqConfig.java

 package cn.quantgroup.xyqb.config.mq;
 
 import cn.quantgroup.tech.brave.service.ITechRabbitBuilder;
-import org.springframework.amqp.core.*;
+import org.springframework.amqp.core.AmqpAdmin;
+import org.springframework.amqp.core.Binding;
+import org.springframework.amqp.core.BindingBuilder;
+import org.springframework.amqp.core.FanoutExchange;
+import org.springframework.amqp.core.Queue;
 import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
+import org.springframework.amqp.rabbit.connection.CachingConnectionFactory.CacheMode;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
 import org.springframework.amqp.rabbit.core.RabbitAdmin;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Created by xuran on 2017/9/7.
@@ -113,4 +121,35 @@ public class RegisterMqConfig {
         template.setExchange(exchange4Gdt);
         return template;
     }
+
+    @Bean(name = "commonConnectionFactory")
+    public ConnectionFactory commonConnectionFactory() {
+        CachingConnectionFactory connectionFactory = new CachingConnectionFactory(host, port);
+        connectionFactory.setCacheMode(CacheMode.CHANNEL);
+        //根据使用情况动态调整。
+        connectionFactory.setChannelCacheSize(100);
+        connectionFactory.setUsername(user);
+        connectionFactory.setPassword(password);
+        connectionFactory.setVirtualHost("/");
+        connectionFactory.setPublisherReturns(false);
+        connectionFactory.setPublisherConfirms(false);
+        return connectionFactory;
+    }
+
+    @Bean(name = "wechatRabbitTemplate")
+    public RabbitTemplate wechatRabbitTemplate(@Qualifier("commonConnectionFactory") ConnectionFactory commonConnectionFactory) {
+        RabbitTemplate rabbitTemplate = techRabbitBuilder.createRabbitTemplate(commonConnectionFactory);
+        rabbitTemplate.setMessageConverter(new Jackson2JsonMessageConverter());
+        RabbitAdmin rabbitAdmin = new RabbitAdmin(commonConnectionFactory);
+        String queueName = "wechat_bind";
+        Map<String, Object> queueArgs = new HashMap<>();
+        //数据 1 天有效期
+        queueArgs.put("x-message-ttl", 24 * 60 * 60 * 1000);
+        Queue wechatBind = new Queue(queueName, true, false, false, queueArgs);
+        rabbitAdmin.declareQueue(wechatBind);
+//        rabbitTemplate.setQueue(queueName);
+        rabbitTemplate.setRoutingKey(queueName);
+        return rabbitTemplate;
+    }
+
 }

src/main/java/cn/quantgroup/xyqb/controller/external/UserDetailController.java

@@ -64,17 +64,14 @@ public class UserDetailController implements IBaseController {
             log.error("身份证号错误,userId:{}, idNo: {}", user.getId(), idNo);
             return JsonResult.buildErrorStateResult("身份证号码错误", null);
         }
-        Timestamp now = new Timestamp(System.currentTimeMillis());
         /* 保存或更新 */
         UserDetail userDetail = userDetailService.findByUserId(user.getId());
         if (Objects.isNull(userDetail)) {
             userDetail = new UserDetail();
-            userDetail.setCreatedAt(now);
         }
         userDetail.setIdNo(idNo);
         userDetail.setPhoneNo(user.getPhoneNo());
         userDetail.setUserId(user.getId());
-        userDetail.setUpdatedAt(now);
         userDetail.setName(name);
         userDetail.setGender(info.getGender());
         userDetail.setIdType(IdType.ID_CARD);

src/main/java/cn/quantgroup/xyqb/controller/internal/user/InnerController.java

@@ -328,7 +328,6 @@ public class InnerController implements IBaseController {
         } else if (!Objects.equals(user.getPhoneNo(), phoneNo)) {
             return JsonResult.buildErrorStateResult("用户手机号不匹配", null);
         }
-        Timestamp now = new Timestamp(System.currentTimeMillis());
         /*
          * 如果已存在记录，则更新
          */
@@ -342,13 +341,11 @@ public class InnerController implements IBaseController {
         }
         if (Objects.isNull(userDetail)) {
             userDetail = new UserDetail();
-            userDetail.setCreatedAt(now);
         }
         userDetail.setUserId(userId);
         userDetail.setName(name);
         userDetail.setPhoneNo(phoneNo);
         userDetail.setIdNo(idNo);
-        userDetail.setUpdatedAt(now);
         userDetail.setIdType(IdType.ID_CARD);
         userDetail.setGender(info.getGender());
         userDetail.setEmail(email);
@@ -568,9 +565,6 @@ public class InnerController implements IBaseController {
         Address addressObj = addressService.findByUserId(userId);
         if (addressObj == null) {
             addressObj = new Address();
-            Timestamp now = new Timestamp(System.currentTimeMillis());
-            addressObj.setCreatedAt(now);
-            addressObj.setUpdateAt(now);
         }
         addressObj.setUserId(userId);
         addressObj.setProvince(province);
@@ -595,13 +589,10 @@ public class InnerController implements IBaseController {
             return JsonResult.buildErrorStateResult("用户ID不能为空", null);
         }
         UserExtInfo info = userExtInfoService.findByUserId(userId);
-        Timestamp now = new Timestamp(System.currentTimeMillis());
         if (info == null) {
             info = new UserExtInfo();
             info.setUserId(userId);
-            info.setCreatedAt(now);
         }
-        info.setUpdateAt(now);
         if (incomeEnum != null) {
             info.setIncomeEnum(cn.quantgroup.user.enums.IncomeEnum.valueOf(incomeEnum.name()));
         }
@@ -976,7 +967,6 @@ public class InnerController implements IBaseController {
             return false;
         }
         user.setEnable(enable);
-        user.setUpdatedAt(new Timestamp(System.currentTimeMillis()));
         log.info("刷新用户激活状态失败：userId:{},enable:{},user:{}", userId, enable, user);
         user = userService.saveUser(user);
         if (!user.getEnable()) {
@@ -1003,15 +993,12 @@ public class InnerController implements IBaseController {
             }
         }
         UserSpouse userSpouse = userSpouseService.findByUserId(userId);
-        Timestamp timestamp = new Timestamp(System.currentTimeMillis());
         if (userSpouse == null) {
             userSpouse = new UserSpouse(userId);
-            userSpouse.setCreatedAt(timestamp);
         }
         userSpouse.setSpouseName(status == MaritalStatus.MARRIED ? spouseName : "");
         userSpouse.setSpousePhone(status == MaritalStatus.MARRIED ? spousePhone : "");
         userSpouse.setStatus(cn.quantgroup.user.enums.MaritalStatus.valueOf(status.name()));
-        userSpouse.setUpdateAt(timestamp);
         userSpouse = userSpouseService.save(userSpouse);
         return JsonResult.buildSuccessResult(null, UserSpouseRet.getUserSpouseRet(userSpouse));
     }

src/main/java/cn/quantgroup/xyqb/controller/internal/user/SyncUserController.java

@@ -71,17 +71,14 @@ public class SyncUserController {
             log.error("用户不存在,phoneNo:{}", phoneNo);
             return JsonResult.buildErrorStateResult("用户不存在", phoneNo);
         }
-        Timestamp now = new Timestamp(System.currentTimeMillis());
         /* 保存或更新 */
         UserDetail userDetail = userDetailService.findByUserId(user.getId());
         if (Objects.isNull(userDetail)) {
             userDetail = new UserDetail();
-            userDetail.setCreatedAt(now);
         }
         userDetail.setUserId(user.getId());
         userDetail.setIdNo(idNo);
         userDetail.setPhoneNo(phoneNo);
-        userDetail.setUpdatedAt(now);
         userDetail.setName(name);
         userDetail.setGender(info.getGender());
         userDetail.setIdType(IdType.ID_CARD);

src/main/java/cn/quantgroup/xyqb/controller/internal/user/center/UserCenterController.java

@@ -291,10 +291,8 @@ public class UserCenterController {
         }
         //查询用户是否有保存地址信息
         Address addressInfo = addressService.findByUserId(userId);
-        Timestamp now = new Timestamp(System.currentTimeMillis());
         if (null == addressInfo) {
             addressInfo = new Address();
-            addressInfo.setCreatedAt(now);
         }
         addressInfo.setUserId(userId);
         addressInfo.setProvince(province);
@@ -304,7 +302,6 @@ public class UserCenterController {
         addressInfo.setDistrictCode(districtCode);
         addressInfo.setDistrict(district);
         addressInfo.setAddress(address);
-        addressInfo.setUpdateAt(now);
         addressService.save(addressInfo);
         return JsonResult.buildSuccessResult(null, addressInfo);
     }
@@ -374,13 +371,10 @@ public class UserCenterController {
         }
         //查询用户是否保存过.
         UserExtInfo userExtInfo = userExtInfoService.findByUserId(userId);
-        Timestamp now = new Timestamp(System.currentTimeMillis());
         if (null == userExtInfo) {
             userExtInfo = new UserExtInfo();
             userExtInfo.setUserId(userId);
         }
-        userExtInfo.setCreatedAt(now);
-        userExtInfo.setUpdateAt(now);
         userExtInfo.setEducationEnum(educationEnum);
         userExtInfo.setMarryStatus(maritalStatus);
         userExtInfo.setOccupationEnum(occupationEnum);

src/main/java/cn/quantgroup/xyqb/controller/middleoffice/userdetail/UserDetailController.java

@@ -48,7 +48,6 @@ public class UserDetailController {
         //更新
         userDetail.setName(userDetailReq.getName());
         userDetail.setIdNo(userDetailReq.getIdNo());
-        userDetail.setUpdatedAt(new Timestamp(System.currentTimeMillis()));
         userDetail = userDetailService.saveUserDetail(userDetail);
         return JsonResult.buildSuccessResultGeneric(userDetail);
     }
@@ -69,7 +68,6 @@ public class UserDetailController {
         }
         User user = userService.findById(userId);
         IdCardInfo idCardInfo = idCardService.getIdCardInfo(userDetailReq.getIdNo());
-        Timestamp now = new Timestamp(System.currentTimeMillis());
 
         userDetail = new UserDetail();
         userDetail.setUserId(userId);
@@ -78,8 +76,6 @@ public class UserDetailController {
         userDetail.setIdNo(userDetailReq.getIdNo());
         userDetail.setIdType(IdType.ID_CARD);
         userDetail.setGender(idCardInfo.getGender());
-        userDetail.setCreatedAt(now);
-        userDetail.setUpdatedAt(now);
         userDetail = userDetailService.saveUserDetail(userDetail);
         return JsonResult.buildSuccessResultGeneric(userDetail);
     }

src/main/java/cn/quantgroup/xyqb/controller/modifyphoneno/ModifyPhoneNoController.java

@@ -10,13 +10,24 @@ import cn.quantgroup.xyqb.entity.ModifyPhoneNo;
 import cn.quantgroup.xyqb.entity.User;
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.service.user.IModifyPhoneNoService;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationConfig;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.io.IOException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 
 /**
  * 用户手机号修改相关api
@@ -81,8 +92,18 @@ public class ModifyPhoneNoController implements IBaseController {
      */
     @ApiOperation("后台客服处理功能 - 查询列表")
     @GetMapping
-    public JsonResult<Page<ModifyPhoneNo>> list(@Valid ModifyPhoneNoQueryReq modifyPhoneNoQueryReq) {
-        return JsonResult.buildSuccessResultGeneric(modifyPhoneNoService.list(modifyPhoneNoQueryReq));
+    public JsonResult<?> list(@Valid ModifyPhoneNoQueryReq modifyPhoneNoQueryReq) {
+        Page<ModifyPhoneNo> list = modifyPhoneNoService.list(modifyPhoneNoQueryReq);
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+        String s;
+        try {
+            s = objectMapper.writeValueAsString(list);
+            Object o = objectMapper.readValue(s, Object.class);
+            return JsonResult.buildSuccessResultGeneric(o);
+        } catch (Exception ignored) {
+        }
+        return JsonResult.buildErrorStateResult("数据错误",null);
     }
 
     /**

src/main/java/cn/quantgroup/xyqb/controller/modifyphoneno/req/Step1Req.java

@@ -65,9 +65,6 @@ public class Step1Req implements Serializable {
     public static ModifyPhoneNo adapt(Step1Req step1Req) {
         ModifyPhoneNo modifyPhoneNo = new ModifyPhoneNo();
         BeanUtils.copyProperties(step1Req, modifyPhoneNo);
-        Date date = new Date();
-        modifyPhoneNo.setCreatedAt(date);
-        modifyPhoneNo.setUpdatedAt(date);
         return modifyPhoneNo ;
     }
 }

src/main/java/cn/quantgroup/xyqb/entity/Address.java

@@ -13,14 +13,10 @@ import java.sql.Timestamp;
 @Data
 @Entity
 @Table(name = "address", uniqueConstraints = @UniqueConstraint(columnNames = "user_id"))
-public class Address implements Serializable {
+public class Address extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = -1L;
 
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
     @Column(name = "user_id")
     private Long userId;
     @Column(name = "province_code")
@@ -37,15 +33,7 @@ public class Address implements Serializable {
     private String district;
     @Column(name = "address")
     private String address;
-    @Column(name = "created_at")
-    private Timestamp createdAt;
-    @Column(name = "updated_at")
-    private Timestamp updateAt;
-
-    @PreUpdate
-    public void preUpdate() {
-        this.updateAt = new Timestamp(System.currentTimeMillis());
-    }
+
 
     public String toString() {
         return province + "(省)" + city + "(市)" + district + "(区/县)" + address;

src/main/java/cn/quantgroup/xyqb/entity/BaseEntity.java

+package cn.quantgroup.xyqb.entity;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+/**
+ * 所有数据库实体，都要继承 BaseEntity
+ * 1. 统一的 ID 设计。
+ * 2. 统一的创建和更新时间。
+ */
+@MappedSuperclass
+@Data
+public abstract class BaseEntity implements Serializable {
+    private static final long serialVersionUID = -1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Basic(optional = false)
+    private Long id;
+
+    @Column(name = "created_at")
+    private Timestamp createdAt;
+
+    @Column(name = "updated_at")
+    private Timestamp updatedAt;
+
+    @PrePersist
+    public void prePersist() {
+        Timestamp now = new Timestamp(System.currentTimeMillis());
+        this.createdAt = now;
+        this.updatedAt = now;
+    }
+
+    @PreUpdate
+    public void preUpdate() {
+        this.updatedAt = new Timestamp(System.currentTimeMillis());
+    }
+
+}

src/main/java/cn/quantgroup/xyqb/entity/Channel.java

-package cn.quantgroup.xyqb.entity;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-/**
- * Created by FrankChow on 15/7/8.
- */
-@Entity
-@Table(name = "channel", uniqueConstraints = @UniqueConstraint(columnNames = "channel_code"))
-public class Channel implements Serializable {
-
-    private static final long serialVersionUID = -1L;
-
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
-    //渠道代号
-    @Column(name = "channel_code")
-    private String channelCode;
-
-    //渠道名称
-    @Column(name = "name")
-    private String name;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getChannelCode() {
-        return channelCode;
-    }
-
-    public void setChannelCode(String channelCode) {
-        this.channelCode = channelCode;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-
-    @Override
-    public String toString() {
-        return "Channel{" +
-                "channelCode='" + channelCode + '\'' +
-                ", id=" + id +
-                ", name='" + name + '\'' +
-                '}';
-    }
-}

src/main/java/cn/quantgroup/xyqb/entity/Contact.java

@@ -27,13 +27,9 @@ import java.sql.Timestamp;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class Contact implements Serializable {
+public class Contact extends BaseEntity implements Serializable {
     private static final long serialVersionUID = -1L;
 
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
     @Column(name = "user_id")
     private Long userId;
     @Column(name = "name")
@@ -44,10 +40,6 @@ public class Contact implements Serializable {
     private BizType bizType;
     @Column(name = "relation")
     private Relation relation;
-    @Column(name = "created_at")
-    private Timestamp createdAt;
-    @Column(name = "updated_at")
-    private Timestamp updateAt;
 
     /**
      * 数据合法性校验

src/main/java/cn/quantgroup/xyqb/entity/Merchant.java

@@ -4,10 +4,8 @@ import lombok.Data;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.Id;
 import javax.persistence.Table;
 import java.io.Serializable;
-import java.sql.Timestamp;
 
 /**
  * Created by 11 on 2016/12/30.
@@ -15,18 +13,11 @@ import java.sql.Timestamp;
 @Data
 @Entity
 @Table(name = "merchant")
-public class Merchant implements Serializable {
+public class Merchant extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = -1L;
-    @Id
-    @Column(name = "id")
-    private Long id;
     @Column(name = "name")
     private String name;
     @Column(name = "enable")
     private boolean enable;
-    @Column(name = "created_at")
-    private Timestamp createAt;
-    @Column(name = "updated_at")
-    private Timestamp updateAt;
 }

src/main/java/cn/quantgroup/xyqb/entity/MerchantConfig.java

@@ -4,10 +4,8 @@ import lombok.Data;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.Id;
 import javax.persistence.Table;
 import java.io.Serializable;
-import java.sql.Timestamp;
 
 /**
  * Created by 11 on 2016/12/30.
@@ -15,20 +13,13 @@ import java.sql.Timestamp;
 @Data
 @Entity
 @Table(name = "merchant_config")
-public class MerchantConfig implements Serializable {
+public class MerchantConfig extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = -1L;
-    @Id
-    @Column(name = "id")
-    private Long id;
     @Column(name = "merchant_id")
     private Long merchantId;
     @Column(name = "config_name")
     private String configName;
     @Column(name = "config_value")
     private String configValue;
-    @Column(name = "created_at")
-    private Timestamp createdAt;
-    @Column(name = "updated_at")
-    private Timestamp updateAt;
 }

src/main/java/cn/quantgroup/xyqb/entity/ModifyPhoneNo.java

@@ -3,9 +3,10 @@ package cn.quantgroup.xyqb.entity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * Date: 2019/11/4
@@ -16,15 +17,10 @@ import java.util.Date;
 @Data
 @Entity
 @Table(name = "user_modify_phone_no")
-public class ModifyPhoneNo implements Serializable {
+@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
+public class ModifyPhoneNo extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = -7797532159380593454L;
-    /**
-     * id
-     */
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
 
     /**
      * user.id
@@ -90,18 +86,4 @@ public class ModifyPhoneNo implements Serializable {
      */
     @Column(name = "processing_status")
     private Integer processingStatus;
-
-    /**
-     *
-     */
-    @Column(name = "created_at")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createdAt;
-
-    /**
-     *
-     */
-    @Column(name = "updated_at")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date updatedAt;
 }

src/main/java/cn/quantgroup/xyqb/entity/User.java

 package cn.quantgroup.xyqb.entity;
 
-import cn.quantgroup.xyqb.config.http.Timestamp2LongConverter;
-import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
 import java.io.Serializable;
-import java.sql.Timestamp;
 import java.util.Objects;
 
 /**
@@ -18,15 +18,11 @@ import java.util.Objects;
 @Setter
 @ToString
 @Entity
-@Table(name = "user", uniqueConstraints = @UniqueConstraint(columnNames = "phone_no"))
-public class User implements Serializable {
+@Table(name = "user",
+       uniqueConstraints = @UniqueConstraint(columnNames = "phone_no"))
+public class User extends BaseEntity implements Serializable {
     private static final long serialVersionUID = -1L;
 
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
     //手机号
     @Column(name = "phone_no")
     private String phoneNo;
@@ -35,7 +31,6 @@ public class User implements Serializable {
     @Column(name = "password")
     private String password;
 
-
     //第一次用户来源 channel_id
     @Column(name = "registered_from")
     private Long registeredFrom;
@@ -47,17 +42,9 @@ public class User implements Serializable {
     @Column(name = "enable")
     private Boolean enable;
 
-    //创建时间
-    @Column(name = "created_at")
-    private Timestamp createdAt;
-
-    //上一次修改时间
-    @Column(name = "updated_at")
-    @JSONField(serializeUsing = Timestamp2LongConverter.class)
-    private Timestamp updatedAt;
-
     /**
      * 是否有密码
+     *
      * @return
      */
     public boolean getHasPassword() {

src/main/java/cn/quantgroup/xyqb/entity/UserAttached.java

@@ -12,19 +12,11 @@ import java.sql.Timestamp;
 @Data
 @Entity
 @Table(name = "user_attached")
-public class UserAttached implements Serializable {
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+public class UserAttached  extends BaseEntity implements Serializable {
     @Column(name = "user_id")
     private Long userId;
     @Column(name = "avatar")
     private String avatar;
     @Column(name = "nick")
     private String nick;
-    @Column(name = "created_at")
-    private Timestamp createdAt;
-    @Column(name = "updated_at")
-    private Timestamp updatedAt;
 }

src/main/java/cn/quantgroup/xyqb/entity/UserBtRegister.java

 package cn.quantgroup.xyqb.entity;
 
-import cn.quantgroup.xyqb.config.http.Timestamp2LongConverter;
-import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
 import java.io.Serializable;
-import java.sql.Timestamp;
 
 /**
  * Created by Administrator on 2017/5/16.
@@ -18,14 +17,9 @@ import java.sql.Timestamp;
 @ToString
 @Entity
 @Table(name = "user_bt_register")
-public class UserBtRegister implements Serializable {
+public class UserBtRegister extends BaseEntity implements Serializable {
     private static final long serialVersionUID = -1L;
 
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
     @Column(name = "user_id")
     private Long userId;
 
@@ -34,29 +28,4 @@ public class UserBtRegister implements Serializable {
 
     @Column(name = "is_active")
     private Boolean isActive = Boolean.TRUE;
-
-    //创建时间
-    @Column(name = "created_at")
-    private Timestamp createdAt;
-
-    //上一次修改时间
-    @Column(name = "updated_at")
-    @JSONField(serializeUsing = Timestamp2LongConverter.class)
-    private Timestamp updatedAt;
-
-
-    @PrePersist
-    public void prePersist() {
-        Timestamp now = new Timestamp(System.currentTimeMillis());
-        this.createdAt = now;
-        this.updatedAt = now;
-    }
-
-
-    @PreUpdate
-    public void preUpdate() {
-        Timestamp now = new Timestamp(System.currentTimeMillis());
-        this.createdAt = now;
-        this.updatedAt = now;
-    }
 }

src/main/java/cn/quantgroup/xyqb/entity/UserDetail.java

@@ -7,7 +7,10 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
 import java.io.Serializable;
 import java.sql.Timestamp;
 import java.util.Optional;
@@ -19,16 +22,12 @@ import java.util.Optional;
 @Setter
 @ToString
 @Entity
-@Table(name = "user_detail", uniqueConstraints = @UniqueConstraint(columnNames = "user_id"))
-public class UserDetail implements Serializable {
+@Table(name = "user_detail",
+       uniqueConstraints = @UniqueConstraint(columnNames = "user_id"))
+public class UserDetail extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = -1L;
 
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
     @Column(name = "user_id")
     private Long userId;
 
@@ -60,14 +59,6 @@ public class UserDetail implements Serializable {
     @Column(name = "qq")
     private String qq;
 
-    //创建时间
-    @Column(name = "created_at")
-    private Timestamp createdAt;
-
-    //上一次修改时间
-    @Column(name = "updated_at")
-    private Timestamp updatedAt;
-
     public XUserDetail toXUserDetail() {
         XUserDetail xUserDetail = new XUserDetail();
         xUserDetail.setId(this.getId());
@@ -76,10 +67,13 @@ public class UserDetail implements Serializable {
         xUserDetail.setName(this.getName());
         xUserDetail.setIdNo(this.getIdNo());
         if (this.getIdType() != null) {
-            xUserDetail.setIdType(cn.quantgroup.motan.enums.IdType.valueOf(this.getIdType().name()));
+            xUserDetail.setIdType(cn.quantgroup.motan.enums.IdType.valueOf(this.getIdType()
+                                                                               .name()));
         }
         if (this.getGender() != null) {
-            xUserDetail.setGender(cn.quantgroup.motan.enums.Gender.valueOf(Optional.ofNullable(this.getGender()).orElse(Gender.UNKNOWN).name()));
+            xUserDetail.setGender(cn.quantgroup.motan.enums.Gender.valueOf(Optional.ofNullable(this.getGender())
+                                                                                   .orElse(Gender.UNKNOWN)
+                                                                                   .name()));
         }
         xUserDetail.setEmail(this.getEmail());
         xUserDetail.setQq(this.getQq());
@@ -90,5 +84,4 @@ public class UserDetail implements Serializable {
         return xUserDetail;
     }
 
-
 }

src/main/java/cn/quantgroup/xyqb/entity/UserExtInfo.java

@@ -14,13 +14,9 @@ import java.sql.Timestamp;
 @Data
 @Entity
 @Table(name = "user_ext_info")
-public class UserExtInfo implements Serializable {
+public class UserExtInfo extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = -1L;
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
-    private Long id;
     @Column(name = "user_id")
     private Long userId;
     @Column(name = "means_of_income_payment")
@@ -41,14 +37,10 @@ public class UserExtInfo implements Serializable {
     private Boolean hasCreditCard = false;
     @Column(name = "marry_status")
     private MaritalStatus marryStatus = MaritalStatus.UNKNOWN;
-    @Column(name = "created_at")
-    private Timestamp createdAt;
-    @Column(name = "updated_at")
-    private Timestamp updateAt;
 
     public XUserExtInfo toXUserExtInfo() {
         XUserExtInfo xUserExtInfo = new XUserExtInfo();
-        xUserExtInfo.setId(this.id);
+        xUserExtInfo.setId(getId());
         xUserExtInfo.setUserId(this.userId);
         xUserExtInfo.setEducationEnum(cn.quantgroup.motan.enums.EducationEnum.valueOf(this.educationEnum.name()));
         xUserExtInfo.setIncomeEnum(cn.quantgroup.motan.enums.IncomeEnum.valueOf(this.incomeEnum.name()));
@@ -58,8 +50,8 @@ public class UserExtInfo implements Serializable {
         xUserExtInfo.setHasSocialSecurity(this.hasSocialSecurity);
         xUserExtInfo.setHasCreditCard(this.hasCreditCard);
         xUserExtInfo.setMarryStatus(cn.quantgroup.motan.enums.MaritalStatus.valueOf(this.marryStatus.name()));
-        xUserExtInfo.setCreatedAt(this.createdAt);
-        xUserExtInfo.setUpdateAt(this.updateAt);
+        xUserExtInfo.setCreatedAt(getCreatedAt());
+        xUserExtInfo.setUpdateAt(getUpdatedAt());
         return xUserExtInfo;
     }
 }

src/main/java/cn/quantgroup/xyqb/entity/UserHashMapping.java

@@ -12,18 +12,13 @@ import java.sql.Timestamp;
 @Entity
 @Table(name = "user_hash_mapping")
 @NoArgsConstructor
-public class UserHashMapping implements Serializable {
+public class UserHashMapping extends BaseEntity implements Serializable {
     private static final long serialVersionUID = -1L;
 
     public UserHashMapping(Long userId) {
         this.userId = userId;
     }
 
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
     @Column(name = "user_id")
     private Long userId;
 
@@ -39,25 +34,6 @@ public class UserHashMapping implements Serializable {
     @Column(name = "id_no_md5_short")
     private Long idNoMd5Short;
 
-    @Column(name = "created_at")
-    private Timestamp createdAt;
-
-    @Column(name = "updated_at")
-    private Timestamp updatedAt;
-
-    @PrePersist
-    public void prePersist() {
-        Timestamp timestamp = new Timestamp(System.currentTimeMillis());
-        createdAt = timestamp;
-        updatedAt = timestamp;
-    }
-
-    @PreUpdate
-    public void preUpdate() {
-        updatedAt = new Timestamp(System.currentTimeMillis());
-    }
-
-
     public void setPhoneNoMd5(String phoneNoMd5) {
         this.phoneNoMd5 = phoneNoMd5;
         this.phoneNoMd5Short = HashUtil.crc32(phoneNoMd5);

src/main/java/cn/quantgroup/xyqb/entity/UserHashPhoneNoIdNoMapping.java

@@ -8,19 +8,12 @@ import java.sql.Timestamp;
 @Data
 @Entity
 @Table(name = "user_hash_phone_no_id_no_mapping")
-public class UserHashPhoneNoIdNoMapping {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+public class UserHashPhoneNoIdNoMapping extends BaseEntity {
 
     @Column(name = "user_id")
     private Long userId;
     @Column(name = "phone_no_id_no_md5")
     private String phoneNoIdNoMd5;
-    @Column(name = "created_at")
-    private Timestamp createdAt;
-    @Column(name = "updated_at")
-    private Timestamp updatedAt;
 
     public UserHashPhoneNoIdNoMapping() {
     }
@@ -28,16 +21,4 @@ public class UserHashPhoneNoIdNoMapping {
     public UserHashPhoneNoIdNoMapping(Long userId) {
         this.userId = userId;
     }
-
-    @PrePersist
-    public void prePersist() {
-        Timestamp timestamp = new Timestamp(System.currentTimeMillis());
-        createdAt = timestamp;
-        updatedAt = timestamp;
-    }
-
-    @PreUpdate
-    public void preUpdate() {
-        updatedAt = new Timestamp(System.currentTimeMillis());
-    }
 }

src/main/java/cn/quantgroup/xyqb/entity/UserJr58.java

-package cn.quantgroup.xyqb.entity;
-
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.sql.Timestamp;
-
-/**
- * @author mengfan.feng
- * @time 2015-09-10 15:32
- */
-@Entity
-@Table(name = "user_jr58", uniqueConstraints = @UniqueConstraint(columnNames = "user_id"))
-@Getter
-@Setter
-@ToString
-public class UserJr58 implements Serializable {
-
-    private static final long serialVersionUID = -1L;
-
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
-    @Column(name = "user_id")
-    private Long userId;
-
-    @Column(name = "wb_id")
-    private String wbId;
-
-    @Column(name = "wb_user_name")
-    private String wbUserName;
-
-    @Column(name = "customer_id")
-    private String customerId;
-
-    @Column(name = "name")
-    private String name;
-
-    @Column(name = "id_card")
-    private String idcard;
-
-    @Column(name = "email")
-    private String email;
-
-    @Column(name = "phone")
-    private String phone;
-
-    @Column(name = "info")
-    private String info;
-
-    @Column(name = "role_id")
-    private String roleId;
-
-    @Column(name = "flag")
-    private String flag;
-
-    @Column(name = "city")
-    private String city;
-
-    @Column(name = "access_mode")
-    private String accessMode;
-
-    @Column(name = "app_id")
-    private String appId;
-
-    @Column(name = "created_at")
-    private Timestamp createdAt;
-
-    @Column(name = "updated_at")
-    private Timestamp updatedAt;
-
-    @Column(name = "edu")
-    private String edu;
-    @Column(name = "income")
-    private String income;
-    @Column(name = "marry")
-    private String marry;
-}

src/main/java/cn/quantgroup/xyqb/entity/UserQueryLog.java

 package cn.quantgroup.xyqb.entity;
 
-
 import lombok.Data;
 
-import javax.persistence.*;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.PrePersist;
+import javax.persistence.PreUpdate;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
-import java.util.Date;
+import java.sql.Timestamp;
 
 /**
  * Created by 11 on 2016/12/30.
@@ -16,11 +24,11 @@ import java.util.Date;
 public class UserQueryLog implements Serializable {
 
     private static final long serialVersionUID = -1L;
-
     @Id
-    @Column(name = "id")
     @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Basic(optional = false)
     private Long id;
+
     @Column(name = "login_user_name")
     private String loginUserName;
     @Column(name = "query_condition")
@@ -31,10 +39,16 @@ public class UserQueryLog implements Serializable {
     private Long resultAmount;
     @Column(name = "query_detail")
     private String queryDetail;
-    @Column(name = "created_at")
-    private Date createdAt = new Date();
 
     @Transient
     private String createDate;
 
+    @Column(name = "created_at")
+    private Timestamp createdAt;
+
+    @PrePersist
+    public void prePersist() {
+        Timestamp now = new Timestamp(System.currentTimeMillis());
+        this.createdAt = now;
+    }
 }

src/main/java/cn/quantgroup/xyqb/entity/UserSpouse.java

@@ -16,13 +16,9 @@ import java.sql.Timestamp;
 @Setter
 @ToString
 @NoArgsConstructor
-public class UserSpouse implements Serializable {
+public class UserSpouse extends BaseEntity implements Serializable {
     private static final long serialVersionUID = -1L;
 
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
 
     @Column(name = "user_id")
     private Long userId;
@@ -33,12 +29,6 @@ public class UserSpouse implements Serializable {
     @Column(name = "spouse_name")
     private String spouseName;
 
-    @Column(name = "created_at")
-    private Timestamp createdAt;
-
-    @Column(name = "updated_at")
-    private Timestamp updateAt;
-
     @Column(name = "status")
     private MaritalStatus status;
 

src/main/java/cn/quantgroup/xyqb/entity/WechatUserInfo.java

@@ -15,13 +15,9 @@ import java.sql.Timestamp;
 @Entity
 @Table(name = "wechat_userinfo")
 @Data
-public class WechatUserInfo implements Serializable {
+public class WechatUserInfo extends BaseEntity implements Serializable {
     private static final long serialVersionUID = -1L;
 
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
     @Column(name = "user_id")
     private Long userId;
     @Column(name = "open_id")
@@ -42,10 +38,6 @@ public class WechatUserInfo implements Serializable {
     private String country;
     @Column(name = "head_img_url")
     private String headImgUrl;
-    @Column(name = "created_at")
-    private Timestamp createdAt = new Timestamp(System.currentTimeMillis());
-    @Column(name = "updated_at")
-    private Timestamp updatedAt = new Timestamp(System.currentTimeMillis());
 
 
     public WechatUserInfo convertEmoji() {

src/main/java/cn/quantgroup/xyqb/event/AddressRegisteredEventListener.java

@@ -30,9 +30,6 @@ public class AddressRegisteredEventListener implements ApplicationListener<Regis
         }
         User user = userRegisterParam.getUser();
         address.setUserId(user.getId());
-        Timestamp currentTime = new Timestamp(System.currentTimeMillis());
-        address.setCreatedAt(currentTime);
-        address.setUpdateAt(currentTime);
         addressRepository.save(address);
     }
 }

src/main/java/cn/quantgroup/xyqb/event/BtRegisteredEventListener.java

@@ -36,9 +36,6 @@ public class BtRegisteredEventListener implements ApplicationListener<RegisterEv
             userBtRegister.setRegisterBtMerchantId(btRegisterChannelId);
         }
         userBtRegister.setIsActive(true);
-        Timestamp currentTime = new Timestamp(System.currentTimeMillis());
-        userBtRegister.setCreatedAt(currentTime);
-        userBtRegister.setUpdatedAt(currentTime);
         userBtRegisterService.save(userBtRegister);
     }
 }

src/main/java/cn/quantgroup/xyqb/event/DetailRegisteredEventListener.java

@@ -51,9 +51,6 @@ public class DetailRegisteredEventListener implements ApplicationListener<Regist
         userDetail.setPhoneNo(phoneNo);
         userDetail.setName(name);
         userDetail.setIdType(IdType.ID_CARD);
-        Timestamp currentTime = new Timestamp(System.currentTimeMillis());
-        userDetail.setCreatedAt(currentTime);
-        userDetail.setUpdatedAt(currentTime);
         userDetail.setUserId(user.getId());
         userDetail.setGender(cardInfo.getGender());
         userDetailService.saveUserDetail(userDetail);

src/main/java/cn/quantgroup/xyqb/event/NotifyWechatBindEventListener.java

+package cn.quantgroup.xyqb.event;
+
+import cn.quantgroup.xyqb.entity.User;
+import cn.quantgroup.xyqb.model.webchat.WechatEventMsg;
+import cn.quantgroup.xyqb.repository.IUserRepository;
+import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * 微信绑定关系变动。通知某系统
+ */
+@Slf4j
+@Component
+public class NotifyWechatBindEventListener implements ApplicationListener<WechatBindEvent> {
+
+    @Resource
+    private RabbitTemplate wechatRabbitTemplate;
+    @Resource
+    private IUserRepository userRepository;
+
+    @Override
+    public void onApplicationEvent(WechatBindEvent event) {
+        WechatEventMsg wechatEventMsg = event.getWechatEventMsg();
+        if (wechatEventMsg.getUserId() == null) {
+            log.info("微信绑定数据，没有用户 ID 信息,openId:{}", wechatEventMsg.getOpenId());
+            return;
+        }
+        User user = userRepository.findById(wechatEventMsg.getUserId());
+        if (user == null) {
+            log.info("微信绑定数据，没有用户信息,openId:{},userId:{}", wechatEventMsg.getOpenId(), wechatEventMsg.getUserId());
+            return;
+        }
+        String uuid = user.getUuid();
+
+        Map<String, Object> msg = Maps.newHashMapWithExpectedSize(3);
+        msg.put("uuid", uuid);
+        msg.put("openId", wechatEventMsg.getOpenId());
+        msg.put("timestamp", event.getTimestamp());
+        wechatRabbitTemplate.convertAndSend(msg);
+    }
+}

src/main/java/cn/quantgroup/xyqb/event/WechatBindEvent.java

+package cn.quantgroup.xyqb.event;
+
+import cn.quantgroup.xyqb.model.webchat.WechatEventMsg;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.context.ApplicationEvent;
+
+/**
+ * 微信用户绑定信息创建或更新事件
+ *
+ * @author ag
+ */
+@Getter
+@Setter
+public class WechatBindEvent extends ApplicationEvent {
+    private WechatEventMsg wechatEventMsg;
+
+    /**
+     * Create a new ApplicationEvent.
+     *
+     * @param source the object on which the event initially occurred (never {@code null})
+     */
+    public WechatBindEvent(Object source) {
+        super(source);
+    }
+
+    public WechatBindEvent(Object source, WechatEventMsg wechatEventMsg) {
+        super(source);
+        this.wechatEventMsg = wechatEventMsg;
+    }
+}

src/main/java/cn/quantgroup/xyqb/model/AddressRet.java

@@ -37,7 +37,7 @@ public class AddressRet {
         ret.setCity(address.getCity());
         ret.setAddress(address.getAddress());
         ret.setCreatedAt(address.getCreatedAt().getTime());
-        ret.setUpdateAt(address.getUpdateAt().getTime());
+        ret.setUpdateAt(address.getUpdatedAt().getTime());
         return ret;
     }
 }

src/main/java/cn/quantgroup/xyqb/model/ContactRet.java

@@ -40,8 +40,8 @@ public class ContactRet implements Serializable {
         if(Objects.nonNull(c.getCreatedAt())){
             ret.setCreatedAt(c.getCreatedAt().getTime());
         }
-        if(Objects.nonNull(c.getUpdateAt())) {
-            ret.setUpdateAt(c.getUpdateAt().getTime());
+        if(Objects.nonNull(c.getUpdatedAt())) {
+            ret.setUpdateAt(c.getUpdatedAt().getTime());
         }
         return ret;
     }

src/main/java/cn/quantgroup/xyqb/model/UserExtInfoRet.java

@@ -46,7 +46,7 @@ public class UserExtInfoRet {
         ret.setHasCreditCard(defaultBoolean(extInfo.getHasCreditCard()));
         ret.setMarryStatus(extInfo.getMarryStatus());
         ret.setCreatedAt(extInfo.getCreatedAt().getTime());
-        ret.setUpdateAt(extInfo.getUpdateAt().getTime());
+        ret.setUpdateAt(extInfo.getUpdatedAt().getTime());
         return ret;
     }
 }

src/main/java/cn/quantgroup/xyqb/model/UserSpouseRet.java

@@ -30,8 +30,8 @@ public class UserSpouseRet {
         ret.setUserId(userSpouse.getUserId());
         ret.setSpouseName(userSpouse.getSpouseName());
         ret.setSpousePhone(userSpouse.getSpousePhone());
-        if (userSpouse.getUpdateAt() != null) {
-            ret.setUpdateAt(userSpouse.getUpdateAt().getTime());
+        if (userSpouse.getUpdatedAt() != null) {
+            ret.setUpdateAt(userSpouse.getUpdatedAt().getTime());
         }
         if (userSpouse.getCreatedAt() != null) {
             ret.setCreatedAt(userSpouse.getCreatedAt().getTime());

src/main/java/cn/quantgroup/xyqb/model/webchat/WechatEventMsg.java

+package cn.quantgroup.xyqb.model.webchat;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class WechatEventMsg {
+    private Long userId;
+    private String openId;
+}

src/main/java/cn/quantgroup/xyqb/repository/IChannelRepository.java

-package cn.quantgroup.xyqb.repository;
-
-import cn.quantgroup.xyqb.entity.Channel;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-/**
- * @author mengfan.feng
- * @time 2015-09-11 11:25
- */
-public interface IChannelRepository extends JpaRepository<Channel, Long> {
-}

src/main/java/cn/quantgroup/xyqb/repository/IUserJr58Repository.java

-package cn.quantgroup.xyqb.repository;
-
-import cn.quantgroup.xyqb.entity.UserJr58;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-/**
- * @author mengfan.feng
- * @time 2015-09-11 14:35
- */
-public interface IUserJr58Repository extends JpaRepository<UserJr58, Long> {
-}

src/main/java/cn/quantgroup/xyqb/service/auth/impl/UserAuthorizedServiceImpl.java

@@ -34,7 +34,7 @@ public class UserAuthorizedServiceImpl implements IUserAuthorizedService {
     @Resource
     private IUserRepository userRepository;
 
-    @Cacheable(value = "user_authorized_idno_cache", key = "#idNo", unless = "#result == false", cacheManager = "cacheManager")
+//    @Cacheable(value = "user_authorized_idno_cache", key = "#idNo", unless = "#result == false", cacheManager = "cacheManager")
     @Override
     public Boolean hasUserAuthorized(String idNo) {
         try {
@@ -81,9 +81,6 @@ public class UserAuthorizedServiceImpl implements IUserAuthorizedService {
         userAuthorized.setName(userAuthorizedParam.getName());
         userAuthorized.setIdNo(userAuthorizedParam.getIdNo());
         userAuthorized.setUserUuid(userAuthorizedParam.getUserUuid());
-        Timestamp now = new Timestamp(System.currentTimeMillis());
-        userAuthorized.setCreatedAt(now);
-        userAuthorized.setUpdatedAt(now);
 
         try {
             userAuthorized = userAuthorizedRepository.save(userAuthorized);
@@ -95,7 +92,7 @@ public class UserAuthorizedServiceImpl implements IUserAuthorizedService {
         }
     }
 
-    @Cacheable(value = "user_authorized_uuid_2_id_cache", key = "#userUuid", unless = "#result == null", cacheManager = "cacheManager")
+//    @Cacheable(value = "user_authorized_uuid_2_id_cache", key = "#userUuid", unless = "#result == null", cacheManager = "cacheManager")
     @Override
     public String getUserAuthorizedId(String userUuid) {
         if (StringUtils.isBlank(userUuid)) {

src/main/java/cn/quantgroup/xyqb/service/register/impl/UserRegisterServiceImpl.java

@@ -94,9 +94,6 @@ public class UserRegisterServiceImpl implements IUserRegisterService {
         if (StringUtils.isNotBlank(password)) {
             user.setPassword(PasswordUtil.MD5WithSalt(password));
         }
-        Timestamp currentTime = new Timestamp(System.currentTimeMillis());
-        user.setUpdatedAt(currentTime);
-        user.setCreatedAt(currentTime);
         user = userService.saveUser(user);
         userRegisterParam.setUser(user);
         return user;

src/main/java/cn/quantgroup/xyqb/service/user/impl/AddressServiceImpl.java

@@ -22,7 +22,7 @@ public class AddressServiceImpl implements IAddressService {
     private IAddressRepository addressRepository;
 
     @Override
-    @Cacheable(value = "addresscache", key = "'address' + #userId", unless = "#result == null", cacheManager = "cacheManager")
+//    @Cacheable(value = "addresscache", key = "'address' + #userId", unless = "#result == null", cacheManager = "cacheManager")
     public Address findByUserId(Long userId) {
         return addressRepository.findByUserId(userId);
     }
@@ -30,14 +30,11 @@ public class AddressServiceImpl implements IAddressService {
     @Override
     @CacheEvict(value = "addresscache", key = "'address' + #addressObj.userId", cacheManager = "cacheManager")
     public Address save(Address addressObj) {
-        Timestamp now = new Timestamp(System.currentTimeMillis());
         /* 替换所有,UTF-8编码时4字节的Emoji表情字符 */
         addressObj.setProvince(EmojiUtil.filterUnicode4(addressObj.getProvince()));
         addressObj.setCity(EmojiUtil.filterUnicode4(addressObj.getCity()));
         addressObj.setDistrict(EmojiUtil.filterUnicode4(addressObj.getDistrict()));
         addressObj.setAddress(EmojiUtil.filterUnicode4(addressObj.getAddress()));
-        addressObj.setCreatedAt(now);
-        addressObj.setUpdateAt(now);
         return addressRepository.save(addressObj);
     }
 

src/main/java/cn/quantgroup/xyqb/service/user/impl/ContactServiceImpl.java

@@ -84,8 +84,6 @@ public class ContactServiceImpl implements IContactService {
             contact.setRelation(relation);
         }
         log.info("修改前联系人信息:{}", contact);
-        Timestamp now = new Timestamp(System.currentTimeMillis());
-        contact.setUpdateAt(now);
         contact = save(contact);
         return contact;
     }
@@ -109,7 +107,6 @@ public class ContactServiceImpl implements IContactService {
     private void mergeContacts(Long userId, List<Contact> contacts) {
         // 当前联系人列表
         List<Contact> userContact = contactRepository.findByUserId(userId);
-        Timestamp now = new Timestamp(System.currentTimeMillis());
         for (int i = 0; i < contacts.size(); i++) {
             Contact c = contacts.get(i);
             c.setId(null);
@@ -117,8 +114,6 @@ public class ContactServiceImpl implements IContactService {
             if(Objects.isNull(c.getRelation())){
                 c.setRelation(Relation.OTHER);
             }
-            c.setCreatedAt(now);
-            c.setUpdateAt(now);
             if (CollectionUtils.isEmpty(userContact) || userContact.size() <= i) {
                 continue;
             }

src/main/java/cn/quantgroup/xyqb/service/user/impl/ModifyPhoneNoServiceImpl.java

@@ -191,7 +191,6 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService {
             throw new DataException("数据不存在。");
         }
         modifyPhoneNo.setProcessingStatus(ModifyPhoneNoProcessingStatusEnum.DONE.ordinal());
-        modifyPhoneNo.setUpdatedAt(new Date());
     }
 
     @Override
@@ -205,7 +204,6 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService {
             modifyPhoneNo.setApplyStatus(ModifyPhoneNoApplyStatusEnum.NO_ALLOW.ordinal());
             modifyPhoneNo.setApplyStatusReason(auditReq.getApplyStatusReason());
             modifyPhoneNo.setProcessingStatus(ModifyPhoneNoProcessingStatusEnum.WAIT_4_USER_FEEDBACK.ordinal());
-            modifyPhoneNo.setUpdatedAt(new Date());
         }
         if (ModifyPhoneNoApplyStatusEnum.DONE == auditReq.getApplyStatus()) {
             log.info("audit userId = 【{}】, name = 【{}】, idCard = 【{}】, prevPhoneNo = 【{}】, " +
@@ -220,7 +218,6 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService {
             userService.modifyPhoneNo(modifyPhoneNo.getPrevPhoneNo(), modifyPhoneNo.getCurPhoneNo());
             modifyPhoneNo.setApplyStatus(ModifyPhoneNoApplyStatusEnum.DONE.ordinal());
             modifyPhoneNo.setProcessingStatus(ModifyPhoneNoProcessingStatusEnum.WAIT_4_USER_FEEDBACK.ordinal());
-            modifyPhoneNo.setUpdatedAt(new Date());
         }
     }
 

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserBtRegisterServiceImpl.java

@@ -20,7 +20,7 @@ public class UserBtRegisterServiceImpl implements IUserBtRegisterService {
     private IUserBtRegisterRepository userBtRegisterRepository;
 
     @Override
-    @Cacheable(value = "btRegisterCache", key = "'userId' + #userId", unless = "#result == null", cacheManager = "cacheManager")
+//    @Cacheable(value = "btRegisterCache", key = "'userId' + #userId", unless = "#result == null", cacheManager = "cacheManager")
     public UserBtRegister findByUserId(Long userId) {
         if (null != userId) {
             return userBtRegisterRepository.findOne((root, query, cb) -> {

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserCenterServiceImpl.java

@@ -28,7 +28,7 @@ public class UserCenterServiceImpl implements UserCenterService {
     private IUserAttachedRepository userAttachedRepository;
 
     @Override
-    @Cacheable(value = "userAttachedCache", key = "'xyqbUserAttached' + #userId", unless = "#result == null", cacheManager = "cacheManager")
+//    @Cacheable(value = "userAttachedCache", key = "'xyqbUserAttached' + #userId", unless = "#result == null", cacheManager = "cacheManager")
     public UserAttached searchUserAttachedByUserId(long userId) {
         return userAttachedRepository.findByUserId(userId);
     }
@@ -47,7 +47,6 @@ public class UserCenterServiceImpl implements UserCenterService {
         }
         if(!Objects.equals(avatar, userAttached.getAvatar())){
             userAttached.setAvatar(avatar);
-            userAttached.setUpdatedAt(new Timestamp(System.currentTimeMillis()));
             userAttached = userAttachedRepository.save(userAttached);
         }
         return userAttached;
@@ -64,7 +63,6 @@ public class UserCenterServiceImpl implements UserCenterService {
         }
         if(!Objects.equals(nick, userAttached.getNick())){
             userAttached.setNick(nick);
-            userAttached.setUpdatedAt(new Timestamp(System.currentTimeMillis()));
             try {
                 userAttached = userAttachedRepository.save(userAttached);
             }catch (ConstraintViolationException e){
@@ -87,7 +85,6 @@ public class UserCenterServiceImpl implements UserCenterService {
         UserAttached userAttached = userAttachedRepository.findByUserId(userId);
         // 更新实例
         userAttached = Optional.ofNullable(userAttached).orElse(new UserAttached());
-        Timestamp now = new Timestamp(System.currentTimeMillis());
         userAttached.setUserId(userId);
         if(StringUtils.isBlank(userAttached.getAvatar())){
             userAttached.setAvatar(avatar);
@@ -95,10 +92,6 @@ public class UserCenterServiceImpl implements UserCenterService {
         if(StringUtils.isBlank(userAttached.getNick())){
             userAttached.setNick(nick);
         }
-        if(Objects.isNull(userAttached.getCreatedAt())){
-            userAttached.setCreatedAt(now);
-        }
-        userAttached.setUpdatedAt(now);
         return userAttachedRepository.save(userAttached);
     }
 }

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserExtInfoServiceImpl.java

@@ -21,7 +21,7 @@ public class UserExtInfoServiceImpl implements IUserExtInfoService {
     private IUserExtInfoRepository userExtInfoRepository;
 
     @Override
-    @Cacheable(value = "userextinfocache", key = "'extinfo' + #userId", unless = "#result == null", cacheManager = "cacheManager")
+//    @Cacheable(value = "userextinfocache", key = "'extinfo' + #userId", unless = "#result == null", cacheManager = "cacheManager")
     public UserExtInfo findByUserId(Long userId) {
         return userExtInfoRepository.findByUserId(userId);
     }
@@ -30,13 +30,6 @@ public class UserExtInfoServiceImpl implements IUserExtInfoService {
     @Transactional(rollbackFor = Exception.class)
     @CacheEvict(value = "userextinfocache", key = "'extinfo' + #info.userId", cacheManager = "cacheManager")
     public UserExtInfo save(UserExtInfo info) {
-        Timestamp timestamp = new Timestamp(System.currentTimeMillis());
-        if (info.getCreatedAt() == null) {
-            info.setCreatedAt(timestamp);
-        }
-        if (info.getUpdateAt() == null) {
-            info.setUpdateAt(timestamp);
-        }
         return userExtInfoRepository.save(info);
     }
 

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java

@@ -101,7 +101,7 @@ public class UserServiceImpl implements IUserService, IBaseController {
     private IContactService contactService;
 
     @Override
-    @Cacheable(value = "usercache", key = "'xyqbuser' + #phone", unless = "#result == null", cacheManager = "cacheManager")
+//    @Cacheable(value = "usercache", key = "'xyqbuser' + #phone", unless = "#result == null", cacheManager = "cacheManager")
     public User findByPhoneInDb(String phone) {
         return userRepository.findByPhoneNo(phone);
     }
@@ -155,13 +155,13 @@ public class UserServiceImpl implements IUserService, IBaseController {
     }
 
     @Override
-    @Cacheable(value = "usercache", key = "'xyqbuser' + #phone", unless = "#result == null", cacheManager = "cacheManager")
+//    @Cacheable(value = "usercache", key = "'xyqbuser' + #phone", unless = "#result == null", cacheManager = "cacheManager")
     public User findByPhoneWithCache(String phone) {
         return userRepository.findByPhoneNo(phone);
     }
 
     @Override
-    @Cacheable(value = "usercache", key = "'xyqbuser' + #uuid", unless = "#result == null", cacheManager = "cacheManager")
+//    @Cacheable(value = "usercache", key = "'xyqbuser' + #uuid", unless = "#result == null", cacheManager = "cacheManager")
     public User findByUuidWithCache(String uuid) {
         return userRepository.findByUuid(uuid);
     }
@@ -186,7 +186,6 @@ public class UserServiceImpl implements IUserService, IBaseController {
         if (user == null) {
             throw new RuntimeException("用户[" + phoneNo + "]不存在");
         }
-        user.setUpdatedAt(new Timestamp(System.currentTimeMillis()));
         user.setPassword(PasswordUtil.MD5WithSalt(password));
         user = userRepository.save(user);
         stringRedisTemplate.expire("usercache:xyqbuser" + phoneNo, 1L, TimeUnit.MILLISECONDS);

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserSpouseServiceImpl.java

@@ -15,7 +15,7 @@ public class UserSpouseServiceImpl implements IUserSpouseService {
     private IUserSpouseRepository userSpouseRepository;
 
     @Override
-    @Cacheable(value = "userSpouseCache", key = "'spouse' + #userId", unless = "#result == null", cacheManager = "cacheManager")
+//    @Cacheable(value = "userSpouseCache", key = "'spouse' + #userId", unless = "#result == null", cacheManager = "cacheManager")
     public UserSpouse findByUserId(Long userId) {
         return userSpouseRepository.findByUserId(userId);
     }

src/main/java/cn/quantgroup/xyqb/service/user/vo/UserDetailVO.java

@@ -84,7 +84,6 @@ public class UserDetailVO {
             xUserDetail.setUpdatedAt(new Timestamp(this.getUpdatedAt()));
         }
 
-
         xUserDetail.setIsAuthenticated(this.getIsAuthenticated());
         xUserDetail.setEnable(this.getEnable());
         return xUserDetail;

src/main/java/cn/quantgroup/xyqb/service/wechat/impl/WechatServiceImpl.java

@@ -2,13 +2,13 @@ package cn.quantgroup.xyqb.service.wechat.impl;
 
 import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.entity.WechatUserInfo;
+import cn.quantgroup.xyqb.event.WechatBindEvent;
 import cn.quantgroup.xyqb.exception.WechatRelateUserException;
 import cn.quantgroup.xyqb.model.webchat.AccessTokenResponse;
+import cn.quantgroup.xyqb.model.webchat.WechatEventMsg;
 import cn.quantgroup.xyqb.repository.IWeChatUserRepository;
 import cn.quantgroup.xyqb.service.http.IHttpService;
-import cn.quantgroup.xyqb.service.session.ISessionService;
 import cn.quantgroup.xyqb.service.wechat.IWechatService;
-import cn.quantgroup.xyqb.util.EmojiUtil;
 import cn.quantgroup.xyqb.util.ValidationUtil;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
@@ -16,6 +16,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -47,6 +48,9 @@ public class WechatServiceImpl implements IWechatService {
     @Qualifier("stringRedisTemplate")
     private RedisTemplate<String, String> redisTemplate;
 
+    @Resource
+    private ApplicationEventPublisher applicationEventPublisher;
+
     @PostConstruct
     private void init() {
         accessTokenUrl = String.format("https://api.weixin.qq.com/sns/oauth2/access_token?appid=%s&secret=%s&grant_type=authorization_code&code=", appId, secret) + "%s";
@@ -143,7 +147,13 @@ public class WechatServiceImpl implements IWechatService {
 //        String city = EmojiUtil.filterUnicode4(userInfo.getCity());
 //        userInfo.setCity(city);
         userInfo = userInfo.convertEmoji();
-        return weChatUserRepository.save(userInfo);
+        WechatUserInfo wechatUserInfo = weChatUserRepository.save(userInfo);
+        WechatEventMsg wechatEventMsg = WechatEventMsg.builder()
+                                                      .userId(wechatUserInfo.getUserId())
+                                                      .openId(wechatUserInfo.getOpenId())
+                                                      .build();
+        applicationEventPublisher.publishEvent(new WechatBindEvent(this, wechatEventMsg));
+        return wechatUserInfo;
     }
 
     @Override
@@ -170,6 +180,11 @@ public class WechatServiceImpl implements IWechatService {
             log.error("微信关联失败：绑定条数<1：[service]:userId:{},phoneNo:{},openId:{}", userId, phoneNo, openId);
             throw new WechatRelateUserException("微信关联失败");
         }
+        WechatEventMsg wechatEventMsg = WechatEventMsg.builder()
+                                                      .userId(userId)
+                                                      .openId(openId)
+                                                      .build();
+        applicationEventPublisher.publishEvent(new WechatBindEvent(this,wechatEventMsg));
         // Todo : 如果当前openId已关联其他用户，则解绑成功后要注销其登录session -- 考虑后暂时不执行，影响太大
         log.info("微信关联成功：[service]:userId:{},phoneNo:{},openId:{},dissociate:{},relate:{},Old-WechatUserInfo:{}", userId, phoneNo, openId, dissociate, relate, wechatUserInfo);
         return relate;

src/test/java/service/UserServiceTest.java

@@ -66,9 +66,6 @@ public class UserServiceTest {
         addressObj.setProvince("悉尼");
         addressObj.setProvinceCode(1L);
         addressObj.setAddress("嘻哈");
-        Timestamp timestamp=Timestamp.valueOf( LocalDateTime.now());
-        addressObj.setCreatedAt(timestamp);
-        addressObj.setUpdateAt(timestamp);
         return Arrays.asList(new Object[][]{{addressObj}});
     }