格式化

pom.xml

@@ -416,6 +416,12 @@
             <version>4.5.8</version>
         </dependency>
 
+        <!-- https://mvnrepository.com/artifact/it.sauronsoftware/jave -->
+        <dependency>
+            <groupId>it.sauronsoftware</groupId>
+            <artifactId>jave</artifactId>
+            <version>1.0.2</version>
+        </dependency>
 
 
     </dependencies>

src/main/java/org/rcisoft/base/BizCommonCheckException.java

-package org.rcisoft.base;
-
-/**
- * 通用check异常
- * 一般是由于数据出现问题, api调用方式不对导致
- * 不需要为rest api调用方返回特定错误
- * 只需要记录好日志即可
- */
-public class BizCommonCheckException extends BizCommonException {
-    public BizCommonCheckException() {
-    }
-
-    public BizCommonCheckException(String message) {
-        super(message);
-    }
-
-    public BizCommonCheckException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}
-

src/main/java/org/rcisoft/base/BizCommonException.java

-package org.rcisoft.base;
-
-
-/**
- * 通用业务异常基类
- */
-public class BizCommonException extends RuntimeException implements IBizException {
-    /**
-     * 展示给前端看的错误消息参数
-     */
-    protected String[] restErrMsgArgs;
-
-    /**
-     * 错误详情对象, 包含各类错误对象
-     */
-    protected transient ErrInfo errInfo;
-
-    public BizCommonException() {
-        super();
-    }
-
-    public BizCommonException(String message) {
-        super(message);
-    }
-
-    public BizCommonException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public BizCommonException setRestErrMsgArgs(String[] restErrMsgArgs) {
-        this.restErrMsgArgs = restErrMsgArgs;
-        return this;
-    }
-
-    public BizCommonException setErrInfo(ErrInfo errInfo) {
-        this.errInfo = errInfo;
-        return this;
-    }
-
-    public String[] getRestErrMsgArgs() {
-        return restErrMsgArgs;
-    }
-
-    public ErrInfo getErrInfo() {
-        return errInfo;
-    }
-}

src/main/java/org/rcisoft/base/ErrCode.java

-package org.rcisoft.base;
-
-import org.apache.commons.collections4.CollectionUtils;
-
-import java.util.List;
-
-/**
- * 所有错误消息编码
- * 某一个异常可以对应一个错误编码
- * 对应消息参考/config/i18n/messages*.properties
- */
-public enum ErrCode {
-    ///////////////////////////////////////////
-    ///////////  通用错误   ////////////////////
-    ///////////////////////////////////////////
-    M0000("M0000"),//成功
-    M0001("M0001"),//不完全成功
-    M0005("M0005"),//无权限访问
-
-
-    ///////////////////////////////////////////
-    ///////////  客户端错误   ///////////////////
-    ///////////////////////////////////////////
-    M4000("M4000"),
-    M4001("M4001"),
-
-    ///////////////////////////////////////////
-    ///////////  服务端错误   ///////////////////
-    ///////////////////////////////////////////
-    M5000("M5000"),//服务器出现其他RuntimeException, 代码问题
-    M5001("M5001"),//service级别的Validation错误
-    M5002("M5002"),//抛出的继承了 IBizException 的异常, 但是没有对应的 errcode 做对应
-    M5004("M5004", ResultMoreThanOneException.class),//数据异常
-
-    ;
-    ////////////////////////////////////////////////////////////////
-
-    private String code; //错误编码
-
-    private Class<? extends IBizException> ex;
-
-    public static List<ErrCodeBean> customErrCodeList;
-
-    ErrCode(String code) {
-        this.code = code;
-    }
-
-    ErrCode(String code, Class<? extends IBizException> ex) {
-        this.code = code;
-        this.ex = ex;
-    }
-
-    /**
-     * 根据异常来获取当前ErrCode
-     *
-     * @param exception
-     * @return
-     */
-    public static ErrCodeBean get(IBizException exception) {
-        Class<? extends IBizException> clazz = exception.getClass();
-
-        ErrCodeBean ret = null;
-
-        // 1. 先找 ErrCode 内部声明的错误信息
-        for (ErrCode ec : values()) {
-            if (ec.ex == clazz) {
-                ret = new ErrCodeBean(ec.getCode(), ec.ex);
-                break;
-            }
-        }
-
-        // 2. 找 customErrCodeList 中声明的错误, 这是每个微服务启动时注入进来的
-        if (ret == null && CollectionUtils.isNotEmpty(customErrCodeList)) {
-            for (ErrCodeBean customErrCode : customErrCodeList) {
-                if(customErrCode.getEx() == clazz){
-                    ret = new ErrCodeBean(customErrCode.getCode(), customErrCode.getEx());
-                    break;
-                }
-            }
-        }
-
-        //3. 如果最终没找到, 则用 M5002 代替
-        if (ret == null) {
-            ret = new ErrCodeBean(ErrCode.M5002.code, ErrCode.M5002.ex);
-        }
-
-        return ret;
-    }
-
-    public String getCode() {
-        return code;
-    }
-}

