From 31f47cbc59edeaf1e3893710db2116a73e6dbd91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B7=E6=9E=97?= Date: Mon, 12 Aug 2019 18:22:27 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90U=E3=80=91=E6=96=B0=E5=A2=9E=E5=BC=82?= =?UTF-8?q?=E5=B8=B8CODE=E6=8E=A5=E5=8F=A3=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/org/easysite/commons/utils/Utils.java | 14 ++++------- .../framework/exception/ErrorCode.java | 25 +++++++++++++++++++ .../easysite/framework/utils/SignUtils.java | 9 ++++--- ...inMappingJackson2HttpMessageConverter.java | 4 +++ 4 files changed, 40 insertions(+), 12 deletions(-) create mode 100644 easy-framework/src/main/java/cn/org/easysite/framework/exception/ErrorCode.java diff --git a/easy-commons/src/main/java/cn/org/easysite/commons/utils/Utils.java b/easy-commons/src/main/java/cn/org/easysite/commons/utils/Utils.java index 8354b41..cb216bb 100644 --- a/easy-commons/src/main/java/cn/org/easysite/commons/utils/Utils.java +++ b/easy-commons/src/main/java/cn/org/easysite/commons/utils/Utils.java @@ -110,6 +110,10 @@ public class Utils { } } } + return getExceptionInfo(e, errInfo); + } + + private static String getExceptionInfo(Throwable e, String errInfo) { StringBuilder sb = new StringBuilder(e.getClass().getSimpleName()); String message = e.getMessage(); if (null != message) { @@ -146,15 +150,7 @@ public class Utils { } } } - StringBuilder sb = new StringBuilder(e.getClass().getSimpleName()); - String message = e.getMessage(); - if (null != message) { - sb.append(':').append(message); - } - if (null != errInfo) { - sb.append(':').append(errInfo); - } - return sb.toString(); + return getExceptionInfo(e, errInfo); } /** diff --git a/easy-framework/src/main/java/cn/org/easysite/framework/exception/ErrorCode.java b/easy-framework/src/main/java/cn/org/easysite/framework/exception/ErrorCode.java new file mode 100644 index 0000000..cef2eab --- /dev/null +++ b/easy-framework/src/main/java/cn/org/easysite/framework/exception/ErrorCode.java @@ -0,0 +1,25 @@ +package cn.org.easysite.framework.exception; + +/** + * @author : yinlin + * @version : 1.0 + * @date : 2019-08-12 13:36 + * @Description : + * @Copyright : Copyright (c) 2019 + * @Company : EasySite Technology Chengdu Co. Ltd. + * @link : cn.org.easysite.framework.exception.ErrorCode + */ +public interface ErrorCode { + + /** + * 获得错误码 + * @return + */ + String getErrorCode(); + + /** + * + * @return + */ + String getErrorMessage(); +} diff --git a/easy-framework/src/main/java/cn/org/easysite/framework/utils/SignUtils.java b/easy-framework/src/main/java/cn/org/easysite/framework/utils/SignUtils.java index 98eefbf..a7e7c64 100644 --- a/easy-framework/src/main/java/cn/org/easysite/framework/utils/SignUtils.java +++ b/easy-framework/src/main/java/cn/org/easysite/framework/utils/SignUtils.java @@ -12,16 +12,19 @@ import lombok.extern.slf4j.Slf4j; import static cn.org.easysite.framework.utils.ExceptionTool.createBaseException; /** - * @author liangb + * @author panda * @version 1.0 - * @date 16/7/7 下午2:15 + * @date 19/7/7 下午2:15 */ @Slf4j public class SignUtils { private static final String SIGN_SHA1 = "SHA1"; private static final String SIGN_MD5 = "MD5"; private static final char hexDigits[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'}; - private static final String KEY_STR = "&key=";//SHA1签名拼接的字符串 + /** + * SHA1签名拼接的字符串 + */ + private static final String KEY_STR = "&key="; /** * RSA签名 diff --git a/easy-spring-boot/src/main/java/cn/org/easysite/spring/boot/converter/TextPlainMappingJackson2HttpMessageConverter.java b/easy-spring-boot/src/main/java/cn/org/easysite/spring/boot/converter/TextPlainMappingJackson2HttpMessageConverter.java index 400b57a..6e11e66 100644 --- a/easy-spring-boot/src/main/java/cn/org/easysite/spring/boot/converter/TextPlainMappingJackson2HttpMessageConverter.java +++ b/easy-spring-boot/src/main/java/cn/org/easysite/spring/boot/converter/TextPlainMappingJackson2HttpMessageConverter.java @@ -6,6 +6,10 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConvert import java.util.ArrayList; import java.util.List; +/** + * 针对返回类型是text/plain类型的结果返回是json增加解析 + * @author yinlin + */ public class TextPlainMappingJackson2HttpMessageConverter extends MappingJackson2HttpMessageConverter { public TextPlainMappingJackson2HttpMessageConverter() {