Merge remote-tracking branch 'origin/master' into version1.2

springboot/pom.xml

@@ -241,7 +241,7 @@
                     <encoding>${project.build.sourceEncoding}</encoding>
                     <compilerArguments>
                         <!-- rt.jar和jce.jar中间的分隔符，windows为“;”，linux为“:” -->
-                        <bootclasspath>${java.home}/lib/rt.jar;${java.home}/lib/jce.jar</bootclasspath>
+                        <bootclasspath>${java.home}/lib/rt.jar:${java.home}/lib/jce.jar</bootclasspath>
                     </compilerArguments>
                 </configuration>
             </plugin>

springboot/wumei-admin/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/var/wumei-smart/java/logs" />
+	<property name="log.path" value="/var/data/java/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

springboot/wumei-iot/src/main/java/com/ruoyi/iot/mqtt/EmqxClient.java

@@ -79,7 +79,7 @@ public class EmqxClient {
                 token.waitForCompletion();
             }catch (Exception e){
                 logger.error("=====>>>>>mqtt连接失败 message={}",e.getMessage());
-//                e.printStackTrace();
+                e.printStackTrace();
             }
         }
     }
@@ -98,7 +98,7 @@ public class EmqxClient {
                 logger.debug("====>>>mqtt客户端启动成功");
             }catch (MqttException e){
                 logger.error("mqtt客户端连接错误 error={}",e.getMessage());
-//                e.printStackTrace();
+                e.printStackTrace();
             }
         }
     }
@@ -132,7 +132,6 @@ public class EmqxClient {
                 token.waitForCompletion();
             }catch (MqttException e){
                 logger.error("====>>>>断开mqtt连接发生错误 message={}",e.getMessage());
-                throw new ServiceException("断开mqtt连接发生错误" + e.getMessage());
             }
         }
         client = null;