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

2894 Commits

Author SHA1 Message Date
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