Commit Graph

1159 Commits

Author SHA1 Message Date
Captain.B 0fb9f69d83 refactor: 打包的时候保留jmeter的jar 2020-08-18 16:52:30 +08:00
shiziyuan9527 7ffb6812cf fix: 取消集成后,解除项目关联 2020-08-18 15:44:41 +08:00
shiziyuan9527 ab07bc3de8 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-18 14:34:43 +08:00
shiziyuan9527 46d52334bf feat: 测试计划测试用例列表显示缺陷数 2020-08-18 14:33:52 +08:00
chenjianxing ab0790a8a2 Merge branch 'master' of https://github.com/metersphere/server 2020-08-18 14:32:38 +08:00
chenjianxing fcb8eeedf2 feat(接口测试): 支持Beanshell脚本 2020-08-18 14:32:24 +08:00
Captain.B c8c53a9030 fix: 删除资源池时检查是否存在关联的性能测试 2020-08-18 13:22:05 +08:00
Captain.B c95afcc29e refactor: 代码调整,不强制电脑上有 /opt/jmeter/ 目录 2020-08-18 12:26:34 +08:00
Captain.B 94c3902c61 Merge remote-tracking branch 'origin/master' into master 2020-08-18 11:39:23 +08:00
Captain.B be18d0b9ab refactor: 代码调整,不强制电脑上有 /opt/jmeter/ 目录 2020-08-18 11:39:00 +08:00
chenjianxing 163fae2e51 Merge branch 'master' of https://github.com/metersphere/server 2020-08-18 10:21:13 +08:00
chenjianxing a3bc670b44 fix: 修改sso名称 2020-08-18 10:20:39 +08:00
shiziyuan9527 240ac7ab26 feat: 集成Jira 2020-08-17 22:01:15 +08:00
chenjianxing 60ed8a0535 Merge branch 'master' of https://github.com/metersphere/server 2020-08-17 19:23:53 +08:00
chenjianxing 5ec095673c feat(接口测试): 前后置脚本页面 2020-08-17 19:23:29 +08:00
chenjianxing c1c2bc7f76 fix: swagger body参数循环依赖问题 2020-08-17 15:24:11 +08:00
Captain.B 1a9d1e1971 refactor: 单接口调试处理mock数据 2020-08-17 13:31:42 +08:00
Captain.B 32ba381ac0 Merge remote-tracking branch 'origin/master' 2020-08-17 13:13:58 +08:00
Captain.B 90dc63c15e refactor: 后台处理mock参数 2020-08-17 13:13:43 +08:00
chenjianxing 0f92569e22 Merge branch 'master' of https://github.com/metersphere/server 2020-08-17 13:07:09 +08:00
chenjianxing 263aba9b57 fix: 单接口调试 2020-08-17 13:06:41 +08:00
Captain.B d9894309d1 Merge remote-tracking branch 'origin/master' 2020-08-17 12:28:55 +08:00
Captain.B b4ed0a5d61 refactor: 后台处理mock参数 2020-08-17 12:28:37 +08:00
chenjianxing 064304ba28 refactor: 适配cas 2020-08-17 10:09:19 +08:00
Captain.B 6e7fe725a1 Merge remote-tracking branch 'origin/master' 2020-08-14 19:20:11 +08:00
Captain.B fa23fcdfcd feat(接口测试): 代码调整 2020-08-14 19:19:53 +08:00
shiziyuan9527 f52a5cc078 feat: 集成Tapd 2020-08-14 18:07:42 +08:00
shiziyuan9527 5b61ff1f99 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-14 14:50:47 +08:00
shiziyuan9527 ce96ec0a4b feat: 修改sql 2020-08-14 14:50:06 +08:00
wenyann 1cff9c1d02 Merge remote-tracking branch 'origin/master' 2020-08-14 14:33:57 +08:00
q4speed b43c2f4962 refactor: merge db.migration 2020-08-14 13:38:41 +08:00
q4speed 2fb347bd85 Merge remote-tracking branch 'origin/master' 2020-08-14 13:35:34 +08:00
q4speed 3783d30d7e feat: 增加配额管理 2020-08-14 13:34:18 +08:00
Captain.B 9ba78978c0 refactor: 删掉不用的controller 2020-08-14 12:37:48 +08:00
wenyann ccf7c0e52f Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-13 19:09:14 +08:00
wenyann bf71b37cf4 style: 测试报告优化 2020-08-13 19:09:02 +08:00
shiziyuan9527 3ddc3ffa29 feat: 修改sql 2020-08-13 17:27:33 +08:00
shiziyuan9527 f42a920fcf feat: 集成TAPD平台 2020-08-13 17:15:19 +08:00
shiziyuan9527 47fad33be1 feat: 服务集成 2020-08-12 17:37:14 +08:00
shiziyuan9527 b13fb0f001 feat: 服务集成 2020-08-11 17:17:25 +08:00
wenyann a8671ca4f3 Merge branch 'master' of https://github.com/metersphere/metersphere
 Conflicts:
	frontend/src/business/components/api/report/components/ScenarioResults.vue
	frontend/src/business/components/common/head/ShowAll.vue
