✨ jfinal 插件重命名为 mica-mqtt-client-jfinal-plugin 和 `mica-mqtt-server-…

…jfinal-plugin`

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## 发行版本
 
+### v2.3.4 - 2024-08-10
+- :sparkles: mica-mqtt 合入 `mica-mqtt-client-solon-plugin` 和 `mica-mqtt-server-solon-plugin` 感谢 `@peigenlpy`
+- :sparkles: jfinal 插件重命名为 `mica-mqtt-client-jfinal-plugin` 和 `mica-mqtt-server-jfinal-plugin`
+- :bug: mica-mqtt-server 修复分组订阅删除，感谢 `@tangjj` 反馈。
+
 ### v2.3.3 - 2024-07-22
 - :sparkles: mica-mqtt-server 可停止，同步捐助版。
 - :sparkles: mica-mqtt-server 添加 schedule 系列方法，同步捐助版。

deploy.sh

@@ -9,4 +9,12 @@ mvn -version
 printf "\n"
 
 ## 3. deploy
-mvn clean package deploy -Prelease -pl mica-mqtt-codec,mica-mqtt-common,mica-mqtt-client,mica-mqtt-server,starter/mica-mqtt-client-spring-boot-starter,starter/mica-mqtt-server-spring-boot-starter,starter/jfinal-mica-mqtt-client,starter/jfinal-mica-mqtt-server
+modules="mica-mqtt-codec,mica-mqtt-common,"
+modules="$modules mica-mqtt-client,mica-mqtt-server,"
+modules="$modules starter/mica-mqtt-client-spring-boot-starter,"
+modules="$modules starter/mica-mqtt-server-spring-boot-starter,"
+modules="$modules starter/mica-mqtt-client-solon-plugin,"
+modules="$modules starter/mica-mqtt-server-solon-plugin,"
+modules="$modules starter/mica-mqtt-client-jfinal-plugin,"
+modules="$modules starter/mica-mqtt-server-jfinal-plugin"
+mvn clean package deploy -Prelease -pl "$modules"

example/mica-mqtt-client-solon-plugin-example/pom.xml

@@ -4,12 +4,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>mica-mqtt</artifactId>
         <groupId>net.dreamlu</groupId>
+        <artifactId>example</artifactId>
         <version>${revision}</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
-
     <artifactId>mica-mqtt-client-solon-plugin-example</artifactId>
 
     <dependencies>

example/mica-mqtt-client-spring-boot-example/pom.xml

@@ -9,9 +9,8 @@
 
     <parent>
         <groupId>net.dreamlu</groupId>
-        <artifactId>mica-mqtt</artifactId>
+        <artifactId>example</artifactId>
         <version>${revision}</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <dependencies>

example/mica-mqtt-example/pom.xml

@@ -8,9 +8,8 @@
 
     <parent>
         <groupId>net.dreamlu</groupId>
-        <artifactId>mica-mqtt</artifactId>
+        <artifactId>example</artifactId>
         <version>${revision}</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <properties>

example/mica-mqtt-server-solon-plugin-example/pom.xml

@@ -4,10 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>mica-mqtt</artifactId>
         <groupId>net.dreamlu</groupId>
+        <artifactId>example</artifactId>
         <version>${revision}</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>mica-mqtt-server-solon-plugin-example</artifactId>

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

@@ -7,15 +7,10 @@
 
     <parent>
         <groupId>net.dreamlu</groupId>
-        <artifactId>mica-mqtt</artifactId>
+        <artifactId>example</artifactId>
         <version>${revision}</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
-    <properties>
-        <java.version>1.8</java.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>net.dreamlu</groupId>

example/pom.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>net.dreamlu</groupId>
+        <artifactId>mica-mqtt</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <artifactId>example</artifactId>
+    <name>${project.artifactId}</name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>mica-mqtt-example</module>
+        <module>mica-mqtt-client-spring-boot-example</module>
+        <module>mica-mqtt-server-spring-boot-example</module>
+        <module>mica-mqtt-client-solon-plugin-example</module>
+        <module>mica-mqtt-server-solon-plugin-example</module>
+    </modules>
+
+</project>

pom.xml

@@ -35,17 +35,8 @@
         <module>mica-mqtt-client</module>
         <module>mica-mqtt-server</module>
         <module>mica-mqtt-broker</module>
