Merge branch '2.0' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into 2.0

# Conflicts:
#	gateway/ag-basic/src/main/resources/application.yml

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

@@ -2,11 +2,11 @@ spring:
  jmx:
    enabled: false
  security:
    basic:
      enabled: true
    user:
      name: jw
      password: jkzl
  application:
    name: svr-configuration
server:
  port: 1221
@@ -18,7 +18,7 @@ eureka:
    healthcheck:
      enabled: false #启动监控检查，
    serviceUrl: # 默认正式线地址
      defaultZone: http://jw:jkzl@172.26.0.153:8761/eureka # 默认本机环境
      defaultZone: http://jw:jkzl@127.0.0.1:8761/eureka # 默认本机环境
    register-with-eureka: true
    fetch-registry: true
@@ -45,7 +45,7 @@ spring:
        failFast: true #启动快速失败 即链接不到配置服务就启动失败
        server:
            git:
              uri: ${wlyy.spring.config.git.uri:http://127.0.0.1/Amoy2/wlyy2.0.config.git}
              uri: ${wlyy.spring.config.git.uri:http://192.168.1.220:10080/Amoy2/wlyy2.0.config.git}
              basedir: /usr/local/wlyy2.0.config
              username: jkzl
              password: jkzl
@@ -359,7 +359,7 @@ spring:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
          git:
            uri: ${wlyy.spring.config.git.uri:http://192.168.1.220:10080/Amoy2/wlyy2.0.config.git}
            uri: ${wlyy.spring.config.git.uri:http://127.0.0.1:10080/Amoy2/wlyy2.0.config.git}
            basedir: /usr/local/wlyy2.0.config
            username: jkzl
            password: jkzl

server/svr-discovery/src/main/java/com/yihu/DiscoveryServer.java

@@ -5,6 +5,9 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
/**
 * Created by chenweida on 2017/5/10.
@@ -19,6 +22,15 @@ public class DiscoveryServer extends SpringBootServletInitializer {
    @Override
    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
        return application.sources(DiscoveryServer.class);
    }
    @EnableWebSecurity
    static class WebSecurityConfig extends WebSecurityConfigurerAdapter {
        @Override
        protected void configure(HttpSecurity http) throws Exception {
            http.csrf().disable().authorizeRequests().anyRequest().authenticated().and().httpBasic();
        }
    }
}

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

@@ -18,7 +18,7 @@ eureka:
    enable-self-preservation: false  #是否开启自我保护模式，默认为true。
    #eviction-interval-timer-in-ms: 60000 #eureka server清理无效节点的时间间隔，默认60000毫秒，即60秒
  client:
    register-with-eureka: true
    register-with-eureka: false
    fetch-registry: false #如果是做高可用的发现服务那就要改成 true
    registry-fetch-interval-seconds: 30 #定期的更新客户端的服务清单 30秒更新一次
    service-url: