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
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
chenjianxing 6956f667fa Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-02-01 20:07:29 +08:00
chenjianxing fa457c1aa8 fix: TCP自定义请求 2021-02-01 20:07:12 +08:00
fit2-zhao 207d86554b fix(接口自动化): IF 非空判断处理 2021-02-01 19:24:32 +08:00
fit2-zhao ed24d9c0ca fix(接口自动化): 修复CSV变量问题修复 2021-02-01 19:13:16 +08:00
wenyann 71b0d84e77 Merge remote-tracking branch 'origin/v1.7' into v1.7 2021-02-01 18:49:49 +08:00
fit2-zhao a5cb70ba08 fix(接口自动化): 执行结果处理 2021-02-01 18:18:08 +08:00
wenyann 6cc2b73d67 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 
 Conflicts:
	frontend/src/business/components/api/definition/components/list/ApiList.vue
 2021-02-01 17:40:43 +08:00
wenyann 89ad020b38 feat: 接口定义批量移动 2021-02-01 17:36:45 +08:00
Coooder-X 81d5ad7848 fix: (测试计划) 修复 测试计划-修改状态后时间显示有误 (#1291) 2021-02-01 15:53:38 +08:00
Coooder-X 7aa5a6fc5c
fix: (测试计划) 修复 测试计划-修改状态后时间显示有误 (#1291) 2021-02-01 14:26:51 +08:00
chenjianxing 5d167e10d5 fix: query参数可以传空值 2021-02-01 13:50:52 +08:00
chenjianxing 4c32efb643 refactor: postman和插件导入自动创建用例 2021-02-01 13:47:24 +08:00
chenjianxing 63d4a7ad81 fix: query参数可以传空值 2021-02-01 13:40:57 +08:00
chenjianxing 26ae02300e Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-01 10:58:59 +08:00
chenjianxing 197aa0a0ac refactor: postman和插件导入自动创建用例 2021-02-01 10:58:26 +08:00
song.tianyang 252d48ac25 fix: 部分场景转性能测试报错的问题 
部分场景转性能测试报错的问题
 2021-01-29 18:10:20 +08:00
fit2-zhao dffdc19fe0 fix(接口自动化): 提取参数给默认值 2021-01-29 17:53:30 +08:00
song.tianyang de3f149e51 Merge remote-tracking branch 'origin/v1.7' into v1.7 2021-01-29 16:50:02 +08:00
song.tianyang 86739288c9 fix: 测试任务报告不展示Jenkins报告的问题 
测试任务报告不展示Jenkins报告的问题
 2021-01-29 16:49:43 +08:00
fit2-zhao 1f408959bc Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-01-29 16:33:44 +08:00
wenyann dcaa20c973 feat: 修复jenkins测试计划收不到通知 2021-01-29 15:52:56 +08:00
fit2-zhao c230f3c028 fix(接口自动化): 断言名称添加默认值 2021-01-29 15:38:31 +08:00
Captain.B fcf9c334a9 Merge branch 'v1.7' 2021-01-29 13:45:35 +08:00
wenyann f90778db22 Merge remote-tracking branch 'origin/v1.7' into v1.7 2021-01-29 11:54:27 +08:00
wenyann 5ad5d1c702 fix: 空指针异常 2021-01-29 11:50:41 +08:00
fit2-zhao 481d9b0964 Merge branch 'v1.7' of https://github.com/metersphere/metersphere into v1.7 2021-01-29 11:29:07 +08:00
fit2-zhao 37d12eea49 fix(接口自动化): 场景报告展示优化 2021-01-29 11:28:47 +08:00
wenyann a79a6246a3 Merge remote-tracking branch 'origin/v1.7' into v1.7 2021-01-29 11:09:34 +08:00
wenyann 86c079c62a feat: swagger定时同步 2021-01-29 11:08:52 +08:00
fit2-zhao 31d870ec57 fix(接口自动化): 旧版本数据迁移 path 和 url 分开处理 2021-01-29 10:55:32 +08:00
fit2-zhao da83beefb0 fix(接口自动化): 旧版本数据迁移 body form-data 类型数据完善 2021-01-29 10:41:22 +08:00
fit2-zhao 3f9a26e65a fix(接口自动化): 旧版本数据迁移 命名规则调整兼容复制的场景数据 2021-01-29 10:31:07 +08:00
fit2-zhao 7e2b2baf80 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-28 18:03:37 +08:00
fit2-zhao ea79196478 fix(接口定义): 快捷调试默认放到bug目录下 2021-01-28 18:03:18 +08:00
wenyann 3c6a48494e Merge remote-tracking branch 'origin/master' 2021-01-28 17:45:54 +08:00
wenyann 1e2b353cb9 feat: jenkins测试计划收不到邮件 2021-01-28 17:45:17 +08:00
Captain.B 047e662fc9 Merge remote-tracking branch 'origin/master' 2021-01-28 17:38:23 +08:00
Captain.B 5a565e1318 fix: 修复没有license无法查询authsource的bug 2021-01-28 17:36:55 +08:00
wenyann 9009746494 feat: jenkins测试计划收不到邮件 2021-01-28 17:35:36 +08:00
song.tianyang 52f58e0cb9 Merge remote-tracking branch 'origin/master' 2021-01-28 16:39:04 +08:00
song.tianyang d5e7d57760 fix: 测试计划开启定时任务，接口用例的执行时间没自动更新、报告点不开 
修复测试计划开启定时任务，接口用例的执行时间没自动更新、报告点不开的问题
 2021-01-28 16:38:41 +08:00
fit2-zhao 26a1acec56 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-28 16:17:56 +08:00
fit2-zhao cd33380763 fix(场景自动化): 修复认证问题 2021-01-28 16:17:14 +08:00
Captain.B 0b3b3f7d72 Merge branch 'v1.7' 2021-01-28 15:04:23 +08:00
fit2-zhao 98f3391c75 refactor(接口自动化): 部分代码优化 2021-01-28 14:50:34 +08:00
fit2-zhao 8c8f2850c2 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-28 14:39:05 +08:00
fit2-zhao 1777735325 fix(接口自动化): 优化报告显示问题 2021-01-28 14:38:40 +08:00
Captain.B 65446c1bb6 Merge branch 'master' into v1.7 2021-01-28 14:36:53 +08:00
Captain.B 05f543cb51 fix: 修复登录后系统参数配置-显示设置和认证设置不显示 2021-01-28 14:23:47 +08:00
wenyann 4102e2e667 Merge remote-tracking branch 'origin/master' 2021-01-28 14:07:19 +08:00
wenyann b9d4b94435 feat: 测试计划收不到邮件 2021-01-28 14:05:58 +08:00
song.tianyang 2f637979e4 fix: 修复场景删除后没有停到定时任务的问题 
修复场景删除后没有停到定时任务的问题
 2021-01-28 13:22:00 +08:00
wenyann 95ac318ee9 Merge remote-tracking branch 'origin/master' 2021-01-28 11:20:02 +08:00
wenyann 38df4313a9 feat: 添加发送邮件日志，空指针异常 2021-01-28 11:18:40 +08:00
shiziyuan9527 012b5d64a7 fix(测试计划): 场景用例显示标签、ID，修改搜索提示 2021-01-28 10:46:08 +08:00
chenjianxing 7a4f33f743 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-28 10:25:43 +08:00
chenjianxing 7cba18ec27 fix: 提取错误日志出现在断言里 2021-01-28 10:05:05 +08:00
fit2-zhao 19fe757774 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-27 19:55:34 +08:00
wenyann 6bdc3a7c21 feat: 修改字符长度 2021-01-27 18:54:23 +08:00
fit2-zhao 5e6aea31ce fix(接口自动化): 数据迁移问题修复 2021-01-27 18:20:03 +08:00
fit2-zhao e0da5d4dc6 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-27 18:04:49 +08:00
fit2-zhao 2cde4124fa fix(接口自动化): 修复遮罩层问题 2021-01-27 18:04:06 +08:00
Captain.B d769c13a8b refactor: CAS登录使用id查询数据库 2021-01-27 17:34:53 +08:00
fit2-zhao ff530b7c8f Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-27 16:56:39 +08:00
fit2-zhao 0b9578ed5c fix(接口自动化): 重新计算报告执行总时间 2021-01-27 16:56:29 +08:00
Captain.B 4284d29ecf Merge remote-tracking branch 'origin/master' 2021-01-27 16:54:48 +08:00
Captain.B 80b3782623 fix: 修复CAS登录报错的问题 2021-01-27 16:54:20 +08:00
song.tianyang 0011112f8b Merge remote-tracking branch 'origin/master' 2021-01-27 16:53:34 +08:00
song.tianyang 8fcaf73890 fix: 测试计划-执行场景案例后更新执行时间 
测试计划-执行场景案例后更新执行时间
 2021-01-27 16:53:03 +08:00
wenyann 97a99f8006 Merge remote-tracking branch 'origin/master' 2021-01-27 16:51:12 +08:00
wenyann db1f99dda8 feat: 增量合并重复问题 2021-01-27 16:50:41 +08:00
shiziyuan9527 ae909070a2 refactor: 统一搜索提示文本 2021-01-27 16:00:18 +08:00
song.tianyang 9e5e2edb12 Merge remote-tracking branch 'origin/master' 2021-01-27 15:50:21 +08:00
song.tianyang 65b4ee425d fix: 接口测试-测试报告-删除大量数据报告失败 
接口测试-测试报告-删除大量数据报告失败
 2021-01-27 15:49:48 +08:00
shiziyuan9527 7eec10e634 refactor(测试计划): 功能用例显示标签列 2021-01-27 15:38:12 +08:00
song.tianyang 77fcc6907d fix: 测试计划-接口测试用例-手动单个执行用例后执行时间未更新 
修复测试计划-接口测试用例-手动单个执行用例后执行时间未更新试的问题
 2021-01-27 15:34:15 +08:00
song.tianyang e95632b94a fix: 测试计划-开启定时执行任务疑似未执行 
修复测试计划-开启定时执行任务未执行的问题 ： 性能测试在定时任务执行完成后进行报告ID的更新、修复了没有情景案例的情况下不执行性能测试的问题
 2021-01-27 15:16:33 +08:00
BugKing 3941e2170a refactor: 修改版本号 2021-01-27 14:55:06 +08:00
fit2-zhao a22456b038 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-27 14:43:18 +08:00
fit2-zhao 1d50e1a910 fix(场景自动化): 自定义请求修复 2021-01-27 14:41:36 +08:00
song.tianyang 99ec66a255 Merge remote-tracking branch 'origin/master' 2021-01-27 14:34:37 +08:00
song.tianyang 1f011e7ccc fix: 接口用例创建的性能测试，Label显示uuid 
修复接口用例创建的性能测试，Label显示uuid的问题
 2021-01-27 14:33:16 +08:00
Captain.B 866db48255 refactor: 修改配置oidc认证源的参数 2021-01-27 13:40:40 +08:00
Captain.B 15f4489cf2 fix: 修复 Missing URI template variable 'a' for method parameter of type String 2021-01-27 13:10:57 +08:00
Captain.B 77a1235ff6 Merge remote-tracking branch 'origin/master' 2021-01-27 12:51:02 +08:00
Captain.B af69dfe7ba fix: 修复改变认证源状态报错的问题 2021-01-27 12:49:48 +08:00
song.tianyang 33e05223e9 Merge remote-tracking branch 'origin/master' 2021-01-27 12:49:26 +08:00
song.tianyang 5fe21e9a71 fix: 测试计划定时任务关闭异常 
解决测试计划定时任务关闭异常的问题
 2021-01-27 12:48:55 +08:00
fit2-zhao d6b2336d35 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-27 11:35:10 +08:00
fit2-zhao c820538f9f fix(场景自动化): 场景变量设置 2021-01-27 11:34:49 +08:00
chenjianxing 7f207e72b6 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-27 11:33:47 +08:00
song.tianyang f9eae8c6dd Merge remote-tracking branch 'origin/master' 2021-01-27 11:21:17 +08:00
song.tianyang 1a57e651eb fix: 测试计划-性能测试，运行时更新表格中的报告ID 
测试计划-性能测试，运行时更新表格中的报告ID
 2021-01-27 11:20:57 +08:00
chenjianxing 4367ef3291 fix: 不同项目下测试计划名称冲突问题 2021-01-27 10:56:10 +08:00
Captain.B 8c7f60b88d Merge remote-tracking branch 'origin/master' 2021-01-27 09:40:18 +08:00
Captain.B 25abe21823 refactor: 修改下载zip的接口，去掉threadnum 2021-01-27 09:39:41 +08:00
song.tianyang b536fff9bf fix: 接口定义全选操作跨协议 
解决接口定义全选操作跨协议的问题
 2021-01-26 23:54:15 +08:00
song.tianyang f21574c2e7 fix: 测试跟踪-报告-查看报告详情，导出报告卡死 
解决测试跟踪-报告-查看报告详情，导出报告卡死的问题
 2021-01-26 23:09:40 +08:00
chenjianxing 55ed001b16 fix: tcp脚本为空，不传脚本 2021-01-26 20:50:47 +08:00
song.tianyang 0e2ee19237 Merge remote-tracking branch 'origin/master' 2021-01-26 20:22:04 +08:00
song.tianyang 2b5857886e fix: 解决手动保存日志时保存数据缺失的问题，同时针对报告页面增加跳转功能 
解决手动保存日志时保存数据缺失的问题，同时针对报告页面增加跳转功能
 2021-01-26 20:21:19 +08:00
fit2-zhao 0e7f91acd7 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-26 19:49:38 +08:00
fit2-zhao 421c4263b7 fix(场景自动化): 修复sql 执行结果类型错误 2021-01-26 19:49:14 +08:00
Captain.B 2ff8b766e5 fix: 修复删除job的代码 2021-01-26 19:42:39 +08:00
Captain.B 12ba2b0594 Merge remote-tracking branch 'origin/master' 2021-01-26 18:54:24 +08:00
Captain.B ffbd3a3ec8 fix: 修复多线程组设置线程数不正确的bug 2021-01-26 18:53:00 +08:00
fit2-zhao dcd30a1fb7 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-26 18:30:02 +08:00
fit2-zhao 1c5249485d fix(场景自动化): 引用请求只允许查看，不能编辑 2021-01-26 18:29:38 +08:00
chenjianxing b5b5d3aa54 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-26 18:03:17 +08:00
chenjianxing 33a397b65e fix: 替换Pair 2021-01-26 18:02:48 +08:00
wenyann ff0d8665f6 Merge remote-tracking branch 'origin/master' 2021-01-26 17:39:43 +08:00
wenyann 2ed98cb3fe feat: 测试计划查询接口修改 2021-01-26 17:39:09 +08:00
chenjianxing 16a2450953 fix: 修复pr冲突 2021-01-26 17:34:54 +08:00
Coooder-X 49a5053b38
fix: (测试资源池) 仅当IP和端口同时重复时，提示添加失败 (#1264) 
* fix: （测试资源池）增加资源池中端口重复判断

* fix: (测试资源池) 仅当IP和端口同时重复时，提示添加失败

Co-authored-by: jianxing <41557596+AgAngle@users.noreply.github.com>
 2021-01-26 17:28:12 +08:00
Coooder-X 6f93e09f47
feat: (接口定义、接口自动化) 删除模块时，模块下的所有接口或场景被放入回收站 (#1268) 2021-01-26 17:21:21 +08:00
fit2-zhao 27f5264a88 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-26 17:20:21 +08:00
fit2-zhao e967cb0539 fix(场景自动化): 数据迁移后附件丢失问题修复 2021-01-26 17:19:57 +08:00
chenjianxing 3426a49c8c Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-26 17:18:20 +08:00
Captain.B 2b6c627e14 Merge remote-tracking branch 'origin/master' 2021-01-26 17:17:54 +08:00
chenjianxing 8961ba6c98 fix: 切换协议，添加相同节点报错 2021-01-26 17:17:52 +08:00
Captain.B 8793acd0b6 fix: 性能测试jmx默认参数去掉 concurrentDwn 和 image_parser 2021-01-26 17:17:08 +08:00
Captain.B e00e07fb30 fix: sso logout 和 sso placeholder 提示 2021-01-26 16:44:00 +08:00
wenyann 1b92d96de7 feat: 添加模版示例，增加接口测试报告路径 2021-01-26 16:06:04 +08:00
wenyann 48b0adc065 Merge remote-tracking branch 'origin/master' 2021-01-26 16:05:42 +08:00
wenyann 2ec320b519 feat: 添加模版示例，增加接口测试报告路径 2021-01-26 16:05:08 +08:00
fit2-zhao 614acd2ed3 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-26 15:02:11 +08:00
fit2-zhao c4aa6da474 fix(场景自动化): 修复迁移数据场景禁用问题 2021-01-26 15:01:48 +08:00
song.tianyang eb74637d82 refactor: 测试计划日志表增加字段 
测试计划日志表增加字段
 2021-01-26 14:17:28 +08:00
Captain.B ab08bb0a6f fix: sso 登录失败报错提示 2021-01-26 13:46:57 +08:00
fit2-zhao 431de613b2 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-26 13:35:19 +08:00
fit2-zhao 6fd4be7e68 fix(接口自动化): 修复旧数据迁移问题 2021-01-26 13:34:54 +08:00
Captain.B 4e63e0ebe4 fix: sso 登录失败报错提示 2021-01-26 13:29:07 +08:00
Coooder-X 827dac097a
fix: （测试资源池）增加资源池中端口重复判断 (#1260) 2021-01-26 13:07:26 +08:00
chenjianxing cffe0f8b3a Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-26 13:03:06 +08:00
chenjianxing 74124839aa feat: 用例列表支持全选 2021-01-26 13:02:42 +08:00
fit2-zhao 96431f0899 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-26 11:41:07 +08:00
fit2-zhao 46737136d9 fix(接口自动化): 修复DELETE参数丢失问题 2021-01-26 11:40:44 +08:00
wenyann 80369f0758 feat: swagger定时同步 2021-01-26 10:31:00 +08:00
wenyann b3808d8c90 Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	backend/src/main/java/io/metersphere/api/parse/ApiImportAbstractParser.java
 2021-01-26 10:27:57 +08:00
wenyann 88280b61aa feat: swagger定时同步 2021-01-26 10:17:19 +08:00
wenyann 00ef6a7c76 feat: swagger定时修改 2021-01-26 10:16:35 +08:00
fit2-zhao cf013c1e84 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-25 18:45:54 +08:00
fit2-zhao b0ee42f9e4 fix(接口自动化): 修复部分缺陷 2021-01-25 18:44:18 +08:00
shiziyuan9527 9990aa90b9 fix(测试跟踪): 修复最近测试计划查询问题 2021-01-25 18:37:56 +08:00
fit2-zhao 7737ee160a Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-25 18:05:11 +08:00
fit2-zhao fb0af088c5 fix(接口自动化): 场景数据迁移问题修改 2021-01-25 18:04:08 +08:00
shiziyuan9527 75552fd896 fix(测试计划): 执行性能测试用例状态更新 2021-01-25 18:02:47 +08:00
Captain.B baeab081a6 Merge remote-tracking branch 'origin/master' 2021-01-25 17:50:03 +08:00
Captain.B 75030f1695 refactor: 场景页面表头优化 2021-01-25 17:49:20 +08:00
shiziyuan9527 b0ff13917c fix(测试计划): 修复测试计划进度条不准确 2021-01-25 17:09:32 +08:00
shiziyuan9527 dc96a9affa fix(测试计划): 修复测试计划状态不准确 2021-01-25 16:50:36 +08:00
chenjianxing 28fa069390 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-25 16:39:56 +08:00
chenjianxing e11b1314bf fix: 接口导入添加body请求头 2021-01-25 16:39:48 +08:00
shiziyuan9527 4c2002f8ff fix(测试计划): 修复测试计划状态不准确 2021-01-25 16:36:08 +08:00
fit2-zhao 57967ab6b0 fix(接口自动化): 列表参数问题修复 2021-01-25 15:55:37 +08:00
song.tianyang a71f75967d Merge remote-tracking branch 'origin/master' 2021-01-25 13:58:39 +08:00
song.tianyang a0bce7cda3 fix: 测试计划报告菜单批量删除功能的缺失 
解决测试计划报告菜单批量删除功能的缺失的问题
 2021-01-25 13:58:15 +08:00
fit2-zhao 3ac8b83d54 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-25 13:50:21 +08:00
fit2-zhao 33cd6b37e8 feat(接口自动化): 循环控制器 结果处理 2021-01-25 13:49:59 +08:00
Captain.B 829f912d8f fix(xPack): 修改substring的使用 2021-01-25 12:51:03 +08:00
shiziyuan9527 e005e39326 fix(测试计划): 修复性能测试按照状态筛选不生效的问题 2021-01-25 10:59:26 +08:00
chenjianxing 058c3b3dd4 refactor: pr代码优化 2021-01-25 10:10:21 +08:00
Captain.B 493e766719 refactor: 单点登录cas提取hidden变量 2021-01-23 13:48:41 +08:00
Captain.B e60f71387b refactor: 修改配置cas的地址 2021-01-23 12:12:12 +08:00
BugKing ed3ca35749
Merge pull request #142 from metersphere/dependabot/maven/backend/org.apache.zookeeper-zookeeper-3.4.14 
chore(deps): bump zookeeper from 3.4.13 to 3.4.14 in /backend
 2021-01-22 22:20:58 +08:00
fit2-zhao e69791a15a Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-22 20:15:33 +08:00
fit2-zhao d6c5d56d55 feat(接口自动化): 循环控制器 结果处理 2021-01-22 20:14:15 +08:00
Captain.B 2013e784f9 Merge remote-tracking branch 'origin/master' 2021-01-22 19:40:00 +08:00
Captain.B c71b1d49f3 refactor(xPack): 接入oidc单点登录 2021-01-22 19:28:34 +08:00
song.tianyang e6d2e1bf4d feat: 测试计划定时任务报告增加状态字段 
测试计划定时任务报告增加状态字段
 2021-01-22 19:06:30 +08:00
fit2-zhao 66473ae258 fix(接口自动化): 修复数据迁移问题 2021-01-22 19:00:36 +08:00
Joker bb952bd430
fix swagger2.0 NullPointException (#1196) 
* fix swagger2.0同步时存在$ref参数而dto不存在的情况

* 删除多余代码

* 修复编辑HTTP配置域名为空是，数据库config拼接的json串中domain没有更新为空的情况

* 语法调整

Co-authored-by: fengkaijun <fengkaijun@yingzi.com>
 2021-01-22 18:17:19 +08:00
fit2-zhao 5340a37cb1 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-22 18:12:25 +08:00
fit2-zhao 4e38c73ac5 fix(接口自动化): 修复部分缺陷 2021-01-22 18:12:05 +08:00
Dream95 fed842e442
bugfix 修复'[]'格式json解析错误问题 (#1242) 
https://github.com/metersphere/metersphere/issues/1144

Co-authored-by: zhouyx <zhouyx1@guahao.com>
 2021-01-22 18:11:38 +08:00
chenjianxing 764ee6507e Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-22 18:06:50 +08:00
chenjianxing 5f8ecf76cf fix: swagger2.0导入body为空 2021-01-22 18:06:18 +08:00
wenyann 2cdf1e6730 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
 2021-01-22 17:07:43 +08:00
wenyann 3048d8b52d feat: swagger定时同步 2021-01-22 17:06:03 +08:00
wenyann 8e1f189ce9 feat: swagger定时修改 2021-01-22 17:01:41 +08:00
chenjianxing 4144a35a26 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-22 16:32:24 +08:00
chenjianxing 6243e3a410 feat: 用例编辑支持上一条下一条 2021-01-22 16:30:49 +08:00
song.tianyang 14b21ca544 feat: 接口测试首页-运行中的定时任务增加字段 
接口测试首页-运行中的定时任务增加字段
 2021-01-22 15:21:37 +08:00
fit2-zhao 38169542e2 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-22 12:57:27 +08:00
fit2-zhao 1157a1c422 fix(场景自动化): 修复场景描述不能编辑问题，修复CSV 预览问题 2021-01-22 12:55:07 +08:00
Captain.B 649872c634 refactor(xPack): 验证k8s账号修改 2021-01-22 11:41:59 +08:00
chenjianxing ccd7d08ef5 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-21 19:45:25 +08:00
chenjianxing 27603bbf90 feat: 场景列表批量移动 2021-01-21 19:45:12 +08:00
fit2-zhao c8d0470ed1 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-21 19:02:18 +08:00
fit2-zhao cf9b64f16d fix(接口定义): 高级搜索问题修复 2021-01-21 19:01:59 +08:00
fit2-zhao c89e439ab5 fix(接口定义): JSON-SCHEMA 数据缺陷修复 2021-01-21 18:39:40 +08:00
song.tianyang 683d538b4b Merge remote-tracking branch 'origin/master' 2021-01-21 18:36:21 +08:00
song.tianyang 2c7a65a5ec fix: 修复测试计划中执行场景案例失败的问题 
修复测试计划中执行场景案例失败的问题
 2021-01-21 18:35:52 +08:00
chenjianxing 5d9cf69916 fix: 场景页面批量编辑用例 2021-01-21 17:43:02 +08:00
fit2-zhao 0d278cf20b fix(接口自动化): 迁移的数据编号处理 2021-01-21 16:58:57 +08:00
fit2-zhao 96caef2f10 fix(接口自动化): 迁移的数据执行报错处理 2021-01-21 16:53:43 +08:00
fit2-zhao 4fd5bce705 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-21 15:42:27 +08:00
fit2-zhao a64294e86e fix(接口自动化): 迁移的数据执行报错处理 2021-01-21 15:42:07 +08:00
Captain.B 44152ef296 refactor: 用户名或密码错误的时候显示信息修改 2021-01-21 15:15:41 +08:00
Captain.B 8699187673 refactor(接口测试): 测试用例显示tags 2021-01-21 14:54:56 +08:00
shiziyuan9527 244dedc47c feat: 接口用例根据tag搜索 2021-01-21 14:25:41 +08:00
song.tianyang 8c4756b3a1 Merge remote-tracking branch 'origin/master' 2021-01-21 13:37:11 +08:00
song.tianyang 6f8ac5fb46 fix: 修复定时任务结束时通知不正确的问题 
修复定时任务结束时通知不正确的问题
 2021-01-21 13:36:39 +08:00
Captain.B 141a526e1d refactor: 启动测试时检查当前站点配置是否可用 2021-01-21 10:55:37 +08:00
chenjianxing deae6d6053 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-20 20:27:28 +08:00
chenjianxing 9c310d7678 feat: TCP优化 2021-01-20 20:27:12 +08:00
Captain.B 55039a984b Merge remote-tracking branch 'origin/master' 2021-01-20 17:16:05 +08:00
Captain.B 45c65497ce fix: 用户不存在时候提示修改 
Closes #1091
 2021-01-20 17:15:41 +08:00
shiziyuan9527 9d49124fc7 feat: 列表可以根据tag搜索 2021-01-20 16:53:27 +08:00
song.tianyang 57e971a357 fix: 
修复场景步骤标题未显示的问题、修复测试计划的性能测试任务结束回调时资源占用的问题
 2021-01-20 16:43:32 +08:00
fit2-zhao cdf1b73253 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-20 14:53:58 +08:00
fit2-zhao 91ded7f5ba feat(接口定义): 另存新用例 TAG问题修复 2021-01-20 14:53:34 +08:00
wenyann dd974949e3 feat: swagger定时同步 2021-01-20 14:07:39 +08:00
wenyann c7500edaa9 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
#	backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
#	backend/src/main/java/io/metersphere/xpack
 2021-01-20 14:04:46 +08:00
wenyann 8512f8f262 feat: swagger定时同步 2021-01-20 13:56:58 +08:00
fit2-zhao 0070123bef feat(接口定义): 增加用例批量编辑功能 2021-01-20 13:12:09 +08:00
fit2-zhao 67635aebbd fix(接口定义): 用例状态统计不准确问题修复 2021-01-20 11:52:37 +08:00
fit2-zhao 0f8cefffb3 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-20 11:16:43 +08:00
fit2-zhao 6d78a2ade9 refactor(接口定义): 重构列表查询sql 加速查询 2021-01-20 11:16:22 +08:00
song.tianyang b58dd49a26 Merge remote-tracking branch 'origin/master' 2021-01-20 11:06:14 +08:00
fit2-zhao 49698e59af refactor(接口定义): 重构用例存储及结果统计 2021-01-20 11:00:11 +08:00
song.tianyang d99fa9b568 refactor: 代码重构-通用代码块提取 
代码重构-通用代码块提取
 2021-01-20 10:55:12 +08:00
fit2-zhao ea7090b3eb refactor(接口定义): 重构用例存储及结果统计 2021-01-20 10:29:17 +08:00
fit2-zhao 66c14eea89 fix(接口定义): 修复参数提取问题 2021-01-20 09:45:51 +08:00
fit2-zhao 260f88a1ee fix(接口自动化): 修复执行没有结果返回时 频繁刷新问题 2021-01-19 18:02:14 +08:00
fit2-zhao 8a47dfa112 Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
 2021-01-19 18:01:07 +08:00
fit2-zhao 56b5b83b4b fix(接口自动化): 批量报告处理 2021-01-19 16:43:33 +08:00
shiziyuan9527 086a1e50bb feat(测试计划): 性能测试用例按照名称或ID查询 2021-01-19 16:30:47 +08:00
Captain.B 1d2bf1adfe Merge remote-tracking branch 'origin/master' 2021-01-19 16:20:40 +08:00
Captain.B b315e3af97 feat(xPack): CAS 登录 2021-01-19 16:19:54 +08:00
song.tianyang c7dfb4160b fix: 修改图标、修改"一件创建性能测试"时压力配置下方显示的内容 
修改图标、修改"一件创建性能测试"时压力配置下方显示的内容
 2021-01-19 16:16:58 +08:00
Captain.B fcf971285c feat(xPack): CAS 登录 2021-01-19 16:01:55 +08:00
fit2-zhao f6490cb5ed Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-19 15:54:42 +08:00
fit2-zhao 387c685455 fix(接口自动化): 循环控制器死循环问题修复 2021-01-19 15:54:13 +08:00
Captain.B 9dde59379d Merge remote-tracking branch 'origin/master' 2021-01-19 15:50:20 +08:00
Captain.B 43ae3dd2ce feat(xPack): CAS 登录 2021-01-19 15:49:20 +08:00
song.tianyang 097ab76a70 refactor: 测试计划执行接口案例-将方法迁移到测试计划Service中 
测试计划执行接口案例-将方法迁移到测试计划Service中
 2021-01-19 14:53:44 +08:00
song.tianyang 0f983aae63 fix: 修复测试计划手动保存报告不成功的问题 
修复测试计划手动保存报告不成功的问题
 2021-01-19 14:43:13 +08:00
song.tianyang e4b16c31d4 feat: 测试计划-增加定时任务、修改接口列表、接口自动化的按钮 
测试计划-增加定时任务、修改接口列表、接口自动化的按钮
 2021-01-19 14:26:58 +08:00
fit2-zhao 4c882ffafd feat(接口定义): 测试步骤位置调整 2021-01-19 13:12:35 +08:00
Captain.B 26edcd1e0c chore: Sync 2021-01-19 09:43:23 +08:00
chenjianxing 8589eeb47b refactor: 场景组件点击名称编辑自动获取焦点 2021-01-18 20:35:34 +08:00
fit2-zhao 6e4e42812a fix(接口自动化): 循环控制器处理 2021-01-18 18:26:45 +08:00
fit2-zhao c951c38eab Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
 2021-01-18 18:15:39 +08:00
fit2-zhao 7fdf8b4154 Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
 2021-01-18 18:15:31 +08:00
fit2-zhao ba6c5b85a6 fix(接口自动化): 修复执行报告场景名称问题 2021-01-18 18:12:02 +08:00
wenyann 3c36edbb96 Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
 2021-01-18 18:07:57 +08:00
wenyann 5b2359ec3c feat: swagger定时自动同步 2021-01-18 18:05:25 +08:00
song.tianyang 3cbca58209 fix: 修复全选统计错误的缺陷、修复测试计划定时任务的缺陷 
修复全选统计错误的缺陷、修复测试计划定时任务的缺陷
 2021-01-18 17:45:01 +08:00
shiziyuan9527 de31246d53 refactor(测试跟踪): 用例评审优化 2021-01-18 17:28:12 +08:00
chenjianxing 51ca545122 fix: 修改接口用例空指针 2021-01-18 17:07:12 +08:00
fit2-zhao ffd86d01d4 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-18 14:54:14 +08:00
fit2-zhao aeaf6f8018 refactor(接口定义): 代码统一规范 2021-01-18 14:53:49 +08:00
Captain.B c4769dbf22 fix: 去掉没有用到的类 2021-01-18 14:49:12 +08:00
Captain.B 4994ca3780 Merge remote-tracking branch 'origin/master' 2021-01-18 14:35:41 +08:00
Captain.B da3811eb3c fix: 去掉没有用到的字段 2021-01-18 14:35:22 +08:00
fit2-zhao b0d01bebba fix(接口定义): 修复用例执行成功后，结果未更新，响应内容为空 2021-01-18 13:02:23 +08:00
chenjianxing 61d8b0b9c8 refactor: kafka报错无法启动 2021-01-18 11:41:23 +08:00
song.tianyang c9868bfd69 fix: 修改数据库脚本文件 
修改数据库脚本文件
 2021-01-13 17:01:31 +08:00
song.tianyang 477e55e16d fix(删除不存在的文件引用): 
删除不存在的文件引用
 2021-01-13 16:54:03 +08:00
song.tianyang 8d152a077e feat(测试计划增加定时任务、增加测试报告查看页面): 
测试计划增加定时任务、增加测试报告查看页面
 2021-01-13 16:51:02 +08:00
shiziyuan9527 93654862ef refactor(测试计划): 性能测试用例执行 2021-01-13 16:17:18 +08:00
fit2-zhao 41f928aa89 feat(接口定义): 接口用例增加执行结果展示 2021-01-13 15:25:05 +08:00
wenyann 6e5427c54d Merge remote-tracking branch 'origin/master' 2021-01-13 14:43:15 +08:00
wenyann fd651e3b34 Merge remote-tracking branch 'origin/master' 2021-01-13 14:42:57 +08:00
Captain.B 3880b876e3 Merge remote-tracking branch 'origin/master' 2021-01-13 14:42:48 +08:00
Captain.B 473d279817 fix: 修改枚举使用不当的问题 2021-01-13 14:41:47 +08:00
fit2-zhao 193a212e09 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-13 14:41:07 +08:00
fit2-zhao 57beb94ada fix(接口自动化): 修复数据迁移后无法编辑问题 2021-01-13 14:40:38 +08:00
Captain.B f8785d06ab fix: 通过apikey登陆使用local realm 2021-01-13 14:13:15 +08:00
Captain.B 9921489cc4 Merge remote-tracking branch 'origin/master' 2021-01-13 14:00:39 +08:00
Captain.B 8e70eefe3c refactor: 接收测试结束的通知 2021-01-13 14:00:19 +08:00
fit2-zhao f0acc7c392 fix(接口定义): 修复参数提取 空指针问题 2021-01-13 13:43:44 +08:00
fit2-zhao a0312d1025 refactor(接口定义): 重构接口执行提取参数方法 2021-01-13 13:19:45 +08:00
wenyann a2ff38a10f Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-13 11:37:22 +08:00
chenjianxing 1ec251c65a refactor: 测试用例列表页面优化 2021-01-13 11:20:27 +08:00
wenyann 2639e2a266 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
 2021-01-13 10:46:02 +08:00
wenyann 7d33f66a26 fix: 添加测试环境，查询测试计划下性能测试 2021-01-13 10:40:46 +08:00
fit2-zhao d72edc7b33 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-12 18:52:19 +08:00
fit2-zhao 96900cd1f4 refactor(接口自动化): 执行代码优化 2021-01-12 18:51:55 +08:00
shiziyuan9527 17ecef469b feat(测试计划): 统计报告新增性能测试用例饼图 2021-01-12 18:08:40 +08:00
fit2-zhao 5d96c71d06 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-12 15:54:38 +08:00
fit2-zhao a46f3cfbba fix(测试跟踪): 测试用例XMIND导入，重复内容更新 2021-01-12 15:53:12 +08:00
shiziyuan9527 9e52669a26 Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-12 15:41:45 +08:00
shiziyuan9527 30b3f83725 feat(测试计划): 性能测试用例展示ID列 2021-01-12 15:41:14 +08:00
Captain.B 4233af67e9 Merge remote-tracking branch 'origin/master' 2021-01-12 15:39:52 +08:00
Captain.B e2048ef969 fix: 修复普通用户查询所有角色列表的bug 
Closes #1090
 2021-01-12 15:39:20 +08:00
shiziyuan9527 4cef65d9f8 feat(性能测试): 测试列表添加ID列 2021-01-12 15:22:08 +08:00
Captain.B 67a9e1588e feat: 配置认证源 2021-01-12 15:12:10 +08:00
Captain.B d7dbcf0860 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	frontend/src/business/components/xpack
 2021-01-12 15:09:04 +08:00
Captain.B c3673be342 feat: 配置认证源 2021-01-12 15:08:07 +08:00
fit2-zhao 5b60ac942c fix(接口定义): 修复模块移动缺陷 2021-01-12 14:58:30 +08:00
fit2-zhao a1eac0996f feat(接口自动化): 修复部分缺陷 2021-01-12 14:51:15 +08:00
fit2-zhao 86b19b68fc feat(接口自动化): 报告优化 2021-01-12 11:16:46 +08:00
fit2-zhao e451248e25 fix(接口自动化): 冲突合并 2021-01-12 09:33:44 +08:00
fit2-zhao a023b85f99 fix(接口自动化): 冲突合并 2021-01-11 19:00:47 +08:00
fit2-zhao 93d57b7d1f fix(接口自动化): 修复测试报告，按照场景展示 2021-01-11 18:50:12 +08:00
chenjianxing 5781cc7b1e Merge branch 'master' of https://github.com/metersphere/metersphere 2021-01-11 18:14:48 +08:00
chenjianxing 07b500331d feat: 接口定义TCP 2021-01-11 18:14:35 +08:00
fit2-zhao 6b57e3a3e2 fix(接口自动化): 所有高级搜索增加TAGS 2021-01-11 15:54:49 +08:00