Explorar el Código

CAT依赖版本问题

suxiaoyang hace 6 años
padre
commit
8448226ce6

+ 6 - 0
commons-data-hbase/pom.xml

@ -17,6 +17,12 @@
        <dependency>
            <groupId>org.apache.hbase</groupId>
            <artifactId>hbase-client</artifactId>
            <exclusions>
                <exclusion>
                    <groupId>org.slf4j</groupId>
                    <artifactId>*</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
        <dependency>
            <groupId>org.springframework.data</groupId>

+ 4 - 6
commons-web/src/main/java/com/yihu/ehr/controller/EnvelopRestEndPoint.java

@ -1,10 +1,8 @@
package com.yihu.ehr.controller;
import com.yihu.ehr.constants.ErrorCode;
import com.yihu.ehr.util.id.BizObject;
import com.yihu.ehr.util.id.ObjectId;
import com.yihu.ehr.util.rest.Envelop;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import java.util.ArrayList;
@ -19,7 +17,7 @@ import java.util.Random;
 * HTTP响应体格式为JSON。
 * + 成功:会根据各业务逻辑自行决定要返回的数据,各业务模块的返回结构不同。
 * + 失败:{"code":"错误代码", "message":"错误原因"}
 *
 * </p>
 * @author zhiyong
 * @author Sand
 */
@ -28,7 +26,7 @@ public class EnvelopRestEndPoint extends BaseRestEndPoint {
    @Value("${deploy.region}")
    protected Short deployRegion = 3502;
    protected <T, J> Envelop<T, J> success(List<T> contents){
    protected <T, J> Envelop<T, J> success(List<T> contents) {
        return success(contents, (J)new HashMap<>(0));
    }
@ -37,7 +35,7 @@ public class EnvelopRestEndPoint extends BaseRestEndPoint {
        return success(_contents);
    }
    protected <T, J> Envelop<T, J> success(J obj){
    protected <T, J> Envelop<T, J> success(J obj) {
        return success(new ArrayList<T>(0), obj);
    }
@ -46,7 +44,7 @@ public class EnvelopRestEndPoint extends BaseRestEndPoint {
        return success(_obj);
    }
    protected <T, J> Envelop<T, J> success(List<T> contents, J obj){
    protected <T, J> Envelop<T, J> success(List<T> contents, J obj) {
        return success(contents, obj, contents.size(), 1, 15);
    }

+ 1 - 1
ehr-cloud-parent/pom.xml

@ -139,7 +139,7 @@
        <version.spring.boot.admin>1.5.7</version.spring.boot.admin>
        <version.jettison>1.3.7</version.jettison>
        <version.springside>4.2.3-GA</version.springside>
        <version.netty>4.0.24.Final</version.netty>
        <version.netty>4.0.27.Final</version.netty>
        <!-- eip -->
        <mine-util-version>2.1.3</mine-util-version>
        <sigar-version>1.6.4</sigar-version>