Эх сурвалжийг харах

修复`DEBUG`期间部分`JSON`结果无法序列化的问题。

mxd 3 жил өмнө
parent
commit
0a041f4181

+ 8 - 3
magic-api/src/main/java/org/ssssssss/magicapi/config/WebSocketSessionManager.java

@@ -42,12 +42,11 @@ public class WebSocketSessionManager {
 	public static void sendToAll(MessageType messageType, Object... values) {
 		String content = buildMessage(messageType, values);
 		sendToAll(content);
-		// 通知其他机器去发送消息
-		magicNotifyService.sendNotify(new MagicNotify(instanceId, Constants.NOTIFY_WS_S_C, null, content));
 	}
 
 	private static void sendToAll(String content) {
 		SESSION.values().stream().filter(MagicConsoleSession::writeable).forEach(session -> sendBySession(session, content));
+		sendToOther(null, content);
 	}
 
 	public static void sendBySessionId(String sessionId, MessageType messageType, Object... values) {
@@ -55,7 +54,13 @@ public class WebSocketSessionManager {
 		String content = buildMessage(messageType, values);
 		if (session != null && session.writeable()) {
 			sendBySession(session, content);
-		} else if (magicNotifyService != null) {
+		} else {
+			sendToOther(sessionId, content);
+		}
+	}
+
+	private static void sendToOther(String sessionId, String content){
+		if (magicNotifyService != null) {
 			// 通知其他机器去发送消息
 			magicNotifyService.sendNotify(new MagicNotify(instanceId, Constants.NOTIFY_WS_S_C, sessionId, content));
 		}

+ 2 - 0
magic-api/src/main/java/org/ssssssss/magicapi/utils/JsonUtils.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -18,6 +19,7 @@ public class JsonUtils {
 
 	static {
 		mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		mapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
 	}
 
 	public static String toJsonString(Object target) {