Merge remote-tracking branch 'origin/master'

@@ -126,6 +126,7 @@
             <artifactId>okhttp</artifactId>
             <artifactId>okhttp</artifactId>
         </dependency>
         </dependency>
 
 
+
     </dependencies>
     </dependencies>
 
 
     <build>
     <build>
@@ -151,7 +152,7 @@
                                    生成的manifest中classpath的前缀，因为要把第三方jar放到lib目录下，所以classpath的前缀是lib/
                                    生成的manifest中classpath的前缀，因为要把第三方jar放到lib目录下，所以classpath的前缀是lib/
                                -->
                                -->
                             <classpathPrefix>lib/</classpathPrefix>
                             <classpathPrefix>lib/</classpathPrefix>
-                            <mainClass>com.zhonglai.waibao.juheliaotian.mqtt.service.MqttServiceApplication</mainClass>
+                            <mainClass>com.zhonglai.luhui.mqtt.MqttApplication</mainClass>
                         </manifest>
                         </manifest>
                     </archive>
                     </archive>
                 </configuration>
                 </configuration>

@@ -6,6 +6,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.ComponentScan;
 
 
+import javax.servlet.Filter;
+
 
 
 @ComponentScan(basePackages = {
 @ComponentScan(basePackages = {
         "com.zhonglai.luhui.mqtt.comm.config",
         "com.zhonglai.luhui.mqtt.comm.config",