Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-pla...

zhaoxiaohao

2020-04-07 069ce0c434d8eb0706ce50ac67040a6283f1266f

Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

 kidgrow-business/kidgrow-code-generator/src/main/resources/template/Controller.java.vm

@@ -15,6 +15,7 @@
import com.kidgrow.common.model.*;

import org.springframework.validation.BindingResult;
import org.springframework.validation.ObjectError;
import javax.validation.Valid;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/BusinessRecordsMapper.java

@@ -30,5 +30,5 @@
     * @param
     * @return BusinessRecords对象
     */
    BusinessRecords findByObject(BusinessRecords businessRecords);
    BusinessRecords findByObject(@Param("p") BusinessRecords businessRecords);
}

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/BusinessServerMapper.java

@@ -30,5 +30,5 @@
     * @param
     * @return BusinessServer对象
     */
    BusinessServer findByObject(BusinessServer businessServer);
    BusinessServer findByObject(@Param("p") BusinessServer businessServer);
}

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/DataNeedMapper.java

@@ -30,5 +30,5 @@
     * @param
     * @return DataNeed对象
     */
    DataNeed findByObject(DataNeed dataNeed);
    DataNeed findByObject(@Param("p") DataNeed dataNeed);
}

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/DoctorAnswerMapper.java

@@ -30,5 +30,5 @@
     * @param
     * @return DoctorAnswer对象
     */
    DoctorAnswer findByObject(DoctorAnswer doctorAnswer);
    DoctorAnswer findByObject(@Param("p") DoctorAnswer doctorAnswer);
}

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/DoctorServerMapper.java

@@ -30,5 +30,5 @@
     * @param
     * @return DoctorServer对象
     */
    DoctorServer findByObject(DoctorServer doctorServer);
    DoctorServer findByObject(@Param("p") DoctorServer doctorServer);
}

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/DoctorSigningMapper.java

@@ -30,5 +30,5 @@
     * @param
     * @return DoctorSigning对象
     */
    DoctorSigning findByObject(DoctorSigning doctorSigning);
    DoctorSigning findByObject(@Param("p") DoctorSigning doctorSigning);
}

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/DoctorTempleteMapper.java

@@ -30,5 +30,5 @@
     * @param
     * @return DoctorTemplete对象
     */
    DoctorTemplete findByObject(DoctorTemplete doctorTemplete);
    DoctorTemplete findByObject(@Param("p") DoctorTemplete doctorTemplete);
}

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/HospitalScreeningMapper.java

@@ -30,5 +30,5 @@
     * @param
     * @return HospitalScreening对象
     */
    HospitalScreening findByObject(HospitalScreening hospitalScreening);
    HospitalScreening findByObject(@Param("p") HospitalScreening hospitalScreening);
}

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/ProductOrderDetailMapper.java

@@ -30,5 +30,5 @@
     * @param
     * @return ProductOrderDetail对象
     */
    ProductOrderDetail findByObject(ProductOrderDetail productOrderDetail);
    ProductOrderDetail findByObject(@Param("p") ProductOrderDetail productOrderDetail);
}

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/ProductOrderMapper.java

@@ -30,5 +30,5 @@
     * @param
     * @return ProductOrder对象
     */
    ProductOrder findByObject(ProductOrder productOrder);
    ProductOrder findByObject(@Param("p") ProductOrder productOrder);
}

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/SysFeedbackMapper.java

@@ -30,5 +30,5 @@
     * @param
     * @return SysFeedback对象
     */
    SysFeedback findByObject(SysFeedback sysFeedback);
    SysFeedback findByObject(@Param("p") SysFeedback sysFeedback);
}

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/SysLoggerMapper.java

@@ -30,5 +30,5 @@
     * @param
     * @return SysLogger对象
     */
    SysLogger findByObject(SysLogger sysLogger);
    SysLogger findByObject(@Param("p") SysLogger sysLogger);
}

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/mapper/SysProductMapper.java

@@ -30,5 +30,5 @@
     * @param
     * @return SysProduct对象
     */
    SysProduct findByObject(SysProduct sysProduct);
    SysProduct findByObject(@Param("p") SysProduct sysProduct);
}

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessRecordsMapper.xml

@@ -76,6 +76,7 @@
        from business_records
        <include refid="where"/>
        order by id desc
        limit 1
    </select>

    <!--定义根据-BusinessRecords当作查询条件返回对象集合-->

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/BusinessServerMapper.xml

@@ -64,6 +64,7 @@
        from business_server
        <include refid="where"/>
        order by id desc
        limit 1
    </select>

    <!--定义根据-BusinessServer当作查询条件返回对象集合-->

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DataNeedMapper.xml

