liubing преди 3 години
родител
ревизия
bfeef2a24a
променени са 2 файла, в които са добавени 14 реда и са изтрити 6 реда
  1. 13 5
      svr/svr-iot/src/main/resources/application.yml
  2. 1 1
      wlyy-parent-pom/pom.xml

+ 13 - 5
svr/svr-iot/src/main/resources/application.yml

@ -291,15 +291,23 @@ spring:
    url: jdbc:mysql://10.90.32.3:20002/xmiot?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: wlyy_new
    password: J4&y9sk#1G
  elasticsearch:
    cluster-name: jkzl #默认即为elasticsearch  集群名
    cluster-nodes: 10.90.32.3:20011,10.90.32.3:20011 #配置es节点信息,逗号分隔,如果没有指定,则启动ClientNode
    jest:
      uris: http://10.90.32.3:20011,http://10.90.32.3:20012
#  elasticsearch:
#    cluster-name: jkzl #默认即为elasticsearch  集群名
#    cluster-nodes: 10.90.32.3:20011,10.90.32.3:20011 #配置es节点信息,逗号分隔,如果没有指定,则启动ClientNode
#    jest:
#      uris: http://10.90.32.3:20011,http://10.90.32.3:20012
  wlyy:
    url: http://www.xmtyw.cn/wlyytest/
    appid: 915d0345-5b1d-11e6-8344-fa163e8aee62
    appsecret: 915d0345-5b1d-11e6-8344-fa163e8aee62
es:
  pwflag: 1 # 1需要密码,2不需要密码
  host:  http://10.90.32.3:20011
  tHost: 10.90.32.3:20012
  clusterName: jkzl
  securityUser: zjxl:6Dbq&fHg
  user: zjxl
  password: 6Dbq&fHg
fast-dfs:
  tracker-server: 172.19.103.54:22122 #服务器地址
fastDFS:

+ 1 - 1
wlyy-parent-pom/pom.xml

@ -85,7 +85,7 @@
        <!-- Version start -->
        <version.wlyy-common>2.0.0</version.wlyy-common>
        <version.jackson>2.8.1</version.jackson>
        <verion.fastjson>1.2.72</verion.fastjson>
        <verion.fastjson>1.2.76</verion.fastjson>
        <version.json>20160212</version.json>
        <version.net-json>2.4</version.net-json>
        <version.logback>1.2.3</version.logback>