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

app/app-iot-server/src/main/resources/application.yml

@@ -59,7 +59,7 @@ app:
  oauth2InnerUrl: http://172.19.103.73:10260/   # 认证中心，获取token ehr环境
  oauth2OuterUrl: http://27.154.233.186:10260/  # 上饶-授权外网映射
service-gateway:
  iotUrl: http://192.168.131.24:8088/svr-iot/
  iotUrl: http://172.19.103.88:8088/svr-iot/
  profileInnerUrl: http://172.19.103.73:10000/api/v1.0/admin
  profileOuterUrl: http://27.154.233.186:10000/api/v1.0/admin
  portalInnerUrl: http://172.19.103.73:10280/api/v1.0/portal
@@ -67,7 +67,7 @@ service-gateway:
third:
  wlyy:
    url: http://192.168.131.24:8086/
    url: http://ehr.yihu.com/wlyy/
    appid: 915d0345-5b1d-11e6-8344-fa163e8aee61
    appsecret: 915d0345-5b1d-11e6-8344-fa163e8aee57
@@ -90,7 +90,7 @@ app:
  oauth2InnerUrl: http://172.19.103.73:10260/
  oauth2OuterUrl: http://27.154.233.186:10260/
service-gateway:
  iotUrl: http://172.19.103.88:10050/svr-iot/
  iotUrl: http://172.19.103.88:8088/svr-iot/
  profileInnerUrl: http://172.19.103.73:10000/api/v1.0/admin
  profileOuterUrl: http://27.154.233.186:10000/api/v1.0/admin
  portalInnerUrl: http://172.19.103.73:10280/api/v1.0/portal

server/svr-configuration/pom.xml

@@ -40,7 +40,7 @@
    </dependencies>
    <build>
        <finalName>svr-configurations</finalName>
        <finalName>svr-configuration</finalName>
        <plugins>
            <plugin>
                <artifactId>maven-war-plugin</artifactId>