Commit Graph

962 Commits

Author SHA1 Message Date
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 fd8b9b3a1c refactor: 修改判断测试用例是否存在的方法 2020-07-24 14:42:16 +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
Captain.B d107be2985 refactor: 修改性能测试日志查询的pagesize 2020-07-23 11:22:44 +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
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
chenjianxing 55a2a96da3 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-23 10:12:53 +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
Captain.B 50c6cfa4d2 style: 格式化代码,优化 import 2020-07-23 09:38:19 +08:00
wenyann 0e54e56c20 Merge remote-tracking branch 'origin/v1.1' into v1.1 2020-07-22 21:26:28 +08:00
wenyann 8bb657c28e fix: 修改导出用例请求方法 2020-07-22 21:26:03 +08:00
wangzhen-fit2cloud b0e02f2b50 refactor: 修改版本号为 1.1 2020-07-22 19:43:15 +08:00
Captain.B 2e05128188 Merge branch 'v1.1' of github.com:fit2cloudrd/metersphere-server into v1.1 2020-07-22 19:07:56 +08:00
Captain.B 59cd84efa2 fix: 修复下载性能测试日志的oom 2020-07-22 19:07:40 +08:00
chenjianxing af03676879 Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1 2020-07-22 17:00:31 +08:00
chenjianxing 9846a364b6 fix: 导入插件文件 2020-07-22 17:00:08 +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