From abb611382ce87a7d8858d01117987e59cef10a35 Mon Sep 17 00:00:00 2001
From: Redkale <22250530@qq.com>
Date: Mon, 19 Jun 2017 13:41:43 +0800
Subject: [PATCH]

---
 src/org/redkale/boot/Application.java          | 4 +++-
 src/org/redkale/net/http/WebSocketServlet.java | 6 +-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/org/redkale/boot/Application.java b/src/org/redkale/boot/Application.java
index ce45f2e28..5a4668380 100644
--- a/src/org/redkale/boot/Application.java
+++ b/src/org/redkale/boot/Application.java
@@ -20,6 +20,7 @@ import java.util.logging.*;
 import javax.annotation.Resource;
 import javax.xml.parsers.*;
 import org.redkale.boot.ClassFilter.FilterEntry;
+import org.redkale.convert.Convert;
 import org.redkale.convert.bson.BsonFactory;
 import org.redkale.convert.json.JsonFactory;
 import org.redkale.net.*;
@@ -366,7 +367,8 @@ public final class Application {
         this.resourceFactory.register(BsonFactory.root());
         this.resourceFactory.register(JsonFactory.root());
         this.resourceFactory.register(BsonFactory.root().getConvert());
-        this.resourceFactory.register(JsonFactory.root().getConvert());
+        this.resourceFactory.register("bsonconvert", Convert.class, BsonFactory.root().getConvert());
+        this.resourceFactory.register("jsonconvert", Convert.class, JsonFactory.root().getConvert());
         //只有WatchService才能加载Application、WatchFactory
         final Application application = this;
         this.resourceFactory.register(new ResourceFactory.ResourceLoader() {
diff --git a/src/org/redkale/net/http/WebSocketServlet.java b/src/org/redkale/net/http/WebSocketServlet.java
index e8c6f5a7b..a2b18499e 100644
--- a/src/org/redkale/net/http/WebSocketServlet.java
+++ b/src/org/redkale/net/http/WebSocketServlet.java
@@ -16,7 +16,6 @@ import java.util.function.BiConsumer;
 import java.util.logging.*;
 import javax.annotation.*;
 import org.redkale.convert.Convert;
-import org.redkale.convert.json.JsonConvert;
 import org.redkale.service.*;
 import org.redkale.util.*;
 
@@ -61,9 +60,7 @@ public abstract class WebSocketServlet extends HttpServlet implements Resourcabl
 
     protected int liveinterval = DEFAILT_LIVEINTERVAL;
 
-    @Resource
-    private JsonConvert jsonConvert;
-
+    @Resource(name = "jsonconvert")
     protected Convert textConvert;
 
     protected Convert binaryConvert;
@@ -98,7 +95,6 @@ public abstract class WebSocketServlet extends HttpServlet implements Resourcabl
             this.node = new WebSocketNodeService();
             if (logger.isLoggable(Level.WARNING)) logger.warning("Not found WebSocketNode, create a default value for " + getClass().getName());
         }
-        if (this.textConvert == null) this.textConvert = jsonConvert;
         //存在WebSocketServlet，则此WebSocketNode必须是本地模式Service
         this.node.localEngine = new WebSocketEngine("WebSocketEngine-" + addr.getHostString() + ":" + addr.getPort() + "-[" + resourceName() + "]", this.single, context, liveinterval, this.node, logger);
         this.node.init(conf);