diff --git a/src/main/java/org/redkale/convert/ConvertFactory.java b/src/main/java/org/redkale/convert/ConvertFactory.java index 909b5089d..7643a60ad 100644 --- a/src/main/java/org/redkale/convert/ConvertFactory.java +++ b/src/main/java/org/redkale/convert/ConvertFactory.java @@ -216,15 +216,15 @@ public abstract class ConvertFactory { public static Convert findConvert(ConvertType type) { Objects.requireNonNull(type); - if (type == ConvertType.JSON) { + if (type == ConvertType.JSON || type.contains(ConvertType.JSON)) { return JsonConvert.root(); } - if (type == ConvertType.BSON) { - return BsonConvert.root(); - } - if (type == ConvertType.PROTOBUF) { + if (type == ConvertType.PROTOBUF || type.contains(ConvertType.PROTOBUF)) { return ProtobufConvert.root(); } + if (type == ConvertType.BSON || type.contains(ConvertType.BSON)) { + return BsonConvert.root(); + } Iterator it = ServiceLoader.load(ConvertProvider.class).iterator(); RedkaleClassLoader.putServiceLoader(ConvertProvider.class); @@ -232,7 +232,7 @@ public abstract class ConvertFactory { ConvertProvider cl = it.next(); RedkaleClassLoader.putReflectionPublicConstructors( cl.getClass(), cl.getClass().getName()); - if (cl.type() == ConvertType.PROTOBUF) { + if (type.contains(cl.type())) { return cl.convert(); } } diff --git a/src/main/java/org/redkale/mq/ResourceProducer.java b/src/main/java/org/redkale/mq/ResourceProducer.java index 86743ff1e..e7d3f88ad 100644 --- a/src/main/java/org/redkale/mq/ResourceProducer.java +++ b/src/main/java/org/redkale/mq/ResourceProducer.java @@ -23,7 +23,7 @@ import org.redkale.convert.ConvertType; public @interface ResourceProducer { /** - * {@link org.redkale.mq.MessageAgent}对象对应名称 + * {@link org.redkale.mq.spi.MessageAgent}对象对应名称 * * @return MQ名称 */