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

server/svr-configuration/pom.xml

@@ -14,6 +14,7 @@
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-configuration</artifactId>
    <version>1.0.0</version>
    <packaging>war</packaging>
    <dependencies>
        <dependency>
@@ -39,6 +40,7 @@
    </dependencies>
    <build>
        <finalName>ROOT</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>

server/svr-configuration/src/main/java/com.yihu.jw/config/ServletInitializer.java

@@ -0,0 +1,22 @@
package com.yihu.jw.config;
import com.yihu.jw.SvrConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.support.SpringBootServletInitializer;
/**
 * Created by chenweida on 2017/12/4.
 * 部署在tomcat需要
 */
public class ServletInitializer extends SpringBootServletInitializer {
    public ServletInitializer() {
        super();
        setRegisterErrorPageFilter(false); //报错不跳到错误页
    }
    @Override
    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
        return application.sources(SvrConfiguration.class);
    }
}

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

@@ -11,7 +11,9 @@ eureka:
    prefer-ip-address: true
    #定制化在eurika中显示的名称
    ##instance-id: ${spring.application.name}:${spring.application.instance_id:${server.port}}
    instance-id: localhost:${server.port}
    instance-id: ${spring.cloud.client.ipAddress}:${server.port}
---

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

@@ -1,14 +1,14 @@
spring:
  application:
    name: svr-configurations
  jmx:
    default-domain: ${spring.application.name}
security:
  user:
    name: jw
    password:  jkzl
#发现服务
eureka:
  client:
    healthcheck:
@@ -21,7 +21,6 @@ eureka:
    instance-id: ${spring.cloud.client.ipAddress}:${server.port}
---
spring:
  profiles: jwdev
@@ -33,8 +32,8 @@ spring:
        git:
#          uri: http://192.168.1.220:10080/chenweida/jw.config.git
#          uri: http://192.168.116.100:10080/chenweida/mini.jw.config.git
         uri: http://192.168.1.220:10080/chenyongxing/jw.config.git
        default-label: master
         uri: http://192.168.1.220:10080/jiwei/jw.config.git
        default-label: jwdev
---

server/svr-dashboard/src/main/resources/application.yml

@@ -16,7 +16,7 @@ eureka:
  client:
    serviceUrl:
      #http://账号:密码@127.0.0.1:8761/eureka/
      defaultZone: http://jw:jkzl@127.0.0.1:8761/eureka/
      defaultZone: http://jw:jkzl@172.19.103.33:8761/eureka/
---
spring:

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

@@ -20,7 +20,7 @@ eureka:
  client:
    serviceUrl:
      #http://账号:密码@127.0.0.1:8761/eureka/
      defaultZone: http://jw:jkzl@127.0.0.1:8761/eureka/
      defaultZone: http://jw:jkzl@172.19.103.33:8761/eureka/
---
spring:

server/svr-discovery/pom.xml

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

server/svr-discovery/src/main/java/com.yihu.jw/config/ServletInitializer.java

@@ -0,0 +1,22 @@
package com.yihu.jw.config;
import com.yihu.jw.SvrDiscovery;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.support.SpringBootServletInitializer;
/**
 * Created by chenweida on 2017/12/4.
 * 部署在tomcat需要
 */
public class ServletInitializer extends SpringBootServletInitializer {
    public ServletInitializer() {
        super();
        setRegisterErrorPageFilter(false); //报错不跳到错误页
    }
    @Override
    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
        return application.sources(SvrDiscovery.class);
    }
}

server/svr-discovery/src/main/resources/application.yml

@@ -4,14 +4,15 @@ server:
spring:
  application:
    name: svr-discovery
  jmx:
    default-domain: ${spring.application.name}
eureka:
  client:
    register-with-eureka: false
    registry-fetch-interval-seconds: 30 #定期的更新客户端的服务清单 30秒更新一次
    fetch-registry: false #如果是做高可用的发现服务那就要改成true
    service-url:
      defaultZone: http://jw:jkzl@127.0.0.1:8761/eureka
#eurika界面的账号密码
@@ -22,14 +23,35 @@ security:
    name: jw
    password: jkzl
---
spring:
  profiles: jwdev
eureka:
  client:
    service-url:
      defaultZone: http://jw:jkzl@172.19.103.33:8761/eureka
---
spring:
  profiles: jwtest
eureka:
  client:
    service-url:
      defaultZone: http://jw:jkzl@172.19.103.33:8761/eureka
---
spring:
  profiles: jwprod
eureka:
  client:
    service-url:
      defaultZone: http://jw:jkzl@172.19.103.33:8761/eureka

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

@@ -20,7 +20,7 @@ eureka:
  client:
    serviceUrl:
      #http://账号:密码@127.0.0.1:8761/eureka/
      defaultZone: http://jw:jkzl@127.0.0.1:8761/eureka/
      defaultZone: http://jw:jkzl@172.19.103.33:8761/eureka/
---
spring:

svr/svr-base/src/main/resources/bootstrap.yml

@@ -20,7 +20,8 @@ eureka:
  client:
    serviceUrl:
      #http://账号:密码@127.0.0.1:8761/eureka/
      defaultZone: http://jw:jkzl@localhost:8761/eureka/
      defaultZone: http://jw:jkzl@172.19.103.33:8761/eureka/
---
spring:

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

@@ -20,7 +20,7 @@ eureka:
  client:
    serviceUrl:
      #http://账号:密码@127.0.0.1:8761/eureka/
      defaultZone: http://jw:jkzl@127.0.0.1:8761/eureka/
      defaultZone: http://jw:jkzl@172.19.103.33:8761/eureka/
---
spring:

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

@@ -20,7 +20,7 @@ eureka:
  client:
    serviceUrl:
      #http://账号:密码@127.0.0.1:8761/eureka/
      defaultZone: http://jw:jkzl@127.0.0.1:8761/eureka/
      defaultZone: http://jw:jkzl@172.19.103.33:8761/eureka/
---
spring: