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

5667 Commits

Author SHA1 Message Date
song.tianyang 608ba81baa refactor: 更新jmx文件的DubboDefaultConfigGui信息 
更新jmx文件的DubboDefaultConfigGui信息
 2021-02-22 16:43:19 +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 188cdbf6e3 fix(接口自动化): 修复场景无法导入问题 2021-02-20 18:26:06 +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
fit2-zhao e831eb5f3d Merge branch 'master' of https://github.com/metersphere/metersphere 2021-02-20 14:33:25 +08:00
fit2-zhao dff4904efb style(接口自动化): DUBBO协议接口 显示样式修改 2021-02-20 14:32:45 +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 8fd91be7b1 fix: 解决文档右侧列表排序变动时产生的错序问题 
解决文档右侧列表排序变动时产生的错序问题
 2021-02-20 14:06:09 +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 35d87006e0 fix(接口自动化): 注释一部分重复代码 2021-02-20 11:56:18 +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
wenyann 9b2e1e5a52 Merge remote-tracking branch 'origin/master' 2021-02-19 18:27:44 +08:00
wenyann 4e376541d1 fix: 修复冲突 2021-02-19 18:27:24 +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
wenyann 774c44c28a fix: 冲突 2021-02-19 16:53:54 +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