From a7c087afbb3bac37537f639350153e8b7bc0b637 Mon Sep 17 00:00:00 2001
From: lejianwen <84855512@qq.com>
Date: Sun, 31 Aug 2025 12:46:54 +0800
Subject: [PATCH] fix!: Update peer to use ID instead of UUID

---
 http/controller/api/index.go | 2 +-
 http/controller/api/peer.go  | 6 +++---
 service/user.go              | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/http/controller/api/index.go b/http/controller/api/index.go
index 57573d6..270b6b7 100644
--- a/http/controller/api/index.go
+++ b/http/controller/api/index.go
@@ -49,7 +49,7 @@ func (i *Index) Heartbeat(c *gin.Context) {
 		c.JSON(http.StatusOK, gin.H{})
 		return
 	}
-	peer := service.AllService.PeerService.FindByUuid(info.Uuid)
+	peer := service.AllService.PeerService.FindById(info.Id)
 	if peer == nil || peer.RowId == 0 {
 		c.JSON(http.StatusOK, gin.H{})
 		return
diff --git a/http/controller/api/peer.go b/http/controller/api/peer.go
index 64d0174..3ed7aa1 100644
--- a/http/controller/api/peer.go
+++ b/http/controller/api/peer.go
@@ -31,10 +31,10 @@ func (p *Peer) SysInfo(c *gin.Context) {
 		return
 	}
 	fpe := f.ToPeer()
-	pe := service.AllService.PeerService.FindByUuid(f.Uuid)
+	pe := service.AllService.PeerService.FindById(f.Id)
 	if pe.RowId == 0 {
 		pe = f.ToPeer()
-		pe.UserId = service.AllService.UserService.FindLatestUserIdFromLoginLogByUuid(pe.Uuid)
+		pe.UserId = service.AllService.UserService.FindLatestUserIdFromLoginLogByUuid(pe.Uuid, pe.Id)
 		err = service.AllService.PeerService.Create(pe)
 		if err != nil {
 			response.Error(c, response.TranslateMsg(c, "OperationFailed")+err.Error())
@@ -42,7 +42,7 @@ func (p *Peer) SysInfo(c *gin.Context) {
 		}
 	} else {
 		if pe.UserId == 0 {
-			pe.UserId = service.AllService.UserService.FindLatestUserIdFromLoginLogByUuid(pe.Uuid)
+			pe.UserId = service.AllService.UserService.FindLatestUserIdFromLoginLogByUuid(pe.Uuid, pe.Id)
 		}
 		fpe.RowId = pe.RowId
 		fpe.UserId = pe.UserId
diff --git a/service/user.go b/service/user.go
index c509b98..9eb7c51 100644
--- a/service/user.go
+++ b/service/user.go
@@ -395,10 +395,10 @@ func (us *UserService) UserThirdInfo(userId uint, op string) *model.UserThird {
 	return ut
 }
 
-// FindLatestUserIdFromLoginLogByUuid 根据uuid查找最后登录的用户id
-func (us *UserService) FindLatestUserIdFromLoginLogByUuid(uuid string) uint {
+// FindLatestUserIdFromLoginLogByUuid 根据uuid和设备id查找最后登录的用户id
+func (us *UserService) FindLatestUserIdFromLoginLogByUuid(uuid string, deviceId string) uint {
 	llog := &model.LoginLog{}
-	DB.Where("uuid = ?", uuid).Order("id desc").First(llog)
+	DB.Where("uuid = ? and device_id = ?", uuid, deviceId).Order("id desc").First(llog)
 	return llog.UserId
 }