Merge branch 'dev' of sunkean/raex_mmo into master

src/main/java/com/izouma/meta/repo/MetaZouMaLightRepo.java

@@ -3,8 +3,10 @@ package com.izouma.meta.repo;
 import com.izouma.meta.domain.MetaZouMaLight;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 
 public interface MetaZouMaLightRepo extends JpaRepository<MetaZouMaLight, Long>, JpaSpecificationExecutor<MetaZouMaLight> {
 
+    @Query("SELECT m.description FROM MetaZouMaLight m WHERE m.publish = ?1 AND m.del = ?2")
     String findDescriptionByPublishAndDel(boolean publish, boolean del);
 }

src/main/java/com/izouma/meta/websocket/WebSocket.java

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 import javax.websocket.*;
 import javax.websocket.server.PathParam;
 import javax.websocket.server.ServerEndpoint;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -108,9 +109,7 @@ public class WebSocket {
                 log.info("查询邮件");
                 try {
                     List<MetaEmail> metaEmails = queryEmail(Long.parseLong(userId));
-                    if (CollectionUtils.isNotEmpty(metaEmails)) {
-                        websocketCommon.sendMessageTo(clients, JSON.toJSONString(metaEmails), userId);
-                    }
+                    websocketCommon.sendMessageTo(clients, CollectionUtils.isNotEmpty(metaEmails) ? JSON.toJSONString(metaEmails) : JSON.toJSONString(new ArrayList<>()), userId);
                 } catch (Exception e) {
                     log.error(String.format("查询邮件失败，错误信息[%S]", e.getMessage()));
                 }