Merge branch 'dev' of humingfen/wlyy2.0 into dev

gateway/ag-basic/pom.xml

@@ -118,6 +118,12 @@
            <artifactId>commons-fileupload</artifactId>
            <version>1.3.1</version>
        </dependency>
        <!--oracle驱动-->
        <dependency>
            <groupId>com.oracle</groupId>
            <artifactId>ojdbc6</artifactId>
            <version>11.2.0.3</version>
        </dependency>
    </dependencies>
    <build>

gateway/ag-basic/src/main/resources/bootstrap.yml

@@ -53,7 +53,7 @@ spring:
  profiles: jwOracleProd
  cloud:
    config:
      uri: ${wlyy.spring.config.uri:http://192.168.33.199:1221}
      uri: ${wlyy.spring.config.uri:http://127.0.0.1:1221}
      label: ${wlyy.spring.config.label:master}
---

server/svr-authentication/pom.xml

@@ -170,6 +170,12 @@
            <artifactId>javax.wsdl</artifactId>
            <version>1.5.1</version>
        </dependency>
        <!--oracle驱动-->
        <dependency>
            <groupId>com.oracle</groupId>
            <artifactId>ojdbc6</artifactId>
            <version>11.2.0.3</version>
        </dependency>
    </dependencies>
    <build>

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

@@ -61,7 +61,7 @@ spring:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://192.168.33.199:3001/jkzl/wlyy2.0.config.git}
          uri: ${wlyy.spring.config.git.uri:http://192.168.33.199:3001/jkzl/ehr.config.git}
          basedir: /usr/local/wlyy2.0-config
        default-label: ${wlyy.spring.config.git.label:master}
---