数据上传

base/common-data-es/src/main/java/com/yihu/base/es/config/ElastricSearchHelper.java

@@ -30,7 +30,7 @@ public class ElastricSearchHelper {
        JestClient jestClient = null;
        try {
            //得到链接elasticFactory.getJestClient();
            jestClient = elasticFactory.getJestClient();
            int success = 0;
            int error = 0;
            Bulk.Builder bulk = new Bulk.Builder().defaultIndex(index).defaultType(type);
@@ -63,7 +63,7 @@ public class ElastricSearchHelper {
        JestClient jestClient = null;
        try {
            //得到链接elasticFactory.getJestClient();
            jestClient = elasticFactory.getJestClient();
            int success = 0;
            int error = 0;
            Bulk.Builder bulk = new Bulk.Builder().defaultIndex(index).defaultType(type);

common/common-entity/src/main/java/com/yihu/jw/iot/data_input/DataProcessLogDO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.iot.data_input;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import javax.persistence.Column;
@@ -9,7 +10,10 @@ import java.io.Serializable;
@Entity
@Table(name = "iot_data_process_log")
public class DataProcessLogDO extends IdEntityWithOperation implements Serializable {
public class DataProcessLogDO extends IdEntity implements Serializable {
    @Column(name = "data_id")
    private String dataId;
    @Column(name = "file_name")
    private String fileName;
@@ -113,4 +117,12 @@ public class DataProcessLogDO extends IdEntityWithOperation implements Serializa
    public void setFileCount(int fileCount) {
        this.fileCount = fileCount;
    }
    public String getProcessInterface() {
        return processInterface;
    }
    public void setProcessInterface(String processInterface) {
        this.processInterface = processInterface;
    }
}

common/common-entity/src/main/java/com/yihu/jw/iot/data_input/DataStandardDO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.iot.data_input;
import com.yihu.jw.IdEntity;
import com.yihu.jw.IdEntityWithOperation;
import javax.persistence.Column;
@@ -9,7 +10,7 @@ import java.io.Serializable;
@Entity
@Table(name = "iot_base_data_def")
public class DataStandardDO extends IdEntityWithOperation implements Serializable {
public class DataStandardDO extends IdEntity implements Serializable {
    @Column(name = "base_name")
    private String baseName;

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -139,7 +139,7 @@ public class BaseRequestMapping {
        public static final String api_create="/systemDictList";
        public static final String api_update="/systemDictList";
        public static final String api_delete="/systemDictList";
        public static final String api_getById="/getById";
        public static final String api_getById="/systemDictList/getById";
        public static final String api_getList="/systemDictList/list";
        public static final String api_getListNoPage="/systemDictList/listNoPage";
        public static final String api_getChildren="/systemDictList/children/{id}";

common/common-request-mapping/src/main/java/com/yihu/jw/rm/iot/DataRequestMapping.java

@@ -20,7 +20,7 @@ public class DataRequestMapping {
     * 数据上传
     */
    public static class DataInput{
        public static final String api_data_input = "dataInput";//数据上传
        public static final String api_data_input = "input";//数据上传
        public static final String api_user_bind = "userBind";//设备注册绑定
        public static final String message_success = "上传成功";

svr/svr-iot/src/main/java/com/yihu/iot/config/jpa/IotJpa.java

@@ -24,7 +24,7 @@ import javax.sql.DataSource;
@EnableJpaRepositories(
        entityManagerFactoryRef = "iotEntityManagerFactory",
        transactionManagerRef = "iotTransactionManager",
        basePackages = {"com.yihu.iot.dao"})   //设置Repository所在位置
        basePackages = {"com.yihu.iot.dao","com.yihu.iot.datainput.dao"})   //设置Repository所在位置
public class IotJpa {
    @Autowired

svr/svr-iot/src/main/java/com/yihu/iot/dao/device/IotDeviceDao.java

@@ -1,7 +1,6 @@
package com.yihu.iot.dao.device;
import com.yihu.jw.iot.device.IotDeviceDO;
import com.yihu.jw.iot.dict.IotDeviceDictDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
@@ -14,7 +13,7 @@ public interface IotDeviceDao extends PagingAndSortingRepository<IotDeviceDO, Lo
    @Query("from IotDeviceDO w where w.id =?1")
    IotDeviceDO findById(String id);
    @Query("count(*) from IotDeviceDO w where w.deviceSn =?1")
    @Query("select count(*) from IotDeviceDO w where w.deviceSn =?1")
    int countByDeviceSn(String deviceSn);
    @Query("from IotDeviceDO w where w.deviceSn =?1")

svr/svr-iot/src/main/java/com/yihu/iot/dao/device/IotDeviceOrderDao.java

@@ -1,6 +1,5 @@
package com.yihu.iot.dao.device;
import com.yihu.jw.iot.device.IotDeviceDO;
import com.yihu.jw.iot.device.IotDeviceOrderDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;

svr/svr-iot/src/main/java/com/yihu/iot/dao/device/IotDevicePurchaseDao.java

@@ -1,6 +1,5 @@
package com.yihu.iot.dao.device;
import com.yihu.jw.iot.device.IotDeviceDO;
import com.yihu.jw.iot.device.IotDevicePurchaseDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;

svr/svr-iot/src/main/java/com/yihu/iot/dao/device/IotDeviceQualityInspectionPlanDao.java

@@ -1,6 +1,5 @@
package com.yihu.iot.dao.device;
import com.yihu.jw.iot.device.IotDevicePurchaseDO;
import com.yihu.jw.iot.device.IotDeviceQualityInspectionPlanDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;

svr/svr-iot/src/main/java/com/yihu/iot/dao/dict/IotDeviceDictDao.java

@@ -1,7 +1,6 @@
package com.yihu.iot.dao.dict;
import com.yihu.jw.iot.dict.IotDeviceDictDO;
import com.yihu.jw.iot.supplier.IotSupplyDeviceDataTypeDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-iot/src/main/java/com/yihu/iot/dao/supplier/IotDeviceSupplierDao.java

@@ -5,8 +5,6 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * @author yeshijie on 2017/12/5.
 */

svr/svr-iot/src/main/java/com/yihu/iot/dao/supplier/IotSupplyDeviceDao.java

@@ -1,6 +1,5 @@
package com.yihu.iot.dao.supplier;
import com.yihu.jw.iot.supplier.IotDeviceSupplierDO;
import com.yihu.jw.iot.supplier.IotSupplyDeviceDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;

svr/svr-iot/src/main/java/com/yihu/iot/dao/supplier/IotSupplyDeviceDataTypeDao.java

@@ -1,6 +1,5 @@
package com.yihu.iot.dao.supplier;
import com.yihu.jw.iot.supplier.IotSupplyDeviceDO;
import com.yihu.jw.iot.supplier.IotSupplyDeviceDataTypeDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;

svr/svr-iot/src/main/java/com/yihu/iot/data_input/controller/DataInputController.java

@@ -1,6 +1,6 @@
package com.yihu.iot.data_input.controller;
package com.yihu.iot.datainput.controller;
import com.yihu.iot.data_input.service.DataInputService;
import com.yihu.iot.datainput.service.DataInputService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.iot.DataRequestMapping;

svr/svr-iot/src/main/java/com/yihu/iot/data_input/controller/DataStandardConvertController.java

@@ -1,12 +1,9 @@
package com.yihu.iot.data_input.controller;
package com.yihu.iot.datainput.controller;
import com.yihu.iot.data_input.service.DataStandardConvertService;
import com.yihu.jw.base.user.BaseMenuDO;
import com.yihu.iot.datainput.service.DataStandardConvertService;
import com.yihu.jw.exception.ApiException;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.base.BaseUserRequestMapping;
import com.yihu.jw.rm.iot.DataRequestMapping;
import com.yihu.jw.rm.iot.IotRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

svr/svr-iot/src/main/java/com/yihu/iot/data_input/dao/DataProcessLogDao.java

@@ -1,9 +1,9 @@
package com.yihu.iot.data_input.dao;
package com.yihu.iot.datainput.dao;
import com.yihu.jw.iot.data_input.DataProcessLogDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface DataProcessLogDao extends PagingAndSortingRepository<DataProcessLogDO, Long>, JpaSpecificationExecutor<DataProcessLogDO> {
public interface DataProcessLogDao extends PagingAndSortingRepository<DataProcessLogDO, String>, JpaSpecificationExecutor<DataProcessLogDO> {
}

svr/svr-iot/src/main/java/com/yihu/iot/data_input/dao/DataStandardDao.java

@@ -1,4 +1,4 @@
package com.yihu.iot.data_input.dao;
package com.yihu.iot.datainput.dao;
import com.yihu.jw.iot.data_input.DataStandardDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
@@ -7,8 +7,8 @@ import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
public interface DataStandardDao extends PagingAndSortingRepository<DataStandardDO, Long>, JpaSpecificationExecutor<DataStandardDO> {
public interface DataStandardDao extends PagingAndSortingRepository<DataStandardDO, String>, JpaSpecificationExecutor<DataStandardDO> {
    @Query("baseName,itemCode,itemName,itemType,required,itemValueMin,itemValueMax from DataStandardDO" )
    @Query("select baseName,itemCode,itemName,itemType,required,itemValueMin,itemValueMax from DataStandardDO" )
    List<DataStandardDO>  getList();
}

svr/svr-iot/src/main/java/com/yihu/iot/data_input/enums/DataDeviceTypeEnum.java

@@ -1,4 +1,4 @@
package com.yihu.iot.data_input.enums;
package com.yihu.iot.datainput.enums;
import org.apache.commons.lang.StringUtils;
@@ -7,8 +7,8 @@ import org.apache.commons.lang.StringUtils;
 */
public enum DataDeviceTypeEnum {
    SYSTOLIC("1","血压"),
    BLOOD_SUGAR("2","血糖");
    SYSTOLIC("1","SYSTOLIC"),
    BLOOD_SUGAR("2","BLOOD_SUGAR");
    private String type;
    private String name;

svr/svr-iot/src/main/java/com/yihu/iot/datainput/enums/DataOperationTypeEnum.java

@@ -0,0 +1,32 @@
package com.yihu.iot.datainput.enums;
public enum DataOperationTypeEnum {
    convert("数据标准转换"),
    bindUser("设备注册绑定"),
    upload0("不含居民信息的数据上传"),
    upload1("含居民信息的数据上传"),
    search("数据查询");
    private String name;
    private DataOperationTypeEnum(String name){
        this.name = name;
    }
    public String getName() {
        return name.toString();
    }
    public void setName(String name) {
        this.name = name;
    }
    @Override
    public String toString() {
        return this.name.toString();
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/data_input/service/DataInputService.java

@@ -1,11 +1,12 @@
package com.yihu.iot.data_input.service;
package com.yihu.iot.datainput.service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.base.es.config.ElastricSearchHelper;
import com.yihu.base.es.config.model.SaveModel;
import com.yihu.base.hbase.HBaseHelper;
import com.yihu.iot.data_input.util.RowKeyUtils;
import com.yihu.iot.datainput.enums.DataOperationTypeEnum;
import com.yihu.iot.datainput.util.RowKeyUtils;
import com.yihu.iot.service.device.IotDeviceService;
import com.yihu.jw.iot.device.IotDeviceDO;
import com.yihu.jw.util.date.DateUtil;
@@ -15,9 +16,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.io.UnsupportedEncodingException;
import java.security.NoSuchAlgorithmException;
import java.text.ParseException;
import java.util.*;
/**
@@ -91,13 +89,13 @@ public class DataInputService {
                }
                iotDeviceService.bindUser(deviceDOList);
                //保存日志
                dataProcessLogService.saveLog("","",data_source,"", DateUtils.formatDate(new Date(), DateUtil.yyyy_MM_dd_HH_mm_ss),"1","4","com.yihu.iot.data_input.service.DataInputService.bindUser",0);
                dataProcessLogService.saveLog("","",data_source,"", DateUtils.formatDate(new Date(), DateUtil.yyyy_MM_dd_HH_mm_ss),"1","4","com.yihu.iot.datainput.service.DataInputService.bindUser",DataOperationTypeEnum.bindUser.getName(),0);
            }
        }catch (Exception e){
            logger.error("注册绑定失败");
            //保存日志
            dataProcessLogService.saveLog("","",data_source,"", DateUtils.formatDate(new Date(), DateUtil.yyyy_MM_dd_HH_mm_ss),"1","3","com.yihu.iot.data_input.service.DataInputService.bindUser",1);
            dataProcessLogService.saveLog("","",data_source,"", DateUtils.formatDate(new Date(), DateUtil.yyyy_MM_dd_HH_mm_ss),"1","3","com.yihu.iot.datainput.service.DataInputService.bindUser",DataOperationTypeEnum.bindUser.getName(),1);
            return "fail";
        }
        return "success";
@@ -114,7 +112,7 @@ public class DataInputService {
        }
        iotDeviceService.save(iotDeviceDO);
        //保存日志
        dataProcessLogService.saveLog("","",data_source,"", DateUtils.formatDate(new Date(), DateUtil.yyyy_MM_dd_HH_mm_ss),"1","3","com.yihu.iot.data_input.service.DataInputService.bindUser",1);
        dataProcessLogService.saveLog("","",data_source,"", DateUtils.formatDate(new Date(), DateUtil.yyyy_MM_dd_HH_mm_ss),"1","3","com.yihu.iot.datainput.service.DataInputService.bindUser","",1);
    }
@@ -134,6 +132,9 @@ public class DataInputService {
        String deviceSn = jsonObject.getString("sn");
        String extCode = jsonObject.getString("ext_code");
        String measuretime = jsonObject.getString("measure_time");
        if(null == measuretime){
            measuretime = DateUtils.formatDate(new Date(), DateUtil.yyyy_MM_dd_HH_mm_ss);
        }
        //包含居民身份的数据，对设备数据进行校验绑定，此处包含的信息只有身份证号和用户名以及设备序列号，如果设备库中存在该序号的设备，则对绑定居民进行修改，改为当前居民，如果没有则跳过
        if(jsonObject.containsKey("idcard") && jsonObject.containsKey("username")){
            String idcard = jsonObject.getString("idcard");
@@ -185,10 +186,10 @@ public class DataInputService {
        } catch (Exception e) {
            e.printStackTrace();
            //保存日志
            dataProcessLogService.saveLog(fileName,fileAbsPath,dataSource,"", DateUtils.formatDate(new Date(), DateUtil.yyyy_MM_dd_HH_mm_ss),"1","3","com.yihu.iot.data_input.service.DataInputService.uploadData",1);
            dataProcessLogService.saveLog(fileName,fileAbsPath,dataSource,"", DateUtils.formatDate(new Date(), DateUtil.yyyy_MM_dd_HH_mm_ss),"1","3","com.yihu.iot.datainput.service.DataInputService.uploadData", DataOperationTypeEnum.upload1.getName(),1);
        }
        //保存日志
        dataProcessLogService.saveLog(fileName,fileAbsPath,dataSource,"", DateUtils.formatDate(new Date(), DateUtil.yyyy_MM_dd_HH_mm_ss),"1","4","com.yihu.iot.data_input.service.DataInputService.uploadData",0);
        dataProcessLogService.saveLog(fileName,fileAbsPath,dataSource,"", DateUtils.formatDate(new Date(), DateUtil.yyyy_MM_dd_HH_mm_ss),"1","4","com.yihu.iot.datainput.service.DataInputService.uploadData",DataOperationTypeEnum.upload1.getName(),0);
        return "success";
    }

svr/svr-iot/src/main/java/com/yihu/iot/data_input/service/DataProcessLogService.java

@@ -1,7 +1,7 @@
package com.yihu.iot.data_input.service;
package com.yihu.iot.datainput.service;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.iot.data_input.dao.DataProcessLogDao;
import com.yihu.iot.datainput.dao.DataProcessLogDao;
import com.yihu.jw.iot.data_input.DataProcessLogDO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -22,15 +22,16 @@ public class DataProcessLogService extends BaseJpaService<DataProcessLogDO,DataP
        this.dataProcessLogDao.save(list);
    }
    public void saveLog(String fileName,String fileAbsPath,String dataSource,String receiveTime,String uploadTime,String processType,String status,String desc,int failCount){
    public void saveLog(String fileName,String fileAbsPath,String dataSource,String receiveTime,String uploadTime,String processType,String status,String processInterface,String desc,int failCount){
        DataProcessLogDO dataProcessLog = new DataProcessLogDO();
        dataProcessLog.setFileName(fileName);
        dataProcessLog.setFileName(fileAbsPath);
        dataProcessLog.setFileName(dataSource);
        dataProcessLog.setFileName(receiveTime);
        dataProcessLog.setFileName(uploadTime);
        dataProcessLog.setFileAbsoultePath(fileAbsPath);
        dataProcessLog.setDataSource(dataSource);
        dataProcessLog.setReceiveTime(receiveTime);
        dataProcessLog.setUploadTime(uploadTime);
        dataProcessLog.setProcessType(processType);
        dataProcessLog.setProcessStatus(status);
        dataProcessLog.setProcessInterface(processInterface);
        dataProcessLog.setProcessDes(desc);
        dataProcessLog.setFileCount(failCount);
        dataProcessLogDao.save(dataProcessLog);

svr/svr-iot/src/main/java/com/yihu/iot/data_input/service/DataStandardConvertService.java

@@ -1,8 +1,9 @@
package com.yihu.iot.data_input.service;
package com.yihu.iot.datainput.service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.iot.data_input.enums.DataDeviceTypeEnum;
import com.yihu.iot.datainput.enums.DataDeviceTypeEnum;
import com.yihu.iot.datainput.enums.DataOperationTypeEnum;
import com.yihu.jw.iot.data_input.DataStandardDO;
import com.yihu.jw.util.date.DateUtil;
import org.apache.http.client.utils.DateUtils;
@@ -62,7 +63,7 @@ public class DataStandardConvertService {
    public String iconvert(String oldJson){
        JSONObject jsonObject = JSONObject.parseObject(oldJson);
        //如果没有授权或者数据来源，则表示数据异常
        if(jsonObject.containsKey("access_token") || jsonObject.containsKey("data_source")){
        if(!jsonObject.containsKey("access_token") || !jsonObject.containsKey("data_source")){
            logger.warn("传过来的数据无有效access_token或data_source",oldJson);
            return "";
        }
@@ -75,7 +76,7 @@ public class DataStandardConvertService {
        String access_token = (String)jsonObject.get("access_token");
        String data_source = (String)jsonObject.get("data_source");
        String sn = (String)jsonObject.get("deviceSn");
        String deviceType = (String)jsonObject.get("deviceType");
        String deviceType = jsonObject.getString("deviceType");
        String ext_code = (String)jsonObject.get("userType");
        String data = (String)jsonObject.get("userType") + (String)jsonObject.get("unit");
        String device_name = (String)jsonObject.get("device_name");
@@ -100,7 +101,7 @@ public class DataStandardConvertService {
        dataJsonObject.put(deviceDataName,data);
        jsonArray.add(dataJsonObject);
        //保存日志
        dataProcessLogService.saveLog("","",data_source,measure_time, DateUtils.formatDate(new Date(),DateUtil.yyyy_MM_dd_HH_mm_ss),"1","4","com.yihu.iot.data_input.service.DataStandardConvertService.iconvert",0);
        dataProcessLogService.saveLog("","",data_source,measure_time, DateUtils.formatDate(new Date(),DateUtil.yyyy_MM_dd_HH_mm_ss),"1","4","com.yihu.iot.datainput.service.DataStandardConvertService.iconvert", DataOperationTypeEnum.convert.getName(),0);
        //转换后的标准json数据
        return newJsonObject.toJSONString();
    }

svr/svr-iot/src/main/java/com/yihu/iot/data_input/service/DataStandardService.java

@@ -1,7 +1,7 @@
package com.yihu.iot.data_input.service;
package com.yihu.iot.datainput.service;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.iot.data_input.dao.DataStandardDao;
import com.yihu.iot.datainput.dao.DataStandardDao;
import com.yihu.jw.iot.data_input.DataStandardDO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

svr/svr-iot/src/main/java/com/yihu/iot/data_input/util/RowKeyUtils.java

@@ -1,4 +1,4 @@
package com.yihu.iot.data_input.util;
package com.yihu.iot.datainput.util;
import org.springframework.util.DigestUtils;
import java.io.UnsupportedEncodingException;

svr/svr-iot/src/main/java/com/yihu/iot/service/device/IotDeviceService.java

@@ -5,6 +5,7 @@ import com.yihu.iot.dao.device.IotDeviceDao;
import com.yihu.jw.iot.device.IotDeviceDO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@@ -25,6 +26,7 @@ public class IotDeviceService extends BaseJpaService<IotDeviceDO,IotDeviceDao> {
     * 设备注册及绑定
     * @param iotDeviceDO
     */
    @Transactional
    public void bindUser(List<IotDeviceDO> iotDeviceDO){
        this.batchInsert(iotDeviceDO);
    }

svr/svr-iot/src/main/resources/application.yml

@@ -24,6 +24,24 @@ spring:
    min-evictable-idle-time-millis: 3600000 #连接池中连接，在时间段内一直空闲，被逐出连接池的时间(1000*60*60)，以毫秒为单位
    time-between-eviction-runs-millis: 300000 #在空闲连接回收器线程运行期间休眠的时间值,以毫秒为单位，一般比minEvictableIdleTimeMillis小
  data:
    elasticsearch: #ElasticsearchProperties
      cluster-name: jkzl #默认即为elasticsearch  集群名
      cluster-nodes: 172.17.110.217:9300,172.17.110.128:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
      local: false #是否本地连接
#      properties: # Additional properties used to configure the client.
  # JEST (Elasticsearch HTTP client) (JestProperties)
  elasticsearch:
    jest:
      uris: http://localhost: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.
#hibernate 配置
hibernate:
  dialect: org.hibernate.dialect.MySQL5Dialect
@@ -54,23 +72,7 @@ es:
data:
  elasticsearch: #ElasticsearchProperties
    cluster-name: jkzl #默认即为elasticsearch  集群名
    cluster-nodes: 172.17.110.217:9300,172.17.110.128:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
    local: false #是否本地连接
    properties: # Additional properties used to configure the client.
  # JEST (Elasticsearch HTTP client) (JestProperties)
elasticsearch:
  jest:
    uris: http://localhost:9200
    connection-timeout: # 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.
hadoop:
  hbase-properties: