✨ http-api 不再强制依赖 `fastjson`

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 发行版本
 
 ### v2.1.1 - 2023-04-08
+- :sparkles: mica-mqtt-server http-api 不再强制依赖 `fastjson` 还支持 `Jackson`、`Fastjson2`、`Gson`、`hutool-json` 和自定义。
 - :sparkles: mica-mqtt-codec 删除 `net.dreamlu.iot.mqtt.codec.ByteBufferUtil`，2.1.0 漏删。
 - :sparkles: mica-mqtt-codec 兼容 qos大于0，messageId == 0，做 qos 降级处理，`@那一刹的容颜` 反馈，详见 gitee #I6PFIH
 - :sparkles: mica-mqtt-client 优化链接时的遗嘱消息构建，默认为 qos0。

mica-mqtt-server/src/main/java/net/dreamlu/iot/mqtt/core/server/MqttServerCreator.java

@@ -50,6 +50,8 @@ import org.tio.server.intf.TioServerHandler;
 import org.tio.server.intf.TioServerListener;
 import org.tio.utils.Threads;
 import org.tio.utils.hutool.StrUtil;
+import org.tio.utils.json.JsonAdapter;
+import org.tio.utils.json.JsonUtil;
 import org.tio.utils.timer.DefaultTimerTaskService;
 import org.tio.utils.timer.TimerTaskService;
 
