Merge branch 'fix/product-import' into 'master_dev'

fix:产品导入与云边同出错国际化显示

See merge request yunteng/thingskit!450

@@ -386,6 +386,10 @@ public abstract class BaseController {
                 log.warn("Database error: {} - {}", errorType, ExceptionUtils.getRootCauseMessage(exception));
             }
             return new ThingsboardException("Database error", ThingsboardErrorCode.GENERAL);
+        } else if(exception instanceof org.springframework.http.converter.HttpMessageNotReadableException){
+            if(exception.getCause() instanceof com.fasterxml.jackson.databind.exc.InvalidFormatException){
+                return new ThingsboardException(MessageUtils.message(ErrorMessage.INVALID_PARAMETER.getI18nCode()), exception, ThingsboardErrorCode.BAD_REQUEST_PARAMS);
+            }
         }
         return new ThingsboardException(exception.getMessage(), exception, ThingsboardErrorCode.GENERAL);
     }

@@ -53,6 +53,9 @@ import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.rule.RuleChain;
 import org.thingsboard.server.common.data.sync.ie.importing.csv.BulkImportRequest;
 import org.thingsboard.server.common.data.sync.ie.importing.csv.BulkImportResult;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.utils.i18n.MessageUtils;
 import org.thingsboard.server.common.msg.edge.FromEdgeSyncResponse;
 import org.thingsboard.server.common.msg.edge.ToEdgeSyncRequest;
 import org.thingsboard.server.dao.attributes.AttributesDao;
@@ -541,7 +544,9 @@ public class EdgeController extends BaseController {
         if (fromEdgeSyncResponse.isSuccess()) {
             response.setResult(new ResponseEntity<>(HttpStatus.OK));
         } else {
-            response.setErrorResult(new ThingsboardException("Edge is not connected", ThingsboardErrorCode.GENERAL));
+            //thingskit code 国际化
+//            response.setErrorResult(new ThingsboardException("Edge is not connected", ThingsboardErrorCode.GENERAL));
+            response.setErrorResult(new TkDataValidationException(MessageUtils.message(ErrorMessage.NETWORK_TIMEOUT.getI18nCode())));
         }
     }