src/main/java/org/rcisoft/base/ErrCodeBean.java

-package org.rcisoft.base;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class ErrCodeBean {
-    private String code;
-    private Class<? extends IBizException> ex;
-
-    public ErrCodeBean(String code, Class<? extends IBizException> ex) {
-        this.code = code;
-        this.ex = ex;
-    }
-}
-

src/main/java/org/rcisoft/base/ErrInfo.java

-package org.rcisoft.base;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @author David
- */
-@Getter
-@Setter
-public class ErrInfo {
-    /**
-     * 发生错误时的对象
-     * 可以是一个String 如: id, 也可以是一个对象, 即一组参数
-     */
-    protected Object errObj;
-
-    /**
-     * 造成错误的对象
-     * 如: 文件名已存在, 那么需要告诉用户是哪个文件id造成的重名
-     */
-    protected Object causeErrObj;
-
-    public ErrInfo(Object errObj, Object causeErrObj) {
-        this.errObj = errObj;
-        this.causeErrObj = causeErrObj;
-    }
-
-    public ErrInfo setErrObj(Object errObj) {
-        this.errObj = errObj;
-        return this;
-    }
-
-    public ErrInfo setCauseErrObj(Object causeErrObj) {
-        this.causeErrObj = causeErrObj;
-        return this;
-    }
-}

src/main/java/org/rcisoft/base/IBizException.java

-package org.rcisoft.base;
/**
 * 所有自定义异常都实现这个接口
 * 方便统一处理异常程序知道哪些是自定义业务异常
 */public interface IBizException {}
\ No newline at end of file

src/main/java/org/rcisoft/base/RequestContext.java

-package org.rcisoft.base;
-
-
-/**
- * 请求上下文
- * 主要用来生成/获取请求id等信息
- * <p>
- * 访问controller时生成
- * controller在return时候获取
- * Created by yc on 2017/3/28.
- */
-public class RequestContext {
-    private static ThreadLocal<RequestInfo> requestInfoTheadLocal = new ThreadLocal<>();
-
-    private RequestContext(){}
-    /**
-     * 生成并设置
-     *
-     * @return
-     */
-    public static void setRequestInfo(RequestInfo requestInfo) {
-        if(requestInfo == null){
-            throw new BizCommonCheckException("requestInfo is null");
-        }
-
-        requestInfoTheadLocal.remove();
-
-        long requestId = 1;
-        requestInfo.setRequestId(requestId);
-
-        requestInfoTheadLocal.set(requestInfo);
-    }
-
-    /**
-     * 获取
-     *
-     * @return
-     */
-    public static RequestInfo getRequestInfo() {
-        return requestInfoTheadLocal.get();
-    }
-
-    /**
-     * 清除
-     */
-    public static void clear() {
-        requestInfoTheadLocal.remove();
-    }
-}
-

src/main/java/org/rcisoft/base/RequestInfo.java

-package org.rcisoft.base;
-
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-import java.io.Serializable;
-
-@Getter
-@Setter
-@NoArgsConstructor
-public class RequestInfo implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private long requestId;
-
-}

src/main/java/org/rcisoft/base/ResponseMessage.java

