Merge branch 'dev' of http://192.168.1.220:10080/jiwei/jw2.0 into dev

Conflicts:
	svr/svr-iot/src/main/resources/application.yml

svr/svr-iot/pom.xml

@@ -56,12 +56,12 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
            <!--tomcat 启动时 打开注释 start-->
           <!-- <exclusions>
            <exclusions>
                <exclusion>
                    <groupId>org.springframework.boot</groupId>
                    <artifactId>spring-boot-starter-tomcat</artifactId>
                </exclusion>
            </exclusions>-->
            </exclusions>
        </dependency>
        <dependency>
            <groupId>javax.servlet</groupId>
@@ -77,10 +77,10 @@
            <!--tomcat 启动时 打开注释 end-->
        </dependency>
        <!--tomcat 启动时 注释下列配置 start-->
        <!--<dependency>-->
            <!--<groupId>org.springframework.boot</groupId>-->
            <!--<artifactId>spring-boot-starter-tomcat</artifactId>-->
        <!--</dependency>-->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-tomcat</artifactId>
        </dependency>
        <!--tomcat 启动时 注释下列配置 end-->
        <dependency>
            <groupId>org.springframework.boot</groupId>

svr/svr-iot/src/main/resources/application.yml

@@ -4,7 +4,9 @@ server:
spring:
  application:
    name:  svr-iot-ysj  #注册到发现服务的id 如果id一样 eurika会自动做负载
    name:  svr-iot  #注册到发现服务的id 如果id一样 eurika会自动做负载
  jmx:
    default-domain: svr-iot
  datasource:
    driver-class-name: com.mysql.jdbc.Driver

web-gateway/pom.xml

@@ -40,12 +40,12 @@
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
           <!-- <exclusions>
            <exclusions>
                <exclusion>
                    <groupId>org.springframework.boot</groupId>
                    <artifactId>spring-boot-starter-tomcat</artifactId>
                </exclusion>
            </exclusions>-->
            </exclusions>
        </dependency>
        <dependency>
            <groupId>javax.servlet</groupId>
@@ -63,10 +63,10 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-jpa</artifactId>
        </dependency>
        <dependency>
      <!--  <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-tomcat</artifactId>
        </dependency>
        </dependency>-->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-jdbc</artifactId>
@@ -153,6 +153,11 @@
            <groupId>commons-codec</groupId>
            <artifactId>commons-codec</artifactId>
        </dependency>
        <dependency>
            <groupId>com.sun.jna</groupId>
            <artifactId>jna</artifactId>
            <version>3.0.9</version>
        </dependency>
    </dependencies>
    <build>
        <finalName>webgate-way</finalName>

web-gateway/src/main/resources/application.yml

@@ -3,7 +3,9 @@ server:
  port: 8088
spring:
  application:
    name:  web-gateway-ysj  #注册到发现服务的id 如果id一样 eurika会自动做负载
    name:  web-gateway #注册到发现服务的id 如果id一样 eurika会自动做负载
  jmx:
    default-domain: web-gateway
  http:
    multipart:
      enabled: true