Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/distributedlock/DistributedLock.java

@@ -18,7 +18,7 @@ import java.util.concurrent.TimeUnit;
 @Component
 public class DistributedLock {
 
-    @Autowired
+    @Autowired(required = false)
     private RedissonClient redissonClient;
 
     /**

epmet-gateway/src/main/java/com/epmet/GatewayApplication.java

@@ -9,9 +9,9 @@
 package com.epmet;
 
 import com.epmet.commons.tools.aspect.ServletExceptionHandler;
+import com.epmet.commons.tools.config.RedissonConfig;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.ComponentScan;
@@ -23,11 +23,11 @@ import org.springframework.context.annotation.FilterType;
  * @author Mark sunlightcs@gmail.com
  * @since 1.0.0
  */
-@SpringBootApplication()
+@SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients
 //@ServletComponentScan
-@ComponentScan(basePackages = {"com.epmet.*"}, excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {ServletExceptionHandler.class}))
+@ComponentScan(basePackages = {"com.epmet.*"}, excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {RedissonConfig.class, ServletExceptionHandler.class}))
 public class GatewayApplication {
 
 	public static void main(String[] args) {