From 0edffa145ba835e1e5cee1b09ad97059f0146100 Mon Sep 17 00:00:00 2001
From: guotao <499836921@qq.com>
Date: Mon, 12 Jan 2026 15:42:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../findmemerchant/controller/AuthController.java  |  1 +
 .../com/xjhs/findmemerchant/entity/Merchant.java   |  1 -
 .../security/JwtAuthenticationFilter.java          | 14 ++++++++------
 .../xjhs/findmemerchant/vo/auth/RegisterVo.java    |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/xjhs/findmemerchant/controller/AuthController.java b/src/main/java/com/xjhs/findmemerchant/controller/AuthController.java
index bfb1633..c854ced 100644
--- a/src/main/java/com/xjhs/findmemerchant/controller/AuthController.java
+++ b/src/main/java/com/xjhs/findmemerchant/controller/AuthController.java
@@ -159,6 +159,7 @@ public class AuthController {
      * @return 商家信息
      */
     @GetMapping("/profile")
+    @Transactional(readOnly = true)
     public ApiResult<MerchantDto> getProfile(@AuthenticationPrincipal LoginUser loginUser) {
         if (loginUser.getMerchantId() == null) {
             return ApiResult.fail("商家信息不存在");
diff --git a/src/main/java/com/xjhs/findmemerchant/entity/Merchant.java b/src/main/java/com/xjhs/findmemerchant/entity/Merchant.java
index 68befd0..e10539a 100644
--- a/src/main/java/com/xjhs/findmemerchant/entity/Merchant.java
+++ b/src/main/java/com/xjhs/findmemerchant/entity/Merchant.java
@@ -16,7 +16,6 @@ import org.hibernate.annotations.Comment;
 @Table
 @Comment("商户信息表")
 public class Merchant extends AbstractBaseEntity {
-
     /**
      * 用户信息
      */
diff --git a/src/main/java/com/xjhs/findmemerchant/security/JwtAuthenticationFilter.java b/src/main/java/com/xjhs/findmemerchant/security/JwtAuthenticationFilter.java
index 7c9c4ca..bb23f89 100644
--- a/src/main/java/com/xjhs/findmemerchant/security/JwtAuthenticationFilter.java
+++ b/src/main/java/com/xjhs/findmemerchant/security/JwtAuthenticationFilter.java
@@ -1,6 +1,7 @@
 package com.xjhs.findmemerchant.security;
 
 
+import com.xjhs.findmemerchant.mapper.SystemUserMapper;
 import com.xjhs.findmemerchant.repository.MerchantRepository;
 import com.xjhs.findmemerchant.security.sms.SmsAuthenticationToken;
 import jakarta.servlet.FilterChain;
@@ -23,17 +24,18 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
 
     private final JwtTokenService jwtTokenService;
     private final MerchantRepository merchantRepository;
+    private final SystemUserMapper systemUserMapper;
 
 
-
-    private   SmsAuthenticationToken getAuthenticationToken(String phone) throws Exception {
+    private SmsAuthenticationToken getAuthenticationToken(String phone) throws Exception {
         // 手机号查商家
-        var merchant =  merchantRepository.findBySystemUserPhone(phone).orElse(null);
-        if(merchant != null){
+        var merchant = merchantRepository.findBySystemUserPhone(phone).orElse(null);
+        if (merchant != null) {
             var authorities = List.of(new SimpleGrantedAuthority("ROLE_USER"));
-            return new SmsAuthenticationToken(merchant, authorities);
+            var loginUser = systemUserMapper.toLoginUserInfo(merchant.getSystemUser());
+            return new SmsAuthenticationToken(loginUser, authorities);
         }
-        throw  new Exception("用户信息不存在");
+        throw new Exception("用户信息不存在");
     }
 
     @Override
diff --git a/src/main/java/com/xjhs/findmemerchant/vo/auth/RegisterVo.java b/src/main/java/com/xjhs/findmemerchant/vo/auth/RegisterVo.java
index c0d031c..5270338 100644
--- a/src/main/java/com/xjhs/findmemerchant/vo/auth/RegisterVo.java
+++ b/src/main/java/com/xjhs/findmemerchant/vo/auth/RegisterVo.java
@@ -19,6 +19,6 @@ public class RegisterVo {
      * 短信验证码
      */
     @NotBlank
-    @Size(max = 6, min = 6)
+    @Size(max = 4, min = 4)
     private String code;
 }