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-authentication/pom.xml

@@ -61,7 +61,7 @@
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-netflix-eureka-client</artifactId>
            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>

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

@@ -766,7 +766,7 @@ kick:
spring:
  profiles: mlwTest
  datasource:
    url: jdbc:mysql://172.26.0.114:3306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    url: jdbc:mysql://172.26.0.114:3306/base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: root
    password: 4D^tK%!4
  redis: