Merge remote-tracking branch 'origin/master'

backend/src/main/java/io/metersphere/api/dto/scenario/request/HttpRequest.java

@@ -44,7 +44,7 @@ public class HttpRequest implements Request {
     @JSONField(ordinal = 13)
     private Boolean enable;
     @JSONField(ordinal = 14)
-    private Integer connectTimeout;
+    private Long connectTimeout;
     @JSONField(ordinal = 15)
-    private Integer responseTimeout;
+    private Long responseTimeout;
 }

backend/src/main/java/io/metersphere/api/service/APITestService.java

@@ -119,13 +119,15 @@ public class APITestService {
                 out = new FileOutputStream(file);
                 FileUtil.copyStream(in, out);
             } catch (IOException e) {
-                e.printStackTrace();
+                LogUtil.error(e);
+                MSException.throwException(Translator.get("upload_fail"));
             } finally {
                 try {
                     in.close();
                     out.close();
                 } catch (IOException e) {
-                    e.printStackTrace();
+                    LogUtil.error(e);
+                    MSException.throwException(Translator.get("upload_fail"));
                 }
             }
         }
@@ -168,7 +170,8 @@ public class APITestService {
             try {
                 FileUtil.copyDir(sourceFile, new File(targetDir));
             } catch (IOException e) {
-                e.printStackTrace();
+                LogUtil.error(e);
+                MSException.throwException(Translator.get("upload_fail"));
             }
         }
     }

backend/src/main/resources/i18n/messages_en_US.properties

@@ -8,6 +8,7 @@ error=error
 connection_failed=Connection failed
 delete_fail=Delete fail
 start_engine_fail=Start fail
+upload_fail=Upload fail
 #user related
 user_email_already_exists=User email already exists
 user_id_is_null=User ID cannot be null

backend/src/main/resources/i18n/messages_zh_CN.properties

@@ -7,6 +7,7 @@ row=行
 error=出错
 delete_fail=删除失败
 start_engine_fail=启动失败
+upload_fail=文件上传失败
 #user related
 user_email_already_exists=用户邮箱已存在
 user_id_is_null=用户ID不能为空

backend/src/main/resources/i18n/messages_zh_TW.properties

@@ -8,6 +8,7 @@ error=出錯
 connection_failed=連接失敗
 delete_fail=刪除失敗
 start_engine_fail=啟動失敗
+upload_fail=文件上傳失敗
 #user related
 user_email_already_exists=用戶郵箱已存在
 user_id_is_null=用戶ID不能為空