-package org.rcisoft.base;
-
-/**
- * 返回信息
- *
- * @author David
- */
-public class ResponseMessage<T> {
-    private String respCode;
-    private String respMsg;
-    private T data;
-    private boolean ok;
-
-    public ResponseMessage() {
-    }
-
-    public ResponseMessage(String respCode, String message) {
-        this.respCode = respCode;
-        this.respMsg = message;
-        this.ok = true;
-    }
-
-    public ResponseMessage(String respCode, String message, boolean ok) {
-        this.respCode = respCode;
-        this.respMsg = message;
-        this.ok = ok;
-    }
-
-    public ResponseMessage(String respCode, String message, boolean ok, T data) {
-        this.respCode = respCode;
-        this.respMsg = message;
-        this.ok = ok;
-        this.data = data;
-    }
-
-    public String getRespCode() {
-        return this.respCode;
-    }
-
-    public void setRespCode(String respCode) {
-        this.respCode = respCode;
-    }
-
-    public String getMessage() {
-        return this.respMsg;
-    }
-
-    public void setMessage(String message) {
-        this.respMsg = message;
-    }
-
-    public T getData() {
-        return this.data;
-    }
-
-    public void setData(T data) {
-        this.data = data;
-    }
-
-    public boolean isOk() {
-        return this.ok;
-    }
-}
-

src/main/java/org/rcisoft/base/ResponseMessageCodeEnum.java

-package org.rcisoft.base;
-
-/**
- * 返回状态
- *
- * @author David
- */
-public enum ResponseMessageCodeEnum {
-    /**
-     * 成功
-     */
-    SUCCESS("0"),
-    /**
-     * 失败
-     */
-    ERROR("-1");
-
-    private String code;
-
-    ResponseMessageCodeEnum(String code) {
-        this.code = code;
-    }
-
-    public String getCode() {
-        return this.code;
-    }
-
-}

src/main/java/org/rcisoft/base/Result.java

-package org.rcisoft.base;
-
-/**
- * 返回信息
- *
- * @author David
- */
-public class  Result {
-    private Result() {
-    }
-
-    public static ResponseMessage success() {
-        return new ResponseMessage(ResponseMessageCodeEnum.SUCCESS.getCode(), "", true);
-    }
-
-    public static <T> ResponseMessage<T> success(String code, T t) {
-        return new ResponseMessage(code, "", true, t);
-    }
-
-    public static <T> ResponseMessage<T> success(String code, String message) {
-        return new ResponseMessage(code, message);
-    }
-
-    public static <T> ResponseMessage<T> success(String code, String message, T t) {
-        return new ResponseMessage(code, message, true, t);
-    }
-
-    public static <T> ResponseMessage<T> success(T t) {
-        return new ResponseMessage(ResponseMessageCodeEnum.SUCCESS.getCode(), "", true, t);
-    }
-
-    public static ResponseMessage error() {
-        return error("");
-    }
-
-    public static ResponseMessage error(String message) {
-        return error(ResponseMessageCodeEnum.ERROR.getCode(), message);
-    }
-
-    public static ResponseMessage error(String code, String message) {
-        return error(code, message, (Object)null);
-    }
-
-    public static <T> ResponseMessage<T> error(String code, String message, T t) {
-        return new ResponseMessage(code, message, false, t);
-    }
-}
-

src/main/java/org/rcisoft/base/ResultMoreThanOneException.java

-package org.rcisoft.base;
-
-/**
- * 查询到的结果应该是一条, 实际多条
- * 请查看表数据异常
- */
-public class ResultMoreThanOneException extends BizCommonException {
-    public ResultMoreThanOneException() {
-    }
-
-    public ResultMoreThanOneException(String message) {
-        super(message);
-    }
-
-    public ResultMoreThanOneException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}

src/main/java/org/rcisoft/base/UserInfo.java

-package org.rcisoft.base;
-
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-import java.io.Serializable;
-
-@Getter
-@Setter
-@NoArgsConstructor
-public class UserInfo implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private String uid;
-
-}

src/main/java/org/rcisoft/common/util/feignClient/ContactFeignClient.java

 package org.rcisoft.common.util.feignClient;
 
-import org.rcisoft.base.Ret;
+import org.rcisoft.core.result.Ret;
 import org.rcisoft.common.util.feignDto.*;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;

src/main/java/org/rcisoft/common/util/feignClient/EuqipmentFeignClient.java

