test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
6,618 Commits 43 Branches 170 Tags 411 MiB
Commit Graph

3372 Commits

Author SHA1 Message Date
Captain.B 84a989db63 Merge remote-tracking branch 'origin/master' 2021-03-15 17:03:41 +08:00
Captain.B c426bb2064 feat(性能测试): 配置压测时长支持单位 2021-03-15 16:55:33 +08:00
chenjianxing bbacb89b02 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-15 16:21:14 +08:00
chenjianxing b5709cc998 feat: 脑图用例编辑 2021-03-15 16:20:51 +08:00
shiziyuan9527 82d7be618c fix: 主题色修改 2021-03-15 15:26:56 +08:00
shiziyuan9527 41cfc77a3e Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-13 13:04:56 +08:00
shiziyuan9527 551f34fee7 feat(测试跟踪): 首页重构 2021-03-13 13:01:28 +08:00
fit2-zhao 170d811c14 fix(接口定义): 空指针问题修复 2021-03-12 18:12:29 +08:00
fit2-zhao 7093a8a921 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-12 17:14:36 +08:00
fit2-zhao 759da73dd5 fix(接口自动化): 规范 提取脚本和 断言脚本名称 2021-03-12 17:14:29 +08:00
shiziyuan9527 7d26ee82c5 feat(测试跟踪): 用例数量统计 2021-03-12 16:57:16 +08:00
Captain.B e9e3dce76c Merge remote-tracking branch 'origin/master' 2021-03-12 15:56:26 +08:00
Captain.B 03151eaa3e fix(性能测试): 修复由于node-controller返回不正确的错误提示 2021-03-12 15:56:09 +08:00
chenjianxing f4ed49fde5 fix: 删除相关用户，接口测试用例列表报错 2021-03-12 15:30:54 +08:00
Captain.B 56110bfa5b Merge remote-tracking branch 'origin/master' 2021-03-12 15:07:58 +08:00
Captain.B 306600c73a refactor: 用户登录时用户名和密码使用密文传输 
Closes #1094
 2021-03-12 15:07:12 +08:00
song.tianyang 2b47f47d40 Merge remote-tracking branch 'origin/master' 2021-03-12 15:03:05 +08:00
song.tianyang a0d7b33323 fix: 修改定时任务创建时的参数-测试计划等入口参数修改 
修改定时任务创建时的参数-测试计划等入口参数修改
 2021-03-12 14:55:59 +08:00
wenyann ca838a36d6 Merge remote-tracking branch 'origin/master' 2021-03-12 14:55:52 +08:00
wenyann d3d35568bb fix:flayway 2021-03-12 14:55:33 +08:00
song.tianyang 7e9cf5b292 fix: 修改定时任务创建时的参数 
修改定时任务创建时的参数类
 2021-03-12 14:23:46 +08:00
