收口商家登录响应敏感字段

ruoyi-admin/src/main/java/com/ruoyi/app/user/InfoUserController.java

@@ -26,6 +26,7 @@ import com.ruoyi.common.utils.ip.IpUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.*;
 import com.ruoyi.system.domain.constants.MerchantAccountConstants;
+import com.ruoyi.app.user.dto.MerchantLoginView;
 import com.ruoyi.system.domain.vo.UserDTO;
 import com.ruoyi.app.service.ImAccountService;
 import com.ruoyi.system.mapper.InfoUserMapper;
@@ -441,7 +442,7 @@ public class InfoUserController extends BaseController {
                 userDto.setUserName(user.getUserName());
                 fillLoginUserInfo(userDto);
                 String token = JwtUtil.setToken(tokenKey, userDto);
-                return success(MessageUtils.message("no.user.login.success"), user, token);
+                return success(MessageUtils.message("no.user.login.success"), merchantLoginView(user), token);
             } else {
                 return error(MessageUtils.message("no.user.password.error"));
             }
@@ -560,6 +561,20 @@ public class InfoUserController extends BaseController {
         return isAppClient() ? CacheConstants.SH_APP_TOKEN_KEY : CacheConstants.SH_PC_TOKEN_KEY;
     }
 
+    private MerchantLoginView merchantLoginView(InfoUser user) {
+        MerchantLoginView view = new MerchantLoginView();
+        view.setUserId(user.getUserId());
+        view.setUserName(user.getUserName());
+        view.setNickName(user.getNickName());
+        view.setUserType(user.getUserType());
+        view.setStoreId(user.getStoreId());
+        view.setMerchantOwnerId(user.getMerchantOwnerId());
+        view.setStatus(user.getStatus());
+        view.setSubaccountStatus(user.getSubaccountStatus());
+        view.setLastLoginAt(user.getLastLoginAt());
+        return view;
+    }
+
     /**
      * 商家端退出登录，仅撤销当前 JWT 对应的会话。
      */

ruoyi-admin/src/main/java/com/ruoyi/app/user/dto/MerchantLoginView.java

@@ -0,0 +1,18 @@
+package com.ruoyi.app.user.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class MerchantLoginView {
+    private Long userId;
+    private String userName;
+    private String nickName;
+    private String userType;
+    private Long storeId;
+    private Long merchantOwnerId;
+    private String status;
+    private String subaccountStatus;
+    private Date lastLoginAt;
+}