Merge branch 'dev' of LiTaohong/jw2.0 into dev

server/svr-configuration/pom.xml

@@ -14,7 +14,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-configuration</artifactId>
    <version>1.0.0</version>
    <packaging>jar</packaging>
    <packaging>war</packaging>
    <dependencies>
        <dependency>
@@ -42,6 +42,13 @@
    <build>
        <finalName>svr-configurations</finalName>
        <plugins>
            <plugin>
                <artifactId>maven-war-plugin</artifactId>
                <configuration>
                    <failOnMissingWebXml>false</failOnMissingWebXml>
                    <filteringDeploymentDescriptors>true</filteringDeploymentDescriptors>
                </configuration>
            </plugin>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>

server/svr-configuration/src/main/resources/bootstrap.yml

@@ -35,9 +35,8 @@ spring:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
#         uri: http://192.168.1.220:10080/jiwei/jw.config.git
         uri: http://192.168.1.220:10080/jiwei/jw.config.git
        default-label: jwdev
          uri: http://192.168.1.220:10080/jiwei/jw.config.git
        default-label: master
---
@@ -49,8 +48,7 @@ spring:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
#          uri: http://192.168.1.220:10080/EHR/ehr.config.git
          uri: http://192.168.1.220:10080/chenyongxing/jw.config.git
          uri: http://192.168.1.220:10080/jiwei/jw.config.git
        default-label: master
---

svr/svr-iot/pom.xml

@@ -146,24 +146,14 @@
        <finalName>svr-iot</finalName>
        <plugins>
            <plugin>
                <artifactId>maven-war-plugin</artifactId>
                <configuration>
                    <failOnMissingWebXml>false</failOnMissingWebXml>
                    <filteringDeploymentDescriptors>true</filteringDeploymentDescriptors>
                </configuration>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin </artifactId>
            </plugin>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <executions>
                    <execution>
                        <goals>
                            <goal>repackage</goal>
                        </goals>
                    </execution>
                </executions>
                <artifactId>maven-compiler-plugin</artifactId>
                <configuration>
                    <mainClass>com.yihu.iot.IOTApplication</mainClass>
                    <source>1.8</source>
                    <target>1.8</target>
                </configuration>
            </plugin>
        </plugins>

svr/svr-iot/src/main/java/com/yihu/iot/config/WarConfig.java

@@ -0,0 +1,13 @@
package com.yihu.iot.config;
import com.yihu.iot.IOTApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.support.SpringBootServletInitializer;
public class WarConfig extends SpringBootServletInitializer {
    @Override
    protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
        return builder.sources(IOTApplication.class);
    }
}

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

@@ -89,11 +89,19 @@ fastDFS:
---
spring:
  profiles: jwtest
  datasource:
    url: jdbc:mysql://172.19.103.77:3306/xmiot?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: 123456
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
---
spring:
  profiles: jwprod
  datasource:
    url: jdbc:mysql://172.19.103.77:3306/xmiot?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: 123456
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/

web-gateway/pom.xml

@@ -40,15 +40,33 @@
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
            <exclusions>
                <exclusion>
                    <groupId>org.springframework.boot</groupId>
                    <artifactId>spring-boot-starter-tomcat</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
        <dependency>
            <groupId>javax.servlet</groupId>
            <artifactId>javax.servlet-api</artifactId>
            <version>3.1.0</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>org.apache.tomcat</groupId>
            <artifactId>tomcat-servlet-api</artifactId>
            <version>8.5.28</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <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>
@@ -137,21 +155,23 @@
        </dependency>
    </dependencies>
    <build>
        <finalName>webgate-way</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <executions>
                    <execution>
                        <goals>
                            <goal>repackage</goal>
                        </goals>
                    </execution>
                </executions>
                <artifactId>spring-boot-maven-plugin </artifactId>
                <configuration>
                    <mainClass>com.yihu.jw.WebGateWayAppliaction</mainClass>
                </configuration>
            </plugin>
            <plugin>
                <artifactId>maven-compiler-plugin</artifactId>
                <configuration>
                    <source>1.8</source>
                    <target>1.8</target>
                </configuration>
            </plugin>
        </plugins>
    </build>
</project>

web-gateway/src/main/java/com/yihu/jw/config/WarConfig.java

@@ -0,0 +1,13 @@
package com.yihu.jw.config;
import com.yihu.jw.WebGateWayAppliaction;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.support.SpringBootServletInitializer;
public class WarConfig extends SpringBootServletInitializer {
    @Override
    protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
        return builder.sources(WebGateWayAppliaction.class);
    }
}