wenyann 637739459e Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-12 11:15:31 +08:00
fit2-zhao 7a9bb603e8 fix(接口自动化): 修复引用场景不能移除问题 2021-03-12 10:56:59 +08:00
shiziyuan9527 846345cdd2 fix: SQL报错 2021-03-12 10:37:50 +08:00
wenyann 9d6cec56e1 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-12 10:23:38 +08:00
Coooder-X de06a5e770
fix: 国际化补充 (#1615) 
* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* fix: 国际化补充
 2021-03-11 20:44:49 +08:00
Coooder-X c25f10050b
feat(接口定义): 支持接口定义导出为 swagger 格式 (#1606) 
* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* feat(接口定义): 支持接口定义导出为 swagger 格式
 2021-03-11 20:44:29 +08:00
wenyann 3aae293f22 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-11 18:54:04 +08:00
fit2-zhao 5870c64653 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-11 18:49:41 +08:00
shiziyuan9527 4c6760df8b fix(测试用例): 字符串限制长度不一致 
Closes #1574
 2021-03-11 18:40:23 +08:00
wenyann 4edddd5e39 Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	backend/src/main/resources/db/migration/V78__v1.8_release.sql
 2021-03-11 18:33:38 +08:00
wenyann c3627e5f29 fix:测试评审接口列表修改 2021-03-11 18:32:34 +08:00
fit2-zhao 257d031b8a Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-11 17:59:27 +08:00
fit2-zhao 7dfa50d348 fix(接口定义): 保存用例最后执行环境 2021-03-11 17:03:29 +08:00
shiziyuan9527 6500e0cf4a Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	frontend/src/business/components/xpack
 2021-03-11 16:46:58 +08:00
shiziyuan9527 56e9399595 feat(系统设置): 修改配色 2021-03-11 16:38:40 +08:00
song.tianyang 9f33d88d3a Merge remote-tracking branch 'origin/master' 2021-03-11 16:36:42 +08:00
song.tianyang 2a29e611b5 feat: 接口自动化模块Har文件导入 
接口自动化模块Har文件导入
 2021-03-11 16:34:14 +08:00
wenyann 0d1d1acd3d fix:修复测试报告不存在 2021-03-11 16:32:47 +08:00
fit2-zhao be133b3cc6 fix(接口自动化，接口定义): 修复列表数据放到回收站再恢复时状态错误问题 2021-03-11 15:56:54 +08:00
wenyann 6b46f3120b Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-11 14:14:29 +08:00
Captain.B b9be1ddd0e refactor(性能测试): 增加上传资源文件的类型, 合并 csv 和 jar 的保存方式统一使用 resourceFiles 2021-03-11 14:12:49 +08:00
wenyann 8fd1ddbf2b Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-11 14:10:33 +08:00
Captain.B b93fac0ee5 Merge remote-tracking branch 'origin/master' 2021-03-11 14:08:40 +08:00
Captain.B 353e6bed77 refactor(性能测试): 增加上传资源文件的类型, 合并 csv 和 jar 的保存方式统一使用 resourceFiles 2021-03-11 14:05:52 +08:00
wenyann 0e3a26cbb5 fix:创建测试用例修改 2021-03-11 14:05:32 +08:00
fit2-zhao 448c14138b Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-11 13:51:07 +08:00
fit2-zhao 6b76d62bdb fix(接口自动化): 每个请求显示执行结果 2021-03-11 13:30:37 +08:00
Captain.B 3392ae6cb3 fix: socket 链接不用经过csrf 2021-03-11 11:47:20 +08:00
song.tianyang 0380567fe4 feat: Har文件导入 
Har文件导入
 2021-03-11 11:40:15 +08:00
Captain.B 061966ce36 fix: socket 链接不用经过csrf 2021-03-11 11:28:01 +08:00
Captain.B e11e59a256 fix: 不设置csrfToken提示错误 2021-03-10 17:48:38 +08:00
Captain.B 808f9de68b fix: 跳转到 / 不用校验csrf 2021-03-10 17:30:13 +08:00
Captain.B 7c40fa3377 fix: 没有登录不需要校验csrf 2021-03-10 16:56:19 +08:00
Captain.B 5a632c7141 Merge remote-tracking branch 'origin/master' 2021-03-10 15:48:33 +08:00
Captain.B 076baff321 refactor: 使用csrf拦截器过滤请求, 如果配置了 referer.urls 则同时校验 referer 
Closes #1088
 2021-03-10 15:27:17 +08:00
Captain.B 7e6a08bef2 refactor: 使用csrf拦截器过滤请求 
Closes #1088
 2021-03-10 15:02:30 +08:00
shiziyuan9527 e1d18909e2 fix(接口自动化): 添加场景到测试计划时未选择环境 2021-03-10 14:15:01 +08:00
fit2-zhao b9d43558bc Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-10 11:15:29 +08:00
fit2-zhao c5d58d40c3 feat(接口定义): JSONpath 断言增加操作符 2021-03-10 11:14:31 +08:00
song.tianyang 7e7433f801 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
 2021-03-09 19:21:19 +08:00
song.tianyang 3d822ac0bb fix: 有附件的案例或场景转JMX时，附件也要加过去 
有附件的案例或场景转JMX时，附件也要加过去
 2021-03-09 19:10:27 +08:00
shiziyuan9527 abe640cba5 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-09 18:09:58 +08:00
shiziyuan9527 c90c061738 fix(接口自动化): 环境配置问题 2021-03-09 18:08:02 +08:00
wenyann 3e64e39631 Merge remote-tracking branch 'origin/master' 2021-03-09 17:44:08 +08:00
fit2-zhao b80da9b9ae refactor(接口自动化): 执行代码规范调整 2021-03-09 17:41:15 +08:00
wenyann 5475bb4adb feat: 测试评审详情改造，关联测试用例 2021-03-09 17:32:49 +08:00
fit2-zhao 974ad20206 fix(接口自动化): 断言JSONPath 恢复支持正则表达式方式 2021-03-09 17:22:24 +08:00
fit2-zhao 8fe8ff48ad Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-09 17:07:13 +08:00
fit2-zhao cc5175ef6c refactor(接口自动化): 重构执行方法，按照一个场景一个jmx 执行 2021-03-09 17:01:53 +08:00
Captain.B cc46f93fe5 Merge remote-tracking branch 'origin/master' 2021-03-09 14:05:52 +08:00
Captain.B 5f59602ddd fix: 去掉登录页面滚动条 2021-03-09 14:05:35 +08:00
wenyann 66977ce60d fix: 场景字段缺失 2021-03-09 13:13:25 +08:00
Captain.B 9ba7639437 refactor: 增加一个restTemplateIgnoreSSL 2021-03-09 10:37:37 +08:00
fit2-zhao add62bacaa Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-08 17:55:44 +08:00
fit2-zhao e532cdb634 refactor(接口自动化): 统一文件路径 2021-03-08 17:38:32 +08:00
shiziyuan9527 3258c90527 fix(接口自动化): 空指针问题 2021-03-08 17:27:22 +08:00
Captain.B 17867c5684 fix(性能测试): 修复上传附件没有修改路径的bug 2021-03-08 17:14:51 +08:00
fit2-zhao 44422224ca Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-08 17:00:39 +08:00
fit2-zhao bace68bd85 feat(测试跟踪): xmind 导入用例增加标签处理 2021-03-08 17:00:32 +08:00
shiziyuan9527 64fd20803b refactor(接口自动化): 兼容历史数据 2021-03-08 15:43:54 +08:00
fit2-zhao 3e985afc4b Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-08 15:38:54 +08:00
fit2-zhao 9cdadf67ee fix(接口自动化): JSON断言特殊符号处理 2021-03-08 15:34:38 +08:00
shiziyuan9527 b22f2a5ed7 feat(接口自动化): 批量修改场景执行环境 2021-03-08 14:21:55 +08:00
fit2-zhao 9b6281d4cc Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-08 13:30:18 +08:00
fit2-zhao 019fa6709a fix(接口自动化): 修复headers和请求同名问题 2021-03-08 13:30:12 +08:00
shiziyuan9527 5e98f32617 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-08 11:24:53 +08:00
BugKing 4e393c2660 refactor: 去掉重复的SQL语句 2021-03-08 11:23:37 +08:00
shiziyuan9527 d976a739e6 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-08 11:22:32 +08:00
shiziyuan9527 691364a527 feat(测试计划): 场景用例使用独立的执行环境 2021-03-08 11:21:00 +08:00
song.tianyang 9fe06d379a refactor: 去掉workspaceService用不到的引用 
去掉workspaceService用不到的引用
 2021-03-08 10:41:59 +08:00
song.tianyang 3e616a5ebb Merge remote-tracking branch 'origin/master' 2021-03-05 20:40:26 +08:00
song.tianyang aeb3af81fa fix: 登陆验证失效，改过的代码暂时回退 
登陆验证失效，改过的代码暂时回退
 2021-03-05 18:58:26 +08:00
fit2-zhao 60bb8bdf18 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-05 18:30:12 +08:00
fit2-zhao fdc57a84e6 feat(XPack): 完成报表列表功能及筛选功能 2021-03-05 18:14:36 +08:00
song.tianyang 5d6f846420 fix: ApiKeyFilter日志部分增加异常处理 
ApiKeyFilter日志部分增加异常处理
 2021-03-05 18:11:06 +08:00
song.tianyang 2c522657e5 Merge remote-tracking branch 'origin/master' 2021-03-05 17:43:45 +08:00
song.tianyang d5a17f447c fix: 文档分享功能问题-增加过滤路径、日志，修改文档路径生成方式 
文档分享功能问题-增加过滤路径、日志，修改文档路径生成方式
 2021-03-05 17:41:31 +08:00
Coooder-X df906148c2
refactor(性能测试): 保存执行时，运行失败提示完善 (#1572) 
* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* refactor(性能测试): 保存执行时，运行失败提示完善
 2021-03-05 17:32:41 +08:00
Coooder-X 595a594d50
feat(场景步骤、环境配置): 场景变量、环境配置 支持mock参数 (#1566) 
* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度

* feat(场景步骤、环境配置): 场景变量、环境配置支持mock参数
 2021-03-05 17:31:05 +08:00
Coooder-X dc6240c964
feat(测试跟踪): 测试用例下载模版增加标签列 (#1548) 
* feat(测试跟踪): 测试用例下载模版增加标签列

* fix(接口定义): 扩大请求头键长度
 2021-03-05 17:29:17 +08:00
Coooder-X a5b03d1e12
fix:(测试计划) 测试计划空指针、计划开始时间更新 (#1543) 2021-03-05 17:28:49 +08:00
shiziyuan9527 7a251e2afb Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	backend/src/main/resources/db/migration/V78__v1.8_release.sql
 2021-03-05 17:08:00 +08:00
shiziyuan9527 313c6d4eaf feat(测试计划): 批量修改场景用例执行环境 2021-03-05 17:03:12 +08:00
Captain.B d6b73f1305 Merge remote-tracking branch 'origin/master' 2021-03-05 16:43:43 +08:00
Captain.B a281f08422 feat(性能测试): 支持选择线程组 2021-03-05 16:43:21 +08:00
wenyann 63578e4391 Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	backend/src/main/resources/db/migration/V78__v1.8_release.sql
 2021-03-05 16:25:51 +08:00
wenyann d1fa34c7fc feat: 测试用例改造 2021-03-05 16:24:34 +08:00
Captain.B 53f173305c feat(性能测试): 支持选择线程组 2021-03-05 16:20:15 +08:00
shiziyuan9527 eed41fab06 feat(测试计划): 关联场景用例时保存执行环境 2021-03-05 16:17:18 +08:00
Captain.B 7599c4c5fc feat(性能测试): 支持选择线程组 2021-03-05 15:57:25 +08:00
Captain.B 3a7a37bc19 feat(性能测试): 上传的文件保证顺序 2021-03-05 14:32:52 +08:00
shiziyuan9527 e228a8eb43 refactor(测试计划): 修改场景用例下环境字段类型 2021-03-05 14:21:16 +08:00
Captain.B 540183f5b8 feat(性能测试): request 包名修改 2021-03-05 13:32:53 +08:00
Captain.B 2dd0d94276 Merge branch 'master' of github.com:metersphere/metersphere 2021-03-05 13:29:47 +08:00
Captain.B 4ac88bbdbd feat(性能测试): request 包名修改 2021-03-05 13:29:18 +08:00
Captain.B 329ed8dd77 feat(性能测试): 支持自由组合场景 2021-03-05 13:13:29 +08:00
shiziyuan9527 b49505328f fix(测试用例): 测试用例导出再导入的用例可以重名的问题 2021-03-05 11:03:15 +08:00
song.tianyang 0c6704b742 Merge remote-tracking branch 'origin/master' 2021-03-04 19:21:32 +08:00
song.tianyang 41cb3e0283 feat: 设置模块，系统->用户、组织->成员 新增批量处理功能【添加工作空间】【添加角色】；工作空间->成员 新增批量处理功能【添加角色】 
设置模块，系统->用户、组织->成员 新增批量处理功能【添加工作空间】【添加角色】；工作空间->成员 新增批量处理功能【添加角色】
 2021-03-04 19:21:18 +08:00
shiziyuan9527 aa54248673 feat(测试计划): 批量修改接口用例执行环境 2021-03-04 17:41:30 +08:00
fit2-zhao eb416c3ef1 fix(接口定义): 修复Basic Auth 认证问题 2021-03-04 16:52:09 +08:00
fit2-zhao c8c96d8919 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-03 18:47:42 +08:00
fit2-zhao 032b9e16e1 fix(接口自动化): 修复jmx导入 断言规则处理问题 2021-03-03 17:48:21 +08:00
Captain.B f4dbf03580 Merge branch 'scenario' 2021-03-03 17:35:02 +08:00
Captain.B 4a9ccc2ea5 feat(性能测试): 支持组合场景场景 2021-03-03 17:33:55 +08:00
fit2-zhao ce9d9c8c43 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-03 17:33:27 +08:00
fit2-zhao a30c790a41 fix(接口自动化): 修复导入jmx JSON 提取参数问题 2021-03-03 17:28:05 +08:00
song.tianyang 1df8b0c38a Merge remote-tracking branch 'origin/master' 2021-03-02 18:27:11 +08:00
song.tianyang 1c4d0c9012 feat: 用户excel批量导入功能 
用户excel批量导入功能
 2021-03-02 18:22:22 +08:00
shiziyuan9527 140ce7c211 fix(测试计划): 定时任务触发的接口用例执行失败的问题 2021-03-02 14:06:10 +08:00
fit2-zhao eae9359892 fix(接口自动化): 修复导入jmx数据源问题 2021-03-02 11:26:30 +08:00
wenyann dd96caedd7 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-01 15:21:32 +08:00
wenyann 1a633fe2ca feat: 改造评审用例，创建评审，评审详情 
fix：修改接口定义更新错误
 2021-03-01 15:21:10 +08:00
fit2-zhao cbd3f6a9b4 fix(接口定义): 重写认证方法 2021-03-01 13:58:18 +08:00
fit2-zhao 4dde080952 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-03-01 13:13:15 +08:00
fit2-zhao a49eb5a416 fix(接口定义): 新版本auth 完善 2021-03-01 12:11:21 +08:00
shiziyuan9527 532007f25d feat(接口自动化): 场景步骤跨项目添加接口 2021-02-26 18:24:59 +08:00
shiziyuan9527 e15b1624a8 fix(接口自动化): 场景步骤下接口执行问题 2021-02-26 13:38:34 +08:00
shiziyuan9527 2bed7959bb Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java
	backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java
 2021-02-26 13:30:00 +08:00
shiziyuan9527 025fa9cde0 fix(接口自动化): 场景步骤中接口无法执行的问题 2021-02-26 13:14:56 +08:00
fit2-zhao a3d3fc8366 refactor(接口测试): 重构基本数据格式 2021-02-26 11:32:49 +08:00
fit2-zhao 9b2b7e7f63 fix(接口定义): 修复新功能导致执行问题 2021-02-25 18:25:38 +08:00
song.tianyang 46bff0e294 refactor: 合并 flyway的SQL 
合并 flyway的SQL， v76 v78 v79 文件合并
 2021-02-25 16:49:58 +08:00
song.tianyang 812ea19285 fix: 修改sql 
修改sql
 2021-02-25 15:51:04 +08:00
song.tianyang e385d3b84c Merge remote-tracking branch 'origin/master' 2021-02-25 15:29:48 +08:00
song.tianyang a84edf8cc9 Merge remote-tracking branch 'origin/master' 2021-02-25 15:29:04 +08:00
song.tianyang 56a369b6a6 fix: 修改请求方式显示样式、提升文档页面数据加载的性能 
修改请求方式显示样式、提升文档页面数据加载的性能
 2021-02-25 15:28:41 +08:00
fit2-zhao 35887dff24 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-25 15:27:26 +08:00
fit2-zhao be78ab5b29 fix(接口自动化，测试跟踪，接口定义): 修复所有高级搜索-标签搜索问题 2021-02-25 15:24:34 +08:00
shiziyuan9527 e4f8018065 Merge branch 'scenario-projects' 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/dto/definition/request/ParameterConfig.java
#	backend/src/main/java/io/metersphere/commons/utils/ServiceUtils.java
#	frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
 2021-02-25 14:48:54 +08:00
shiziyuan9527 c9e4e32fca fix(接口自动化): 跨项目添加场景兼容历史数据 2021-02-25 14:37:08 +08:00
song.tianyang 19508c3254 Merge remote-tracking branch 'origin/master' 2021-02-25 14:00:52 +08:00
chenjianxing 16b146b2a4 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-25 13:56:21 +08:00
song.tianyang f2644a0afa refactor: 接口定义增加api文档功能-增加创建表sql 
接口定义增加api文档功能-增加创建表sql
 2021-02-25 13:55:23 +08:00
chenjianxing 089a994b01 fix: 测试用例导出全选 2021-02-25 13:47:47 +08:00
song.tianyang 8412735cec Merge remote-tracking branch 'origin/master' 2021-02-25 13:46:42 +08:00
song.tianyang 33468c66cd feat: 接口定义增加api文档功能 
接口定义增加api文档功能
 2021-02-25 13:46:01 +08:00
Captain.B c91cf585fa refactor(性能测试): 手动停止测试发送通知修改 2021-02-25 13:32:41 +08:00
Captain.B 198bb154c4 refactor(性能测试): 手动停止测试发送通知修改 2021-02-25 13:27:47 +08:00
Captain.B 26d67b166b Merge remote-tracking branch 'origin/master' 2021-02-25 11:34:02 +08:00
Captain.B 9cd635dcb2 refactor(性能测试): 资源池增加配置gc和heap的选项 2021-02-25 11:33:30 +08:00
Captain.B 072792eb8b refactor(性能测试): 资源池增加配置gc和heap的选项 2021-02-25 11:32:58 +08:00
chenjianxing 13f5488e9c Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-25 11:27:45 +08:00
chenjianxing 3c8815f400 fix: 测试计划页面空指针 2021-02-25 11:27:36 +08:00
shiziyuan9527 6417a131b0 fix(接口自动化): 跨项目添加场景 2021-02-25 11:22:01 +08:00
Captain.B e2c0bedb8d Merge remote-tracking branch 'origin/master' 2021-02-25 10:12:35 +08:00
Captain.B 05261720d3 refactor(性能测试): 增加gc配置 2021-02-25 10:12:08 +08:00
Captain.B 7b17664d92 refactor(性能测试): 增加gc配置 2021-02-25 10:11:49 +08:00
wenyann fc43d9967f Merge remote-tracking branch 'origin/master' 2021-02-24 18:38:39 +08:00
wenyann 3fc69227ff fix: 设置接口URL不可重复，重复导入时接口用例重复生成,部分提取 2021-02-24 18:37:59 +08:00
fit2-zhao 10417ce699 refactor(接口自动化): 规范化代码 2021-02-24 18:29:42 +08:00
fit2-zhao 79780c8bac fix(场景自动化): 修复引用场景请求头未生效问题 2021-02-24 18:12:20 +08:00
fit2-zhao 2b9a239d6c fix(接口自动化): 导出jmx 部分问题修复 2021-02-24 17:16:01 +08:00
shiziyuan9527 ef08532187 feat(接口自动化): 跨项目添加场景 2021-02-24 16:29:22 +08:00
Captain.B 80234b3b91 refactor(性能测试): 去掉setupThreadGroup 2021-02-24 16:08:57 +08:00
chenjianxing 5562999f07 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-23 20:41:06 +08:00
chenjianxing b312f8d333 fix: 请求json转换异常 2021-02-23 20:40:41 +08:00
Captain.B ec426fcc1e refactor(性能测试): 变量名修改 2021-02-23 19:04:09 +08:00
Captain.B dc0adf3d8b refactor(性能测试): 去掉teardown线程组，使用日志信息判断结束 2021-02-23 19:02:09 +08:00
shiziyuan9527 0a997065dd feat(接口自动化): 跨项目添加场景步骤 2021-02-23 18:06:12 +08:00
Captain.B 396be1dd6b Merge remote-tracking branch 'origin/master' 2021-02-23 17:28:11 +08:00
Captain.B 6f7edddb03 fix(性能测试): 启动jmeter之前检查站点配置是否可用 2021-02-23 17:27:36 +08:00
chenjianxing ebfcc56a3d Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-23 17:10:39 +08:00
chenjianxing 1edc8f1644 refactor: 自定义表头支持拖拽 2021-02-23 17:10:24 +08:00
fit2-zhao 236781a575 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-23 17:02:58 +08:00
fit2-zhao 80e5b4935d feat(接口自动化): 导入jmx 添加HTTP 请求头处理 2021-02-23 17:02:49 +08:00
Captain.B 9e5ca27be0 chore: sync 2021-02-23 14:51:14 +08:00
fit2-zhao 22855ba8cb fix(接口定义):规范jmx导入方法 2021-02-23 14:27:23 +08:00
Captain.B abc533eac3 chore: sync 2021-02-23 13:03:17 +08:00
fit2-zhao 4d810c3d5d fix(接口定义): 修复执行报错问题 2021-02-23 11:29:15 +08:00
fit2-zhao 6b931b9777 fix(接口定义): 修复dubbo类型错误问题 2021-02-23 11:01:13 +08:00
Captain.B 75d576c7cd chore: sync 2021-02-23 09:42:43 +08:00
fit2-zhao 661274a650 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-22 18:21:26 +08:00
fit2-zhao 5b36c2fbe4 fix(接口自动化): 修复引用场景没有步骤问题 2021-02-22 18:12:10 +08:00
song.tianyang 7e2148a4f2 Merge remote-tracking branch 'origin/master' 2021-02-22 18:09:53 +08:00
fit2-zhao 8771e82ba1 fix(接口自动化): 修复场景变量 header 输入提示功能，修复报告显示顺序问题 2021-02-22 18:05:17 +08:00
fit2-zhao 13f1198a5f refactor(接口自动化): 性能优化，去除调试结果的加载 2021-02-22 16:54:40 +08:00
song.tianyang 608ba81baa refactor: 更新jmx文件的DubboDefaultConfigGui信息 
更新jmx文件的DubboDefaultConfigGui信息
 2021-02-22 16:43:19 +08:00
fit2-zhao a983c8a4da Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-22 16:38:49 +08:00
fit2-zhao 42a9c3b1de feat(接口自动化): 完成 jmx 导出功能 2021-02-22 16:32:44 +08:00
shiziyuan9527 5f0821174a refactor: 测试元素实体类增加项目ID属性 2021-02-22 14:51:05 +08:00
chenjianxing 2a7ccf7b24 refactor: 统一接口定义和场景导出 2021-02-22 13:57:40 +08:00
chenjianxing 0acadee061 fix：postman 导入脚本包含Tests脚本 2021-02-22 13:03:00 +08:00
chenjianxing adb134e56f Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-22 12:09:43 +08:00
chenjianxing bc3731b8cb refactor: 重构接口导入 2021-02-22 12:09:29 +08:00
song.tianyang cb1b9b1d67 Merge remote-tracking branch 'origin/master' 2021-02-22 11:41:40 +08:00
song.tianyang c737b01c27 fix: 修复更新jmx文件时未更新dubbo节点信息的缺陷 
修复更新jmx文件时未更新dubbo节点信息的缺陷
 2021-02-22 11:41:19 +08:00
Captain.B 11be6a7b5f feat: K8S 资源池支持nodeSelector 2021-02-22 11:32:22 +08:00
Captain.B 0922859f64 chore: sync 2021-02-22 09:43:15 +08:00
fit2-zhao 08a3c98ed6 fix(接口自动化): 修复jmx导入dubbo协议参数初始化问题 2021-02-20 18:50:40 +08:00
fit2-zhao 2cdad7e83c Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-20 18:26:12 +08:00
fit2-zhao e6e71a0f1e feat(接口自动化): 完成导出jmx功能 2021-02-20 18:25:39 +08:00
song.tianyang 85cd5077f5 fix: 修改生成jmx文件函数的逻辑，转化Dubbl标签的参数 
修改生成jmx文件函数的逻辑，转化Dubbl标签的参数
 2021-02-20 18:00:56 +08:00
fit2-zhao d98cee3d42 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-20 16:41:51 +08:00
fit2-zhao 91c8509a06 Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
 2021-02-20 15:58:17 +08:00
fit2-zhao adda8ff8a1 Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
 2021-02-20 15:57:24 +08:00
song.tianyang bbb218d60a fix: 修改生成jmx文件函数的逻辑，增加tcp/sql/dubbl的类名节点转化 
修改生成jmx文件函数的逻辑，增加tcp/sql/dubbl的类名节点转化
 2021-02-20 15:56:17 +08:00
fit2-zhao 44f04d6a2c feat(接口自动化): 导出jmx文件 2021-02-20 15:55:10 +08:00
song.tianyang c50517a6ff Merge remote-tracking branch 'origin/master' 2021-02-20 15:24:22 +08:00
song.tianyang d8262c3ec3 refactor: 修改生成jmx文件函数的逻辑 
修改生成jmx文件函数的逻辑
 2021-02-20 15:23:57 +08:00
Captain.B 8b178f9938 chore: sync 2021-02-20 15:10:21 +08:00
chenjianxing 29b87fd76d Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-20 14:12:39 +08:00
chenjianxing 3e623dd0ad fix: 场景导出代码冲突 2021-02-20 14:10:06 +08:00
song.tianyang f33de156fc Merge remote-tracking branch 'origin/master' 2021-02-20 13:59:30 +08:00
song.tianyang 012c8ec841 fix: 解决点击文档会报错的问题 
解决点击文档会报错的问题
 2021-02-20 13:59:09 +08:00
chenjianxing ce7600bad4 fix: 解决冲突 2021-02-20 13:44:18 +08:00
chenjianxing 500fe60fec feat: 场景导入-MS格式 2021-02-20 11:57:31 +08:00
fit2-zhao 5e04f7ef17 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-20 11:53:11 +08:00
fit2-zhao 1270eb8b29 Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
#	backend/src/main/java/io/metersphere/base/mapper/SwaggerUrlProjectMapper.xml
#	frontend/src/business/components/api/automation/ApiAutomation.vue
#	frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
 2021-02-20 11:53:04 +08:00
fit2-zhao b0486b6faf Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
#	backend/src/main/java/io/metersphere/base/mapper/SwaggerUrlProjectMapper.xml
#	frontend/src/business/components/api/automation/ApiAutomation.vue
#	frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
 2021-02-20 11:52:23 +08:00
song.tianyang 9be6c192d0 Merge branch 'v1.7' 2021-02-20 11:28:56 +08:00
song.tianyang 567ae41aa3 fix: 接口测试、接口自动化转性能测试时自带函数会带来jmeter报错 
修复接口测试、接口自动化转性能测试时自带函数会带来jmeter报错的问题
 2021-02-20 11:27:04 +08:00
fit2-zhao 63b8801aa9 feat(接口自动化): 完善jmx导入功能，增加jmeter相关Sampler依赖jar包 2021-02-20 11:20:58 +08:00
song.tianyang 2b9713b143 Merge remote-tracking branch 'origin/v1.7' into v1.7 2021-02-19 18:45:53 +08:00
song.tianyang 217800b24d fix: 修改定时任务表key字段长度 
修改定时任务表key字段长度
 2021-02-19 18:45:36 +08:00
song.tianyang 1f6736cad0 Merge remote-tracking branch 'origin/master' 2021-02-19 18:30:13 +08:00
song.tianyang d1789dd154 feat: 接口定义->文档 增加JSON-Schema的显示和查找功能 
接口定义->文档 增加JSON-Schema的显示和查找功能
 2021-02-19 18:29:47 +08:00
chenjianxing a813605095 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-19 17:52:45 +08:00
chenjianxing c6c220269b fix: 解决冲突 2021-02-19 17:52:34 +08:00
chenjianxing ff478c3d88 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-19 17:47:51 +08:00
chenjianxing a15ab8b8c6 fix: 测试用例模块树拖拽报错 2021-02-19 17:44:29 +08:00
wenyann a1d0dc5208 fix: flyway版本号冲突 2021-02-19 17:03:51 +08:00
wenyann c72a85ba39 Merge remote-tracking branch 'origin/master' 2021-02-19 16:54:36 +08:00
fit2-zhao bf81de8926 fix(测试跟踪): 修复https://github.com/metersphere/metersphere/issues/659 对应问题 2021-02-19 16:45:58 +08:00
shiziyuan9527 eb5b2d3de1 feat(测试跟踪): 用例评审默认关联工作空间下所有项目 2021-02-19 16:44:51 +08:00
wenyann 6e6ca3c0b9 Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
	frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
	frontend/src/business/components/api/definition/components/list/ApiList.vue
 2021-02-19 16:42:14 +08:00
chenjianxing 3f23ce02d7 场景导入-插件 2021-02-19 16:37:11 +08:00
wenyann 56a195b247 fix: 自定义表头 2021-02-19 16:34:30 +08:00
wenyann 245b46dc19 fix: 自定义表头 2021-02-19 16:34:22 +08:00
fit2-zhao 1c04e19880 feat(接口自动化): 导入JMX 通用数据源初始化 2021-02-19 16:26:30 +08:00
shiziyuan9527 b289b4d267 feat(测试跟踪): 测试计划默认关联工作空间下所有项目 2021-02-19 16:12:04 +08:00
chenjianxing f42e7ac3eb feat: 场景用例导出 2021-02-19 15:41:27 +08:00
fit2-zhao 6e3391c6fe fix(场景自动化): 场景请求头失效问题修复 2021-02-19 15:13:06 +08:00
fit2-zhao 8f9286252c feat(接口自动化): 导入JMX JDBC类型 数据源处理 2021-02-19 15:07:19 +08:00
chenjianxing a003eb566e Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-19 14:37:49 +08:00
chenjianxing 1e2e80d507 refactor: 重构场景全选 2021-02-19 14:37:25 +08:00
Captain.B 2b27f03ddf Merge remote-tracking branch 'origin/master' 2021-02-19 13:12:26 +08:00
Captain.B cecdcebc49 feat: K8S 资源池支持nodeSelector 2021-02-19 13:11:19 +08:00
chenjianxing c24ca8e562 场景支持导入postman 2021-02-19 11:30:08 +08:00
fit2-zhao 09b39ca249 fix(xpack): 修复license数量显示为0 问题 2021-02-18 14:54:44 +08:00
fit2-zhao 72351396ae fix(xpack): 修复license数量显示为0 问题 2021-02-18 14:23:31 +08:00
chenjianxing b7e12652dd fix: 解决冲突 2021-02-18 14:10:57 +08:00
fit2-zhao 329d95fe64 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-18 09:35:18 +08:00
song.tianyang 54d6c68dd7 fix: 解决合并1.7的冲突 
解决合并1.7的冲突
 2021-02-17 12:07:18 +08:00
song.tianyang d54e6911db Merge branch 'v1.7' 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
#	frontend/src/business/components/api/definition/components/runtest/RunTestDubboPage.vue
#	frontend/src/business/components/api/definition/components/runtest/RunTestSQLPage.vue
#	frontend/src/business/components/api/definition/components/runtest/RunTestTCPPage.vue
 2021-02-17 12:03:59 +08:00
song.tianyang 6f1db9d4eb Merge remote-tracking branch 'origin/master' 2021-02-17 11:50:52 +08:00
song.tianyang 7b671d3620 feat: 接口页面增加文档功能 
接口页面增加文档功能
 2021-02-17 11:50:25 +08:00
fit2-zhao 660f474924 fix(接口自动化): 修复用例文件上传丢失问题 2021-02-09 17:38:16 +08:00
fit2-zhao e0349f5a5f fix(测试跟踪): 修复上次xmind 格式错误问题 2021-02-09 17:22:15 +08:00
fit2-zhao 39cffd9615 feat(接口自动化): 导入jmx 增加HashTree 有序处理 2021-02-09 16:22:59 +08:00
fit2-zhao b7cc737dd7 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-09 15:09:46 +08:00
fit2-zhao 16283572c7 feat(接口自动化): 导入jmx 增加HashTree 有序处理 2021-02-09 14:56:14 +08:00
Captain.B 7d6d5bc5d8 fix(性能测试): 手动停止测试时发送停止消息到data-streaming 2021-02-09 14:49:49 +08:00
Captain.B cd7dff5fb7 fix(性能测试): 手动停止测试时发送停止消息到data-streaming 2021-02-09 11:34:00 +08:00
fit2-zhao e7df89b1e2 feat(接口自动化): 导入jmx对已经有的请求处理 2021-02-08 18:27:22 +08:00
wenyann 94ead290cc fix: 修改id长度 2021-02-08 17:36:49 +08:00
wenyann 6a948b3091 fix: 修改id长度 2021-02-08 17:27:18 +08:00
wenyann 21b6481b8b feat: 自定义表头 2021-02-08 17:22:27 +08:00
shiziyuan9527 2d791651db Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-08 14:29:36 +08:00
shiziyuan9527 f233d8d5cb fix(测试跟踪): 修复删除计划关联项目，测试计划也被删除的问题 2021-02-08 14:29:02 +08:00
fit2-zhao 5eb34cbae4 feat(场景自动化): 场景变量增加请求头，并历史请求头数据可以支持迁移 2021-02-08 14:12:07 +08:00
fit2-zhao 726044ee61 feat(接口自动化): 导入jmx 针对已存在协议处理 2021-02-08 11:24:10 +08:00
fit2-zhao d25d6f54cf feat(接口自动化): 导入jmx处理 2021-02-07 11:16:22 +08:00
fit2-zhao dcb0714601 Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	frontend/src/business/components/api/automation/scenario/ApiScenarioModule.vue
 2021-02-07 09:42:00 +08:00
chenjianxing b2bd89f986 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-05 18:52:00 +08:00
chenjianxing 64c746a10a feat: 导出接口支持用例一起导出 2021-02-05 18:51:47 +08:00
fit2-zhao 61992c14d5 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-05 16:38:24 +08:00
fit2-zhao 6c188f3f88 feat(接口自动化): 修复当变量未定义时 影响IF为空或非空判断问题 2021-02-05 16:38:03 +08:00
Captain.B f298817c91 refactor: 统一处理sql异常，不在前台显示，提示sql错误，检查日志文件 2021-02-05 15:38:19 +08:00
fit2-zhao fc625a27f3 feat(接口自动化): 导入Jmeter文件初步结构完成 2021-02-05 15:32:39 +08:00
shiziyuan9527 c5b4450997 refactor: 调整目录结构 2021-02-05 15:07:27 +08:00
chenjianxing 0fd72ce96d refactor: 接口列表全选重构 2021-02-05 14:49:48 +08:00
fit2-zhao eb815f9182 Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
 2021-02-05 10:58:43 +08:00
fit2-zhao 1102ad81ab Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
 2021-02-05 10:40:48 +08:00
wenyann 67a420e78e Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	frontend/src/business/components/track/case/components/TestCaseList.vue
 2021-02-05 10:19:25 +08:00
wenyann 41964c5c58 fix: 自定义表头 2021-02-05 10:16:51 +08:00
fit2-zhao 38ce17b583 Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
 2021-02-05 10:14:14 +08:00
Captain.B 264ec0e412 Merge remote-tracking branch 'origin/master' 2021-02-04 17:54:11 +08:00
Captain.B 7b3612f84d Merge branch 'v1.7' 2021-02-04 17:53:16 +08:00
shiziyuan9527 37f451408a Merge branch 'refactor-pool' 2021-02-04 17:11:10 +08:00
shiziyuan9527 7cb592955c refactor(系统设置): 优化测试资源池删除 2021-02-04 17:09:38 +08:00
fit2-zhao bc5f317f15 fix(接口自动化): SQL历史数据升级数据源处理 2021-02-04 17:07:01 +08:00
fit2-zhao 24b172af9f fix(接口自动化): SQL历史数据升级变量处理 2021-02-04 17:00:02 +08:00
fit2-zhao f9d731365b Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-04 16:26:08 +08:00
fit2-zhao 5071bc16fa fix(接口自动化): 设置csv，默认允许循环获取内容 2021-02-04 16:25:48 +08:00
Captain.B 2052ea4cd7 refactor(性能测试): 清理数据的功能放在data-streaming中 2021-02-04 16:22:46 +08:00
Captain.B af5a970412 Merge branch 'v1.7' 2021-02-04 16:14:03 +08:00
Captain.B 5ac56fe720 Merge remote-tracking branch 'origin/v1.7' into v1.7 2021-02-04 16:13:07 +08:00
Captain.B 72851dc3ce refactor(性能测试): 清理数据的功能放在data-streaming中 2021-02-04 16:11:40 +08:00
fit2-zhao be1722f7b7 fix(接口自动化): 去除场景级别csv，保留循环内。 2021-02-04 16:07:09 +08:00
fit2-zhao 68256ca9fa Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-04 15:50:04 +08:00
Captain.B 592b2a7cd0 refactor(性能测试): 每天定时清理已经执行完成的测试中间数据 2021-02-04 15:49:38 +08:00
fit2-zhao 1e9d320ddf fix(接口自动化): 修改包含场景ID字段长度，修复因历史数据升级ID长度过长问题。 2021-02-04 15:49:26 +08:00
Captain.B 3dbb5a2e5a refactor(性能测试): 每天定时清理已经执行完成的测试中间数据 
(cherry picked from commit b96c602842)
 2021-02-04 15:24:36 +08:00
Captain.B 4f6cf0e505 refactor(性能测试): 每天定时清理已经执行完成的测试中间数据 
(cherry picked from commit bbbdb63b21)
 2021-02-04 15:24:35 +08:00
Captain.B b96c602842 refactor(性能测试): 每天定时清理已经执行完成的测试中间数据 2021-02-04 15:23:34 +08:00
Captain.B bbbdb63b21 refactor(性能测试): 每天定时清理已经执行完成的测试中间数据 2021-02-04 15:21:25 +08:00
fit2-zhao 935bcbfafe fix(接口定义): 导入Jmeter 2021-02-04 14:48:04 +08:00
chenjianxing 7955dc6205 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-04 13:36:03 +08:00
Captain.B 2052fe9600 Merge branch 'v1.7' 2021-02-04 13:35:55 +08:00
Captain.B 124c3e4aa0 revert(性能测试): 回退使用java作为http-client，jmeter默认是httpclient4 2021-02-04 13:35:38 +08:00
Captain.B dae7ad93a7 Merge branch 'v1.7' 2021-02-04 12:56:43 +08:00
Captain.B 072efeaf86 refactor(性能测试): 使用java作为http-client，设置连接超时60s 2021-02-04 12:56:13 +08:00
chenjianxing 13da850bcb fix: 脚本断言选其他语言不生效 2021-02-04 11:11:20 +08:00
chenjianxing f3fedcdb05 fix: get请求query参数传空报错 2021-02-04 10:19:14 +08:00
wenyann 167742dfd9 fix: 测试 2021-02-03 18:57:11 +08:00
song.tianyang 0fa4facec4 fix: 代码格式优化 
代码格式优化
 2021-02-03 18:28:00 +08:00
fit2-zhao e69ee40438 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-03 17:48:37 +08:00
song.tianyang 683c533db0 Merge branch 'v1.7' 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
#	backend/src/main/java/io/metersphere/track/service/TestPlanService.java
#	frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
#	frontend/src/business/components/api/automation/scenario/variable/VariableList.vue
#	frontend/src/business/components/api/definition/components/case/ApiCaseItem.vue
 2021-02-03 17:11:04 +08:00
fit2-zhao a803225644 fix(接口定义): 历史JDBC数据兼容处理 2021-02-03 15:25:51 +08:00
chenjianxing 16b2b185ed fix: 环境里的请求头会优先于请求里的请求头 2021-02-03 13:48:41 +08:00
Coooder-X 21f8e54069 fit: 解决冲突 2021-02-03 11:54:44 +08:00
Coooder-X 9a9f8f628b fear: (系统设置) 项目-jar包管理，支持查找 (#1350) 2021-02-03 11:23:17 +08:00
Coooder-X 893485d592
fear: (系统设置) 项目-jar包管理，支持查找 (#1350) 2021-02-03 11:20:15 +08:00
Coooder-X 133035bd7a
fix: 测试计划无法编辑 (#1359) 2021-02-03 11:19:39 +08:00
fit2-zhao 8b3620337a refactor(接口自动化): 场景导入 jmx 基本完成 2021-02-03 10:03:07 +08:00
song.tianyang cc390326ab Merge remote-tracking branch 'origin/v1.7' into v1.7 2021-02-02 18:56:25 +08:00
song.tianyang 65427d18ca refactor: 测试计划关联接口用例，批量执行过程中前端显示加载状态 
测试计划关联接口用例，批量执行过程中建议前端显示加载状态
 2021-02-02 18:56:05 +08:00
fit2-zhao c74e88c3f3 refactor(接口自动化): 场景导入 ms，postman 基本完成 2021-02-02 17:46:00 +08:00
shiziyuan9527 f8d5ad2363 feat(用例评审): 批量修改评审结果 2021-02-02 17:29:25 +08:00
song.tianyang adeedd6272 Merge remote-tracking branch 'origin/v1.7' into v1.7 2021-02-02 13:43:14 +08:00
song.tianyang 45c705d020 fix: 部分数据进入测试计划详情会报错 
解决部分数据进入测试计划详情会报错的问题
 2021-02-02 13:42:47 +08:00
wenyann 17f340002d Merge remote-tracking branch 'origin/v1.7' into v1.7 2021-02-02 11:11:23 +08:00
wenyann c74c786725 fix: 修复导入swagger，模式选择覆盖，无法编辑 2021-02-02 11:10:56 +08:00
Captain.B d21ec14290 Merge remote-tracking branch 'origin/v1.7' into v1.7 2021-02-02 10:54:08 +08:00
Captain.B 99b46de258 fix: 修复下载jtl过大导致oom的问题 2021-02-02 10:53:55 +08:00
song.tianyang 172ff3d92d Merge remote-tracking branch 'origin/v1.7' into v1.7 2021-02-02 10:38:54 +08:00
song.tianyang faad2d2b0c fix: 接口测试首页统计，未执行情景统计了回收站里的数据 
解决接口测试首页统计，未执行情景统计了回收站里的数据的问题
 2021-02-02 10:38:36 +08:00
chenjianxing eb97cbeb25 fix: 批量修改场景环境报错 2021-02-01 20:29:38 +08:00