test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,119 Commits 41 Branches 167 Tags 406 MiB
Commit Graph

1487 Commits

Author SHA1 Message Date
chenjianxing 1e808df7ba Merge branch 'master' of https://github.com/metersphere/server 2020-09-17 19:37:52 +08:00
chenjianxing cd42469860 fix(接口测试): swagger 导入报错 2020-09-17 19:37:28 +08:00
fit2-zhao 7b8aaaebb6 refactor(测试跟踪): 删除多余模版文件 2020-09-17 18:58:33 +08:00
fit2-zhao 5374525783 fix(测试跟踪): 修改文件流关闭 2020-09-17 18:43:29 +08:00
fit2-zhao a13c3b2de3 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-17 18:41:48 +08:00
fit2-zhao c575a94e7f fix(测试跟踪): 导入缺陷修复 2020-09-17 18:38:49 +08:00
chenjianxing 7b0045d1a7 refactor: 解决冲突 2020-09-17 18:37:38 +08:00
wenyann bd42309f73 Merge remote-tracking branch 'origin/master' 2020-09-17 18:24:54 +08:00
wenyann a537892de2 fix:接口测试不执行 2020-09-17 18:24:26 +08:00
chenjianxing 6e72c03e2e fix: ScenarioModel.js 报错 2020-09-17 18:16:53 +08:00
q4speed d4199e85b4 Merge remote-tracking branch 'origin/master' 2020-09-17 18:09:28 +08:00
q4speed 3994e346b5 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	frontend/src/business/components/api/test/model/ScenarioModel.js
 2020-09-17 18:08:37 +08:00
q4speed 4e9a2f084f feat(接口测试): 增加逻辑控制器 2020-09-17 18:04:51 +08:00
shiziyuan9527 ed43ef4dc4 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-17 18:03:32 +08:00
shiziyuan9527 92f91fcb48 feat(测试跟踪): 用例评审CURD 2020-09-17 18:03:05 +08:00
fit2-zhao 61f04a6f9a fix(测试跟踪): 下载模版缺陷修复 2020-09-17 17:30:51 +08:00
fit2-zhao 8a447c2494 fix(测试跟踪): Xmind模版下载修改 2020-09-17 17:06:18 +08:00
fit2-zhao 05f43a0f7f Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-17 16:54:41 +08:00
fit2-zhao 30164c6591 fix(测试跟踪): 导入xmind 相关缺陷修复 2020-09-17 16:54:20 +08:00
wenyann be136e99e8 Merge remote-tracking branch 'origin/master' 2020-09-17 16:15:00 +08:00
wenyann 167dd8d0e8 fix:添加保存 2020-09-17 16:14:38 +08:00
Captain.B dd0b474959 Merge branch 'master' of github.com:fit2cloudrd/metersphere-server into master 2020-09-17 16:05:47 +08:00
Captain.B eecc351061 refactor(性能测试): 页面可配置响应超时时间 2020-09-17 15:52:17 +08:00
chenjianxing 370b424e7c Merge branch 'master' of https://github.com/metersphere/server 2020-09-17 15:11:37 +08:00
chenjianxing e1eba35e13 feat(接口测试): 支持 Oracle 2020-09-17 15:11:00 +08:00
Captain.B 6a0d7ecf47 Merge branch 'master' of github.com:fit2cloudrd/metersphere-server into master 2020-09-17 14:55:41 +08:00
Captain.B 10d42f432d refactor(性能测试): 增加一个response_timeout，避免目标网站不反回结果导致测试不能结束 2020-09-17 14:55:08 +08:00
fit2-zhao 79b232b928 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-17 13:52:09 +08:00
fit2-zhao dfc7f1755e perf(测试跟踪): 导入性能优化 2020-09-17 13:51:50 +08:00
chenjianxing d4439f01ad feat(接口测试): 支持 postgresql 2020-09-17 13:03:33 +08:00
fit2-zhao 8ca36bd18f Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-17 11:36:43 +08:00
fit2-zhao 252e52d316 fix(测试跟踪): 导入xmind 增加校验保护 2020-09-17 11:35:59 +08:00
chenjianxing dc41ddc683 Merge branch 'master' of https://github.com/metersphere/server 2020-09-17 11:02:27 +08:00
chenjianxing 21ad96c691 feat(接口测试): 支持sqlserver 2020-09-17 11:02:16 +08:00
fit2-zhao 4d983fd071 fix(接口调试): 修复host不匹配时开启DnsCache缺陷 2020-09-17 11:01:08 +08:00
wenyann c0a9dc003d fix:导出全部用例 2020-09-16 22:14:19 +08:00
chenjianxing 9918d77e51 fix: 解决冲突 2020-09-16 20:48:40 +08:00
chenjianxing fccababb39 feat(接口测试): 支持连接Mysql 2020-09-16 20:45:09 +08:00
fit2-zhao 4ad35dcf7d Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-16 19:32:31 +08:00
fit2-zhao 95b44e7fd0 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	backend/pom.xml
 2020-09-16 19:32:11 +08:00