@@ -82,6 +82,7 @@
        from data_need
        <include refid="where"/>
        order by id desc
        limit 1
    </select>

    <!--定义根据-DataNeed当作查询条件返回对象集合-->

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorAnswerMapper.xml

@@ -46,6 +46,7 @@
        from doctor_answer
        <include refid="where"/>
        order by id desc
        limit 1
    </select>

    <!--定义根据-DoctorAnswer当作查询条件返回对象集合-->

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorServerMapper.xml

@@ -55,6 +55,7 @@
        from doctor_server
        <include refid="where"/>
        order by id desc
        limit 1
    </select>

    <!--定义根据-DoctorServer当作查询条件返回对象集合-->

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorSigningMapper.xml

@@ -46,6 +46,7 @@
        from doctor_signing
        <include refid="where"/>
        order by id desc
        limit 1
    </select>

    <!--定义根据-DoctorSigning当作查询条件返回对象集合-->

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml

@@ -79,6 +79,7 @@
        from doctor_templete
        <include refid="where"/>
        order by id desc
        limit 1
    </select>

    <!--定义根据-DoctorTemplete当作查询条件返回对象集合-->

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.xml

@@ -61,6 +61,7 @@
        from hospital_screening
        <include refid="where"/>
        order by id desc
        limit 1
    </select>

    <!--定义根据-HospitalScreening当作查询条件返回对象集合-->

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml

@@ -73,6 +73,7 @@
        from product_order_detail
        <include refid="where"/>
        order by id desc
        limit 1
    </select>

    <!--定义根据-ProductOrderDetail当作查询条件返回对象集合-->

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.xml

@@ -76,6 +76,7 @@
        from product_order
        <include refid="where"/>
        order by id desc
        limit 1
    </select>

    <!--定义根据-ProductOrder当作查询条件返回对象集合-->

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysFeedbackMapper.xml

@@ -73,6 +73,7 @@
        from sys_feedback
        <include refid="where"/>
        order by id desc
        limit 1
    </select>

    <!--定义根据-SysFeedback当作查询条件返回对象集合-->

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysLoggerMapper.xml

@@ -46,6 +46,7 @@
        from sys_logger
        <include refid="where"/>
        order by id desc
        limit 1
    </select>

    <!--定义根据-SysLogger当作查询条件返回对象集合-->

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml

@@ -67,6 +67,7 @@
        from sys_product
        <include refid="where"/>
        order by id desc
        limit 1
    </select>

    <!--定义根据-SysProduct当作查询条件返回对象集合-->

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysOrganization.java

File was deleted

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysUserOrg.java

File was deleted

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/mapper/SysAreaMapper.java

@@ -30,5 +30,5 @@
     * @param
     * @return SysArea对象
     */
    SysArea findByObject(SysArea sysArea);
    SysArea findByObject(@Param("p") SysArea sysArea);
}

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/mapper/SysCompanyMapper.java

@@ -30,5 +30,5 @@
     * @param
     * @return SysCompany对象
     */
    SysCompany findByObject(SysCompany sysCompany);
    SysCompany findByObject(@Param("p") SysCompany sysCompany);
}

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/mapper/SysDepartmentMapper.java

@@ -30,5 +30,5 @@
     * @param
     * @return SysDepartment对象
     */
    SysDepartment findByObject(SysDepartment sysDepartment);
    SysDepartment findByObject(@Param("p") SysDepartment sysDepartment);
}

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/mapper/SysDictionariesMapper.java

@@ -30,5 +30,5 @@
     * @param
     * @return SysDictionaries对象
     */
    SysDictionaries findByObject(SysDictionaries sysDictionaries);
    SysDictionaries findByObject(@Param("p") SysDictionaries sysDictionaries);
}

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/mapper/SysDoctorMapper.java

@@ -30,5 +30,5 @@
     * @param
     * @return SysDoctor对象
     */
    SysDoctor findByObject(SysDoctor sysDoctor);
    SysDoctor findByObject(@Param("p") SysDoctor sysDoctor);
}

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/mapper/SysHospitalMapper.java

@@ -30,5 +30,5 @@
     * @param
     * @return SysHospital对象
     */
    SysHospital findByObject(SysHospital sysHospital);
    SysHospital findByObject(@Param("p") SysHospital sysHospital);
}

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/mapper/SysLoggerMapper.java

@@ -30,5 +30,5 @@
     * @param
     * @return SysLogger对象
     */
    SysLogger findByObject(SysLogger sysLogger);
    SysLogger findByObject(@Param("p") SysLogger sysLogger);
}

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/mapper/SysOrganizationMapper.java

