diff --git a/daffodil-cloud-common/src/main/java/com/daffodil/common/aspect/TableInfoAspect.java b/daffodil-cloud-common/src/main/java/com/daffodil/common/aspect/TableInfoAspect.java index 602eeb1af5601f8a6cdad24a883f368de05c67ef..83c0cad0fddd0aa0ddc62ea28f3a847876a2ec19 100644 --- a/daffodil-cloud-common/src/main/java/com/daffodil/common/aspect/TableInfoAspect.java +++ b/daffodil-cloud-common/src/main/java/com/daffodil/common/aspect/TableInfoAspect.java @@ -178,8 +178,7 @@ public class TableInfoAspect { } } } catch (Exception e) { - e.printStackTrace(); - log.warn(e.getMessage()); + log.warn(e.getMessage(), e); } } } @@ -220,8 +219,7 @@ public class TableInfoAspect { return (List) objectInputStream.readObject(); } } catch (Exception e) { - e.printStackTrace(); - log.warn(e.getMessage()); + log.warn(e.getMessage(), e); } return Collections.emptyList(); } diff --git a/daffodil-cloud-common/src/main/java/com/daffodil/common/exception/handler/GlobalExceptionHandler.java b/daffodil-cloud-common/src/main/java/com/daffodil/common/exception/handler/GlobalExceptionHandler.java index 165819bb898bfc638e661e3cd91eaddf25866696..3f98647fbf60854ce8f4313198ae840574324a6a 100644 --- a/daffodil-cloud-common/src/main/java/com/daffodil/common/exception/handler/GlobalExceptionHandler.java +++ b/daffodil-cloud-common/src/main/java/com/daffodil/common/exception/handler/GlobalExceptionHandler.java @@ -54,7 +54,7 @@ public class GlobalExceptionHandler { @ExceptionHandler(BaseException.class) public JsonResult handleBaseException(BaseException e) { log.error("系统基础异常[{}]", e.getMessage()); - return JsonResult.error(e.getDefaultMessage()); + return JsonResult.error(e.getMessage()); } } diff --git a/daffodil-cloud-core/src/main/java/com/daffodil/core/dao/helper/DaoHelper.java b/daffodil-cloud-core/src/main/java/com/daffodil/core/dao/helper/DaoHelper.java index 461ce13c29fc86b5773d179c3f23d6580d6683ac..ff807c3e0d56f8d55126d175aae830f3505b82e5 100644 --- a/daffodil-cloud-core/src/main/java/com/daffodil/core/dao/helper/DaoHelper.java +++ b/daffodil-cloud-core/src/main/java/com/daffodil/core/dao/helper/DaoHelper.java @@ -15,6 +15,8 @@ import com.daffodil.core.entity.BaseEntity; import com.daffodil.core.exception.BusinessException; import com.daffodil.util.ReflectUtils; +import lombok.extern.slf4j.Slf4j; + /** * Dao帮助类 * @@ -23,6 +25,7 @@ import com.daffodil.util.ReflectUtils; * @version 1.0 * @description */ +@Slf4j public class DaoHelper { /** @@ -174,7 +177,7 @@ public class DaoHelper { clobStream.close(); } } catch (Exception e) { - throw new BusinessException("[JDBC] Clob数据转换错误 ...", e); + log.warn(e.getMessage(), e); } } } @@ -203,7 +206,7 @@ public class DaoHelper { try { in.close(); } catch (Exception e) { - throw new BusinessException("[JDBC] Blob数据转换错误 ...", e); + log.warn(e.getMessage(), e); } } } diff --git a/daffodil-cloud-core/src/main/java/com/daffodil/core/exception/BaseException.java b/daffodil-cloud-core/src/main/java/com/daffodil/core/exception/BaseException.java index 8b481e42228a7295629f97334a384c52391f4057..91b469086437825b1e8a05d006dc8b3fed17cda6 100644 --- a/daffodil-cloud-core/src/main/java/com/daffodil/core/exception/BaseException.java +++ b/daffodil-cloud-core/src/main/java/com/daffodil/core/exception/BaseException.java @@ -70,7 +70,4 @@ public class BaseException extends RuntimeException { return args; } - public String getDefaultMessage() { - return defaultMessage; - } } \ No newline at end of file diff --git a/daffodil-cloud-core/src/main/java/com/daffodil/core/jdbc/DaffodilDataSourceContextHolder.java b/daffodil-cloud-core/src/main/java/com/daffodil/core/jdbc/DaffodilDataSourceContextHolder.java index 20fb34268e31720dd19aa0e71eeb1c99206e221b..fff9ec6adecb183d35f2bae6bced95f6c5ae75dc 100644 --- a/daffodil-cloud-core/src/main/java/com/daffodil/core/jdbc/DaffodilDataSourceContextHolder.java +++ b/daffodil-cloud-core/src/main/java/com/daffodil/core/jdbc/DaffodilDataSourceContextHolder.java @@ -14,7 +14,7 @@ public class DaffodilDataSourceContextHolder { private static final ThreadLocal contextHolder = new ThreadLocal<>(); - public static List dataSourceLookupKeys = new ArrayList<>(); + protected static final List dataSourceLookupKeys = new ArrayList<>(); public static void setDataSourceLookupKey(String dataSourceLookupKey) { contextHolder.set(dataSourceLookupKey); diff --git a/daffodil-cloud-core/src/main/java/com/daffodil/util/HqlUtils.java b/daffodil-cloud-core/src/main/java/com/daffodil/util/HqlUtils.java index 12588c7d21690a48d601449f13d2a858bcbe0b6b..b6ac9edc5b40ce5d234e6c0de1b1a7484cf15ece 100644 --- a/daffodil-cloud-core/src/main/java/com/daffodil/util/HqlUtils.java +++ b/daffodil-cloud-core/src/main/java/com/daffodil/util/HqlUtils.java @@ -4,14 +4,13 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.daffodil.core.annotation.Hql; import com.daffodil.core.annotation.Hql.Logical; import com.daffodil.core.entity.Query; import com.daffodil.util.text.Convert; +import lombok.extern.slf4j.Slf4j; + /** * hql操作辅助工具类 * @@ -19,14 +18,13 @@ import com.daffodil.util.text.Convert; * @date 2019年8月18日 * @version 1.0 */ +@Slf4j public class HqlUtils { - private static final Logger log = LoggerFactory.getLogger(HqlUtils.class); - /** * 仅支持字母、数字、下划线、空格、逗号（支持多个字段排序） */ - public static String HQL_PATTERN = "[a-zA-Z0-9_\\ \\,]+"; + public static final String HQL_PATTERN = "[a-zA-Z0-9_\\ \\,]+"; /** * 检查字符，防止注入绕过 @@ -133,8 +131,7 @@ public class HqlUtils { } } } catch (Exception e) { - e.printStackTrace(); - log.warn(e.getMessage()); + log.warn(e.getMessage(), e); } } } diff --git a/daffodil-cloud-utils/src/main/java/com/daffodil/util/DateUtils.java b/daffodil-cloud-utils/src/main/java/com/daffodil/util/DateUtils.java index 8c65adf3be87236e115b767ae70036956469d5a2..3dd2df93a5e443ca839e4c25c69cb75fa1aba54a 100644 --- a/daffodil-cloud-utils/src/main/java/com/daffodil/util/DateUtils.java +++ b/daffodil-cloud-utils/src/main/java/com/daffodil/util/DateUtils.java @@ -14,15 +14,16 @@ import java.util.Date; * @version 1.0 */ public class DateUtils { - public static String YYYY = "yyyy"; + + public static final String YYYY = "yyyy"; - public static String YYYY_MM = "yyyy-MM"; + public static final String YYYY_MM = "yyyy-MM"; - public static String YYYY_MM_DD = "yyyy-MM-dd"; + public static final String YYYY_MM_DD = "yyyy-MM-dd"; - public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss"; + public static final String YYYYMMDDHHMMSS = "yyyyMMddHHmmss"; - public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss"; + public static final String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss"; /** * 获取当前Date型日期 @@ -130,9 +131,9 @@ public class DateUtils { * 计算两个时间差 */ public static String getDatePoor(Date endDate, Date nowDate) { - long nd = 1000 * 24 * 60 * 60; - long nh = 1000 * 60 * 60; - long nm = 1000 * 60; + long nd = 1000L * 24L * 60L * 60L; + long nh = 1000L * 60L * 60L; + long nm = 1000L * 60L; // long ns = 1000; // 获得两个时间的毫秒时间差异 long diff = endDate.getTime() - nowDate.getTime(); diff --git a/daffodil-cloud-utils/src/main/java/com/daffodil/util/IpUtils.java b/daffodil-cloud-utils/src/main/java/com/daffodil/util/IpUtils.java index 1ae8336ccdcca52fd3e715a0bf53c722dc87e15a..fa023cf3e16baef34a488cfea6feaed689d36ff6 100644 --- a/daffodil-cloud-utils/src/main/java/com/daffodil/util/IpUtils.java +++ b/daffodil-cloud-utils/src/main/java/com/daffodil/util/IpUtils.java @@ -48,7 +48,7 @@ public class IpUtils { String ip = request.getHeaders().getFirst("x-forwarded-for"); if (ip != null && ip.length() != 0 && !"unknown".equalsIgnoreCase(ip)) { // 多次反向代理后会有多个ip值，第一个ip才是真实ip - if (ip.indexOf(",") != -1) { + if (ip.indexOf(',') != -1) { ip = ip.split(",")[0]; } } diff --git a/daffodil-cloud-utils/src/main/java/com/daffodil/util/JacksonUtils.java b/daffodil-cloud-utils/src/main/java/com/daffodil/util/JacksonUtils.java index c6e4b7ffc12abd018f2fc2538d9f64dc73946088..845f10dd97e1482763af9207f8d9161e82ea1741 100644 --- a/daffodil-cloud-utils/src/main/java/com/daffodil/util/JacksonUtils.java +++ b/daffodil-cloud-utils/src/main/java/com/daffodil/util/JacksonUtils.java @@ -154,7 +154,7 @@ public class JacksonUtils { } return mapper.readValue(value, clazz); } catch (Throwable e) { - log.error(String.format("toJavaObject exception: \n %s\n %s", value, clazz), e); + log.error(String.format("toJavaObject exception: %s %s", value, clazz), e); } return supplier.get(); } @@ -176,7 +176,7 @@ public class JacksonUtils { try { return Long.valueOf(value); } catch (Throwable e) { - log.error(String.format("getAsLong exception: \n %s", key), e); + log.error(String.format("getAsLong exception: %s", key), e); } return 0L; } @@ -198,7 +198,7 @@ public class JacksonUtils { try { return Double.valueOf(value); } catch (Throwable e) { - log.error(String.format("getAsDouble exception: \n %s", key), e); + log.error(String.format("getAsDouble exception: %s", key), e); } return 0.0; } @@ -220,7 +220,7 @@ public class JacksonUtils { try { return Float.valueOf(value); } catch (Throwable e) { - log.error(String.format("getAsFloat exception: \n %s", key), e); + log.error(String.format("getAsFloat exception: %s", key), e); } return 0f; } @@ -242,7 +242,7 @@ public class JacksonUtils { try { return Integer.valueOf(value); } catch (Throwable e) { - log.error(String.format("getAsInteger exception: \n %s", key), e); + log.error(String.format("getAsInteger exception: %s", key), e); } return 0; } @@ -260,7 +260,7 @@ public class JacksonUtils { try { return String.valueOf(map.get(key)); } catch (Throwable e) { - log.error(String.format("getAsString exception: \n %s", key), e); + log.error(String.format("getAsString exception: %s", key), e); } return null; } @@ -279,7 +279,7 @@ public class JacksonUtils { try { return (Map) map.get(key); } catch (Throwable e) { - log.error(String.format("getAsMap exception: \n %s", key), e); + log.error(String.format("getAsMap exception: %s", key), e); } return null; } @@ -297,7 +297,7 @@ public class JacksonUtils { try { return (List) map.get(key); } catch (Throwable e) { - log.error(String.format("getAsList exception: \n %s", key), e); + log.error(String.format("getAsList exception: %s", key), e); } return null; } diff --git a/daffodil-cloud-utils/src/main/java/com/daffodil/util/JwtTokenUtils.java b/daffodil-cloud-utils/src/main/java/com/daffodil/util/JwtTokenUtils.java index 6d669c0575e1a61a3891982d7b6bf46bda550bc3..505357ea583be938c935218109d3c2411fb9149b 100644 --- a/daffodil-cloud-utils/src/main/java/com/daffodil/util/JwtTokenUtils.java +++ b/daffodil-cloud-utils/src/main/java/com/daffodil/util/JwtTokenUtils.java @@ -41,7 +41,7 @@ public class JwtTokenUtils { /** * token有效期30分钟=30 * 60 * 1000 */ - public static long EXPIRE_TIME = 30 * 60 * 1000; + public static final long EXPIRE_TIME = 30L * 60L * 1000L; /** * 私钥密匙 @@ -135,7 +135,7 @@ public class JwtTokenUtils { verifier.verify(token); return true; }catch (JWTVerificationException e) { - log.warn(e.getMessage()); + log.warn(e.getMessage(), e); } return false; } diff --git a/daffodil-cloud-utils/src/main/java/com/daffodil/util/ReflectUtils.java b/daffodil-cloud-utils/src/main/java/com/daffodil/util/ReflectUtils.java index 0244ed411ff76a559e06364456002e5fb5bb0e1f..28ba82c15cbea40b2e289030dc887f4ed6284304 100644 --- a/daffodil-cloud-utils/src/main/java/com/daffodil/util/ReflectUtils.java +++ b/daffodil-cloud-utils/src/main/java/com/daffodil/util/ReflectUtils.java @@ -178,8 +178,7 @@ public class ReflectUtils { return null; } Validate.notBlank(fieldName, "fieldName can't be blank"); - for (Class superClass = obj.getClass(); superClass != Object.class; superClass = superClass - .getSuperclass()) { + for (Class superClass = obj.getClass(); superClass != Object.class; superClass = superClass.getSuperclass()) { try { Field field = superClass.getDeclaredField(fieldName); makeAccessible(field); @@ -203,8 +202,7 @@ public class ReflectUtils { return null; } Validate.notBlank(methodName, "methodName can't be blank"); - for (Class searchType = obj.getClass(); searchType != Object.class; searchType = searchType - .getSuperclass()) { + for (Class searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass()) { try { Method method = searchType.getDeclaredMethod(methodName, parameterTypes); makeAccessible(method); diff --git a/daffodil-cloud-utils/src/main/java/com/daffodil/util/ServletUtils.java b/daffodil-cloud-utils/src/main/java/com/daffodil/util/ServletUtils.java index 0b72000b0aa95736c4a52509fb4ca7c52708bc4b..cb80d6620318bc9e1e08413fa4073b9d5a14d866 100644 --- a/daffodil-cloud-utils/src/main/java/com/daffodil/util/ServletUtils.java +++ b/daffodil-cloud-utils/src/main/java/com/daffodil/util/ServletUtils.java @@ -10,6 +10,8 @@ import org.springframework.web.context.request.ServletRequestAttributes; import com.daffodil.util.text.Convert; +import lombok.extern.slf4j.Slf4j; + /** * 客户端工具类 * @@ -17,6 +19,7 @@ import com.daffodil.util.text.Convert; * @date 2019年8月18日 * @version 1.0 */ +@Slf4j public class ServletUtils { /** * 获取String参数 @@ -87,7 +90,7 @@ public class ServletUtils { response.setCharacterEncoding("utf-8"); response.getWriter().print(string); } catch (IOException e) { - e.printStackTrace(); + log.error(e.getMessage(), e); } return null; } diff --git a/daffodil-cloud-utils/src/main/java/com/daffodil/util/ThreadUtils.java b/daffodil-cloud-utils/src/main/java/com/daffodil/util/ThreadUtils.java index d564dcc597b13b1011a67c38d9b1f00a910396b9..235f81b09f9a320af42edac5d6425a21ee44f38e 100644 --- a/daffodil-cloud-utils/src/main/java/com/daffodil/util/ThreadUtils.java +++ b/daffodil-cloud-utils/src/main/java/com/daffodil/util/ThreadUtils.java @@ -25,7 +25,7 @@ public class ThreadUtils { try { Thread.sleep(milliseconds); } catch (InterruptedException e) { - return; + Thread.currentThread().interrupt(); } } @@ -44,7 +44,7 @@ public class ThreadUtils { logger.info("Pool did not terminate"); } } - } catch (InterruptedException ie) { + } catch (InterruptedException e) { pool.shutdownNow(); Thread.currentThread().interrupt(); } @@ -61,11 +61,11 @@ public class ThreadUtils { if (future.isDone()) { future.get(); } - } catch (CancellationException ce) { - t = ce; - } catch (ExecutionException ee) { - t = ee.getCause(); - } catch (InterruptedException ie) { + } catch (CancellationException e) { + t = e; + } catch (ExecutionException e) { + t = e.getCause(); + } catch (InterruptedException e) { Thread.currentThread().interrupt(); } } diff --git a/daffodil-cloud-utils/src/main/java/com/daffodil/util/sm/CodeUtils.java b/daffodil-cloud-utils/src/main/java/com/daffodil/util/sm/CodeUtils.java index 36c04f43f78913a829de9f6826f3dae2af9296b1..b32decc7397785b104f138b57bd625f86c0be194 100644 --- a/daffodil-cloud-utils/src/main/java/com/daffodil/util/sm/CodeUtils.java +++ b/daffodil-cloud-utils/src/main/java/com/daffodil/util/sm/CodeUtils.java @@ -353,7 +353,7 @@ public class CodeUtils { } else { algorism = c - 55; } - result += Math.pow(16, max - i) * algorism; + result += (int)Math.pow(16, max - i) * algorism; } return result; } @@ -490,7 +490,7 @@ public class CodeUtils { for (int i = max; i > 0; i--) { char c = binary.charAt(i - 1); int algorism = c - '0'; - result += Math.pow(2, max - i) * algorism; + result += (int)Math.pow(2, max - i) * algorism; } return result; } @@ -570,7 +570,6 @@ public class CodeUtils { * * @return the array of byte */ - @SuppressWarnings("deprecation") public static byte[] hexToByte(String hex) throws IllegalArgumentException { if (hex.length() % 2 != 0) { throw new IllegalArgumentException(); @@ -580,7 +579,7 @@ public class CodeUtils { for (int i = 0, j = 0, l = hex.length(); i < l; i++, j++) { String swap = "" + arr[i++] + arr[i]; int byteint = Integer.parseInt(swap, 16) & 0xFF; - b[j] = new Integer(byteint).byteValue(); + b[j] = Integer.valueOf(byteint).byteValue(); } return b; } diff --git a/daffodil-cloud-utils/src/main/java/com/daffodil/util/sm/SM2Utils.java b/daffodil-cloud-utils/src/main/java/com/daffodil/util/sm/SM2Utils.java index 6a2911c9d91e336051c67a7451fbd79928b9fbfe..6e2537bb62ae9dfd256a4c0c0c50d8fb391501bc 100644 --- a/daffodil-cloud-utils/src/main/java/com/daffodil/util/sm/SM2Utils.java +++ b/daffodil-cloud-utils/src/main/java/com/daffodil/util/sm/SM2Utils.java @@ -21,8 +21,8 @@ import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey; import org.bouncycastle.jce.spec.ECParameterSpec; import org.bouncycastle.math.ec.ECPoint; import org.bouncycastle.util.encoders.Hex; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + +import lombok.extern.slf4j.Slf4j; /** * 国密sm2 级别 对应RSA @@ -32,10 +32,9 @@ import org.slf4j.LoggerFactory; * @version 1.0 * @description */ +@Slf4j public class SM2Utils { - private static final Logger log = LoggerFactory.getLogger(SM2Utils.class); - /** * 生成公私钥对 * @@ -195,7 +194,7 @@ public class SM2Utils { try { keyPairGenerator .init(new ECKeyGenerationParameters(domainParameters, SecureRandom.getInstance("SHA1PRNG"))); } catch (NoSuchAlgorithmException e) { - e.printStackTrace(); + log.error(e.getMessage(), e); } // 3.生成密钥对 diff --git a/daffodil-cloud-utils/src/main/java/com/daffodil/util/sm/SM3Utils.java b/daffodil-cloud-utils/src/main/java/com/daffodil/util/sm/SM3Utils.java index 2cf2d8d154f3ed99ce9cb56194eeb7c99273e057..9aed17b18f0e73d2d5a140873f09f28d8b865c58 100644 --- a/daffodil-cloud-utils/src/main/java/com/daffodil/util/sm/SM3Utils.java +++ b/daffodil-cloud-utils/src/main/java/com/daffodil/util/sm/SM3Utils.java @@ -4,8 +4,8 @@ import org.bouncycastle.crypto.digests.SM3Digest; import org.bouncycastle.crypto.macs.HMac; import org.bouncycastle.crypto.params.KeyParameter; import org.bouncycastle.util.encoders.Hex; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + +import lombok.extern.slf4j.Slf4j; import java.security.MessageDigest; @@ -16,10 +16,9 @@ import java.security.MessageDigest; * @version 1.0 * @description */ +@Slf4j public class SM3Utils { - private static final Logger log = LoggerFactory.getLogger(SM3Utils.class); - /** * SM3计算hashCode 统一转小写，和前端保持一致 * @@ -78,7 +77,7 @@ public class SM3Utils { // 将返回的hash值转换成16进制字符串 cipherStr = Hex.toHexString(encrypt); } catch (Exception e) { - log.error("SM3签名失败"); + log.error("SM3签名失败", e.getMessage()); } return cipherStr; } @@ -103,7 +102,7 @@ public class SM3Utils { // 将返回的hash值转换成16进制字符串 cipherStr = Hex.toHexString(encrypt); } catch (Exception e) { - log.error("SM3签名失败"); + log.error("SM3签名失败", e.getMessage()); } return cipherStr; } diff --git a/daffodil-cloud-utils/src/main/java/com/daffodil/util/text/Convert.java b/daffodil-cloud-utils/src/main/java/com/daffodil/util/text/Convert.java index 57653a3b9c121740cf4e9297ed05465e451efc9f..572df27e71b6d83a24d8da9d6c7dfd36105106d2 100644 --- a/daffodil-cloud-utils/src/main/java/com/daffodil/util/text/Convert.java +++ b/daffodil-cloud-utils/src/main/java/com/daffodil/util/text/Convert.java @@ -657,10 +657,10 @@ public class Convert { return (BigDecimal) value; } if (value instanceof Long) { - return new BigDecimal((Long) value); + return BigDecimal.valueOf((Long)value); } if (value instanceof Double) { - return new BigDecimal((Double) value); + return BigDecimal.valueOf((Double)value); } if (value instanceof Integer) { return new BigDecimal((Integer) value);