Commit Graph

1105 Commits

Author SHA1 Message Date
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