websocket签名方法调整

pkg/rpc/device.go

@@ -120,7 +120,7 @@ func (d *Device) SetAttribute(deviceId uint32, attributeSet map[string]any) erro
 }
 
 // 获取设备属性
-func (d *Device) GetAttribute(deviceId uint32) (*map[string]any, error) {
+func (d *Device) GetAttribute(deviceId uint32) (map[string]any, error) {
 	body := map[string]any{
 		"device_id": deviceId,
 	}
@@ -131,7 +131,7 @@ func (d *Device) GetAttribute(deviceId uint32) (*map[string]any, error) {
 	if result.Code != 0 {
 		return nil, fmt.Errorf("%s", result.Message)
 	}
-	return &result.Data, nil
+	return result.Data, nil
 }
 
 // 更新设备版本信息

pkg/rpc/server.go

@@ -1,46 +0,0 @@
-package rpc
-
-import "fmt"
-
-// 服务相关RPC
-type Server struct{}
-
-// 获取Websocket签名信息
-func (s *Server) GetWebsocketSignData(sign string) (*WebsocketSignData, error) {
-	body := map[string]any{
-		"sign": sign,
-	}
-	result := &Result[WebsocketSignData]{}
-	if err := GetRequest().Send("server.get_websocket_sign", body, result); err != nil {
-		return nil, err
-	}
-	if result.Code != 0 {
-		return nil, fmt.Errorf("%s", result.Message)
-	}
-	return &result.Data, nil
-}
-
-// 删除Websocket签名
-func (s *Server) DeleteWebsocketSign(sign string) error {
-	body := map[string]any{
-		"sign": sign,
-	}
-	result := &Result[WebsocketSignData]{}
-	if err := GetRequest().Send("server.get_websocket_sign", body, result); err != nil {
-		return err
-	}
-	if result.Code != 0 {
-		return fmt.Errorf("%s", result.Message)
-	}
-	return nil
-}
-
-var server *Server
-
-// 获取服务相关RPC类
-func GetServer() *Server {
-	if server == nil {
-		server = &Server{}
-	}
-	return server
-}

pkg/rpc/user.go

@@ -21,6 +21,36 @@ func (u *User) GetDetail(userId uint32) (*UserDetail, error) {
 	return &result.Data, nil
 }
 
+// 获取Websocket签名信息
+func (s *User) GetWebsocketSignData(sign string) (*WebsocketSignData, error) {
+	body := map[string]any{
+		"sign": sign,
+	}
+	result := &Result[WebsocketSignData]{}
+	if err := GetRequest().Send("user.get_websocket_sign", body, result); err != nil {
+		return nil, err
+	}
+	if result.Code != 0 {
+		return nil, fmt.Errorf("%s", result.Message)
+	}
+	return &result.Data, nil
+}
+
+// 删除Websocket签名
+func (s *User) DeleteWebsocketSign(sign string) error {
+	body := map[string]any{
+		"sign": sign,
+	}
+	result := &Result[WebsocketSignData]{}
+	if err := GetRequest().Send("user.get_websocket_sign", body, result); err != nil {
+		return err
+	}
+	if result.Code != 0 {
+		return fmt.Errorf("%s", result.Message)
+	}
+	return nil
+}
+
 var user *User
 
 // 获取用户相关RPC