-        <module>starter/mica-mqtt-client-spring-boot-starter</module>
-        <module>starter/mica-mqtt-server-spring-boot-starter</module>
-        <module>starter/mica-mqtt-client-solon-plugin</module>
-        <module>starter/mica-mqtt-server-solon-plugin</module>
-        <module>starter/jfinal-mica-mqtt-client</module>
-        <module>starter/jfinal-mica-mqtt-server</module>
-        <module>example/mica-mqtt-example</module>
-        <module>example/mica-mqtt-client-spring-boot-example</module>
-        <module>example/mica-mqtt-server-spring-boot-example</module>
-        <module>example/mica-mqtt-client-solon-plugin-example</module>
-        <module>example/mica-mqtt-server-solon-plugin-example</module>
+        <module>example</module>
+        <module>starter</module>
     </modules>
 
     <dependencyManagement>

starter/jfinal-mica-mqtt-client/README.md → starter/mica-mqtt-client-jfinal-plugin/README.md

@@ -6,7 +6,7 @@
 ```xml
 <dependency>
 	<groupId>net.dreamlu</groupId>
-	<artifactId>jfinal-mica-mqtt-client</artifactId>
+	<artifactId>mica-mqtt-client-jfinal-plugin</artifactId>
 	<version>${最新版本}</version>
 </dependency>
 ```

starter/jfinal-mica-mqtt-client/pom.xml → starter/mica-mqtt-client-jfinal-plugin/pom.xml

@@ -3,15 +3,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>jfinal-mica-mqtt-client</artifactId>
-    <name>${project.artifactId}</name>
-
     <parent>
         <groupId>net.dreamlu</groupId>
-        <artifactId>mica-mqtt</artifactId>
+        <artifactId>starter</artifactId>
         <version>${revision}</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
+    <artifactId>mica-mqtt-client-jfinal-plugin</artifactId>
+    <name>${project.artifactId}</name>
 
     <dependencies>
         <dependency>

starter/mica-mqtt-client-solon-plugin/pom.xml

@@ -4,10 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>mica-mqtt</artifactId>
         <groupId>net.dreamlu</groupId>
+        <artifactId>starter</artifactId>
         <version>${revision}</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>mica-mqtt-client-solon-plugin</artifactId>
 

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

@@ -7,10 +7,9 @@
     <name>${project.artifactId}</name>
 
     <parent>
-        <artifactId>mica-mqtt</artifactId>
         <groupId>net.dreamlu</groupId>
+        <artifactId>starter</artifactId>
         <version>${revision}</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <dependencies>

starter/jfinal-mica-mqtt-server/README.md → starter/mica-mqtt-server-jfinal-plugin/README.md

@@ -6,7 +6,7 @@
 ```xml
 <dependency>
 	<groupId>net.dreamlu</groupId>
-	<artifactId>jfinal-mica-mqtt-server</artifactId>
+	<artifactId>mica-mqtt-server-jfinal-plugin</artifactId>
 	<version>${最新版本}</version>
 </dependency>
 ```

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

@@ -3,15 +3,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>jfinal-mica-mqtt-server</artifactId>
-    <name>${project.artifactId}</name>
-
     <parent>
         <groupId>net.dreamlu</groupId>
-        <artifactId>mica-mqtt</artifactId>
+        <artifactId>starter</artifactId>
         <version>${revision}</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
+    <artifactId>mica-mqtt-server-jfinal-plugin</artifactId>
+    <name>${project.artifactId}</name>
 
     <dependencies>
         <dependency>

starter/mica-mqtt-server-solon-plugin/pom.xml

@@ -4,10 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>mica-mqtt</artifactId>
         <groupId>net.dreamlu</groupId>
+        <artifactId>starter</artifactId>
         <version>${revision}</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>mica-mqtt-server-solon-plugin</artifactId>

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

@@ -8,9 +8,8 @@
 
     <parent>
         <groupId>net.dreamlu</groupId>
-        <artifactId>mica-mqtt</artifactId>
+        <artifactId>starter</artifactId>
         <version>${revision}</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <dependencies>

starter/pom.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>net.dreamlu</groupId>
+        <artifactId>mica-mqtt</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <artifactId>starter</artifactId>
+    <name>${project.artifactId}</name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>mica-mqtt-client-spring-boot-starter</module>
+        <module>mica-mqtt-server-spring-boot-starter</module>
+        <module>mica-mqtt-client-solon-plugin</module>
+        <module>mica-mqtt-server-solon-plugin</module>
+        <module>mica-mqtt-client-jfinal-plugin</module>
+        <module>mica-mqtt-server-jfinal-plugin</module>
+    </modules>
+
+</project>