Merge branch 'dev' of chinawu123/wlyy2.0 into dev

svr/svr-cloud-device/pom.xml

@@ -169,10 +169,6 @@
            <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
            <version>1.2.5</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-commons</artifactId>
        </dependency>
    </dependencies>
    <build>

svr/svr-cloud-device/src/main/java/com/yihu/SvrCloudDeviceApplication.java

@@ -5,7 +5,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.support.SpringBootServletInitializer;
import org.springframework.context.annotation.Bean;
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.web.client.RestTemplate;
@@ -31,7 +30,6 @@ public class SvrCloudDeviceApplication extends SpringBootServletInitializer {
        return builder.sources(SvrCloudDeviceApplication.class);
    }
    @LoadBalanced//为RestTemplate Bean添加了一个LoadBalancerInterceptor拦截器。可以将请求的地址中的服务逻辑名转为具体的服务地址
    @Bean//将RestTemplate注册到容器
    public RestTemplate RestTemplate(){
        return new RestTemplate();

svr/svr-cloud-device/src/main/java/com/yihu/jw/care/common/PostConstructUtil.java

@@ -36,7 +36,7 @@ public class PostConstructUtil {
        if("hzprod".equals(profiles)){
            logger.info("启动宇视人脸摄像头sdk====");
            netDevSdkService.init();
            //netDevSdkService.init();
        }
    }