Merge branch 'master' of http://git.izouma.com/xiongzhu/raex_back into dev

src/main/java/com/izouma/nineth/dto/WebsocketUser.java

@@ -1,12 +1,15 @@
 package com.izouma.nineth.dto;
 
+import com.izouma.nineth.domain.User;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
+@Builder
 public class WebsocketUser {
 
     private String nickname;
@@ -14,4 +17,12 @@ public class WebsocketUser {
     private String avatar;
 
     private int level;
+
+    public static WebsocketUser create(User user) {
+        return WebsocketUser.builder()
+                .avatar(user.getAvatar())
+                .level(user.getLevel())
+                .nickname(user.getNickname())
+                .build();
+    }
 }

src/main/java/com/izouma/nineth/web/UserController.java

@@ -456,13 +456,8 @@ public class UserController extends BaseController {
 
     @GetMapping("/websocket/{userId}")
     public WebsocketUser websocket(@PathVariable Long userId) {
-        Map<String, String> map = userRepo.websocketQuery(userId);
-        if (Objects.isNull(map)) {
-            throw new BusinessException("没有玩家信息");
-        }
-        JSONArray jsonArray = new JSONArray();
-        jsonArray.add(map);
-        return jsonArray.toJavaObject(WebsocketUser.class);
+        User user = userRepo.findById(userId).orElseThrow(new BusinessException("没有玩家信息"));
+        return WebsocketUser.create(user);
     }
 }