@@ -200,6 +202,10 @@ public class MqttServerCreator {
 	 * taskService
 	 */
 	private TimerTaskService taskService;
+	/**
+	 * json 处理器
+	 */
+	private JsonAdapter jsonAdapter;
 
 	public String getName() {
 		return name;
@@ -527,6 +533,15 @@ public class MqttServerCreator {
 		return this;
 	}
 
+	public JsonAdapter getJsonAdapter() {
+		return jsonAdapter;
+	}
+
+	public MqttServerCreator jsonAdapter(JsonAdapter jsonAdapter) {
+		this.jsonAdapter = JsonUtil.getJsonAdapter(jsonAdapter);
+		return this;
+	}
+
 	public MqttServer build() {
 		// 默认的节点名称，用于集群
 		if (StrUtil.isBlank(this.nodeName)) {

mica-mqtt-server/src/main/java/net/dreamlu/iot/mqtt/core/server/http/api/MqttHttpApi.java

@@ -16,7 +16,6 @@
 
 package net.dreamlu.iot.mqtt.core.server.http.api;
 
-import com.alibaba.fastjson.JSON;
 import net.dreamlu.iot.mqtt.core.server.MqttServerCreator;
 import net.dreamlu.iot.mqtt.core.server.dispatcher.IMqttMessageDispatcher;
 import net.dreamlu.iot.mqtt.core.server.enums.MessageType;
@@ -31,13 +30,14 @@ import net.dreamlu.iot.mqtt.core.server.model.Subscribe;
 import net.dreamlu.iot.mqtt.core.server.session.IMqttSessionManager;
 import net.dreamlu.iot.mqtt.core.util.PayloadEncode;
 import net.dreamlu.iot.mqtt.core.util.TopicUtil;
+import org.tio.http.common.HttpConst;
 import org.tio.http.common.HttpRequest;
 import org.tio.http.common.HttpResponse;
 import org.tio.http.common.Method;
 import org.tio.utils.hutool.StrUtil;
+import org.tio.utils.json.JsonUtil;
 
 import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.function.Function;
 
@@ -77,7 +77,7 @@ public class MqttHttpApi {
 	 */
 	public HttpResponse publish(HttpRequest request) {
 		PublishForm form = readForm(request, (requestBody) ->
-			JSON.parseObject(requestBody, PublishForm.class)
+			JsonUtil.readValue(requestBody, PublishForm.class)
 		);
 		if (form == null) {
 			return Result.fail(request, ResultCode.E101);
@@ -100,10 +100,9 @@ public class MqttHttpApi {
 	 * @return HttpResponse
 	 */
 	public HttpResponse publishBatch(HttpRequest request) {
-		List<PublishForm> formList = readForm(request, (requestBody) -> {
-			String jsonBody = new String(requestBody, StandardCharsets.UTF_8);
-			return JSON.parseArray(jsonBody, PublishForm.class);
-		});
+		List<PublishForm> formList = readForm(request, (requestBody) ->
+			JsonUtil.readList(requestBody, PublishForm.class)
+		);
 		if (formList == null || formList.isEmpty()) {
 			return Result.fail(request, ResultCode.E101);
 		}
@@ -147,7 +146,7 @@ public class MqttHttpApi {
 	 */
 	public HttpResponse subscribe(HttpRequest request) {
 		SubscribeForm form = readForm(request, (requestBody) ->
-			JSON.parseObject(requestBody, SubscribeForm.class)
+			JsonUtil.readValue(requestBody, SubscribeForm.class)
 		);
 		if (form == null) {
 			return Result.fail(request, ResultCode.E101);
@@ -175,10 +174,9 @@ public class MqttHttpApi {
 	 * @return HttpResponse
 	 */
 	public HttpResponse subscribeBatch(HttpRequest request) {
-		List<SubscribeForm> formList = readForm(request, (requestBody) -> {
-			String jsonBody = new String(requestBody, StandardCharsets.UTF_8);
-			return JSON.parseArray(jsonBody, SubscribeForm.class);
-		});
+		List<SubscribeForm> formList = readForm(request, (requestBody) ->
+			JsonUtil.readList(requestBody, SubscribeForm.class)
+		);
 		if (formList == null || formList.isEmpty()) {
 			return Result.fail(request, ResultCode.E101);
 		}
@@ -212,7 +210,7 @@ public class MqttHttpApi {
 	 */
 	public HttpResponse unsubscribe(HttpRequest request) {
 		BaseForm form = readForm(request, (requestBody) ->
-			JSON.parseObject(requestBody, BaseForm.class)
+			JsonUtil.readValue(requestBody, BaseForm.class)
 		);
 		if (form == null) {
 			return Result.fail(request, ResultCode.E101);
@@ -236,10 +234,9 @@ public class MqttHttpApi {
 	 * @return HttpResponse
 	 */
 	public HttpResponse unsubscribeBatch(HttpRequest request) {
-		List<BaseForm> formList = readForm(request, (requestBody) -> {
-			String jsonBody = new String(requestBody, StandardCharsets.UTF_8);
-			return JSON.parseArray(jsonBody, BaseForm.class);
-		});
+		List<BaseForm> formList = readForm(request, (requestBody) ->
+			JsonUtil.readList(requestBody, BaseForm.class)
+		);
 		if (formList == null || formList.isEmpty()) {
 			return Result.fail(request, ResultCode.E101);
 		}
@@ -317,12 +314,12 @@ public class MqttHttpApi {
 	 * @param <T>      泛型
 	 * @return 表单
 	 */
-	private static <T> T readForm(HttpRequest request, Function<byte[], T> function) {
+	private static <T> T readForm(HttpRequest request, Function<String, T> function) {
 		byte[] requestBody = request.getBody();
 		if (requestBody == null) {
 			return null;
 		}
-		return function.apply(requestBody);
+		return function.apply(new String(requestBody, HttpConst.CHARSET));
 	}
 
 	/**

mica-mqtt-server/src/main/java/net/dreamlu/iot/mqtt/core/server/http/api/result/Result.java

@@ -16,15 +16,12 @@
 
 package net.dreamlu.iot.mqtt.core.server.http.api.result;
 
-import com.alibaba.fastjson.JSONObject;
 import net.dreamlu.iot.mqtt.core.server.http.api.code.ResultCode;
-import org.tio.http.common.HeaderName;
-import org.tio.http.common.HeaderValue;
-import org.tio.http.common.HttpRequest;
-import org.tio.http.common.HttpResponse;
+import org.tio.http.common.*;
+import org.tio.utils.json.JsonUtil;
 
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * api Result
@@ -32,7 +29,6 @@ import java.nio.charset.StandardCharsets;
  * @author L.cm
  */
 public final class Result {
-	private static final Charset UTF_8 = StandardCharsets.UTF_8;
 
 	/**
 	 * 响应成功
@@ -51,7 +47,7 @@ public final class Result {
 	 */
 	public static HttpResponse ok(HttpResponse response) {
 		ResultCode resultCode = ResultCode.SUCCESS;
-		JSONObject json = new JSONObject();
+		Map<String, Object> json = new HashMap<>(2);
 		json.put("code", resultCode.getResultCode());
 		return result(response, resultCode, json);
 	}
@@ -86,7 +82,7 @@ public final class Result {
 	 */
 	public static HttpResponse ok(HttpResponse response, Object data) {
 		ResultCode resultCode = ResultCode.SUCCESS;
-		JSONObject json = new JSONObject();
+		Map<String, Object> json = new HashMap<>(4);
 		json.put("code", resultCode.getResultCode());
 		json.put("data", data);
 		return result(response, resultCode, json);
@@ -121,16 +117,16 @@ public final class Result {
 	 * @return HttpResponse
 	 */
 	public static HttpResponse fail(HttpResponse response, ResultCode resultCode) {
-		JSONObject json = new JSONObject();
+		Map<String, Object> json = new HashMap<>(2);
 		json.put("code", resultCode.getResultCode());
 		return result(response, resultCode, json);
 	}
 
-	private static HttpResponse result(HttpResponse response, ResultCode resultCode, JSONObject json) {
+	private static HttpResponse result(HttpResponse response, ResultCode resultCode, Object value) {
 		response.addHeader(HeaderName.Content_Type, HeaderValue.Content_Type.TEXT_PLAIN_JSON);
 		response.setStatus(resultCode.getStatusCode());
-		response.setBody(json.toJSONString().getBytes(UTF_8));
-		response.setCharset(UTF_8);
+		response.setBody(JsonUtil.toJsonString(value).getBytes(HttpConst.CHARSET));
+		response.setCharset(HttpConst.CHARSET);
 		return response;
 	}
 

mica-mqtt-server/src/main/java/net/dreamlu/iot/mqtt/core/server/http/core/MqttWebServer.java

@@ -206,6 +206,7 @@ import org.tio.http.common.handler.HttpRequestHandler;
 import org.tio.server.TioServer;
 import org.tio.server.TioServerConfig;
 import org.tio.server.intf.TioServerListener;
+import org.tio.utils.json.JsonUtil;
 import org.tio.utils.thread.pool.SynThreadPoolExecutor;
 import org.tio.websocket.server.handler.IWsMsgHandler;
 
@@ -284,10 +285,12 @@ public class MqttWebServer {
 	public static MqttWebServer config(MqttServerCreator serverCreator, TioServerConfig mqttServerConfig) {
 		// 1. 判断是否开启 http
 		if (serverCreator.isHttpEnable()) {
-			// 1.1 http 路由配置
+			// 1.1 http-api 用到 json
+			serverCreator.jsonAdapter(JsonUtil.getJsonAdapter(serverCreator.getJsonAdapter()));
+			// 1.2 http 路由配置
 			MqttHttpApi httpApi = new MqttHttpApi(serverCreator);
 			httpApi.register();
-			// 1.2 认证配置
+			// 1.3 认证配置
 			String username = serverCreator.getHttpBasicUsername();
 			String password = serverCreator.getHttpBasicPassword();
 			if (Objects.nonNull(username) && Objects.nonNull(password)) {

pom.xml

@@ -19,7 +19,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven-flatten.version>1.2.2</maven-flatten.version>
         <!-- mica-net version -->
-        <mica-net.version>0.0.8</mica-net.version>
+        <mica-net.version>0.0.9-SNAPSHOT</mica-net.version>
         <mica.version>2.7.9</mica.version>
         <mica.auto.version>2.3.2</mica.auto.version>
         <spring.boot.version>2.7.9</spring.boot.version>

starter/jfinal-mica-mqtt-server/pom.xml

@@ -22,10 +22,6 @@
             <groupId>net.dreamlu</groupId>
             <artifactId>mica-net-http</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.jfinal</groupId>
             <artifactId>jfinal</artifactId>

starter/mica-mqtt-server-spring-boot-starter/pom.xml

@@ -22,10 +22,6 @@
             <groupId>net.dreamlu</groupId>
             <artifactId>mica-net-http</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-autoconfigure</artifactId>