Commit Graph

1393 Commits

Author SHA1 Message Date
chenjianxing 5b750fe55f refact: 解决冲突 2020-09-02 19:33:38 +08:00
chenjianxing 86098dee8a refactor: merge v1.2 2020-09-02 19:32:31 +08:00
chenjianxing 9f9210bb87 fix(接口测试): 修复环境删除时,测试保存无反应 2020-09-02 19:18:37 +08:00
Captain.B 32d8054304 Merge branch 'v1.2' into master 2020-09-02 17:06:56 +08:00
Captain.B e9c79676c1 chore: 去掉不用的文件 2020-09-02 17:03:08 +08:00
wenyann 0c36bde3ac Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-02 16:34:28 +08:00
shiziyuan9527 fdfcf4392b feat: 测试计划和项目的关联表 2020-09-02 16:33:19 +08:00
wenyann af53cf7c47 Merge branch 'master' of https://github.com/metersphere/metersphere
 Conflicts:
	frontend/src/business/components/common/components/MsScheduleEdit.vue
2020-09-02 16:24:27 +08:00
wenyann 5b3552b510 fix: 任务通知设置 2020-09-02 16:21:53 +08:00
wenyann 2dbe00bf23 fix: 任务通知设置 2020-09-02 16:21:40 +08:00
chenjianxing d0e8cf0a49 Merge branch 'v1.2' of https://github.com/metersphere/server into v1.2 2020-09-02 15:29:17 +08:00
chenjianxing 7d6cf859df feat(接口测试): 支持python脚本 2020-09-02 15:29:01 +08:00
Captain.B 5aa7019bb0 Merge branch 'v1.2' into master
# Conflicts:
#	frontend/src/business/components/common/components/MsScheduleEdit.vue
2020-09-01 17:54:53 +08:00
shiziyuan9527 1a9fcf0d7b feat: 性能测试报告批量删除 2020-09-01 16:22:58 +08:00
Captain.B 3707c02df9 fix(性能测试): 修复性能测试不能复制的问题
Closes 298
2020-09-01 10:35:50 +08:00
chenjianxing 4fa973eff1 Merge branch 'master' of https://github.com/metersphere/server 2020-08-31 23:37:04 +08:00
chenjianxing 31d7fa36f3 feat(接口测试): 跟随重定向配置 2020-08-31 20:14:49 +08:00
shiziyuan9527 4203707ef5 feat: 接口测试报告批量删除 2020-08-31 17:18:25 +08:00
chenjianxing fb93109cf6 Merge branch 'v1.2' of https://github.com/metersphere/server into v1.2 2020-08-28 19:24:39 +08:00
chenjianxing 29d43bee4c fix(接口测试): GET请求url多带了& 2020-08-28 19:24:13 +08:00
shiziyuan9527 b88e3d5bff fix: jira 提交缺陷失败的问题 2020-08-28 18:16:27 +08:00
wenyann c2cef4bd70 fix: 用例导出优化 2020-08-28 16:38:44 +08:00
wenyann 082c634611 Merge branch 'v1.2' of https://github.com/metersphere/metersphere into v1.2 2020-08-28 13:35:54 +08:00
chenjianxing 0dc6e10529 Merge branch 'master' of https://github.com/metersphere/server 2020-08-28 11:39:06 +08:00
chenjianxing 34859866f6 fix(接口测试): 增加test_case 表node_path字段长度 2020-08-28 11:24:58 +08:00
wenyann 00c269ff8d fix:创建测试用例点击窗口外区域不关闭当前窗口
fix:测试名称校验
2020-08-28 10:30:42 +08:00
chenjianxing 278d0bf2bd refactor: 代码优化 2020-08-27 10:05:25 +08:00
chenjianxing 549aedef7d fix(接口测试): 超时时间最大值报错 2020-08-27 09:41:39 +08:00
shiziyuan9527 ec84639d3d fix: 批量更新测试计划后更新时间未修改的bug 2020-08-26 18:22:06 +08:00
chenjianxing ac73c09544 fix(接口测试): 复制测试判断重名 2020-08-26 17:48:48 +08:00
chenjianxing 1f6fffad2c refactor: 复制测试可填写测试名称 2020-08-26 17:20:56 +08:00
chenjianxing e8ee29da09 fix(接口测试): body 文件上传大小限制 2020-08-26 15:46:47 +08:00
shiziyuan9527 9d5523f2f0 fix: jira缺陷描述文本格式 2020-08-26 14:42:55 +08:00
Captain.B 9f5f5acfda fix: 修复 api test 场景复杂是列表查询慢的问题 2020-08-26 13:22:07 +08:00
chenjianxing 9ffffe5703 fix(接口测试): 文件上传调试执行失败 2020-08-26 13:03:03 +08:00
q4speed 4632afab9c chore: update submodule 2020-08-26 10:14:25 +08:00
chenjianxing 52049d61d4 refacotr: 合并v1.1 2020-08-25 15:44:07 +08:00
Captain.B a0feab582e fix: 修复 only_full_group_by 错误 2020-08-25 15:19:20 +08:00
Captain.B b80e5cc996 fix: 修复 select distinct 错误 2020-08-25 15:10:56 +08:00
chenjianxing 050a519d54 refactor: 解决冲突 2020-08-25 13:44:50 +08:00
chenjianxing d54b32ced3 feat(接口测试): 接口测试支持文件上传 2020-08-25 13:42:31 +08:00
wenyann e33ffa6542 fix: 缺陷列表按时间排序 2020-08-24 16:51:33 +08:00
shiziyuan9527 d14242c4b2 refactor: 删除无用代码 2020-08-24 16:13:44 +08:00
shiziyuan9527 d315944c20 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-24 16:11:05 +08:00
shiziyuan9527 8fcf7aea75 fix: 缺陷添加创建时间 2020-08-24 16:10:12 +08:00
wenyann af7ea03f8b Merge remote-tracking branch 'origin/master' 2020-08-24 16:07:52 +08:00
wenyann 6a8c1788ea fix: 修改模块显示路径,时间排序 2020-08-24 16:07:23 +08:00
shiziyuan9527 9ad4da05cd fix: 修改缺陷标题长度 2020-08-24 14:11:08 +08:00
wenyann ba6a0a6a6b feat(测试跟踪):去掉描述html标签 2020-08-21 18:26:37 +08:00
q4speed be574b1b40 chore: update submodule 2020-08-21 14:29:00 +08:00
q4speed cb8b73d9ad feat(性能测试): 增加资源池限额过滤 2020-08-21 11:14:47 +08:00
chenjianxing 9a9d702aca Merge branch 'master' of https://github.com/metersphere/server 2020-08-20 18:16:45 +08:00
chenjianxing eceb099545 feactor: 用户ID支持特殊字符 2020-08-20 18:16:28 +08:00
q4speed 3c96650b79 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
2020-08-20 18:06:53 +08:00
q4speed 2b77e43050 feat(性能测试): 增加性能测试限额检查 2020-08-20 18:06:02 +08:00
shiziyuan9527 1abd168b5c Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-20 16:16:57 +08:00
shiziyuan9527 07a34181c8 fix: 批量更新用例后用例更新时间没修改的bug 2020-08-20 16:16:17 +08:00
shiziyuan9527 0602044d6a feat: 删除用例时删除关联的缺陷 2020-08-20 16:03:02 +08:00
chenjianxing 72010207ea Merge branch 'master' of https://github.com/metersphere/server 2020-08-20 15:53:52 +08:00
chenjianxing 53b2833ee4 fix(测试跟踪): 只读用户创建用户测试报告 2020-08-20 15:53:16 +08:00
shiziyuan9527 1038f50c3f fix: 修改缺陷描述 2020-08-20 15:00:18 +08:00
shiziyuan9527 639830b58b fix: 测试计划状态执行结果无法更新的问题 2020-08-20 14:59:35 +08:00
chenjianxing 3ebee20b90 Merge branch 'master' of https://github.com/metersphere/server 2020-08-20 14:37:25 +08:00
chenjianxing 84e9c23486 feat(接口测试): 添加超时设置 2020-08-20 14:37:05 +08:00
Captain.B a50666f1d6 Updating the submodule to the latest version 2020-08-20 12:12:20 +08:00
chenjianxing fbed4ecda4 fix: 解决冲突 2020-08-19 18:10:31 +08:00
chenjianxing 948e489626 fix(接口调试): 接口调试响应不更新问题 2020-08-19 18:04:42 +08:00
Captain.B 9791463ead fix(接口测试): 修复 post url 格式不对的问题 2020-08-19 17:43:22 +08:00
Captain.B f1b8bf4c9f fix(接口测试): 修复 post url 格式不对的问题 2020-08-19 17:39:40 +08:00
q4speed bf414059fa Merge remote-tracking branch 'origin/master' 2020-08-19 17:07:08 +08:00
q4speed 20674b1c7a feat(接口测试): 增加接口测试数量限额检查 2020-08-19 17:06:26 +08:00
shiziyuan9527 12e288016d fix: 测试计划测试用例页面获取不到备注的bug 2020-08-19 16:34:07 +08:00
chenjianxing 83c21a33b5 Merge branch 'master' of https://github.com/metersphere/server 2020-08-19 15:41:24 +08:00
chenjianxing 478d6db83b feat(接口测试): 场景和接口支持禁用和启用 2020-08-19 15:41:14 +08:00
Captain.B 0c2f7e27e6 refactor: 修改ignore 2020-08-19 13:20:43 +08:00
Captain.B b39db8c97b refactor: 修改ignore 2020-08-19 13:19:44 +08:00
q4speed 44540d813f refactor: 删除无用代码 2020-08-19 10:39:10 +08:00
q4speed 0197515077 chore: 子模块 2020-08-19 10:22:04 +08:00
wenyann 29f5e772a1 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-08-19 10:02:22 +08:00
wenyann d9b3831b3e feat(测试跟踪): 新增缺陷列表,缺陷数 2020-08-19 10:02:02 +08:00
chenjianxing d820bf400c feat(接口测试): dubbo BeanShell 2020-08-18 19:01:49 +08:00
q4speed cadcf9eb7b Merge remote-tracking branch 'origin/master'
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
2020-08-18 18:10:02 +08:00
q4speed a26a12fb17 fix: 修复保存工作控件配额时超出组织的配额的bug 2020-08-18 18:08:50 +08:00
Captain.B 052fae882e refactor: 打包的时候保留jmeter的jar 2020-08-18 17:09:54 +08:00
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
Captain.B 9716376e34 refactor(deps): 更新pom使用2.7.8版本的 dubbo plugin 2020-07-29 18:38:42 +08:00
chenjianxing 5933e0a27c fix: swagger 导入post请求body格式化 2020-07-29 18:38:21 +08:00
shiziyuan9527 cdc790e90d feat(LDAP): LDAP设置中添加对phone字段的属性映射 2020-07-29 18:32:05 +08:00
chenjianxing 9ca6055c0f Merge branch 'master' of https://github.com/metersphere/server 2020-07-29 18:22:55 +08:00
chenjianxing 3bb35a4452 Merge branch 'v1.1' 2020-07-29 18:22:05 +08:00
q4speed 67aa2a0585 docs: 修改Readme 2020-07-29 18:11:58 +08:00
chenjianxing 24a2d357b3 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-29 14:09:21 +08:00
chenjianxing ea60dae2d4 fix: postman 导入body异常 2020-07-29 14:09:02 +08:00
chenjianxing ccf90308dd fix: postman 导入body异常 2020-07-29 14:08:08 +08:00
Captain.B 2f4561f78c Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-29 13:41:59 +08:00
Captain.B 999dc8654e refactor: 修改性能测试查询报告状态判断 2020-07-29 13:41:31 +08:00
chenjianxing 7528053dd0 Merge branch 'v1.1' 2020-07-29 13:33:09 +08:00
chenjianxing df7865bcf0 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-29 13:23:53 +08:00
chenjianxing 5b9279b116 fix: postman 多级目录导入 2020-07-29 13:16:46 +08:00
Captain.B 55be1a7386 refactor(deps): 使用中央仓库的 jar 2020-07-29 11:24:47 +08:00
Captain.B 81ce9fab91 fix: 修复 Thread Iterations Limit 为1的bug 2020-07-29 10:40:18 +08:00
Captain.B f21790e089 fix: 修复 mvn clean 没有删除 static 和 templates 2020-07-28 20:55:30 +08:00
chenjianxing f0e3fd22a0 Merge branch 'v1.1' 2020-07-28 19:16:36 +08:00
chenjianxing 5aca08a677 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-28 19:16:15 +08:00
chenjianxing e181a4867c feat: post 请求支持参数格式化 2020-07-28 19:16:00 +08:00
shiziyuan9527 f31ac1b1b6 fix(系统设置): 修改sql,根据ID或邮箱查询用户 2020-07-28 18:36:06 +08:00
shiziyuan9527 270e816599 feat(系统设置): 组织菜单下,一次可以添加多个成员 2020-07-28 18:29:25 +08:00
chenjianxing 15798a7726 Merge branch 'v1.1' 2020-07-28 16:23:08 +08:00
Captain.B 665700d03f feat(deps): 增加actuator实现服务监控
Closes 156
2020-07-28 14:35:43 +08:00
Captain.B ec424af9af refactor(deps): 去掉POM中的slf4j
Closes 155
2020-07-28 13:54:27 +08:00
Captain.B e64ada7ae9 fix: 修复不停的输出dubbo日志的问题 2020-07-28 13:36:54 +08:00
shiziyuan9527 5bf3f355f5 feat: 启用LDAP认证后才显示LDAP登录选项 2020-07-27 18:09:34 +08:00
shiziyuan9527 ff9965b2e7 feat: 导入用例时,用例所有字段值都相同才判断用例重复 2020-07-27 16:42:12 +08:00
Captain.B 492dca961c feat: 优化停止性能测试是否保留报告 2020-07-27 13:25:47 +08:00
Captain.B e6b171a21d fix: 修复不停的输出dubbo日志的问题 2020-07-27 12:26:50 +08:00
chenjianxing 10d7441487 Merge branch 'master' of https://github.com/metersphere/server 2020-07-24 18:24:02 +08:00
chenjianxing ce2b3e4c98 Merge branch 'v1.1' 2020-07-24 18:23:18 +08:00
chenjianxing 3841ff55d8 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-24 18:22:46 +08:00
chenjianxing 8d389f0298 fix: post 参数encoding 2020-07-24 18:22:31 +08:00
wenyann dd39904c5d refactor: 修改方法名;调整条件筛选sql 2020-07-24 18:20:15 +08:00
wenyann 404bcff3b7 refactor(deps): 调整条件筛选sql 2020-07-24 17:48:55 +08:00
shiziyuan9527 56e0415ddb refactor: 简化代码 2020-07-24 15:04:38 +08:00
shiziyuan9527 fd8b9b3a1c refactor: 修改判断测试用例是否存在的方法 2020-07-24 14:42:16 +08:00
q4speed f7f8258371 refactor: 简化代码 2020-07-23 17:39:26 +08:00
Captain.B ebefc9df76 Merge branch 'v1.1' 2020-07-23 13:24:11 +08:00
Captain.B a95d4465f5 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-23 12:32:56 +08:00
Captain.B b863e78469 refactor: 修改性能测试日志下载flush 2020-07-23 12:32:41 +08:00
chenjianxing c3e54df8bb Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-23 11:56:04 +08:00
chenjianxing fb0653c0f0 fix: 插件导入请求头等信息缺失 2020-07-23 11:55:42 +08:00
chenjianxing 0e53f0bdd2 fix: 插件导入请求头等信息缺失 2020-07-23 11:54:35 +08:00
Captain.B d107be2985 refactor: 修改性能测试日志查询的pagesize 2020-07-23 11:22:44 +08:00
chenjianxing fffea1a1da Merge branch 'master' of https://github.com/metersphere/server 2020-07-23 10:42:52 +08:00
chenjianxing 896594e9d9 Merge branch 'v1.1' 2020-07-23 10:42:22 +08:00
chenjianxing aca349e590 erge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-23 10:41:45 +08:00
chenjianxing 354c6afca4 fix: URL导入失败 2020-07-23 10:41:31 +08:00
wangzhen-fit2cloud 57c02609b8 refactor: Merge branch 'v1.1' 2020-07-23 10:31:27 +08:00
Captain.B b5f2afc4f8 Merge branch 'v1.1' of github.com:fit2cloudrd/metersphere-server into v1.1 2020-07-23 10:26:46 +08:00
Captain.B bd3ea709b2 fix: 修复下载性能测试日志的oom 2020-07-23 10:26:39 +08:00
q4speed 344b9f6f77 Merge remote-tracking branch 'origin/master' 2020-07-23 10:20:56 +08:00
q4speed b316344788 fix(高级查询): 修复部分高级查询报错的bug 2020-07-23 10:20:40 +08:00
chenjianxing 55a2a96da3 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-23 10:12:53 +08:00
chenjianxing 28a58b7ecf fix: 解决冲突 2020-07-23 10:12:15 +08:00
chenjianxing 9d5164ed9f fix: 删除测试时停止任务 2020-07-23 10:11:06 +08:00
Captain.B 6107789244 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-23 10:05:33 +08:00
Captain.B c517952a20 fix: 修复日志查询时的排序 2020-07-23 10:05:14 +08:00
chenjianxing c20e4c4e8c Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-23 09:59:09 +08:00
chenjianxing 1637dd53cf fix: 删除测试时删除定时任务 2020-07-23 09:58:52 +08:00
chenjianxing e3e3a166e6 fix: 删除测试时删除定时任务 2020-07-23 09:57:44 +08:00
Captain.B 50c6cfa4d2 style: 格式化代码,优化 import 2020-07-23 09:38:19 +08:00
chenjianxing b877e03e5c Merge branch 'master' of https://github.com/metersphere/server 2020-07-23 07:36:59 +08:00
wenyann 0e54e56c20 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-22 21:26:28 +08:00