update version to 0.61

broker/pom.xml

@@ -5,7 +5,7 @@
         <relativePath>../</relativePath>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>0.60</version>
+        <version>0.61</version>
     </parent>
 
     <artifactId>moquette-broker</artifactId>
@@ -118,7 +118,7 @@
         <dependency>
             <groupId>com.hazelcast</groupId>
             <artifactId>hazelcast</artifactId>
-            <version>3.9.4</version>
+            <version>3.11.5</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/com.xiaoleilu/hutool -->

broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java

@@ -150,8 +150,8 @@ public class NettyAcceptor implements ServerAcceptor {
             LOG.error("An interruptedException was caught while initializing server. Protocol={}", protocol, ex);
         } catch (Exception e) {
             e.printStackTrace();
-            LOG.error("端口 {} 已经被占用。请检查该端口被那个程序占用，找到程序停掉。\n查找端口被那个程序占用的命令是: netstat -tunlp | grep {}", port, port);
-            System.out.println("端口 " + port + " 已经被占用。请检查该端口被那个程序占用，找到程序停掉。\n查找端口被那个程序占用的命令是: netstat -tunlp | grep " + port);
+            LOG.error("端口 {} 已经被占用或者无权限使用。如果无权限使用，请以root权限运行；如果被占用，请检查该端口被那个程序占用，找到程序停掉。\n查找端口被那个程序占用的命令是: netstat -tunlp | grep {}", port, port);
+            System.out.println("端口 " + port + " 已经被占用或者无权限使用。如果无权限使用，请以root权限运行；如果被占用，请检查该端口被那个程序占用，找到程序停掉。\n查找端口被那个程序占用的命令是: netstat -tunlp | grep " + port);
             System.exit(-1);
         }
     }

broker/src/main/java/win/liyufan/im/SensitiveFilter.java

@@ -17,33 +17,6 @@ public class SensitiveFilter {
 
     private static final String END_FLAG="end";
 
-    public static void main(String[] args) {
-        Set<String> sensitiveWords=new HashSet<>();
-        sensitiveWords.add("你是傻逼");
-        sensitiveWords.add("你是傻逼啊");
-        sensitiveWords.add("你是坏蛋");
-        sensitiveWords.add("你个大笨蛋");
-        sensitiveWords.add("我去年买了个表");
-        sensitiveWords.add("shit");
-
-        SensitiveFilter textFilter=new SensitiveFilter(sensitiveWords);
-        String text="你你你你是傻逼啊你，说你呢，你个大笨蛋。";
-        System.out.println(textFilter.getSensitiveWords(text,MatchType.MAX_MATCH));
-        for (int i = 0; i < 100; i++) {
-            new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    System.out.println(textFilter.getSensitiveWords(text,MatchType.MAX_MATCH));
-                }
-            }).start();
-        }
-        try {
-            Thread.sleep(1000 * 100);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-    }
-
     public boolean isContainSensitiveWord(String text){
         Set<String> sensitiveWords = getSensitiveWords(text, MatchType.MIN_MATCH);
         if(sensitiveWords!=null&&sensitiveWords.size()>0){

common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>0.60</version>
+        <version>0.61</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

distribution/pom.xml

@@ -6,7 +6,7 @@
         <!--<relativePath>../pom.xml</relativePath>-->
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>0.60</version>
+        <version>0.61</version>
     </parent>
 
     <artifactId>distribution</artifactId>

distribution/src/main/assembly/assembly.xml

@@ -74,12 +74,6 @@
             <destName>moquette-broker-${project.version}.jar</destName>
         </file>
 
-        <file>
-            <source>../common/target/common-${project.version}.jar</source>
-            <outputDirectory>java_client/</outputDirectory>
-            <destName>common-${project.version}.jar</destName>
-        </file>
-
         <file>
             <source>../sdk/target/sdk-${project.version}.jar</source>
             <outputDirectory>server_sdk/</outputDirectory>

distribution/src/main/scripts/wildfirechat.bat

@@ -72,4 +72,8 @@ rem set JAVA_OPTS=%JAVA_OPTS% -XX:+UseGCLogFileRotation
 rem set JAVA_OPTS=%JAVA_OPTS% -XX:NumberOfGCLogFiles=10
 rem set JAVA_OPTS=%JAVA_OPTS% -XX:GCLogFileSize=10M"
 
+echo 请设置JVM参数Xmx和Xms！！！
+rem set JAVA_OPTS=%JAVA_OPTS% -Xmx2G
+rem set JAVA_OPTS=%JAVA_OPTS% -Xms2G
+
 %JAVA% -server %JAVA_OPTS% %JAVA_OPTS_SCRIPT% -Dlog4j.configuration=file:%LOG_FILE% -Dcom.mchange.v2.c3p0.cfg.xml=%C3P0_CONF_FILE% -Dhazelcast.configuration=file:%HZ_CONF_FILE% -Dwildfirechat.path=%WILDFIRECHAT_PATH% -cp %WILDFIRECHAT_HOME%\lib\* cn.wildfirechat.server.Server

distribution/src/main/scripts/wildfirechat.sh

@@ -83,8 +83,9 @@ JAVA_OPTS="$JAVA_OPTS -XX:+UseGCLogFileRotation"
 JAVA_OPTS="$JAVA_OPTS -XX:NumberOfGCLogFiles=10"
 JAVA_OPTS="$JAVA_OPTS -XX:GCLogFileSize=10M"
 
-#JAVA_OPTS="$JAVA_OPTS -Xmx128M"
-#JAVA_OPTS="$JAVA_OPTS -Xms128M"
+echo "请设置JVM参数Xmx和Xms！！！"
+#JAVA_OPTS="$JAVA_OPTS -Xmx2G"
+#JAVA_OPTS="$JAVA_OPTS -Xms2G"
 
 
 $JAVA -server $JAVA_OPTS $JAVA_OPTS_SCRIPT -Dlog4j.configuration="file:$LOG_FILE" -Dcom.mchange.v2.c3p0.cfg.xml="$C3P0_CONF_FILE" -Dhazelcast.configuration="file:$HZ_CONF_FILE" -Dwildfirechat.path="$WILDFIRECHAT_PATH" -cp "$WILDFIRECHAT_HOME/lib/*" cn.wildfirechat.server.Server

pom.xml

@@ -12,7 +12,7 @@
     <artifactId>wildfirechat-parent</artifactId>
 
     <packaging>pom</packaging>
-    <version>0.60</version>
+    <version>0.61</version>
     <name>Wildfire Chat</name>
     <description>Wildfire Chat Server</description>
     <inceptionYear>2019</inceptionYear>

sdk/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>0.60</version>
+        <version>0.61</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>