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

2981 Commits

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