修改设备设置及登录判断

api/device.go

@@ -37,6 +37,7 @@ func (*DeviceApi) SevaDeviceInfo(ctx *gin.Context) {
 	}
 	// 获取当前的用户ID跟token信息
 	token, _ := ctx.Get("token")
+	IP := ctx.ClientIP()
 	// 保存当前的设备
 	DeviceService := services.InitDeviceService()
 	DeviceService.UpdateByToken(token.(string), &models.Device{
@@ -47,6 +48,7 @@ func (*DeviceApi) SevaDeviceInfo(ctx *gin.Context) {
 		Cpu:             paramsJson.CPU,
 		Mem:             paramsJson.Mem,
 		Disk:            paramsJson.Disk,
+		Ip:              IP,
 	})
 	res = libs.ErrorCode["SevaSuccessful"]
 	ctx.JSON(http.StatusOK, gin.H{
@@ -55,3 +57,14 @@ func (*DeviceApi) SevaDeviceInfo(ctx *gin.Context) {
 		"data": res.Data,
 	})
 }
+
+func (*DeviceApi) GetAll(ctx *gin.Context) {
+	userId, _ := ctx.Get("userID")
+	DeviceService := services.InitDeviceService()
+	devices := DeviceService.GetAll(userId.(int64))
+	ctx.JSON(http.StatusOK, gin.H{
+		"code": 200,
+		"msg":  "",
+		"data": devices,
+	})
+}

api/websocks.go

@@ -5,6 +5,7 @@ import (
 	grpcClient "go-desk-service/grpc-client"
 	"go-desk-service/libs"
 	userpb "go-desk-service/proto/gen"
+	"go-desk-service/services"
 	"log"
 	"net/http"
 	"sync"
@@ -64,7 +65,8 @@ func (*Websocks) Init(ctx *gin.Context) {
 		return
 	}
 	defer conn.Close()
-
+	deviceService := services.InitDeviceService()
+	deviceService.Login(tokenStr)
 	// 将保存连接状态
 	// ClientsMu.Lock()
 	// Clients[TokenStatus.UserId] = conn
@@ -74,6 +76,9 @@ func (*Websocks) Init(ctx *gin.Context) {
 		mt, message, err := conn.ReadMessage()
 		if err != nil {
 			log.Printf("读取错误: %v (客户端: %s)", err, conn.RemoteAddr())
+			log.Println("客户端断开", tokenStr)
+			deviceService := services.InitDeviceService()
+			deviceService.Logout(tokenStr)
 			break
 		}
 		log.Printf("收到来自 %s 的消息: %s", conn.RemoteAddr(), string(message))