zhou-hao преди 5 години
родител
ревизия
89b7da5a0b

+ 5 - 2
jetlinks-components/gateway-component/src/main/java/org/jetlinks/community/gateway/spring/ProxyMessageListener.java

@@ -15,8 +15,8 @@ import java.util.StringJoiner;
 import java.util.function.BiFunction;
 
 class ProxyMessageListener implements MessageListener {
-    private Class<?> paramType;
-    private Object target;
+    private final Class<?> paramType;
+    private final Object target;
 
     BiFunction<Object, Object, Object> proxy;
 
@@ -74,6 +74,9 @@ class ProxyMessageListener implements MessageListener {
 
         if (message.getMessage() instanceof EncodableMessage) {
             Object payload = ((EncodableMessage) message.getMessage()).getNativePayload();
+            if(paramType.isInstance(payload)){
+                return payload;
+            }
             return FastBeanCopier.DEFAULT_CONVERT.convert(payload, paramType, new Class[]{});
         }
         return message;

+ 3 - 3
jetlinks-components/notify-component/notify-core/src/main/java/org/jetlinks/community/notify/event/SerializableNotifierEvent.java

@@ -1,8 +1,6 @@
 package org.jetlinks.community.notify.event;
 
-import lombok.Builder;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 import org.jetlinks.community.notify.template.Template;
 
 import javax.annotation.Nonnull;
@@ -12,6 +10,8 @@ import java.util.Map;
 @Getter
 @Setter
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class SerializableNotifierEvent {
 
     private boolean success;