fit2-zhao 76b09b4751 feat(测试跟踪): 支持思维导图导入用例 2020-09-16 18:47:04 +08:00
wenyann b6e9f7867f Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-16 16:25:52 +08:00
wenyann 0a9563a7db fix:jenkins对应接口修改 2020-09-16 16:25:39 +08:00
shiziyuan9527 77ebb23127 feat(测试跟踪): 用例评审相关类 2020-09-16 15:52:51 +08:00
shiziyuan9527 be29bcc04f feat(测试跟踪): tapd提交缺陷时增加创建人 2020-09-16 14:26:54 +08:00
wenyann 8dca4bce9a fix:修改互相调用 2020-09-16 12:05:02 +08:00
wenyann 64a731bb57 Merge remote-tracking branch 'origin/master' 2020-09-16 11:35:30 +08:00
wenyann 4ff4023889 fix:修改互相调用 2020-09-16 11:35:04 +08:00
Captain.B 142c32705f fix: 误删jira的包 2020-09-16 10:47:09 +08:00
wenyann 124c93dc7b fix: 删除无用代码 2020-09-16 10:37:19 +08:00
wenyann 43bfebfcaa Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	backend/src/main/resources/i18n/messages_en_US.properties
	backend/src/main/resources/i18n/messages_zh_CN.properties
	backend/src/main/resources/i18n/messages_zh_TW.properties
 2020-09-16 10:03:31 +08:00
