Merge branch 'master' into dev

dromara · Jun 5, 2024 · 2756b9c · 2756b9c
2 parents eccb42a + 82074b0
commit 2756b9c
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 12 deletions.
diff --git a/.gitee/ISSUE_TEMPLATE/issue.yml b/.gitee/ISSUE_TEMPLATE/issue.yml
@@ -6,17 +6,24 @@ body:
     attributes:
       label: mica-mqtt版本
       options:
+        - "2.3.x"
         - "2.2.x"
-        - "老版本存在编解码异常，请先升级"
+        - "老版本存在编解码异常，建议先升级"
     validations:
       required: true
   - type: dropdown
     id: version
     attributes:
-      label: 服务端还是客户端
+      label: 使用的组件
       options:
-        - "mica-mqtt client 客户端"
-        - "mica-mqtt server 服务端"
+        - "mica-mqtt-client"
+        - "mica-mqtt-server"
+        - "mica-mqtt-client-spring-boot-starter"
+        - "mica-mqtt-server-spring-boot-starter"
+        - "jfinal-mica-mqtt-client"
+        - "jfinal-mica-mqtt-server"
+        - "mica-mqtt-broker 仅供参考"
+        - "其他"
     validations:
       required: true
   - type: textarea

diff --git a/example/mica-mqtt-client-spring-boot-example/src/main/resources/application.yml b/example/mica-mqtt-client-spring-boot-example/src/main/resources/application.yml
@@ -19,7 +19,6 @@ mqtt:
     version: mqtt_3_1_1         # mqtt 协议版本，可选 MQTT_3_1、mqtt_3_1_1、mqtt_5，默认：mqtt_3_1_1
     read-buffer-size: 8KB       # 接收数据的 buffer size，默认：8k
     max-bytes-in-message: 10MB  # 消息解析最大 bytes 长度，默认：10M
-    buffer-allocator: heap      # 堆内存和堆外内存，默认：堆内存
     keep-alive-secs: 60         # keep-alive 时间，单位：秒
     clean-session: true         # mqtt clean session，默认：true
     will-message:

diff --git a/example/mica-mqtt-server-spring-boot-example/src/main/resources/application.yml b/example/mica-mqtt-server-spring-boot-example/src/main/resources/application.yml
@@ -10,7 +10,6 @@ mqtt:
     #    ip: 0.0.0.0                # 服务端 ip 默认为空，0.0.0.0，建议不要设置
     port: 1883                  # 端口，默认：1883
     name: Mica-Mqtt-Server      # 名称，默认：Mica-Mqtt-Server
-    buffer-allocator: HEAP      # 堆内存和堆外内存，默认：堆内存
     heartbeat-timeout: 120000   # 心跳超时，单位毫秒，默认: 1000 * 120
     read-buffer-size: 8KB       # 接收数据的 buffer size，默认：8k
     max-bytes-in-message: 10MB  # 消息解析最大 bytes 长度，默认：10M

diff --git a/mica-mqtt-broker/src/main/resources/application-dev.yml b/mica-mqtt-broker/src/main/resources/application-dev.yml
@@ -25,7 +25,6 @@ mqtt:
 #    ip: 0.0.0.0                 # 服务端 ip 默认为空，0.0.0.0，建议不要设置
     port: 1883                  # 端口，默认：1883
     name: Mica-Mqtt-Server      # 名称，默认：Mica-Mqtt-Server
-    buffer-allocator: HEAP      # 堆内存和堆外内存，默认：堆内存
     heartbeat-timeout: 120000   # 心跳超时，单位毫秒，默认: 1000 * 120
     read-buffer-size: 8KB       # 接收数据的 buffer size，默认：8k
     max-bytes-in-message: 10MB  # 消息解析最大 bytes 长度，默认：10M

diff --git a/mica-mqtt-client/README.md b/mica-mqtt-client/README.md
@@ -36,7 +36,6 @@ MqttClient client = MqttClient.create()
     .password("123456")             // 密码
     .version(MqttVersion.MQTT_5)    // 默认：3_1_1
     .clientId("xxxxxx")             // 非常重要务必手动设置，一般设备 sn 号，默认：MICA-MQTT- 前缀和 36进制的纳秒数
-    .bufferAllocator(ByteBufferAllocator.DIRECT) // 堆内存和堆外内存，默认：堆内存
     .readBufferSize(512)            // 消息一起解析的长度，默认：为 8092 （mqtt 消息最大长度）
     .maxBytesInMessage(1024 * 10)   // 最大包体长度,如果包体过大需要设置此参数，默认为： 10M (10*1024*1024)
     .keepAliveSecs(120)             // 默认：60s

diff --git a/mica-mqtt-server/README.md b/mica-mqtt-server/README.md
@@ -18,8 +18,6 @@ MqttServer mqttServer = MqttServer.create()
     .messageListener((context, clientId, message) -> {
         logger.info("clientId:{} message:{} payload:{}", clientId, message, new String(message.getPayload(), StandardCharsets.UTF_8));
     })
-    // 堆内存和堆外内存选择，默认：堆内存
-    .bufferAllocator(ByteBufferAllocator.HEAP)
     // 心跳超时时间，默认：120s
     .heartbeatTimeout(120_1000L)
     // ssl 配置

diff --git a/starter/mica-mqtt-client-spring-boot-starter/README.md b/starter/mica-mqtt-client-spring-boot-starter/README.md
@@ -36,7 +36,6 @@ mqtt:
     version: mqtt_3_1_1         # mqtt 协议版本，可选 MQTT_3_1、mqtt_3_1_1、mqtt_5，默认：mqtt_3_1_1
     read-buffer-size: 8KB       # 接收数据的 buffer size，默认：8k
     max-bytes-in-message: 10MB  # 消息解析最大 bytes 长度，默认：10M
-    buffer-allocator: heap      # 堆内存和堆外内存，默认：堆内存
     keep-alive-secs: 60         # keep-alive 时间，单位：秒
     clean-session: true         # mqtt clean session，默认：true
     ssl:

diff --git a/starter/mica-mqtt-server-spring-boot-starter/README.md b/starter/mica-mqtt-server-spring-boot-starter/README.md
@@ -27,7 +27,6 @@ mqtt:
 #    ip: 0.0.0.0                # 服务端 ip 默认为空，0.0.0.0，建议不要设置
     port: 1883                  # 端口，默认：1883
     name: Mica-Mqtt-Server      # 名称，默认：Mica-Mqtt-Server
-    buffer-allocator: HEAP      # 堆内存和堆外内存，默认：堆内存
     heartbeat-timeout: 120000   # 心跳超时，单位毫秒，默认: 1000 * 120
     read-buffer-size: 8KB       # 接收数据的 buffer size，默认：8k
     max-bytes-in-message: 10MB  # 消息解析最大 bytes 长度，默认：10M