2020-08-11 14:52:02 +08:00
wenyann 66b6c179e8 feat(接口测试):增加接口测试一键运行功能 2020-08-11 14:40:18 +08:00
chenjianxing e187d91c76 feat(接口测试): dubbo 单接口调试 2020-08-11 10:36:18 +08:00
chenjianxing 22950f0893 Merge branch 'master' of https://github.com/metersphere/server 2020-08-10 21:59:26 +08:00
chenjianxing 4e0b340c20 feat(接口测试): 单接口调试 2020-08-10 21:59:11 +08:00
Captain.B ece541e80e Merge remote-tracking branch 'origin/master' 2020-08-10 18:07:55 +08:00
Captain.B dfd66d3793 feat: 显示性能测试的压力配置 2020-08-10 18:07:17 +08:00
q4speed 09d1a1822e feat: 增加对Jmeter内置函数支持 2020-08-10 17:06:05 +08:00
shiziyuan9527 f247807c3d feat(测试跟踪): 测试计划和测试用例页面搜索框可以根据名称或者ID搜索用例 2020-08-10 14:26:51 +08:00
shiziyuan9527 2646dc94b4 feat(测试跟踪): 测试计划下用例按照ID字段排序 2020-08-10 14:17:16 +08:00
Captain.B fa13003865 Merge branch 'master' of github.com:fit2cloudrd/metersphere-server 2020-08-07 17:37:45 +08:00
chenjianxing 683fed8ec9 feat: 接口调试部分代码 2020-08-07 17:16:24 +08:00
Captain.B fdda9b00b0 feat: 使用java运行js脚本,添加相关js 2020-08-07 16:26:54 +08:00
q4speed 9a954934af fix(接口测试): 修复无法正确调用接口的bug 2020-08-07 13:29:16 +08:00
chenjianxing 9b294a00f8 Merge branch 'v1.1' of https://github.com/metersphere/server 2020-08-07 11:36:01 +08:00
chenjianxing df2f972c9a Merge branch 'master' of https://github.com/metersphere/server 2020-08-07 11:26:10 +08:00
chenjianxing 76ae0969c4 feat: 场景内cookie共享 2020-08-07 11:25:56 +08:00
chenjianxing a9d6c98c09 Merge branch 'master' of https://github.com/metersphere/server 2020-08-07 10:03:33 +08:00
chenjianxing 18c7a30a03 refactor: 首页只显示运行中的定时任务 2020-08-07 10:03:22 +08:00
q4speed b48f7e7468 fix(接口测试): 修复ServiceKey与ServiceInterface颠倒的bug 2020-08-06 15:51:28 +08:00
Captain.B e8c682e402 feat: 使用java运行js脚本,添加相关jar 2020-08-06 15:50:45 +08:00
q4speed 7ce75319bb fix(XPack): 修复ClassNotFound bug 2020-08-06 14:58:11 +08:00
wangzhen-fit2cloud e5c4885d3f build: 暂时去掉allatori 2020-08-06 13:36:49 +08:00
chenjianxing b04904d105 Merge branch 'v1.1' 2020-08-05 20:07:04 +08:00
chenjianxing cef3c8dea7 fix: swagger 参数描述中带有/导入报错 2020-08-05 20:06:21 +08:00
chenjianxing 60d863208b fix: 接口测试首页定时任务 2020-08-05 18:21:15 +08:00
q4speed 018f7caf88 fix(接口测试): 修复zookeeper无限重连bug,修复Registry Center更新后无法生效bug 2020-08-05 16:57:54 +08:00
chenjianxing f10fef30bf Merge branch 'master' of https://github.com/metersphere/server 2020-08-05 13:10:40 +08:00
chenjianxing ff7d0e0343 fix: 解决冲突 2020-08-05 13:10:24 +08:00
chenjianxing 3a8dc9ee04 fix: 修复插件导入kv类型body报错 2020-08-05 13:08:18 +08:00
chenjianxing 1faa4b6e8c fix: 测试用例导入功能测试不能选择自动方式 2020-08-05 10:55:21 +08:00
chenjianxing e1089b1eb1 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-08-05 10:14:11 +08:00
chenjianxing 7de5205b99 fix: 模块树拖拽 2020-08-05 10:13:56 +08:00
wenyann 74ea612f2e fix(测试计划): 修复测试用例筛选条件 2020-08-04 19:04:03 +08:00
wenyann 5fb0fc59b7 Merge remote-tracking branch 'origin/master' 2020-08-04 17:36:30 +08:00
wenyann b4658c2a9a feat(测试跟踪): 修改新增字段长度 2020-08-04 17:35:58 +08:00
chenjianxing 998750d77f 性能测试首页定时任务列表 2020-08-04 17:35:09 +08:00
wenyann 833d80faf5 Merge remote-tracking branch 'origin/master' 2020-08-04 16:45:17 +08:00
wenyann 4359861a50 feat(测试跟踪): 导出用例,备注显示文本框名字 2020-08-04 16:44:56 +08:00
chenjianxing 4ad4a698cd Merge branch 'master' of https://github.com/metersphere/server 2020-08-04 16:38:06 +08:00
chenjianxing 002ace6b16 接口测试首页定时任务列表 2020-08-04 16:37:42 +08:00
wenyann b29720930e feat(测试跟踪): 测试方式自动时关联用例增加其它选项 2020-08-04 16:36:04 +08:00
Captain.B 9f4dd6e49c Merge branch 'v1.1'
# Conflicts:
#	frontend/src/business/components/api/test/components/ApiScenarioVariables.vue
#	frontend/src/business/components/api/test/model/ScenarioModel.js
2020-08-04 16:07:26 +08:00
wenyann 82eb4a4e7a style(api): 删除无用代码 2020-08-03 18:44:14 +08:00
wenyann cb58177c62 fix(测试跟踪): 修复case导出后,xls打开顺序不一致 2020-08-03 14:52:03 +08:00
shiziyuan9527 a0600ed4b9 refactor(测试跟踪): 优先级名称变更为用例等级 2020-08-03 14:14:50 +08:00
chenjianxing 7cbb202309 fix: 非管理员用户点击高级搜索退出登入 2020-07-31 18:10:44 +08:00
Captain.B bcdbabc54a refactor: 修改性能测试结果字段的长度为LONGTEXT 2020-07-31 14:26:54 +08:00
chenjianxing 6e6ce650f7 Merge branch 'master' of https://github.com/metersphere/server 2020-07-30 18:45:55 +08:00
chenjianxing 1b0dc296fc Merge branch 'v1.1' 2020-07-30 18:45:14 +08:00
chenjianxing 2d2ac4f632 feat: 断言支持JSONPath 2020-07-30 17:01:04 +08:00
q4speed 85d6b34bdb build: 增加allatori 2020-07-30 16:52:00 +08:00
q4speed b54ae2769b feat: Demo 2020-07-30 15:27:28 +08:00
q4speed 8704c43929 feat: 添加submodule 2020-07-30 12:25:39 +08:00
chenjianxing dc375e1b4a fix: 导出用例默认按更新时间排序 2020-07-30 11:52:41 +08:00
chenjianxing 2a0cc4c7ea Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-30 09:26:13 +08:00
chenjianxing 022534038c Merge branch 'v1.1' of https://github.com/metersphere/server 2020-07-30 09:24:04 +08:00
chenjianxing e8f7ee688a refactor: merge v1.1 2020-07-29 18:41:01 +08:00
Captain.B f7e59049d7 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-29 18:39:01 +08:00
chenjianxing e498b287d8 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-29 18:38:46 +08:00