@@ -30,7 +30,7 @@
     * @param
     * @return SysOrganization对象
     */
    SysOrganization findByObject(SysOrganization sysOrganization);
    SysOrganization findByObject(@Param("p") SysOrganization sysOrganization);


    /**

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/mapper/SysUserLogsMapper.java

@@ -30,5 +30,5 @@
     * @param
     * @return SysUserLogs对象
     */
    SysUserLogs findByObject(SysUserLogs sysUserLogs);
    SysUserLogs findByObject(@Param("p") SysUserLogs sysUserLogs);
}

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/mapper/SysUserOrgMapper.java

@@ -30,5 +30,5 @@
     * @param
     * @return SysUserOrg对象
     */
    SysUserOrg findByObject(SysUserOrg sysUserOrg);
    SysUserOrg findByObject(@Param("p") SysUserOrg sysUserOrg);
}

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysAreaMapper.xml

@@ -52,6 +52,7 @@
        from sys_area
        <include refid="where"/>
        order by id desc
        limit 1
    </select>

    <!--定义根据-SysArea当作查询条件返回对象集合-->

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysCompanyMapper.xml

@@ -73,6 +73,7 @@
        from sys_company
        <include refid="where"/>
        order by id desc
        limit 1
    </select>

    <!--定义根据-SysCompany当作查询条件返回对象集合-->

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDepartmentMapper.xml

@@ -61,6 +61,7 @@
        from sys_department
        <include refid="where"/>
        order by id desc
        limit 1
    </select>

    <!--定义根据-SysDepartment当作查询条件返回对象集合-->

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDictionariesMapper.xml

@@ -58,6 +58,7 @@
        from sys_dictionaries
        <include refid="where"/>
        order by id desc
        limit 1
    </select>

    <!--定义根据-SysDictionaries当作查询条件返回对象集合-->

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDoctorMapper.xml

@@ -100,6 +100,7 @@
        from sys_doctor
        <include refid="where"/>
        order by id desc
        limit 1
    </select>

    <!--定义根据-SysDoctor当作查询条件返回对象集合-->

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml

@@ -118,6 +118,7 @@
        from sys_hospital
        <include refid="where"/>
        order by id desc
        limit 1
    </select>

    <!--定义根据-SysHospital当作查询条件返回对象集合-->

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysLoggerMapper.xml

@@ -46,6 +46,7 @@
        from sys_logger
        <include refid="where"/>
        order by id desc
        limit 1
    </select>

    <!--定义根据-SysLogger当作查询条件返回对象集合-->

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysOrganizationMapper.xml

@@ -58,16 +58,17 @@
    </sql>

    <!--定义根据-SysOrganization当作查询条件返回对象-->
    <select id="findByObject" resultType="com.kidgrow.usercenter.model.SysOrganization">
    <select id="findByObject" resultType="com.kidgrow.common.model.SysOrganization">
        select
        <include refid="Column_List"/>
        from sys_organization
        <include refid="where"/>
        order by id desc
        limit 1
    </select>

    <!--定义根据-SysOrganization当作查询条件返回对象集合-->
    <select id="findList" resultType="com.kidgrow.usercenter.model.SysOrganization">
    <select id="findList" resultType="com.kidgrow.common.model.SysOrganization">
        select
        <include refid="Column_List"/>
        from sys_organization

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserLogsMapper.xml

@@ -52,6 +52,7 @@
        from sys_user_logs
        <include refid="where"/>
        order by id desc
        limit 1
    </select>

    <!--定义根据-SysUserLogs当作查询条件返回对象集合-->

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserOrgMapper.xml

@@ -49,16 +49,17 @@
    </sql>

    <!--定义根据-SysUserOrg当作查询条件返回对象-->
    <select id="findByObject" resultType="com.kidgrow.usercenter.model.SysUserOrg">
    <select id="findByObject" resultType="com.kidgrow.common.model.SysUserOrg">
        select
        <include refid="Column_List"/>
        from sys_user_org
        <include refid="where"/>
        order by id desc
        limit 1
    </select>

    <!--定义根据-SysUserOrg当作查询条件返回对象集合-->
    <select id="findList" resultType="com.kidgrow.usercenter.model.SysUserOrg">
    <select id="findList" resultType="com.kidgrow.common.model.SysUserOrg">
        select
        <include refid="Column_List"/>
        from sys_user_org

 kidgrow-config/src/main/resources/application-dev.properties

@@ -18,7 +18,7 @@
kidgrow.druid.loginpwd=123456

#eureka \u6CE8\u518C\u4E2D\u5FC3Url
kidgrow.eureka.client.serviceUrl.defaultZone=http://127.0.0.1:9001/eureka/
kidgrow.eureka.client.serviceUrl.defaultZone=http://192.168.2.240:9001/eureka/
kidgrow.eureka.instance.hostname=127.0.0.1
##eureka client\u53D1\u9001\u5FC3\u8DF3\u7ED9server\u7AEF\u7684\u9891\u7387
eureka.instance.lease-renewal-interval-in-seconds=30