-package org.rcisoft.common.util.feignClient;
-
-import feign.Headers;
-import org.rcisoft.common.util.feignDto.DimCodeReqDTO;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 设备库客户端
- */
-@FeignClient(value = "SF-EUQIPMENT")
-public interface EuqipmentFeignClient {
-
-    @RequestMapping(value = "/api/equipment/v1/dictionary/getDictionaryBySearch",method = RequestMethod.POST)
-    @Headers({"clientType: app"})
-    ResponseEntity<String> getDictionaryBySearch(@RequestBody DimCodeReqDTO dimCodeReqDTO,
-                                                 @RequestParam("dictionaryCode") String dictionaryCode,
-                                                 @RequestHeader("corpId") String corpId,
-                                                 @RequestParam("zxClientType") String zxClientType,
-                                                 @RequestParam("zxAccountId") Long zxAccountId);
-
-    @RequestMapping(value = "/api/equipment/v1//data/getEquipment/{equipmentCodeOrName}",method = RequestMethod.GET)
-    ResponseEntity<String> getEquipment(@PathVariable("equipmentCodeOrName") String equipmentCodeOrName,
-                                        @RequestParam("dimCode") String dimCode,
-                                        @RequestHeader("corpId") String corpId,
-                                        @RequestParam("zxClientType") String zxClientType,
-                                        @RequestParam("zxAccountId") Long zxAccountId);
-}

src/main/java/org/rcisoft/common/util/feignClient/FileFeignClient.java

 package org.rcisoft.common.util.feignClient;
 
-import org.rcisoft.base.Ret;
+import org.rcisoft.core.result.Ret;
 import org.rcisoft.common.util.feignDto.MTOssRspDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/org/rcisoft/common/util/feignClient/GateWayFeignClient.java

 package org.rcisoft.common.util.feignClient;
 
-import org.rcisoft.base.Ret;
+import org.rcisoft.core.result.Ret;
 import org.rcisoft.common.util.feignDto.RefreshDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/org/rcisoft/common/util/feignClient/MessageFeignClient.java

 package org.rcisoft.common.util.feignClient;
 
-import org.rcisoft.base.Ret;
+import org.rcisoft.core.result.Ret;
 import org.rcisoft.common.util.feignDto.GroupAddPersonRDTO;
 import org.rcisoft.common.util.feignDto.GroupCreateRDTO;
 import org.rcisoft.common.util.feignDto.GroupDismissRDTO;

src/main/java/org/rcisoft/common/util/feignClient/NotificationFeignClient.java

 package org.rcisoft.common.util.feignClient;
 
-import org.rcisoft.base.Ret;
+import org.rcisoft.core.result.Ret;
 import org.rcisoft.common.util.feignDto.MTNotificationSendReqDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;

src/main/java/org/rcisoft/common/util/outClient/MTCotactApiRequestClient.java

@@ -3,12 +3,12 @@ package org.rcisoft.common.util.outClient;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
 import lombok.extern.slf4j.Slf4j;
-import org.rcisoft.base.Ret;
+import org.apache.commons.lang3.StringUtils;
+import org.rcisoft.common.util.OkHttpUtil;
 import org.rcisoft.common.util.feignClient.ContactFeignClient;
 import org.rcisoft.common.util.feignClient.GateWayFeignClient;
-import org.rcisoft.common.util.OkHttpUtil;
 import org.rcisoft.common.util.feignDto.*;
-import org.apache.commons.lang3.StringUtils;
+import org.rcisoft.core.result.Ret;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;

src/main/java/org/rcisoft/common/util/outClient/MTEquipmentApiRequestClient.java

-package org.rcisoft.common.util.outClient;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
-import lombok.extern.slf4j.Slf4j;
-import org.rcisoft.common.util.feignClient.EuqipmentFeignClient;
-import org.rcisoft.common.util.feignDto.DimCodeReqDTO;
-import org.rcisoft.common.util.feignDto.DimCodeRspDTO;
-import org.rcisoft.common.util.feignDto.MTEquipmentInfoDTO;
-import org.rcisoft.common.util.feignDto.MTEquipmentInfoRspDTO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * 设备接口
- * @author David
- */
-@Slf4j
-@Component
-public class MTEquipmentApiRequestClient {
-
-//    @Autowired
-    private EuqipmentFeignClient euqipmentFeignClient;
-
-    public static String zxClientType = "app";
-
-    public static Long zxAccountId = (long)1;
-
-    /**
-     * 模糊搜索列表
-     * @return
-     */
-    public List<MTEquipmentInfoDTO> getEquipment(String equipmentCodeOrName, String dimCode, String corpId) {
-        ResponseEntity<String> obj =  euqipmentFeignClient.getEquipment(equipmentCodeOrName,dimCode,corpId,zxClientType,zxAccountId);
-        MTEquipmentInfoRspDTO mtEquipmentInfoRspDTO = JSON.parseObject(obj.getBody(), new TypeReference<MTEquipmentInfoRspDTO>() {});
-        return mtEquipmentInfoRspDTO.getData();
-    }
-
-    /**
-     * 查询所有的dimCode
-     * @param corpId
-     * @return
-     */
-    public DimCodeRspDTO getDictionaryBySearch(String corpId) {
-        DimCodeReqDTO dimCodeReqDTO = DimCodeReqDTO.builder().name("").pageNum(1).pageSize(1000).build();
-        ResponseEntity<String> obj =  euqipmentFeignClient.getDictionaryBySearch(dimCodeReqDTO,"dim",corpId,zxClientType,zxAccountId);
-        DimCodeRspDTO list = JSON.parseObject(obj.getBody(), new TypeReference<DimCodeRspDTO>() {});
-        return list;
-    }
-
-}

