Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	svr/svr-wlyy-health-bank/src/main/resources/application.yml
#	svr/svr-wlyy-specialist/src/main/resources/application.yml

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

@@ -41,8 +41,8 @@ public class DataProcessLogDO extends UuidIdentityEntity implements Serializable
    @Column(name = "process_des")
    private String processDes;
    @Column(name = "fail_count")
    private int fileCount;
    /*@Column(name = "fail_count")
    private int fileCount;*/
    public String getFileName() {
@@ -109,13 +109,13 @@ public class DataProcessLogDO extends UuidIdentityEntity implements Serializable
        this.processDes = processDes;
    }
    public int getFileCount() {
    /*public int getFileCount() {
        return fileCount;
    }
    public void setFileCount(int fileCount) {
        this.fileCount = fileCount;
    }
    }*/
    public String getProcessInterface() {
        return processInterface;

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/PatientDiagnosisInformationDO.java

@@ -0,0 +1,181 @@
package com.yihu.jw.entity.specialist.rehabilitation;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
/**
 * Created by humingfen on 2019/2/11.
 */
@Entity
@Table(name = "wlyy_patient_diagnosis_information")
public class PatientDiagnosisInformationDO extends UuidIdentityEntity implements Serializable {
    @Column(name = "saas_id")
    private String saasId;
    @Column(name = "plan_id")
    private String planId;//居民康复套餐code
    @Column(name = "patient")
    private String patient;//居民code
    @Column(name = "patient_name")
    private String patientName;//居民姓名
    @Column(name = "hospital")
    private String hospital;//诊疗医院code
    @Column(name = "hospital_name")
    private String hospitalName;//诊疗医院名称
    @Column(name = "department")
    private String department;//入院科室
    @Column(name = "attending_doctor_code")
    private String attendingDoctorCode;//主治医生code
    @Column(name = "attending_doctor_name")
    private String attendingDoctorName;//主治医生名称
    @Column(name = "admitting_diagnosis")
    private String admittingDiagnosis;//入院诊断
    @Column(name = "discharge_diagnosis")
    private String dischargeDiagnosis;//出院诊断
    @Column(name = "advice")
    private String advice;//医嘱小结
    @Column(name = "discharge_time")
    private Date dischargerTime;
    @Column(name = "create_time")
    protected Date createTime;//创建时间
    @Column(name = "create_user")
    protected String createUser;//创建者
    @Column(name = "create_user_name")
    protected String createUserName;//创建者
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    public String getPlanId() {
        return planId;
    }
    public void setPlanId(String planId) {
        this.planId = planId;
    }
    public String getPatient() {
        return patient;
    }
    public void setPatient(String patient) {
        this.patient = patient;
    }
    public String getPatientName() {
        return patientName;
    }
    public void setPatientName(String patientName) {
        this.patientName = patientName;
    }
    public String getHospital() {
        return hospital;
    }
    public void setHospital(String hospital) {
        this.hospital = hospital;
    }
    public String getHospitalName() {
        return hospitalName;
    }
    public void setHospitalName(String hospitalName) {
        this.hospitalName = hospitalName;
    }
    public String getDepartment() {
        return department;
    }
    public void setDepartment(String department) {
        this.department = department;
    }
    public String getAttendingDoctorCode() {
        return attendingDoctorCode;
    }
    public void setAttendingDoctorCode(String attendingDoctorCode) {
        this.attendingDoctorCode = attendingDoctorCode;
    }
    public String getAttendingDoctorName() {
        return attendingDoctorName;
    }
    public void setAttendingDoctorName(String attendingDoctorName) {
        this.attendingDoctorName = attendingDoctorName;
    }
    public String getAdmittingDiagnosis() {
        return admittingDiagnosis;
    }
    public void setAdmittingDiagnosis(String admittingDiagnosis) {
        this.admittingDiagnosis = admittingDiagnosis;
    }
    public String getDischargeDiagnosis() {
        return dischargeDiagnosis;
    }
    public void setDischargeDiagnosis(String dischargeDiagnosis) {
        this.dischargeDiagnosis = dischargeDiagnosis;
    }
    public String getAdvice() {
        return advice;
    }
    public void setAdvice(String advice) {
        this.advice = advice;
    }
    public Date getDischargerTime() {
        return dischargerTime;
    }
    public void setDischargerTime(Date dischargerTime) {
        this.dischargerTime = dischargerTime;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    public String getCreateUser() {
        return createUser;
    }
    public void setCreateUser(String createUser) {
        this.createUser = createUser;
    }
    public String getCreateUserName() {
        return createUserName;
    }
    public void setCreateUserName(String createUserName) {
        this.createUserName = createUserName;
    }
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/specialist/SpecialistMapping.java

@@ -123,4 +123,10 @@ public class SpecialistMapping {
        public static final String selectByDoctor = "/selectByDoctor";
        public static final String getServiceItemsAfterStop="getServiceItemsAfterStop";
    }
    public static class diagnosisInformation{
        public static final String createDiagnosisInformation = "/createDiagnosisInformation";
        public static final String findDiagnosisInformationByPlanId = "/findDiagnosisInformationByPlanId";
        public static final String findDiagnosisInformationByPatient = "/findDiagnosisInformationByPatient";
    }
}

svr/svr-iot/pom.xml

@@ -46,18 +46,18 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-aop</artifactId>
        </dependency>-->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-eureka</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-config</artifactId>
        </dependency>
        <!--<dependency>-->
            <!--<groupId>org.springframework.boot</groupId>-->
            <!--<artifactId>spring-boot-starter-actuator</artifactId>-->
        <!--</dependency>-->
        <!--<dependency>-->
            <!--<groupId>org.springframework.cloud</groupId>-->
            <!--<artifactId>spring-cloud-starter-eureka</artifactId>-->
        <!--</dependency>-->
        <!--<dependency>-->
            <!--<groupId>org.springframework.cloud</groupId>-->
            <!--<artifactId>spring-cloud-starter-config</artifactId>-->
        <!--</dependency>-->
        <dependency>
            <groupId>com.alibaba</groupId>

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

@@ -33,7 +33,7 @@ public class DataProcessLogService extends BaseJpaService<DataProcessLogDO,DataP
        dataProcessLog.setProcessStatus(status);
//        dataProcessLog.setProcessInterface(processInterface);
        dataProcessLog.setProcessDes(desc);
        dataProcessLog.setFileCount(failCount);
        /*dataProcessLog.setFileCount(failCount);*/
        dataProcessLogDao.save(dataProcessLog);
    }
}

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

@@ -3,8 +3,9 @@ server:
  port: 10050
spring:
  jmx:
    default-domain: svr-iot
  application:
    name:  svr-iot  #注册到发现服务的id 如果id一样 eurika会自动做负载
  datasource:
    driver-class-name: com.mysql.jdbc.Driver
    max-active: 50
@@ -22,14 +23,17 @@ spring:
    test-while-idle: true #指明连接是否被空闲连接回收器(如果有)进行检验，如果检测失败，则连接将被从池中去除
    min-evictable-idle-time-millis: 3600000 #连接池中连接，在时间段内一直空闲，被逐出连接池的时间(1000*60*60)，以毫秒为单位
    time-between-eviction-runs-millis: 300000 #在空闲连接回收器线程运行期间休眠的时间值,以毫秒为单位，一般比minEvictableIdleTimeMillis小
  # Elasticsearch Transport
  data:
    elasticsearch: #ElasticsearchProperties
      cluster-name: jkzl #默认即为elasticsearch  集群名
      local: false #是否本地连接
      properties: # Additional properties used to configure the client.
        enable: true
  # JEST (Elasticsearch HTTP client) (JestProperties)
  elasticsearch:
    cluster-name: jkzl #默认即为elasticsearch  集群名
    cluster-nodes: 172.19.103.45:9300,172.19.103.68:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
    client-transport-sniff: false
    # JEST (Elasticsearch HTTP client) (JestProperties)
    jest:
      uris: http://172.19.103.45:9200,http://172.19.103.68: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.
@@ -45,7 +49,6 @@ hibernate:
    naming_strategy: org.hibernate.cfg.ImprovedNamingStrategy
fast-dfs:
  tracker-server: 172.19.103.54:22122 #服务器地址
  connect-timeout: 2 #链接超时时间
  network-timeout: 30
  charset: ISO8859-1 #编码
@@ -58,25 +61,42 @@ fast-dfs:
    max-size: 20
    wait-time: 500
#暂时先不用hbase，先注释掉
#hadoop:
#  hbase-properties:
#    hbase.zookeeper.property.clientPort: 2181
#    zookeeper.znode.parent: /hbase-unsecure
#    hbase.zookeeper.quorum:  node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
#  user:
#    name: root
---
spring:
  profiles: jwdev
  datasource:
    url: jdbc:mysql://172.19.103.77:3306/xmiot?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: 123456
  elasticsearch:
    cluster-name: jkzl #默认即为elasticsearch  集群名
    cluster-nodes: 172.19.103.45:9300,172.19.103.68:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
    jest:
      uris: http://172.19.103.45:9200,http://172.19.103.68:9200
fast-dfs:
  tracker-server: 172.19.103.54:22122 #服务器地址
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
---
spring:
  profiles: dev
  datasource:
    url: jdbc:mysql://172.26.0.204:3306/xmiot?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: ssgg
    password: ssgg@jkzl2019
  elasticsearch:
    cluster-name: jkzl #默认即为elasticsearch  集群名
    cluster-nodes: 172.26.0.203:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
    jest:
      uris: http://172.26.0.202:9200
fast-dfs:
  tracker-server: 172.26.0.200:22122 #服务器地址
fastDFS:
  fastdfs_file_url: http://172.26.0.200:22122/
---
spring:
  profiles: jwtest
@@ -84,6 +104,13 @@ spring:
    url: jdbc:mysql://172.19.103.77:3306/xmiot?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: 123456
  elasticsearch:
    cluster-name: jkzl #默认即为elasticsearch  集群名
    cluster-nodes: 172.19.103.45:9300,172.19.103.68:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
    jest:
      uris: http://172.19.103.45:9200,http://172.19.103.68:9200
fast-dfs:
  tracker-server: 172.19.103.54:22122 #服务器地址
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
@@ -94,5 +121,12 @@ spring:
    url: jdbc:mysql://172.19.103.77:3306/xmiot?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: 123456
  elasticsearch:
    cluster-name: jkzl #默认即为elasticsearch  集群名
    cluster-nodes: 172.19.103.45:9300,172.19.103.68:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
    jest:
      uris: http://172.19.103.45:9200,http://172.19.103.68:9200
fast-dfs:
  tracker-server: 172.19.103.54:22122 #服务器地址
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/

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

@@ -1,24 +1,32 @@
spring:
  application:
    name: svr-iot
  cloud:
    config:
      failFast: true
      username: jw
      password: jkzl
---
spring:
  profiles: jwdev
  cloud:
    config:
      uri: ${wlyy.spring.config.uri:http://172.17.110.212:1221}
      label: ${wlyy.spring.config.label:jwdev}
---
spring:
  profiles: jwtest
  cloud:
    config:
      uri: ${wlyy.spring.config.uri:http://172.17.110.212:1221}
      label: ${wlyy.spring.config.label:jwdev}
#  cloud:
                                               #    config:
                                               #      failFast: false
                                               #      username: jw
                                               #      password: jkzl
                                               #
                                               #---
                                               #spring:
                                               #  profiles: jwdev
                                               #  cloud:
                                               #    config:
                                               #      uri: ${wlyy.spring.config.uri:http://172.17.110.212:1221}
                                               #      label: ${wlyy.spring.config.label:jwdev}
                                               #
                                               #---
                                               #spring:
                                               #  profiles: dev
                                               #  cloud:
                                               #    config:
                                               #      uri: ${wlyy.spring.config.uri:http://localhost:1221}
                                               #      label: ${wlyy.spring.config.label:dev}
                                               #
                                               #---
                                               #spring:
                                               #  profiles: jwtest
                                               #  cloud:
                                               #    config:
                                               #      uri: ${wlyy.spring.config.uri:http://172.17.110.212:1221}
                                               #      label: ${wlyy.spring.config.label:jwdev}

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

@@ -35,7 +35,7 @@ hibernate:
  implicit_naming_strategy: org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyHbmImpl
fast-dfs:
  tracker-server: 192.168.131.174:8761 #服务器地址
  tracker-server: 172.26.0.110:22122 #服务器地址
  connect-timeout: 2 #链接超时时间
  network-timeout: 30
  charset: ISO8859-1 #编码

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/controller/rehabilitation/DiagnosisInformationController.java

@@ -0,0 +1,73 @@
package com.yihu.jw.controller.rehabilitation;
import com.yihu.jw.entity.specialist.rehabilitation.PatientDiagnosisInformationDO;
import com.yihu.jw.entity.specialist.rehabilitation.RehabilitationPlanTemplateDO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.specialist.SpecialistMapping;
import com.yihu.jw.service.rehabilitation.DiagnosisInformationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.sleuth.Tracer;
import org.springframework.web.bind.annotation.*;
/**
 * Created by humingfen on 2019/2/11.
 */
@RestController
@RequestMapping(SpecialistMapping.api_specialist_common)
@Api(tags = "诊疗信息管理相关操作", description = "诊疗信息相关操作")
public class DiagnosisInformationController extends EnvelopRestEndpoint {
    @Autowired
    private DiagnosisInformationService diagnosisInformationService;
    @Autowired
    private Tracer tracer;
    @PostMapping(value = SpecialistMapping.diagnosisInformation.createDiagnosisInformation)
    @ApiOperation(value = "诊疗信息创建")
    public Envelop createDiagnosisInformation(@ApiParam(name = "diagnosisInformationJson", value = "实体JSON")
                                                       @RequestParam(value = "diagnosisInformationJson")String diagnosisInformationJson){
        try {
            PatientDiagnosisInformationDO diagnosisInformationDO = toEntity(diagnosisInformationJson, PatientDiagnosisInformationDO.class);
            return diagnosisInformationService.createDiagnosisInformation(diagnosisInformationDO);
        }catch (Exception e){
            e.printStackTrace();
            tracer.getCurrentSpan().logEvent(e.getMessage());
            return ObjEnvelop.getError(e.getMessage());
        }
    }
    @GetMapping(value = SpecialistMapping.diagnosisInformation.findDiagnosisInformationByPlanId)
    @ApiOperation(value = "根据康复计划id查找诊疗信息")
    public Envelop findDiagnosisInformationByPlanId(@ApiParam(name = "planId", value = "康复计划id")
                                              @RequestParam(value = "planId") String planId){
        try {
            return diagnosisInformationService.findDiagnosisInformationByPlanId(planId);
        }catch (Exception e){
            e.printStackTrace();
            tracer.getCurrentSpan().logEvent(e.getMessage());
            return ObjEnvelop.getError(e.getMessage());
        }
    }
    @GetMapping(value = SpecialistMapping.diagnosisInformation.findDiagnosisInformationByPatient)
    @ApiOperation(value = "查找居民诊疗信息记录")
    public Envelop findDiagnosisInformationByPatient(@ApiParam(name = "patient", value = "居民code")
                                                    @RequestParam(value = "patient") String patient,
                                                     @ApiParam(name = "page", value = "第几页")
                                                     @RequestParam(value = "page") Integer page,
                                                     @ApiParam(name = "size", value = "行数")
                                                         @RequestParam(value = "size") Integer size){
        try {
            return diagnosisInformationService.findDiagnosisInformationByPatient(patient, page, size);
        }catch (Exception e){
            e.printStackTrace();
            tracer.getCurrentSpan().logEvent(e.getMessage());
            return ObjEnvelop.getError(e.getMessage());
        }
    }
}

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/dao/rehabilitation/PatientDiagnosisInformationDao.java

@@ -0,0 +1,20 @@
package com.yihu.jw.dao.rehabilitation;
import com.yihu.jw.entity.specialist.rehabilitation.PatientDiagnosisInformationDO;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
public interface PatientDiagnosisInformationDao extends PagingAndSortingRepository<PatientDiagnosisInformationDO, Long>,
        JpaSpecificationExecutor<PatientDiagnosisInformationDO> {
    PatientDiagnosisInformationDO findByPlanId(String planId);
    @Query("select d from PatientDiagnosisInformationDO d where d.patient = ?1 order by d.dischargerTime desc")
    Page<PatientDiagnosisInformationDO> findByPatient(String patient, Pageable pageRequest);
}

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/service/SpecialistService.java

@@ -1040,6 +1040,13 @@ public class SpecialistService{
     * @throws Exception
     */
    public ObjEnvelop<SpecialistPatientRelationDO> createPatientInSpeciaRelation(SpecialistPatientRelationDO specialistPatientRelationDO) throws Exception {
        if(StringUtils.isNotEmpty(specialistPatientRelationDO.getId())){
            //获取
            Map<String,Object> m=  getMessageByRelationId(specialistPatientRelationDO.getId());
            if(null!=m){
                updateMessageByRelationId(specialistPatientRelationDO.getId());
            }
        }
        specialistPatientRelationDO.setSignStatus("1");
        specialistPatientRelationDO.setSignDate(new Date());
        specialistPatientRelationDO.setCreateTime(new Date());
@@ -1170,4 +1177,28 @@ public class SpecialistService{
        SpecialistPatientRelationDO specialistPatientRelationDO=null!=relationDOS&&relationDOS.size()>0?relationDOS.get(0):new SpecialistPatientRelationDO();
        return specialistPatientRelationDO;
    }
    /**
     * 根据签约关系id获取消息
     * @param relationId
     * @return
     */
    public Map<String,Object> getMessageByRelationId(String relationId){
        String sql = "select w.* from wlyy_message w where w.type='16' and  w.relation_code='" + relationId + "' ";
       List<Map<String,Object>> res= jdbcTemplate.queryForList(sql);
       if(null!=res&&res.size()>0){
           return res.get(0);
       }
       return null;
    }
    /**
     * 更新消息
     * @param relationId
     * @return
     */
    public void updateMessageByRelationId(String relationId){
        String sql = "update wlyy_message set has_read=0 ,over=0  where relation_code='" + relationId + "' ";
        jdbcTemplate.execute(sql);
    }
}

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/service/rehabilitation/DiagnosisInformationService.java

@@ -0,0 +1,62 @@
package com.yihu.jw.service.rehabilitation;
import com.yihu.jw.dao.rehabilitation.PatientDiagnosisInformationDao;
import com.yihu.jw.entity.specialist.rehabilitation.PatientDiagnosisInformationDO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.rm.specialist.SpecialistMapping;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
/**
 * Created by humingfen on 2019/1/11.
 */
@Service
@Transactional
public class DiagnosisInformationService extends BaseJpaService<PatientDiagnosisInformationDO, PatientDiagnosisInformationDao> {
    @Autowired
    private PatientDiagnosisInformationDao diagnosisInformationDao;
    /**
     * 保存诊疗信息
     * @param diagnosisInformationDO
     * @return
     */
    public Envelop createDiagnosisInformation(PatientDiagnosisInformationDO diagnosisInformationDO) {
        Date date = new Date();
        diagnosisInformationDO.setCreateTime(date);
        diagnosisInformationDao.save(diagnosisInformationDO);
        return Envelop.getSuccess(SpecialistMapping.api_success);
    }
    /**
     * 根据康复计划查找诊疗信息
     * @param planId
     * @return
     */
    public ObjEnvelop findDiagnosisInformationByPlanId(String planId) {
        return ObjEnvelop.getSuccess(SpecialistMapping.api_success, diagnosisInformationDao.findByPlanId(planId));
    }
    /**
     * 获取居民诊疗信息记录
     * @param patient
     * @param page
     * @param size
     * @return
     */
    public PageEnvelop findDiagnosisInformationByPatient(String patient, Integer page, Integer size) {
        PageRequest pageRequest = new PageRequest(page, size);
        Page<PatientDiagnosisInformationDO> list = diagnosisInformationDao.findByPatient(patient,pageRequest);
        return PageEnvelop.getSuccessListWithPage(SpecialistMapping.api_success, list.getContent(), page, size,list.getTotalElements());
    }
}

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

@@ -27,14 +27,14 @@ spring:
  data:
    elasticsearch: #ElasticsearchProperties
      cluster-name: jkzl #默认即为elasticsearch  集群名
      cluster-nodes: 172.19.103.68:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
      cluster-nodes: 172.26.0.115: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.19.103.68:9200
      uris: http://172.26.0.112: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.
@@ -52,7 +52,7 @@ hibernate:
  physical_naming_strategy: org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
  implicit_naming_strategy: org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy
fast-dfs:
  tracker-server: 172.19.103.54:22122 #服务器地址
  tracker-server: 172.26.0.110:22122 #服务器地址
  connect-timeout: 2 #链接超时时间
  network-timeout: 30
  charset: ISO8859-1 #编码
@@ -72,22 +72,22 @@ spring:
  profiles: jwdev
  datasource:
    url: jdbc:mysql://172.19.103.77:3306/wlyy_specialist?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: ceshi
    password: ssgg@jkzl2019
    url: jdbc:mysql://172.26.0.114:3306/wlyy_specialist?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: jkzlehr
  redis:
    host: 172.19.103.88 # Redis server host.
    host: 172.26.0.253 # Redis server host.
    port: 6379 # Redis server port.
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
  fastdfs_file_url: http://172.26.0.110:80/
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:80/
  tracker-server: 172.26.0.110:22122
  public-server: http://172.26.0.110:80/
neiwang:
  enable: true
  wlyy: http://172.19.103.54:22122/
  wlyy: http://172.26.0.110:22122/
base:
  url: http://172.17.110.212:10020/
@@ -110,21 +110,21 @@ spring:
  datasource:
    url: jdbc:mysql://172.26.0.104/wlyy_specialist?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: ceshi
    username: ssgg
    password: ssgg@jkzl2019
  redis:
    host: 172.26.0.253 # Redis server host.
    port: 6379 # Redis server port.
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
  fastdfs_file_url: http://172.26.0.110:80/
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:80/
  tracker-server: 172.26.0.110:22122
  public-server: http://172.26.0.110:80/
neiwang:
  enable: true
  wlyy: http://172.19.103.54:22122/
  wlyy: http://172.26.0.110:22122/
base:
  url: http://172.17.110.212:10020/
@@ -146,21 +146,21 @@ spring:
  datasource:
    url: jdbc:mysql://172.26.0.104/wlyy_specialist?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: linzhou
    password: linzhou
    username: ssgg
    password: ssgg@jkzl2019
  redis:
    host: 172.26.0.253 # Redis server host.
    port: 6379 # Redis server port.
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
  fastdfs_file_url: http://172.26.0.110:80/
fast-dfs:
  tracker-server: 172.19.103.54:22122
  public-server: http://172.19.103.54:80/
  tracker-server: 172.26.0.110:22122
  public-server: http://172.26.0.110:80/
neiwang:
  enable: true
  wlyy: http://172.19.103.54:22122/
  wlyy: http://172.26.0.110:22122/
base:
  url: http://172.17.110.212:10020/

wlyy-parent-pom/pom.xml

@@ -31,7 +31,7 @@
        <repository>
            <id>jkzlRepositories</id>
            <name>jkzlRepositories</name>
            <url>http://172.19.103.43:8081/nexus/content/repositories/jkzlRepositories/</url>
            <url>http://192.168.1.220:8081/nexus/content/repositories/jkzlRepositories/</url>
        </repository>
    </distributionManagement>
@@ -40,7 +40,7 @@
        <repository>
            <id>public</id>
            <name>public</name>
            <url>http://172.19.103.43:8081/nexus/content/groups/public/</url>
            <url>http://192.168.1.220:8081/nexus/content/groups/public/</url>
            <releases>
                <enabled>true</enabled>
            </releases>