From 7d30e603d1aa2f88e04c518e0efe2479bd078e47 Mon Sep 17 00:00:00 2001
From: liaozan <378024053@qq.com>
Date: Wed, 31 May 2023 13:19:35 +0800
Subject: [PATCH] Refine dubbo exception message

---
 .../autoconfigure/dubbo/filter/DubboExceptionFilter.java   | 7 ++++---
 .../framework/autoconfigure/mybatis/biz/BizIdHelper.java   | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/filter/DubboExceptionFilter.java b/starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/filter/DubboExceptionFilter.java
index 8620b5e..a8959fc 100644
--- a/starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/filter/DubboExceptionFilter.java
+++ b/starters/dubbo-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/dubbo/filter/DubboExceptionFilter.java
@@ -37,13 +37,14 @@ public class DubboExceptionFilter extends ExceptionFilter {
     }
 
     private void logErrorDetail(Invoker<?> invoker, Throwable exception) {
-        RpcServiceContext context = RpcContext.getServiceContext();
+        RpcServiceContext context = RpcContext.getCurrentServiceContext();
         String arguments = Arrays.toString(context.getArguments());
         String serviceName = invoker.getInterface().getSimpleName();
         String methodName = context.getMethodName();
         String remoteHost = context.getRemoteHost();
         String remoteApplication = context.getRemoteApplicationName();
-        log.error("Catch rpc exception, client: {}@{}, target: {}#{}, args: {}", remoteApplication, remoteHost, serviceName, methodName, arguments, exception);
+        String errorMessage = ExceptionUtil.getMessage(exception);
+        log.error("Catch rpc exception: {}, client: {}@{}, target: {}#{}, args: {}", errorMessage, remoteApplication, remoteHost, serviceName, methodName, arguments, exception);
     }
 
-}
\ No newline at end of file
+}
diff --git a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/biz/BizIdHelper.java b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/biz/BizIdHelper.java
index 79aca83..0ef748a 100644
--- a/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/biz/BizIdHelper.java
+++ b/starters/mybatis-spring-boot-starter/src/main/java/com/schbrain/framework/autoconfigure/mybatis/biz/BizIdHelper.java
@@ -44,7 +44,7 @@ public class BizIdHelper {
 
     private static TableFieldInfo getBizIdFieldInfo(TableInfo tableInfo, Field bizIdField) {
         List<TableFieldInfo> fieldInfoList = tableInfo.getFieldList().stream()
-                .filter(fieldInfo -> fieldInfo.getField() == bizIdField)
+                .filter(fieldInfo -> fieldInfo.getField().equals(bizIdField))
                 .collect(Collectors.toList());
         if (CollectionUtils.isEmpty(fieldInfoList)) {
             throw new BaseException(String.format("%s can not be found in fieldList", bizIdField.getName()));
-- 
GitLab