src/main/java/org/rcisoft/common/util/outClient/MTMessageApiRequestClient.java

 package org.rcisoft.common.util.outClient;
 
 import lombok.extern.slf4j.Slf4j;
-import org.rcisoft.base.Ret;
+import org.rcisoft.core.result.Ret;
 import org.rcisoft.common.util.feignClient.MessageFeignClient;
 import org.rcisoft.common.util.feignDto.GroupAddPersonRDTO;
 import org.rcisoft.common.util.feignDto.GroupCreateRDTO;

src/main/java/org/rcisoft/common/util/outClient/MTNotificationApiRequestClient.java

@@ -3,7 +3,8 @@ package org.rcisoft.common.util.outClient;
 
 //import com.zgiot.zx.schedule.service.INotificationService;
 import lombok.extern.slf4j.Slf4j;
-import org.rcisoft.base.Ret;
+import org.rcisoft.core.result.ResultCode;
+import org.rcisoft.core.result.Ret;
 import org.rcisoft.common.util.feignClient.NotificationFeignClient;
 import org.rcisoft.common.util.feignDto.MTNotificationSendReqDTO;
 import org.rcisoft.common.util.feignDto.MTUserGetsReqDTO;
@@ -52,7 +53,7 @@ public class MTNotificationApiRequestClient {
         mtNotificationSendReqDTO.setChannels("ALL");
         mtNotificationSendReqDTO.setCategoryCodes(Arrays.asList(new String[]{type}));
         Ret ret = notificationFeignClient.sendMessage(mtNotificationSendReqDTO,"app",(long)1);
-        if(ret != null && "M0000".equals(ret.getCode())){
+        if(ret != null && ResultCode.SUCCESS.getCode().toString().equals(ret.getCode())){
             return true;
         }
         return false;

src/main/java/org/rcisoft/common/util/outClient/MTOauthApiRequestClient.java

@@ -4,7 +4,7 @@ import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
 import lombok.extern.slf4j.Slf4j;
-import org.rcisoft.base.Ret;
+import org.rcisoft.core.result.Ret;
 import org.rcisoft.common.util.OkHttpUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

src/main/java/org/rcisoft/config/MvcConfig.java

@@ -92,13 +92,13 @@ public class MvcConfig extends WebMvcConfigurerAdapter {
                                     handlerMethod.getBean().getClass().getName(),
                                     handlerMethod.getMethod().getName(),
                                     e.getMessage());
-                            result.setCode(ResultCode.INTERNAL_SERVER_ERROR).setMessage(message);
+                            result.setCode(ResultCode.ERROR).setMessage(message);
                         }
                     } else {
                         if (e instanceof NoHandlerFoundException) {
                             result.setCode(ResultCode.NOT_FOUND).setMessage("接口 [" + request.getRequestURI() + "] 不存在");
                         } else {
-                            result.setCode(ResultCode.INTERNAL_SERVER_ERROR).setMessage(e.getMessage());
+                            result.setCode(ResultCode.ERROR).setMessage(e.getMessage());
                         }
                     }
                     log.error(e.getMessage());

src/main/java/org/rcisoft/core/result/Result.java

