From 8dc2c8a103dbd17cda10471e51c2dd7c336ac71c Mon Sep 17 00:00:00 2001
From: zhongzb <972627721@qq.com>
Date: Sun, 14 May 2023 00:56:37 +0800
Subject: [PATCH] =?UTF-8?q?ip=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/abin/mallchat/common/user/domain/entity/IpInfo.java  | 5 ++---
 .../com/abin/mallchat/common/user/domain/entity/User.java    | 2 +-
 .../mallchat/custom/user/service/impl/UserServiceImpl.java   | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/IpInfo.java b/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/IpInfo.java
index 201ea7a..08f5b99 100644
--- a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/IpInfo.java
+++ b/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/IpInfo.java
@@ -16,7 +16,6 @@ import java.util.Optional;
  * @since 2023-03-19
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
 public class IpInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -53,10 +52,10 @@ public class IpInfo implements Serializable {
     }
 
     public void refreshIpDetail(IpDetail ipDetail) {
-        if (Objects.equals(createIp, ipDetail)) {
+        if (Objects.equals(createIp, ipDetail.getIp())) {
             createIpDetail = ipDetail;
         }
-        if (Objects.equals(updateIp, ipDetail)) {
+        if (Objects.equals(updateIp, ipDetail.getIp())) {
             updateIpDetail = ipDetail;
         }
     }
diff --git a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/User.java b/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/User.java
index a897446..5a63304 100644
--- a/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/User.java
+++ b/mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/User.java
@@ -28,7 +28,7 @@ import lombok.experimental.Accessors;
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-@TableName("user")
+@TableName(value = "user", autoResultMap = true)
 public class User implements Serializable {
 
     private static final long serialVersionUID = 1L;
diff --git a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/UserServiceImpl.java b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/UserServiceImpl.java
index b5358b3..c8b34f8 100644
--- a/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/UserServiceImpl.java
+++ b/mallchat-custom-server/src/main/java/com/abin/mallchat/custom/user/service/impl/UserServiceImpl.java
@@ -98,7 +98,6 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    @Transactional
     public void register(String openId) {
         User insert = User.builder().openId(openId).build();
         userDao.save(insert);