Browse Source

upgrade magician version to 2.0.7 (#7693)

Beerus 2 years ago
parent
commit
61be1b62af

+ 4 - 4
frameworks/Java/magician-io/pom.xml

@@ -18,13 +18,13 @@
         <dependency>
         <dependency>
             <groupId>com.github.yuyenews</groupId>
             <groupId>com.github.yuyenews</groupId>
             <artifactId>Magician</artifactId>
             <artifactId>Magician</artifactId>
-            <version>2.0.6</version>
+            <version>2.0.7</version>
         </dependency>
         </dependency>
 
 
         <dependency>
         <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>2.0.8</version>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
+            <version>2.0.18</version>
         </dependency>
         </dependency>
 
 
 
 

+ 8 - 8
frameworks/Java/magician-io/src/main/java/com/test/io/Start.java

@@ -14,19 +14,19 @@ public class Start {
     public static void main(String[] args) {
     public static void main(String[] args) {
         try {
         try {
 
 
-            MagicianConfig magicianConfig = new MagicianConfig();
-            magicianConfig.setNumberOfPorts(1);
-            magicianConfig.setBossThreads(3);
-            magicianConfig.setWorkThreads(5);
-
-
             HttpServer httpServer = Magician.createHttp()
             HttpServer httpServer = Magician.createHttp()
                     .scan("com.test.io")
                     .scan("com.test.io")
-                    .setConfig(magicianConfig);
+                    .setConfig(MagicianConfig.create()
+                            .setNumberOfPorts(1)
+                            .setBossThreads(3)
+                            .setWorkThreads(8)
+                            .setCorePoolSize(8)
+                            .setMaximumPoolSize(10)
+                    );
 
 
             httpServer.bind(8080);
             httpServer.bind(8080);
 
 
-        } catch (Exception e){
+        } catch (Exception e) {
             logger.error("启动服务出现异常", e);
             logger.error("启动服务出现异常", e);
         }
         }
     }
     }

+ 2 - 2
frameworks/Java/magician-io/src/main/java/com/test/io/handler/JsonHandler.java

@@ -1,6 +1,6 @@
 package com.test.io.handler;
 package com.test.io.handler;
 
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSONObject;
 import com.test.io.vo.MessageVO;
 import com.test.io.vo.MessageVO;
 import io.magician.application.request.MagicianRequest;
 import io.magician.application.request.MagicianRequest;
 import io.magician.application.request.MagicianResponse;
 import io.magician.application.request.MagicianResponse;
@@ -28,7 +28,7 @@ public class JsonHandler implements HttpBaseHandler {
             magicianResponse
             magicianResponse
                     .setResponseHeader("Server","magician")
                     .setResponseHeader("Server","magician")
                     .setResponseHeader("Date", str)
                     .setResponseHeader("Date", str)
-                    .sendJson(JSON.toJSONString(messageVO));
+                    .sendJson(JSONObject.toJSONString(messageVO));
         } catch (Exception e) {
         } catch (Exception e) {
             throw new RuntimeException(e);
             throw new RuntimeException(e);
         }
         }