test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
wenyann 2020-08-27 10:16:02 +08:00
parent 7ddd9f23d2 278d0bf2bd
commit d7f3481300
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

9
backend/src/main/java/io/metersphere/api/service/APITestService.java
View File

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

1
backend/src/main/resources/i18n/messages_en_US.properties
View File

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

1
backend/src/main/resources/i18n/messages_zh_CN.properties
View File

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

1
backend/src/main/resources/i18n/messages_zh_TW.properties
View File

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