代码修改

svr/svr-iot/sql-scripts/device_location_es.sql

@@ -1,33 +1,37 @@
创建索引
POST  http://172.26.0.190:9200/device_location_index
curl -XPUT http://url/device_location_index
给索引加mapping
POST http://172.26.0.190:9200/device_location_index/device_location_type/_mapping
{
        "mappings": {
            "device_location_type": {
                "properties": {
                    "categoryCode": {
                        "type": "string"
                    },
                    "createTime": {
                        "type": "date",
                        "format": "yyyy-MM-dd HH:mm:ss"
                    },
                    "deviceSn": {
                        "type": "string"
                    },
                    "deviceTime": {
                        "type": "date",
                        "format": "yyyy-MM-dd HH:mm:ss"
                    },
                    "idCard": {
                        "type": "string"
                    },
                    "location": {
                        "type": "geo_point"
                    }
                }
    "device_location_type": {
        "properties": {
            "categoryCode": {
                "type": "string",
                "index": "not_analyzed"
            },
            "createTime": {
                "type": "date",
                "format": "yyyy-MM-dd HH:mm:ss"
            },
            "deviceSn": {
                "type": "string",
                "index": "not_analyzed"
            },
            "deviceTime": {
                "type": "date",
                "format": "yyyy-MM-dd HH:mm:ss"
            },
            "idCard": {
                "type": "string",
                "index": "not_analyzed"
            },
            "location": {
                "type": "geo_point"
            }
        }
    }
}

svr/svr-wlyy-health-bank/src/main/resources/application.yml

@@ -114,6 +114,39 @@ spring:
fastDFS:
  fastdfs_file_url: http://172.26.0.110:80/
---
spring:
  profiles: iotyanshi
  datasource:
    url: jdbc:mysql://172.26.0.195:3306/wlyy_health_bank?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: jkzlehr
  redis:
    host: 172.26.0.190 # Redis server host.
    port: 6379 # Redis server port.
#    password: jkzl_ehr
  data:
    elasticsearch: #ElasticsearchProperties
      cluster-name: jkzl #默认即为elasticsearch  集群名
      cluster-nodes: 172.26.0.190:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
      local: false #是否本地连接
      properties: # Additional properties used to configure the client.
        enable: true
  # JEST (Elasticsearch HTTP client) (JestProperties)
  elasticsearch:
    jest:
      uris: http://172.26.0.190:9200
#      uris: [图片]http://172.19.103.68:9200
      connection-timeout: 60000 # Connection timeout in milliseconds.
      multi-threaded: true # Enable connection requests from multiple execution threads.
      username: # Login user.
      password: # Login password.
      proxy.port:  # Proxy port the HTTP client should use.
      proxy.host:  # Proxy host the HTTP client should use.
fastDFS:
  fastdfs_file_url: http://172.26.0.110:80/
---
spring:
  profiles: prod

svr/svr-wlyy-health-bank/src/main/resources/bootstrap.yml

@@ -23,6 +23,13 @@ spring:
      uri: ${wlyy.spring.config.uri:http://172.26.0.107:1221}
      label: ${wlyy.spring.config.label:jwdev}
---
spring:
  profiles: iotyanshi
  cloud:
    config:
      uri: ${wlyy.spring.config.uri:http://127.0.0.1:1221}
      label: ${wlyy.spring.config.label:jwdev}
---
spring:

svr/svr-wlyy-specialist/src/main/resources/application.yml

@@ -140,6 +140,42 @@ im:
  im_list_get: http://172.26.0.118:3000/
  data_base_name: im_new
---
spring:
  profiles: iotyanshi
  datasource:
    url: jdbc:mysql://172.26.0.195/wlyy_specialist?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: jkzlehr
  redis:
    host: 172.26.0.190 # Redis server host.
    port: 6379 # Redis server port.
fastDFS:
  fastdfs_file_url: http://172.26.0.110:80/
fast-dfs:
  tracker-server: 172.26.0.110:22122
  public-server: http://172.26.0.110:80/
neiwang:
  enable: true
  wlyy: http://172.26.0.110:22122/
base:
  url: http://172.17.110.212:10020/
wechat:
  appId: wx1f129f7b51701428
  appSecret: 988f005d8309ed1795939e0f042431fb
  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
  wechat_base_url: http%3a%2f%2fehr.yihu.com%2fwlyy
  accId: gh_ffd64560fb21
im:
  im_list_get: http://172.26.0.191:3000/
  data_base_name: im_new
---
spring:
  profiles: jwdevtest

svr/svr-wlyy-specialist/src/main/resources/bootstrap.yml

@@ -14,7 +14,13 @@ spring:
    config:
      uri: ${wlyy.spring.config.uri:http://172.26.0.107:1221}
      label: ${wlyy.spring.config.label:jwdev}
---
spring:
  profiles: iotyanshi
  cloud:
    config:
      uri: ${wlyy.spring.config.uri:http://127.0.0.1:1221}
      label: ${wlyy.spring.config.label:jwdev}
---
spring:
  profiles: jwtest