From 8c93ed5446f71b4dc75e00b293db0392aa684165 Mon Sep 17 00:00:00 2001
From: wangqing <408564126@qq.com>
Date: Mon, 25 Mar 2024 19:38:13 +0800
Subject: [PATCH] fix: apple Login

---
 .../java/com/luoo/user/controller/LoginController.java     | 1 +
 .../main/java/com/luoo/user/dto/request/AppleLoginReq.java | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/luoo_user/src/main/java/com/luoo/user/controller/LoginController.java b/luoo_user/src/main/java/com/luoo/user/controller/LoginController.java
index efdc0fc..52be0e7 100644
--- a/luoo_user/src/main/java/com/luoo/user/controller/LoginController.java
+++ b/luoo_user/src/main/java/com/luoo/user/controller/LoginController.java
@@ -145,6 +145,7 @@ public class LoginController extends BaseController {
 		}
 		UserInfo loginUserInfo = new UserInfo();
 		loginUserInfo.setLastLoginIp(getIpAddr(request));
+		loginUserInfo.setLastUseDeviceId(appleLoginReq.getDeviceId());
 		loginUserInfo.setLastUseDeviceBrand("iPhone");
 		String token = userInfoService.appleLoginOrRegister(loginUserInfo);
 
diff --git a/luoo_user/src/main/java/com/luoo/user/dto/request/AppleLoginReq.java b/luoo_user/src/main/java/com/luoo/user/dto/request/AppleLoginReq.java
index 996a1b3..055c89c 100644
--- a/luoo_user/src/main/java/com/luoo/user/dto/request/AppleLoginReq.java
+++ b/luoo_user/src/main/java/com/luoo/user/dto/request/AppleLoginReq.java
@@ -18,6 +18,13 @@ import java.io.Serializable;
 public class AppleLoginReq implements Serializable {
 	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty(name = "deviceId", value = "设备id", required = true)
+	@VerifyParam(required = true)
+	private String deviceId;
+
+	@ApiModelProperty(name = "deviceBrand", value = "设备品牌", required = false)
+	String deviceBrand;
+
 	private String userIdentifier;
 	private String identityToken;