Commit Graph

935 Commits

Author SHA1 Message Date
Captain.B 59cd84efa2 fix: 修复下载性能测试日志的oom 2020-07-22 19:07:40 +08:00
Captain.B 90489ae2a3 fix: 修复下载性能测试日志的排序问题 2020-07-22 16:16:59 +08:00
shiziyuan9527 2660ebb975 Merge branch 'v1.1'
# Conflicts:
#	backend/src/main/java/io/metersphere/api/service/APITestService.java
2020-07-22 15:56:40 +08:00
Captain.B c3176d1a6e Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-22 13:58:12 +08:00
Captain.B 1f09dbb24a refactor: 调整session过期时间为可配置,默认1800s 2020-07-22 13:57:53 +08:00
chenjianxing 451f7311bf fix: 解决冲突 2020-07-22 13:38:31 +08:00
chenjianxing d1f2251536 refactor: swagger 增加url导入 2020-07-22 13:36:49 +08:00
Captain.B 23351a71e2 feat: 增加测试用例和测试计划的高级搜索 2020-07-22 13:22:54 +08:00
q4speed fc278e6bf7 fix(接口测试): 使用Dubbo常量 2020-07-22 12:26:49 +08:00
q4speed 7365355d8e fix(接口测试): 修复interface重复bug 2020-07-22 12:22:29 +08:00
shiziyuan9527 0b1a0964d1 Merge branch 'v1.1' of https://github.com/metersphere/metersphere into v1.1 2020-07-22 11:35:30 +08:00
shiziyuan9527 ffd4ae427d fix: LDAP支持邮箱登录 2020-07-22 11:35:19 +08:00
chenjianxing a4cad32132 Merge branch 'v1.1' 2020-07-22 00:06:56 +08:00
chenjianxing c075308efc fix: 解决Github仓库冲突 2020-07-22 00:06:21 +08:00
chenjianxing bac8f3215e refactor: merge v1.1 2020-07-22 00:04:16 +08:00
chenjianxing f62c6bdb4e refactor: 修改报告图表顺序 2020-07-21 23:54:03 +08:00
chenjianxing feeebf7205 fix: 模块重名校验 2020-07-21 22:08:30 +08:00
chenjianxing 4eeede9322 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-21 20:09:29 +08:00
chenjianxing 43f9f190f7 fix: postman 导入GET请求报错 2020-07-21 19:16:52 +08:00
Captain.B d60dc04648 refactor: 修改容器停止失败的提示 2020-07-21 18:41:44 +08:00
q4speed 1db793a11b fix(接口测试):
场景的Dubbo配置自动赋值给空的请求配置;
Interface配置中提供getProviderList功能
2020-07-21 17:49:08 +08:00
Captain.B b196e88014 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-21 14:55:29 +08:00
Captain.B 9a5c02827b feat: 增加测试用例和测试计划的高级搜索 2020-07-21 14:53:42 +08:00
shiziyuan9527 7bd9f429c2 fix: 系统菜单用户列表能修改LDAP来源用户的密码 2020-07-21 13:52:12 +08:00
shiziyuan9527 f29dfbf018 fix: 接口权限 2020-07-21 13:27:12 +08:00
Captain.B 6ece43e71b refactor(deps): 采用外部的dubbo插件 2020-07-21 11:50:11 +08:00
Captain.B 2ca4d75916 refactor(deps): 采用外部的dubbo插件 2020-07-21 11:48:54 +08:00
q4speed 382087086f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	backend/src/main/java/io/metersphere/api/parse/ApiImportAbstractParser.java
2020-07-21 11:37:21 +08:00
q4speed 390384c6a4 feat(接口测试): 增加Dubbo支持 2020-07-21 11:34:30 +08:00
Captain.B ebe0fdf2d9 fix: 修复user-keys-controller没加权限的问题 2020-07-21 11:09:06 +08:00
Captain.B 1f4dc99864 fix: 修复session到期之后测试计划,测试用例与模块不对应 2020-07-21 11:05:50 +08:00
Captain.B 801ee5edd5 fix: 修改系统参数只允许系统管理员操作 2020-07-21 10:41:01 +08:00
Captain.B 52b0b93510 fix: 修改初始化数据的时间戳 2020-07-21 10:37:41 +08:00
Captain.B 4262a1833a fix: 修改系统参数只允许系统管理员操作 2020-07-21 10:26:51 +08:00
wenyann 9ca7fdf576 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-21 10:16:35 +08:00
wenyann e4cb8647d5 fix: 1.导入用例维护人信息错误 2关联用例后更新用例优先级
3系统参数默认显示错误
2020-07-21 10:15:47 +08:00
chenjianxing 2a5eea722e Merge branch 'v1.1' 2020-07-21 01:57:02 +08:00
chenjianxing c41a29e863 fix: 环境保存请求头变量失败 2020-07-21 01:03:11 +08:00
Captain.B 9535758d0d fix: 修复停止性能测试的时候无法关闭socket造成空指针的错误 2020-07-20 14:32:46 +08:00
Captain.B 0edc40b09e refactor: 设置restTemplateWithTimeout 超时时间10s 2020-07-20 14:13:59 +08:00
shiziyuan9527 ca11d787c7 refactor: 修改sql 2020-07-20 13:50:12 +08:00
AgAngle e24ab7a2ad refactor: 优化定时任务页面 2020-07-19 16:17:16 +08:00
chenjianxing f20c9ca591 Merge branch 'master' of https://github.com/metersphere/server 2020-07-17 18:26:00 +08:00
chenjianxing 985385aba2 refactor: 优化接口测试导入 2020-07-17 18:25:09 +08:00
Captain.B 27990fdacc refactor: 去掉无用的接口 2020-07-17 16:56:24 +08:00
wenyann 7c04bf4ca5 Merge remote-tracking branch 'origin/master' 2020-07-17 15:38:14 +08:00
Captain.B 2850017733 refactor: 记录容器停止失败的日志,并返回报错信息 2020-07-17 15:32:54 +08:00
wenyann 9e0653947c Merge branch 'v1.0' 2020-07-17 14:42:02 +08:00
wenyann cf216d1d84 Merge remote-tracking branch 'origin/master' 2020-07-17 14:05:56 +08:00
wenyann b5dc9ff8ff fix: 导入导出图标交换,jenkins按计划查询,模块全部查询 2020-07-17 14:05:19 +08:00