@@ -33,13 +33,13 @@ public class Result {
 
 
     public void setErrorMessage(String message, Object data) {
-        this.code = ResultCode.FAIL.code;
+        this.code = ResultCode.FAIL.getCode();
         this.message = message;
         this.data = data;
     }
 
     public void setSucessMessage(String message, Object data) {
-        this.code = ResultCode.SUCCESS.code;
+        this.code = ResultCode.SUCCESS.getCode();
         this.message = message;
         this.data = data;
     }
@@ -48,7 +48,7 @@ public class Result {
 
 
     public Result setCode(ResultCode resultCode) {
-        this.code = resultCode.code;
+        this.code = resultCode.getCode();
         return this;
     }
 

src/main/java/org/rcisoft/core/result/ResultCode.java

 package org.rcisoft.core.result;
 
+import lombok.Data;
+
 /**
  * 响应码枚举，参考HTTP状态码的语义
  */
+
 public enum ResultCode {
     SUCCESS(200),//成功
     FAIL(400),//失败
     UNAUTHORIZED(401),//未认证（签名错误）
     NOT_FOUND(404),//接口不存在
-    INTERNAL_SERVER_ERROR(500),//服务器内部错误
+    ERROR(500),//服务器内部错误
     SERVICE_ERROR(999);//自定义异常
 
 
-    public int code;
+    private Integer code;
+
+    public Integer getCode() {
+        return code;
+    }
 
     ResultCode(int code) {
         this.code = code;

src/main/java/org/rcisoft/base/Ret.java → src/main/java/org/rcisoft/core/result/Ret.java

-package org.rcisoft.base;
+package org.rcisoft.core.result;
 
 import com.google.common.base.MoreObjects;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.rcisoft.core.util.UserUtil;
 import org.springframework.core.annotation.Order;
 
 import java.io.Serializable;
@@ -35,37 +36,30 @@ public class Ret<T> implements Serializable {
     private T data;
 
     public Ret() {
-        this.ctime = System.currentTimeMillis();
-        if (RequestContext.getRequestInfo() != null) {
-            this.requestID = String.valueOf(RequestContext.getRequestInfo().getRequestId());
-        }
+        this(null);
     }
 
     public Ret(String code) {
-        this.code = code;
-        this.ctime = System.currentTimeMillis();
-        if (RequestContext.getRequestInfo() != null) {
-            this.requestID = String.valueOf(RequestContext.getRequestInfo().getRequestId());
-        }
+        this(code, null);
     }
 
     public Ret(String code, String msg) {
         this.code = code;
         this.msg = msg;
         this.ctime = System.currentTimeMillis();
-        if (RequestContext.getRequestInfo() != null) {
-            this.requestID = String.valueOf(RequestContext.getRequestInfo().getRequestId());
+        if (UserUtil.getCurUser() != null) {
+            this.requestID = String.valueOf(UserUtil.getCurUser().getRequireId());
         }
     }
 
     //构建成功返回
     public static Ret ok() {
-        return new Ret(ErrCode.M0000.getCode(), "ok");
+        return new Ret(ResultCode.SUCCESS.getCode().toString(), "ok");
     }
 
     //构建系统异常返回
     public static Ret error() {
-        return new Ret(ErrCode.M5000.getCode(), "false");
+        return new Ret(ResultCode.ERROR.getCode().toString(), "false");
     }
 
 

src/main/java/org/rcisoft/core/util/UserUtil.java

 package org.rcisoft.core.util;
 
 import org.apache.commons.lang3.StringUtils;
-import org.rcisoft.base.BizCommonCheckException;
-import org.rcisoft.base.UserInfo;
 import org.rcisoft.business.bchapter.entity.BChapter;
 import org.rcisoft.common.util.feignDto.UserInfoDTO;
 import org.rcisoft.core.entity.IdEntity;
@@ -37,11 +35,13 @@ public class UserUtil {
      * 设置登陆人
      * @param obj
      */
-    public static void setCurUser(Object obj){
+    public static void setCurUser(CurUser obj){
         Map<String,Object> user = null;
         user = local.get();
         if(null == user)
             user = new HashMap<>();
+        //设置请求id
+        obj.setRequireId(IdGen.uuid());
         user.put(UserUtil.USER_MODEL,obj);
         local.set(user);
    }

src/main/java/org/rcisoft/sys/user/bean/CurUser.java

@@ -23,4 +23,8 @@ public class CurUser {
 
     @ApiModelProperty(value = "用户id")
     private String userId;
+
+
+    @ApiModelProperty(required = false,value = "请求id,不需要传递")
+    private String requireId;
 }