Merge pull request #3231 from KouShenhai/dev

feat: 优化代码【异常捕获】
KouShenhai · Dec 30, 2024 · c4ce18f · c4ce18f
2 parents 311902a + fe43c48
commit c4ce18f
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 8 deletions.
diff --git a/laokou-common/laokou-common-core/src/main/java/org/laokou/common/core/utils/FileUtil.java b/laokou-common/laokou-common-core/src/main/java/org/laokou/common/core/utils/FileUtil.java
@@ -127,7 +127,7 @@ public static void write(File file, InputStream in, long size, long chunkSize) t
 							inChannel.transferTo(finalPosition, finalEndSize, outChannel);
 						}
 						catch (IOException e) {
-							throw new SystemException("S_UnKnow_Error", e.getMessage());
+							throw new SystemException("S_UnKnow_Error", e.getMessage(), e);
 						}
 						return true;
 					});
@@ -137,7 +137,7 @@ public static void write(File file, InputStream in, long size, long chunkSize) t
 			catch (InterruptedException e) {
 				Thread.currentThread().interrupt();
 				log.error("错误信息：{}", e.getMessage());
-				throw new SystemException("S_UnKnow_Error", e.getMessage());
+				throw new SystemException("S_UnKnow_Error", e.getMessage(), e);
 			}
 		}
 	}
@@ -251,7 +251,7 @@ private static void replaceFromEnd(String sourcePath, char oldChar, char newChar
 			}
 		}
 		catch (IOException e) {
-			throw new SystemException("S_UnKnow_Error", e.getMessage());
+			throw new SystemException("S_UnKnow_Error", e.getMessage(), e);
 		}
 	}
 

diff --git a/...ou-common/laokou-common-core/src/main/java/org/laokou/common/core/utils/TemplateUtil.java b/...ou-common/laokou-common-core/src/main/java/org/laokou/common/core/utils/TemplateUtil.java
@@ -54,7 +54,7 @@ public static String getContent(String template, Map<String, Object> params) {
 		}
 		catch (Exception e) {
 			log.error("错误信息：{}", e.getMessage());
-			throw new SystemException("S_UnKnow_Error", e.getMessage());
+			throw new SystemException("S_UnKnow_Error", e.getMessage(), e);
 		}
 	}
 

diff --git a/laokou-common/laokou-common-crypto/src/main/java/org/laokou/common/crypto/utils/RSAUtil.java b/laokou-common/laokou-common-crypto/src/main/java/org/laokou/common/crypto/utils/RSAUtil.java
@@ -67,7 +67,7 @@ public final class RSAUtil {
 		}
 		catch (IOException e) {
 			log.error("读取私钥或密钥失败，错误信息：{}", e.getMessage());
-			throw new SystemException("S_UnKnow_Error", e.getMessage());
+			throw new SystemException("S_UnKnow_Error", e.getMessage(), e);
 		}
 	}
 

diff --git a/...aokou-common-i18n/src/main/java/org/laokou/common/i18n/common/exception/BizException.java b/...aokou-common-i18n/src/main/java/org/laokou/common/i18n/common/exception/BizException.java
@@ -32,4 +32,8 @@ public BizException(String code, String msg) {
 		super(code, msg);
 	}
 
+	public BizException(String code, String msg, Throwable throwable) {
+		super(code, msg, throwable);
+	}
+
 }
diff --git a/...ou-common-i18n/src/main/java/org/laokou/common/i18n/common/exception/GlobalException.java b/...ou-common-i18n/src/main/java/org/laokou/common/i18n/common/exception/GlobalException.java
@@ -49,4 +49,10 @@ protected GlobalException(String code, String msg) {
 		this.msg = msg;
 	}
 
+	protected GlobalException(String code, String msg, Throwable throwable) {
+		super(msg, throwable);
+		this.code = code;
+		this.msg = msg;
+	}
+
 }
diff --git a/...kou-common-i18n/src/main/java/org/laokou/common/i18n/common/exception/ParamException.java b/...kou-common-i18n/src/main/java/org/laokou/common/i18n/common/exception/ParamException.java
@@ -32,6 +32,10 @@ public ParamException(String code, String msg) {
 		super(code, msg);
 	}
 
+	public ParamException(String code, String msg, Throwable throwable) {
+		super(code, msg, throwable);
+	}
+
 	public final static class OAuth2 {
 
 		/**

diff --git a/...ou-common-i18n/src/main/java/org/laokou/common/i18n/common/exception/SystemException.java b/...ou-common-i18n/src/main/java/org/laokou/common/i18n/common/exception/SystemException.java
@@ -32,6 +32,10 @@ public SystemException(String code, String msg) {
 		super(code, msg);
 	}
 
+	public SystemException(String code, String msg, Throwable throwable) {
+		super(code, msg, throwable);
+	}
+
 	public final static class Gateway {
 
 		/**

diff --git a/...ou-common-mybatis-plus/src/main/java/org/laokou/common/mybatisplus/utils/MybatisUtil.java b/...ou-common-mybatis-plus/src/main/java/org/laokou/common/mybatisplus/utils/MybatisUtil.java
@@ -96,7 +96,7 @@ public <T, M> void batch(List<T> dataList, int batchNum, int timeout, Class<M> c
 			catch (InterruptedException e) {
 				Thread.currentThread().interrupt();
 				log.error("错误信息：{}", e.getMessage());
-				throw new SystemException("S_UnKnow_Error", e.getMessage());
+				throw new SystemException("S_UnKnow_Error", e.getMessage(), e);
 			}
 		}
 	}

diff --git a/...mon-mybatis-plus/src/main/java/org/laokou/common/mybatisplus/utils/TransactionalUtil.java b/...mon-mybatis-plus/src/main/java/org/laokou/common/mybatisplus/utils/TransactionalUtil.java
@@ -48,7 +48,7 @@ public void executeInTransaction(DatabaseOperation operation) {
 			catch (Exception e) {
 				r.setRollbackOnly();
 				log.error("操作失败，错误信息：{}", e.getMessage());
-				throw new SystemException("S_DS_OperationError", e.getMessage());
+				throw new SystemException("S_DS_OperationError", e.getMessage(), e);
 			}
 		});
 	}

diff --git a/...ain/java/org/laokou/auth/service/authentication/AbstractOAuth2AuthenticationProvider.java b/...ain/java/org/laokou/auth/service/authentication/AbstractOAuth2AuthenticationProvider.java
@@ -81,7 +81,7 @@ public Authentication authenticate(Authentication authentication) {
 		}
 		catch (IOException e) {
 			log.error("认证授权失败，错误信息：{}", e.getMessage());
-			throw new SystemException("S_UnKnow_Error", e.getMessage());
+			throw new SystemException("S_UnKnow_Error", e.getMessage(), e);
 		}
 	}