wenyann b221a51d4c feat: 定时任务通知 2020-09-16 09:57:55 +08:00
shiziyuan9527 a325a18139 feat(测试跟踪): tapd提交缺陷时增加处理人信息 2020-09-15 16:54:50 +08:00
chenjianxing 14531a571a Merge branch 'master' of https://github.com/metersphere/server 2020-09-15 11:29:12 +08:00
chenjianxing cbb1976f77 feat(接口测试): sql 请求 2020-09-15 11:26:29 +08:00
shiziyuan9527 98ccbc043c refactor(测试跟踪): 修改测试计划表，删除项目ID列 2020-09-15 11:21:10 +08:00
shiziyuan9527 84c891419f refactor: Jira id 替换为 key 2020-09-15 10:51:52 +08:00
fit2-zhao 776d17833b style(XPack): 修复 认证页面样式 2020-09-15 10:32:44 +08:00
fit2-zhao f306dbc804 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-14 17:09:48 +08:00
fit2-zhao 825957fbbb fix(XPack): 修改认证文件路径，删除源代码下认证文件 2020-09-14 17:08:11 +08:00
shiziyuan9527 5c400f616c Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-14 16:51:01 +08:00
shiziyuan9527 54b72c017e feat(测试计划): 测试报告中列表增加所属项目列 2020-09-14 16:50:49 +08:00
Captain.B 4f4cef3feb Merge branch 'master' of github.com:fit2cloudrd/metersphere-server into master 2020-09-14 16:17:41 +08:00
Captain.B 2abc0bd912 refactor: 处理创建容器的返回结果 2020-09-14 16:16:59 +08:00
fit2-zhao 3445ac4656 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-14 15:57:20 +08:00
fit2-zhao 1644a03cf6 feat(XPack): 【企业版】【公共】License 认证机制 2020-09-14 15:51:37 +08:00
shiziyuan9527 3b439edaeb feat(测试计划): 关联测试用例切换项目页列表分页 2020-09-14 15:14:19 +08:00
chenjianxing ed86abfb9e Merge branch 'master' of https://github.com/metersphere/server 2020-09-08 18:30:46 +08:00
chenjianxing f39e2f97a1 fix: 定时任务死锁问题 2020-09-08 18:30:25 +08:00
shiziyuan9527 b55ca479a4 feat(测试计划): 测试计划下测试用例增加所属项目列 2020-09-08 18:28:37 +08:00
chenjianxing fdd401280e Merge branch 'v1.2' 2020-09-08 17:30:57 +08:00
chenjianxing 40780b9158 Merge branch 'v1.2' of https://github.com/metersphere/server into v1.2 2020-09-08 17:29:47 +08:00
chenjianxing fcfb01db6e fix(接口测试): python 执行失败 2020-09-08 17:29:38 +08:00
chenjianxing fdde95218d Merge branch 'master' of https://github.com/metersphere/server 2020-09-08 17:26:22 +08:00
chenjianxing 2deec48cd5 fix(接口测试): python 执行失败 2020-09-08 17:25:57 +08:00
shiziyuan9527 84a1075795 refactor(LDAP): LDAP记录错误日志 2020-09-08 15:47:39 +08:00
wenyann 5eb9a5aadd fix: 修复导出用例null 2020-09-08 15:23:16 +08:00
shiziyuan9527 fbce41bb3e refactor(测试计划): 删除测试计划时同时删除相关联数据 2020-09-08 15:20:30 +08:00
wenyann 913ff44480 fix: 任务通知设置 2020-09-08 14:52:44 +08:00
q4speed 1d84cda5fe refactor: 优化代码 2020-09-08 10:49:18 +08:00
shiziyuan9527 dad8ad2be9 feat: 测试计划关联用例支持跨项目 2020-09-07 22:30:38 +08:00
q4speed 7f296f453c Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	frontend/src/business/components/api/test/components/ApiScenarioConfig.vue
#	frontend/src/business/components/api/test/components/request/ApiHttpRequestForm.vue
 2020-09-07 13:29:37 +08:00
q4speed d6459dfa73 feat(接口测试): 增加场景拼接 2020-09-07 13:20:27 +08:00
shiziyuan9527 34bf64ce73 fix: 获取jira缺陷时出现空指针的问题 2020-09-07 11:38:02 +08:00
fit2-zhao ea832f6f0e Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-04 19:36:11 +08:00
fit2-zhao 59aeb11fa1 feat(接口测试): 环境配置增加hosts 2020-09-04 19:35:50 +08:00
Captain.B d00f170581 refactor: 修改session默认的timeout时间为12小时 2020-09-04 14:29:55 +08:00
fit2-zhao 60961c0a27 style(接口测试): 规范化提交内容 2020-09-03 16:17:15 +08:00
fit2-zhao 82cf5b25c4 Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	frontend/src/business/components/api/test/components/ApiVariable.vue
 2020-09-03 15:11:05 +08:00
fit2-zhao ed4b773bd8 feat(接口调试): 参数增加启用/禁用勾选项 2020-09-03 14:59:12 +08:00
Captain.B 433aa6bf19 refactor: 修改定时任务的配置类 2020-09-03 14:47:12 +08:00
wenyann 788f60b7b8 fix: 任务通知设置 2020-09-03 11:32:48 +08:00
wenyann 3e14fd3d6b Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	frontend/src/business/components/common/components/MsScheduleEdit.vue
 2020-09-03 10:36:44 +08:00
wenyann 6785e58d10 feat: 任务通知 2020-09-03 10:34:13 +08:00
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