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

1628 Commits

Author SHA1 Message Date
chenjianxing b29a4f9109 fix: 导入用户不校验名称 2020-07-16 18:50:45 +08:00
chenjianxing c16f60e87d fix: 保存环境设置 2020-07-16 18:04:11 +08:00
chenjianxing 82cc66dbcd feat: 接口测试支持导入插件录制json格式 2020-07-16 13:10:52 +08:00
Captain.B 4018235aaa Merge branch 'master' of github.com:fit2cloudrd/metersphere-server 2020-07-16 09:49:00 +08:00
chenjianxing 942707ab64 Merge branch 'master' of https://github.com/metersphere/server 2020-07-15 20:45:46 +08:00
chenjianxing bfa01c09e9 fix: 修复接口测试落干bug 2020-07-15 20:45:33 +08:00
shiziyuan9527 b5f471c67d feat: 测试用例列表添加ID展示列 2020-07-15 18:52:46 +08:00
Captain.B 2a759ca848 refactor: 去掉警告 2020-07-15 17:54:46 +08:00
shiziyuan9527 15c75c4fda fix: 修复升级 mybatis-generator-plugin 中的 mysql-connector 版本造成没有识别主键的bug 2020-07-15 16:46:18 +08:00
q4speed 1aac4684dd refactor: 去警告 2020-07-15 16:08:51 +08:00
chenjianxing ddf4d7f938 Merge branch 'master' of https://github.com/metersphere/server 2020-07-15 15:35:49 +08:00
chenjianxing 685da4ccef feat: Swagger2 导入接口测试 2020-07-15 15:35:36 +08:00
wenyann b15d35558f Merge remote-tracking branch 'origin/master' 2020-07-15 10:41:12 +08:00
wenyann 1d5fb3f3ff style: 调整代码格式 2020-07-15 10:40:43 +08:00
q4speed fdc7db695d refactor: 优化 2020-07-15 10:25:52 +08:00
shiziyuan9527 c3e32f2df8 refactor: 检查测试用例是否关联测试 2020-07-14 21:52:10 +08:00
shiziyuan9527 5cc3755dcd fix: 用户登录问题 2020-07-14 20:58:52 +08:00
Captain.B cd9f39c8b1 Merge remote-tracking branch 'origin/master' 2020-07-14 18:37:05 +08:00
Captain.B 2da491a287 fix: 修复用户登录报错无法显示到页面上的 bug 2020-07-14 18:36:51 +08:00
shiziyuan9527 ccaf3db2a6 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-07-14 17:29:40 +08:00
shiziyuan9527 0c9badda9c fix: LDAP用户登录问题 2020-07-14 17:28:53 +08:00
Captain.B a483732635 Merge remote-tracking branch 'origin/master' 2020-07-14 17:27:04 +08:00
Captain.B 46586e7da6 fix: 修复jmx只有线程组没有采样器导致无法收到消息的bug 2020-07-14 17:23:32 +08:00
BugKing f6e30833de
Merge pull request #75 from metersphere/dependabot/maven/backend/mysql-mysql-connector-java-8.0.16 
chore: Bump mysql-connector-java from 5.1.41 to 8.0.16 in /backend
 2020-07-14 15:53:14 +08:00
shiziyuan9527 327e06f0b7 style: 修改用户来源标识 2020-07-14 15:36:17 +08:00
shiziyuan9527 9045102e21 feat: 新建用户时设置用户来源 2020-07-14 14:46:40 +08:00
Captain.B 3f41704583 refactor: 去掉DEBUG中的SQL日志 2020-07-14 13:42:09 +08:00
wenyann 339e1e243b Merge remote-tracking branch 'origin/master' 2020-07-14 11:28:48 +08:00
wenyann 567f217566 fix: 修改用例步骤拼接，格式 2020-07-14 11:27:06 +08:00
wenyann bac151be1e 用例步骤换行 2020-07-14 11:10:36 +08:00
shiziyuan9527 f9b2cdc20d feat: LDAP设置中支持多个OU 2020-07-14 11:05:01 +08:00
wenyann 686baea129 Merge remote-tracking branch 'origin/master' 2020-07-14 10:15:47 +08:00
wenyann cd60ef9be8 测试用例导出 2020-07-14 10:15:11 +08:00
shiziyuan9527 b9c369ec5c feat: 关联测试用例页面添加高级搜索 2020-07-13 21:25:45 +08:00
q4speed faad7895e9 Merge remote-tracking branch 'origin/master' 2020-07-13 16:05:14 +08:00
q4speed c715a96cb7 高级查询 2020-07-13 16:05:01 +08:00
shiziyuan9527 71085aa54c sql 2020-07-13 10:43:51 +08:00
shiziyuan9527 98eeb7bc2e Merge branch 'master' of https://github.com/metersphere/metersphere 2020-07-13 10:31:52 +08:00
shiziyuan9527 2bd46f80b4 新建用户时设置用户来源 2020-07-13 10:31:14 +08:00
shiziyuan9527 8199fbbf5f ldap设置中支持多个OU 2020-07-10 17:32:01 +08:00
q4speed 7e40811443 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-07-10 16:44:03 +08:00
shiziyuan9527 aca19f6dfa 通过ldap登录的用户不能修改密码和邮箱 2020-07-10 16:27:41 +08:00
q4speed 5a377843d9 Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	frontend/src/i18n/en-US.js
	frontend/src/i18n/zh-CN.js
	frontend/src/i18n/zh-TW.js
 2020-07-10 10:47:56 +08:00
q4speed 506ad9f5f0 统一状态 2020-07-10 10:43:33 +08:00
shiziyuan9527 6cf137f777 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-07-09 15:09:32 +08:00
shiziyuan9527 e71e866827 测试计划关联用例页增加按用例名称搜索 2020-07-09 15:09:05 +08:00
chenjianxing cf9cffb114 Merge branch 'master' of https://github.com/metersphere/server 2020-07-09 15:09:01 +08:00
chenjianxing 23c8f9a8ea merge v1.0 2020-07-09 15:08:37 +08:00
wenyann f415dad267 . 2020-07-09 14:51:30 +08:00
shiziyuan9527 0228043184 测试计划关联用例增加优先级和类型并支持筛选 2020-07-09 14:17:05 +08:00
Captain.B 39121f0f99 shiro config 配置 2020-07-09 14:09:59 +08:00
chenjianxing 458583ce1f Swagger导入相关 2020-07-09 11:39:05 +08:00
wenyann c52f7abeb0 Merge remote-tracking branch 'origin/master' 2020-07-09 11:24:22 +08:00
wenyann e089e967c0 . 2020-07-09 11:23:58 +08:00
chenjianxing 93b011a4ac Merge branch 'master' of https://github.com/metersphere/server 2020-07-08 17:56:17 +08:00
chenjianxing 5318537e12 支持 postman 导入 2020-07-08 17:56:05 +08:00
shiziyuan9527 5c4ce18486 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-07-08 15:47:57 +08:00
shiziyuan9527 e45810701d ldap 2020-07-08 15:47:44 +08:00
wenyann ec3f54de0f Merge remote-tracking branch 'origin/master' 2020-07-08 14:57:14 +08:00
wenyann 16c7044b25 jenkins 2020-07-08 14:56:46 +08:00
chenjianxing 901cbfdaf4 Merge branch 'master' of https://github.com/metersphere/server 2020-07-08 11:57:55 +08:00
chenjianxing 3dcf2f0f2a 接口测试导入- Metersphere(json) 2020-07-08 11:57:45 +08:00
shiziyuan9527 fbb6fc0277 ldap 2020-07-08 01:02:16 +08:00
shiziyuan9527 192dac6f79 删除性能测试报告时同时删除相关数据 2020-07-07 18:12:02 +08:00
wenyann 8903fc80b3 smtp超时修改 2020-07-07 17:44:43 +08:00
wenyann b852fe7457 Merge remote-tracking branch 'origin/v1.0' into v1.0 2020-07-07 16:31:56 +08:00
wenyann a0483661bd smtp修改 2020-07-07 16:29:01 +08:00
shiziyuan9527 fbc6886972 删除接口测试前检查是否有相关联的测试用例 2020-07-07 13:48:18 +08:00
chenjianxing cee30dd126 修改quartz-spring-boot-starter仓库地址 2020-07-07 10:02:29 +08:00
chenjianxing 86077b91e2 Merge branch 'master' of https://github.com/metersphere/server 2020-07-07 09:13:56 +08:00
chenjianxing 3341602733 i18n 2020-07-07 09:13:32 +08:00
shiziyuan9527 d38cffe952 ldap 2020-07-06 18:17:31 +08:00
chenjianxing 76b68b2214 Merge branch 'master' of https://github.com/metersphere/server 2020-07-06 11:53:45 +08:00
chenjianxing 785705e69e api测试环境配置 2020-07-06 11:53:36 +08:00
wenyann 55e6c25202 jenkins相关接口 2020-07-06 09:59:54 +08:00
Captain.B 9f9109fbe2 rpsLimitEnable 2020-07-03 13:38:32 +08:00
Captain.B d991b698b5 set hold 2020-07-03 11:06:08 +08:00
shiziyuan9527 74417e6bec Merge branch 'master' of https://github.com/metersphere/metersphere 2020-07-02 17:35:26 +08:00
shiziyuan9527 f9c9709fd3 i18n 2020-07-02 17:34:36 +08:00
chenjianxing 4edf7c2a4c V6__api_test_environment.sql 2020-07-02 17:08:17 +08:00
chenjianxing 1e5433e0e4 Merge branch 'master' of https://github.com/metersphere/server 2020-07-02 17:00:40 +08:00
chenjianxing 08c689a72d 环境配置相关操作 2020-07-02 17:00:26 +08:00
shiziyuan9527 fa59db4418 LDAP 测试登录 2020-07-02 15:51:26 +08:00
dependabot[bot] 780240b3cf
Bump mysql-connector-java from 5.1.41 to 8.0.16 in /backend 
Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 5.1.41 to 8.0.16.
- [Release notes](https://github.com/mysql/mysql-connector-j/releases)
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/5.1.41...8.0.16)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-02 03:36:32 +00:00
Captain.B b079798ee4 Merge remote-tracking branch 'origin/master' 2020-07-01 19:01:55 +08:00
Captain.B 1c88a46fd8 set hold 2020-07-01 18:59:09 +08:00
shiziyuan9527 62f6dd634c LDAP 测试连接 2020-07-01 18:38:48 +08:00
Captain.B 404bbe395c Merge remote-tracking branch 'origin/master' 2020-07-01 15:53:46 +08:00
Captain.B 571d32a4fc apikey validate 2020-07-01 15:53:32 +08:00
shiziyuan9527 fee6481452 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-07-01 14:57:42 +08:00
shiziyuan9527 89aaf0396b 系统参数LDAP设置 2020-07-01 14:57:15 +08:00
Captain.B 32ecb65cc1 Merge remote-tracking branch 'origin/master' 2020-07-01 14:10:17 +08:00
Captain.B eb20930616 thread group name set index 2020-07-01 14:08:51 +08:00
wenyann 5c04697c86 Merge remote-tracking branch 'origin/master' 2020-07-01 10:26:35 +08:00
wenyann 8456c4c584 jenkins相关接口 2020-07-01 10:25:54 +08:00
chenjianxing d21b7282d0 merge v1.0 2020-06-30 17:39:52 +08:00
chenjianxing 0e11e90737 文件上传后端限制 2020-06-30 17:31:38 +08:00
shiziyuan9527 8c7689c239 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-06-30 15:27:51 +08:00
shiziyuan9527 1c16353180 对模板导入的测试用例进行排序 2020-06-30 15:27:12 +08:00
Captain.B e641e27956 实时报告通知前端 2020-06-30 15:20:04 +08:00
Captain.B e0306f2d0c 实时报告通知前端 2020-06-30 15:17:36 +08:00
chenjianxing 19430cc6a4 Merge branch 'v1.0' of https://github.com/metersphere/server into v1.0 2020-06-30 09:34:09 +08:00
chenjianxing 3667587e39 支持从响应头等对象中提取 2020-06-30 09:23:04 +08:00
chenjianxing 56d25dfcd8 支持从响应头等对象中提取 2020-06-29 21:11:36 +08:00
shiziyuan9527 9d95f7b665 删除性能测试前检查是否有相关联的测试用例 2020-06-29 15:46:32 +08:00
Captain.B 910ce17270 立即停止测试功能 2020-06-29 13:40:02 +08:00
chenjianxing a6c9e45f9a fix 性能测试定时任务 2020-06-29 10:20:33 +08:00
chenjianxing 1f39b8fe4a Merge branch 'master' of https://github.com/metersphere/server 2020-06-28 20:43:58 +08:00
chenjianxing 94dbd9ca17 解决定时任务集群问题 2020-06-28 20:43:43 +08:00
shiziyuan9527 52932ed2bc fix 访问最近的计划中已删除的测试计划报错 2020-06-28 17:56:25 +08:00
Captain.B 3f00363e6f 实时报告初版 2020-06-28 16:20:14 +08:00
chenjianxing 22c1858846 测试报告添加触发方式 2020-06-28 10:34:50 +08:00
chenjianxing a9f81bc59f Merge branch 'master' of https://github.com/metersphere/server 2020-06-24 17:46:45 +08:00
chenjianxing fff67b45fd 测试报告添加 trigger_mode 字段 2020-06-24 17:46:24 +08:00
shiziyuan9527 67e402afa3 ldap 2020-06-24 17:40:49 +08:00
chenjianxing fdfac7f038 性能测试-定时任务 2020-06-24 17:33:42 +08:00
chenjianxing 6c4dbedf36 V5__schedule.sql 2020-06-24 14:02:40 +08:00
chenjianxing b94eb966f6 AppStartListener 2020-06-24 13:24:51 +08:00
chenjianxing c0faacae36 应用启动时启动任务调度 2020-06-24 13:06:57 +08:00
chenjianxing 2afce7f966 接口测试-定时任务 2020-06-24 11:17:31 +08:00
chenjianxing 4f30ba5fb1 接口测试-添加任务调度 2020-06-23 16:47:48 +08:00
Captain.B c480483858 openapi 3.0 2020-06-23 11:13:17 +08:00
shiziyuan9527 d9cc2c7d7f ldap 2020-06-22 18:46:30 +08:00
shiziyuan9527 8bcf1ebc4c Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	backend/pom.xml
 2020-06-22 18:26:02 +08:00
Captain.B 8fa2a2265f Merge branch 'master' of github.com:fit2cloudrd/metersphere-server 2020-06-22 18:23:18 +08:00
Captain.B 78b0f4a4d9 用户添加apikey 2020-06-22 18:22:58 +08:00
shiziyuan9527 b66c3765ef ldap 2020-06-22 14:13:34 +08:00
chenjianxing 90e405bcc0 quartz 2020-06-22 14:01:44 +08:00
chenjianxing f8cb40cb10 接口测试 shcedule 业务逻辑 2020-06-22 12:49:20 +08:00
shiziyuan9527 aacd8df1b9 修改报错提示 2020-06-17 17:34:32 +08:00
q4speed a6ab2813ae 删除无用代码 2020-06-17 14:49:57 +08:00
shiziyuan9527 0bf62d76c3 执行测试前检查kafka 2020-06-17 10:59:30 +08:00
Captain.B 1e4db9b55f Merge remote-tracking branch 'origin/v1.0' into v1.0 2020-06-17 09:58:51 +08:00
Captain.B e386379752 setup thread bug fix 2020-06-17 09:58:36 +08:00
chenjianxing 12cc7da26b fix 测试执行人等过滤只读用户 2020-06-16 19:49:00 +08:00
Captain.B 4bb76b6f50 执行测试前检查kafka 2020-06-16 16:33:57 +08:00
Captain.B 204d01ee97 添加setup thread group 2020-06-16 15:57:09 +08:00
chenjianxing 1e99e83ea4 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-15 19:00:42 +08:00
chenjianxing 5006919f91 重构测试报告 2020-06-15 18:31:51 +08:00
q4speed 42f99a0154 修复复制接口测试重名bug 
增加后端model以便未来支持导入
修改响应时间断言名称，跟jmeter保持一致
 2020-06-15 18:05:48 +08:00
chenjianxing cc4e72906e 测试报告失败列表 2020-06-15 10:59:10 +08:00
shiziyuan9527 3738f77950 restTemplate 超时限制 2020-06-12 20:32:17 +08:00
chenjianxing 82f7b44a03 fix 导入用户该维护人不存在 2020-06-12 13:46:46 +08:00
shiziyuan9527 18fcb24755 restTemplate 超时限制 2020-06-12 11:02:46 +08:00
chenjianxing d96578f305 切换组织时自动选取工作空间 2020-06-12 09:49:27 +08:00
chenjianxing 8b15612d61 创建项目后台权限 2020-06-11 18:11:52 +08:00
chenjianxing 7ccf59ac8a 测试计划报告保留一位小数 2020-06-11 15:39:41 +08:00
chenjianxing 875e132d99 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-11 15:33:44 +08:00
chenjianxing 32fd7e8b1f 自动更新执行人 2020-06-11 15:33:19 +08:00
shiziyuan9527 3ab0ef54b5 用户ID校验 2020-06-11 15:26:09 +08:00
chenjianxing 155ff74c57 邮箱登入 2020-06-11 14:27:17 +08:00
chenjianxing 30c0612c51 fix 字符集 2020-06-11 12:06:35 +08:00
shiziyuan9527 20a0fa0fcc 删除资源池前进行检查 2020-06-11 11:44:52 +08:00
Captain.B 6560a87bd6 去掉dns cache 2020-06-11 10:39:09 +08:00
Captain.B 6694f45c17 rollback 2020-06-10 16:47:33 +08:00
shiziyuan9527 c2f91a140e 校验资源池服务器是否可用时，添加超时限制 2020-06-10 16:21:40 +08:00
Captain.B 302d4ea5a3 每次刷新页面的时候重新put session user 2020-06-10 16:17:29 +08:00
Captain.B 0065f15f60 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-06-10 14:09:58 +08:00
Captain.B 26079198e1 get user 2020-06-09 15:18:40 +08:00
q4speed 92d10d6c8e NaN 2020-06-09 11:14:52 +08:00
q4speed 6cb11c5fb7 修改sql，去掉大小写区分 2020-06-09 10:56:04 +08:00
shiziyuan9527 ae77df2ae3 用户排序 2020-06-08 18:18:11 +08:00
Captain.B cc7efe9497 Merge remote-tracking branch 'origin/dev' into dev 2020-06-08 16:10:25 +08:00
Captain.B b130c1ffa4 修复sql报错 2020-06-08 16:08:59 +08:00
shiziyuan9527 c14a8b24c3 移除角色时判断是否需要清空lastWsId和lastOrgId 2020-06-08 16:08:53 +08:00
shiziyuan9527 0e240b1ad9 删除用户时同时删除用户角色 2020-06-08 14:10:44 +08:00
chenjianxing 5ab8c54f93 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-08 13:23:17 +08:00
chenjianxing ad2f41f07a 删除项目确认 2020-06-08 12:58:38 +08:00
Captain.B 66b60dbbc6 删除无用的代码 2020-06-08 11:56:31 +08:00
shiziyuan9527 5eca6de52f fix 2020-06-05 17:52:51 +08:00
shiziyuan9527 80a870c548 bug fix 2020-06-05 15:25:54 +08:00
shiziyuan9527 9acb7e38a2 fix 无角色登录 2020-06-05 14:44:11 +08:00
shiziyuan9527 5291f6073c i18n 2020-06-05 10:46:14 +08:00
shiziyuan9527 0923ed43de Merge branch 'dev' of https://github.com/metersphere/metersphere into dev 2020-06-04 18:52:10 +08:00
shiziyuan9527 1304459791 i18n 2020-06-04 18:51:48 +08:00
wenyann ba94365ea8 '合并' 2020-06-04 18:43:54 +08:00
wenyann 285037e475 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	backend/src/main/java/io/metersphere/controller/SystemParameterController.java
#	backend/src/main/java/io/metersphere/service/SystemParameterService.java
 2020-06-04 18:34:32 +08:00
wenyann fc8cad2679 '添加查询默认smtp设置' 2020-06-04 18:32:06 +08:00
shiziyuan9527 1b12e870d0 系统设置下信息列表按照时间排序查询 2020-06-04 17:57:36 +08:00
chenjianxing d4d09ccf0d 关于 2020-06-04 16:09:03 +08:00
wenyann 54f2fdf3ea Merge remote-tracking branch 'origin/dev' into dev 2020-06-04 15:19:33 +08:00
wenyann 22ff5f0b4b 'i18n' 2020-06-04 15:19:10 +08:00
q4speed 430c15f742 Merge remote-tracking branch 'origin/dev' into dev 2020-06-04 15:13:55 +08:00
wenyann 4b5aa3d98c '登陆国际化修改' 2020-06-04 14:43:27 +08:00
q4speed 3cdd916633 去掉无用代码 2020-06-04 14:17:05 +08:00
wenyann 381189cb39 '登陆国际化修改' 2020-06-04 11:58:08 +08:00
wenyann 4191176da7 '修改个人信息密码提示' 2020-06-04 11:03:15 +08:00
q4speed b06215f582 修复字符集bug 2020-06-03 18:07:28 +08:00
q4speed 19ae82dc43 修复排序问题 2020-06-03 14:37:02 +08:00
q4speed b022fc087a 修复排序问题 2020-06-03 13:23:52 +08:00
q4speed a64685abdf 修复测试名称重复bug 2020-06-03 11:43:29 +08:00
wenyann 86630d0115 '性能测试报告展示' 2020-06-02 18:35:38 +08:00
shiziyuan9527 e39732882d fix 同名校验 2020-06-02 18:12:29 +08:00
王振 5f1ed2611b Merge branch 'dev' of github.com:metersphere/metersphere into dev 2020-06-02 17:31:51 +08:00
王振 963b41006a 增加默认组织、工作空间创建 SQL 2020-06-02 17:31:39 +08:00
wenyann e4cdbc8d24 Merge remote-tracking branch 'origin/dev' into dev 2020-06-02 17:17:21 +08:00
wenyann 0639330f83 '接口测试名称重复国际化修改' 2020-06-02 17:16:57 +08:00
shiziyuan9527 a12cf46b7a fix 组织名称重复检查 2020-06-02 17:11:49 +08:00
wenyann 7849e771e5 Merge remote-tracking branch 'origin/dev' into dev 2020-06-02 16:54:42 +08:00
wenyann 1c671aed3c '' 2020-06-02 16:54:21 +08:00
shiziyuan9527 1a15ebae4e Merge branch 'dev' of https://github.com/metersphere/metersphere into dev 2020-06-02 16:48:35 +08:00
wenyann dd8ab09875 '接口测试筛选修改' 2020-06-02 16:47:41 +08:00
shiziyuan9527 25ee74760f i18n 2020-06-02 16:46:43 +08:00
wenyann b6529b25b8 '' 2020-06-02 15:41:50 +08:00
wenyann 6e3d551a01 '' 2020-06-02 15:33:52 +08:00
wenyann ffaefb3985 修改API测试判断名称不能重复 2020-06-02 15:20:39 +08:00
wenyann 2bd46011ea Merge remote-tracking branch 'origin/dev' into dev 2020-06-02 15:16:32 +08:00
wenyann 4ac32d7c17 API测试判断名称不能重复 2020-06-02 15:15:32 +08:00
shiziyuan9527 4f3aa4b8ae 项目排序 2020-06-02 14:50:39 +08:00
shiziyuan9527 8e52fc7266 最近列表按照更新时间降序 2020-06-02 14:31:21 +08:00
q4speed 1a67407155 Merge remote-tracking branch 'origin/dev' into dev 2020-06-02 12:43:05 +08:00
q4speed 9a97f53ae4 修复oom问题，查看报告获取日志改为滚动分页，不再一次获取 2020-06-02 12:42:52 +08:00
shiziyuan9527 b5c220f9a6 性能测试报告 筛选排序 2020-06-01 21:34:49 +08:00
shiziyuan9527 9f3a21756a fix 筛选,排序 2020-06-01 21:16:18 +08:00
chenjianxing 6554685c37 测试计划排序筛选 2020-06-01 18:02:05 +08:00
chenjianxing e3f364c0b0 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-06-01 17:26:20 +08:00
chenjianxing 54000e2f31 测试用例关联性能测试 2020-06-01 17:25:55 +08:00
shiziyuan9527 42db0a44d3 性能测试-全部测试-点击名称跳转 2020-06-01 17:25:19 +08:00
shiziyuan9527 8abae1024d 性能测试-全部测试-排序 2020-06-01 16:43:51 +08:00
shiziyuan9527 194326b11e 性能测试 复制 2020-06-01 14:29:00 +08:00
chenjianxing dde198da93 测试计划默认排序 2020-06-01 13:53:09 +08:00
shiziyuan9527 c03656f5ad 性能测试报告添加创建人 2020-05-29 17:21:50 +08:00
shiziyuan9527 ab19dc0627 Merge branch 'dev' of https://github.com/metersphere/metersphere into dev 2020-05-29 17:02:49 +08:00
shiziyuan9527 464fd7abb0 添加性能测试创建人 2020-05-29 17:02:39 +08:00
chenjianxing d97eacd5e4 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-05-29 16:46:58 +08:00
chenjianxing 1f84e55ce7 解决全屏对话框浏览器回退问题 2020-05-29 16:46:32 +08:00
q4speed 592c8117bc 接口测试复制功能 2020-05-29 16:34:42 +08:00
chenjianxing 5f93bc4f56 判断导入文件中名称重复 2020-05-29 14:01:08 +08:00
chenjianxing 146a5cc385 修改项目、计划、用例时判断名称重复 2020-05-29 13:47:40 +08:00
shiziyuan9527 a07e58e54f 项目按照更新时间排序 2020-05-29 11:24:00 +08:00
chenjianxing 1293137541 测试用例关联接口测试 2020-05-28 23:51:27 +08:00
chenjianxing cb34d921bd Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-05-28 14:27:27 +08:00
chenjianxing bceade43a9 创建用例绑定测试 2020-05-28 09:47:24 +08:00
shiziyuan9527 d4a4d74926 校验邮箱是否存在 2020-05-27 21:09:24 +08:00
shiziyuan9527 fd4854d4ab bug fix 资源池创建未检查同名 2020-05-27 19:02:42 +08:00
shiziyuan9527 e8db406de6 bug fix 修改组织的描述信息失败 2020-05-27 18:15:26 +08:00
shiziyuan9527 37de2c2c4e 接口添加权限 2020-05-27 14:45:06 +08:00
shiziyuan9527 eeb6dd0a70 bug fix 禁用用户后仍可登录 2020-05-27 14:42:54 +08:00
shiziyuan9527 ab23a3d5f3 管理员添加成员时提示问题 2020-05-27 14:06:30 +08:00
chenjianxing 74827189bc fix 删除项目 2020-05-27 12:25:02 +08:00
chenjianxing dfd6aaeeee 自动更新测试计划状态 2020-05-27 10:47:30 +08:00
chenjianxing a7a5086816 Merge branch 'dev' of https://github.com/metersphere/server into dev 2020-05-26 21:45:03 +08:00
chenjianxing bae5d95371 测试用例默认按更新时间排序 2020-05-26 19:45:08 +08:00
王振 1ad5d52e73 update default user 2020-05-26 18:22:32 +08:00
q4speed 12b4aae62c 完成follow_redirects，展示子请求内容 2020-05-26 14:32:20 +08:00
q4speed d240c1a377 删除项目时，删除接口测试相关资源 2020-05-26 13:12:37 +08:00
q4speed adb7dc2728 修复乱码 2020-05-26 12:59:13 +08:00
q4speed 0433d8f36b Merge remote-tracking branch 'origin/dev' into dev 2020-05-26 12:15:07 +08:00
q4speed 7cba4604da 压缩报告 2020-05-26 12:14:50 +08:00
chenjianxing 58ba058041 冲突 2020-05-25 17:58:07 +08:00
chenjianxing fbbba58bfc 测试计划已存在校验 2020-05-25 17:46:12 +08:00
wenyann a64760e72d Merge remote-tracking branch 'origin/dev' into dev 2020-05-25 17:32:34 +08:00
wenyann bc3e3d6fcd 测试 2020-05-25 17:31:45 +08:00
chenjianxing cf0f35eba3 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-25 17:26:06 +08:00
chenjianxing b7b33ad2bb 删除项目提示并删除测试跟踪资源 2020-05-25 17:25:49 +08:00
q4speed b6fef27f69 Merge remote-tracking branch 'origin/dev' into dev 2020-05-25 15:24:27 +08:00
q4speed e736019e8f 改为后台增加BackendListener，保证前端生成的jmx独立性 2020-05-25 15:22:05 +08:00
shiziyuan9527 928539f1c1 添加性能测试创建人和报告创建人 2020-05-25 14:31:16 +08:00
chenjianxing afcd60c6f7 添加后端权限 2020-05-22 20:08:37 +08:00
chenjianxing df7f4c18da Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-22 19:56:30 +08:00
chenjianxing f9ff75fe36 测试跟踪-只读用户 2020-05-22 19:56:09 +08:00
shiziyuan9527 ca3a38ab1a 修复编辑用户角色出现的问题 2020-05-22 17:47:30 +08:00
q4speed b2f6866237 Merge remote-tracking branch 'origin/dev' into dev 2020-05-22 16:45:34 +08:00
q4speed a5bc32ff57 修改多个脚本并行运行的处理方式 2020-05-22 16:45:08 +08:00
chenjianxing 6ae916a191 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-22 16:32:33 +08:00
chenjianxing 6977ee496b excel导入导出国际化 2020-05-22 16:08:22 +08:00
shiziyuan9527 7421b4b89d 登录时判断用户状态 2020-05-22 14:47:07 +08:00
shiziyuan9527 788939936d 修改user字段为user_id 2020-05-22 14:29:16 +08:00
shiziyuan9527 b169fb86da 修改新增工作空间接口 2020-05-22 14:16:15 +08:00
q4speed 4896115c1c Merge remote-tracking branch 'origin/dev' into dev 2020-05-22 13:25:44 +08:00
q4speed 44cfaf811a 增加创建人列 2020-05-22 13:25:16 +08:00
Captain.B 01924836a4 Merge remote-tracking branch 'origin/dev' into dev 2020-05-22 11:32:53 +08:00
Captain.B b988ea1331 添加user字段 2020-05-22 11:30:17 +08:00
shiziyuan9527 c727bf356c 组织，工作空间同名检查 2020-05-22 11:19:39 +08:00
shiziyuan9527 e4d1046152 组织同名检查 2020-05-22 11:00:35 +08:00
chenjianxing cf83d9efae Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-22 09:25:39 +08:00
chenjianxing 3981cc8741 国际化 2020-05-22 09:24:00 +08:00
shiziyuan9527 3323d6f8c3 修改新建用户时角色选择项 2020-05-21 18:45:47 +08:00
Captain.B 601cc89395 Merge remote-tracking branch 'origin/dev' into dev 2020-05-21 18:13:28 +08:00
q4speed 601e329f0d 测试运行后自动跳转到报告 2020-05-21 18:10:16 +08:00
Captain.B a11eb7dab1 DDL 使用 utf8mb4_general_ci，user 中的 id 和 password 使用 utf8mb4_bin 2020-05-21 17:46:00 +08:00
chenjianxing 18b4250dbf Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-21 14:42:34 +08:00
chenjianxing d031adf090 模版名称校验 2020-05-21 14:41:08 +08:00
wenyann 9887cf5904 修改 2020-05-21 14:04:34 +08:00
Captain.B dd26ca150b part index 2020-05-21 11:39:25 +08:00
chenjianxing 0fee46ceaf excel国际化加锁 2020-05-21 10:10:51 +08:00
chenjianxing 8853b39dd7 保留两位小数 2020-05-21 09:35:40 +08:00
chenjianxing c4d6ec1f26 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-21 09:02:48 +08:00
shiziyuan9527 abf1135a7a 新建/编辑用户时增加角色选择项 2020-05-20 21:55:01 +08:00
Captain.B 64f6e05b93 download log 2020-05-20 20:48:04 +08:00
Captain.B 3b55c2236c download log 2020-05-20 20:28:06 +08:00
Captain.B 7f915f8467 log model 2020-05-20 20:04:08 +08:00
Captain.B bd58dffee0 log model 2020-05-20 20:02:50 +08:00
Captain.B 23ef8714a7 修改保存metric 2020-05-20 19:16:59 +08:00
Captain.B b623a34631 修改保存metric 2020-05-20 18:56:28 +08:00
Captain.B 92d6a7e369 Merge remote-tracking branch 'origin/dev' into dev 2020-05-20 18:56:09 +08:00
Captain.B b5df16df7c 修改保存metric 2020-05-20 18:55:51 +08:00
q4speed 5c75349171 Merge remote-tracking branch 'origin/dev' into dev 2020-05-20 17:55:15 +08:00
q4speed 0b6ea9cd09 修复场景排序bug 2020-05-20 17:55:02 +08:00
wenyann 2f1c847e87 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	frontend/src/i18n/en-US.js
#	frontend/src/i18n/zh-CN.js
 2020-05-20 17:27:03 +08:00
wenyann 7f06194cff 邮件服务设置 2020-05-20 17:22:45 +08:00
q4speed dc2a1202ae 修复报告中请求失败数错误的bug 2020-05-20 16:29:23 +08:00
shiziyuan9527 621472d1b2 删除无用代码 2020-05-20 15:23:18 +08:00
chenjianxing 58ace8e0e8 fix 首页报错 2020-05-19 19:53:52 +08:00
chenjianxing 8c4afc465b Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-19 18:09:57 +08:00
chenjianxing 4cbed26f30 fix 节点拖拽 2020-05-19 18:09:44 +08:00
shiziyuan9527 dbf0c4fd08 Merge remote-tracking branch 'origin/dev' into dev 2020-05-19 16:27:54 +08:00
shiziyuan9527 cbf4c3a8cc 系统用户列表角色列 2020-05-19 16:27:40 +08:00
chenjianxing 9271305038 国际化 2020-05-19 16:13:51 +08:00
chenjianxing a98535ecea merge 2020-05-19 16:02:25 +08:00
chenjianxing cd52993e24 表头国际化 2020-05-19 15:56:05 +08:00
shiziyuan9527 b1de405457 i18n 2020-05-19 11:39:34 +08:00
chenjianxing 81922206ca Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-18 17:33:29 +08:00
chenjianxing d030b9ee8b 修复样式 2020-05-18 17:32:48 +08:00
chenjianxing 3870a81222 校验信息国际化 2020-05-18 16:05:47 +08:00
chenjianxing 306e34494c JSR-303校验国际化 2020-05-18 15:48:16 +08:00
q4speed bb7d818a33 修复测试关联报告查询错误的bug 
首页增加测试日历功能
 2020-05-18 15:32:20 +08:00
Captain.B ffdf8ef805 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-05-18 14:17:50 +08:00
Captain.B bc31e3366d calendar heatmap 2020-05-18 14:17:22 +08:00
chenjianxing 0285b4cd59 fix 节点拖拽 2020-05-18 11:22:34 +08:00
chenjianxing be6d48f497 修改缺陷字段名称 2020-05-18 09:34:16 +08:00
chenjianxing aa81e1f430 后端国际化 2020-05-17 16:52:28 +08:00
chenjianxing 5892cd3f29 测试报告缺陷数 2020-05-17 10:26:24 +08:00
chenjianxing a4ab4e238b 批量删除测试用例 2020-05-16 15:06:24 +08:00
chenjianxing df3f4ad784 测试计划-测试用例批量删除 2020-05-16 14:52:42 +08:00
chenjianxing f810e19fe2 用例缺陷 2020-05-16 14:30:55 +08:00
chenjianxing 457ee06b87 fix 导入用例模块为空报错 2020-05-15 17:49:00 +08:00
chenjianxing 1fc354e556 修改测试跟踪首页 2020-05-15 17:42:42 +08:00
chenjianxing 7eee038ea3 测试跟踪首页数据 2020-05-15 17:07:47 +08:00
chenjianxing 6ad8cac646 接口调整 2020-05-15 15:22:31 +08:00
chenjianxing 8a5a855759 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-15 15:11:08 +08:00
chenjianxing ccde2f50a2 测试用例首页跳转 2020-05-15 15:10:46 +08:00
chenjianxing 7364f84da0 测试跟踪首页 2020-05-15 13:55:56 +08:00
chenjianxing ff387a1b0c 测试跟踪首页计划列表 2020-05-15 10:44:42 +08:00
Captain.B 61b689c3a0 order by update_time desc 2020-05-15 10:41:56 +08:00
Captain.B d1e8cf95b7 默认语言设置 2020-05-14 19:21:44 +08:00
wenyann 204493ecd3 修改 2020-05-14 18:40:18 +08:00
wenyann e0f99b4d8a 设置默认语言 2020-05-14 18:36:09 +08:00
wenyann 9e4a38015c Merge remote-tracking branch 'origin/dev' into dev 2020-05-14 16:32:36 +08:00
wenyann f59ae61a06 查询默认语言 2020-05-14 16:32:04 +08:00
Captain.B 23afff82af Merge remote-tracking branch 'origin/dev' into dev 2020-05-14 16:25:12 +08:00
Captain.B 6952030e18 resource pool page 2020-05-14 16:24:25 +08:00
wenyann dfa8c2eea0 查询默认语言 2020-05-14 16:21:55 +08:00
wenyann 818b5faa03 查询默认语言 2020-05-14 16:19:42 +08:00
shiziyuan9527 58c7e87816 删除无用代码 2020-05-14 15:48:10 +08:00
chenjianxing 4a470e4d86 fix 测试计划-我的用例 2020-05-14 13:42:52 +08:00
chenjianxing f835d627a1 fix 节点拖拽 2020-05-14 13:20:28 +08:00
chenjianxing 479dd28d05 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-14 11:53:31 +08:00
chenjianxing 2b3e148463 重命名节点更新模块字段 2020-05-14 11:41:45 +08:00
Captain.B e0fb95f461 zh_TW 2020-05-14 11:28:50 +08:00
chenjianxing 8c286795f7 拖拽节点更新模块字段 2020-05-14 09:34:11 +08:00
Captain.B 39fa11dc09 删除原来的国际化方式 2020-05-13 18:02:29 +08:00
shiziyuan9527 3bb0c0eb1a 语言切换入口 2020-05-13 16:07:18 +08:00
Captain.B 62bf729e8c 代码调整 2020-05-13 10:33:16 +08:00
chenjianxing dd7409681b Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-12 19:19:57 +08:00
chenjianxing 63ade5a017 代码结构 2020-05-12 19:14:13 +08:00
Captain.B 2e6dacb028 lombok 2020-05-12 18:55:37 +08:00
Captain.B e069dcadd4 统一结果处理 2020-05-12 16:14:02 +08:00
Captain.B b96ee28b67 统一结果处理 2020-05-12 16:06:13 +08:00
Captain.B 19a0fe3b70 代码结构调整，性能测试的相关代码放到一起 2020-05-12 16:03:20 +08:00
Captain.B 94556d6687 Merge remote-tracking branch 'origin/dev' into dev 2020-05-12 15:40:06 +08:00
Captain.B 59a61ca6a8 request lombok 2020-05-12 15:39:23 +08:00
shiziyuan9527 5a703e080e 无法删除当前登录用户 2020-05-12 15:34:48 +08:00
shiziyuan9527 17be7deb21 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	frontend/src/business/components/settings/system/User.vue
 2020-05-12 15:23:42 +08:00
shiziyuan9527 a05782e6c1 设置系统管理员入口 2020-05-12 15:19:40 +08:00
Captain.B ea97ba0023 更新密码单独执行 2020-05-12 11:34:26 +08:00
q4speed bc294c354c Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	frontend/src/i18n/zh-CN.js
 2020-05-12 11:27:36 +08:00
q4speed 82b4d1ac6f 默认按更新时间排序 2020-05-12 11:21:43 +08:00
Captain.B 6555e73510 去掉引号 2020-05-11 18:10:27 +08:00
Captain.B 2cf70f9484 Merge remote-tracking branch 'origin/dev' into dev 2020-05-11 17:29:40 +08:00
Captain.B 2903d6d593 日志详情和日志下载 2020-05-11 17:29:25 +08:00
王振 cba0cc99af fix 测试计划通过模块筛选测试用例报错问题 2020-05-11 16:40:59 +08:00
shiziyuan9527 9bd15aa8b7 管理员只能修改成员角色信息 backend 2020-05-11 16:29:24 +08:00
wenyann 31102c3b82 id唯一性校验 2020-05-11 16:26:42 +08:00
wenyann c6b4dd0948 修改用户密码 2020-05-11 16:20:03 +08:00
wenyann 54a3155461 id唯一性校验 2020-05-11 16:11:55 +08:00
wenyann 92704173dd 修改密码 2020-05-11 15:47:37 +08:00
wenyann 867225673b Merge remote-tracking branch 'origin/dev' into dev 2020-05-11 15:31:53 +08:00
wenyann 2bc01c9128 修改密码 2020-05-11 15:29:43 +08:00
shiziyuan9527 12da2509d2 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	backend/src/main/java/io/metersphere/service/UserService.java
 2020-05-11 14:48:17 +08:00
shiziyuan9527 5abece2d37 优化工作空间和组织相关部分 2020-05-11 14:44:53 +08:00
王振 fac529140e fix 测试计划用例搜索问题 2020-05-11 14:26:24 +08:00
wenyann c76a0ba941 修改密码 2020-05-11 14:22:56 +08:00
wenyann 4a958d6f44 Merge remote-tracking branch 'origin/dev' into dev 2020-05-11 14:13:16 +08:00
wenyann 8880599f29 修改密码 2020-05-11 14:12:29 +08:00
Captain.B c1e6062645 dto lombok 2020-05-11 10:54:10 +08:00
Captain.B eaa2d35b37 Merge remote-tracking branch 'origin/dev' into dev 2020-05-11 10:46:38 +08:00
Captain.B 8857a41e5e dto lombok 2020-05-11 10:46:18 +08:00
q4speed 6de53a5997 修改路径 2020-05-11 10:41:15 +08:00
q4speed 84716a42ef 调整JMeter Home设置方式 2020-05-11 10:23:07 +08:00
q4speed a1b7d214b0 Merge remote-tracking branch 'origin/dev' into dev 2020-05-10 11:54:48 +08:00
q4speed 81b888b2a2 调整JMeter Home目录 2020-05-10 11:54:35 +08:00
chenjianxing 4c10f521fa Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-09 20:06:57 +08:00
chenjianxing b941ffebf5 测试用例执行人显示名称 2020-05-09 19:26:42 +08:00
王振 c316b279c1 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-09 19:05:02 +08:00
王振 870595b6a2 fix 导入用例模块树层级问题 2020-05-09 19:04:35 +08:00
chenjianxing e50241158f Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-09 19:03:35 +08:00
chenjianxing 08d3ec19ef 测试详筛选排序 2020-05-09 18:39:47 +08:00
chenjianxing f014d5267d fix 测试用例查询 2020-05-09 18:07:23 +08:00
chenjianxing 4df45d190c 测试用例筛选排序 2020-05-09 17:55:13 +08:00
Captain.B c62bf4c960 Merge remote-tracking branch 'origin/dev' into dev 2020-05-09 16:51:56 +08:00
Captain.B 2a686f5133 lombok 2020-05-09 16:49:43 +08:00
q4speed 4131aac4a1 删除jmeter 2020-05-09 16:48:53 +08:00
q4speed 615ecbed49 简化 2020-05-09 16:10:57 +08:00
shiziyuan9527 f0427d4705 组织，工作空间管理员无法移除自身 2020-05-09 15:40:57 +08:00
q4speed ac6235d334 修改JMeter Home位置 2020-05-09 15:32:43 +08:00
q4speed efec984b90 Merge remote-tracking branch 'origin/dev' into dev 2020-05-09 14:51:51 +08:00
q4speed 2a7be35de1 API报告页面 2020-05-09 14:51:37 +08:00
Captain.B 642dd588f3 md5 2020-05-09 13:43:12 +08:00
chenjianxing 18e2cc8960 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-09 11:36:19 +08:00
chenjianxing de3faf3ca5 用例模块等允许带空格 2020-05-09 11:36:01 +08:00
shiziyuan9527 0752a0c54b 修改个人信息 2020-05-09 11:05:03 +08:00
chenjianxing b876ca0acc Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-08 15:59:44 +08:00
shiziyuan9527 3ec68ed0c1 bug fix 2020-05-08 14:40:42 +08:00
chenjianxing cff0b05b32 获取测试报告数据 2020-05-08 14:06:33 +08:00
chenjianxing e5e7737f29 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-05-08 00:23:12 +08:00
chenjianxing c5fb011819 uuid 2020-05-08 00:22:35 +08:00
q4speed b5e7b74633 Merge remote-tracking branch 'origin/dev' into dev 2020-05-08 00:00:05 +08:00
q4speed 39aed31aa5 生成report 2020-05-07 23:59:51 +08:00
Captain.B d6eba07dea configmap name 2020-05-07 17:03:06 +08:00
Captain.B cdf3a260e5 Merge remote-tracking branch 'origin/dev' into dev 2020-05-07 16:14:24 +08:00
Captain.B 5652944761 bigint -> varchar 2020-05-07 16:11:43 +08:00
shiziyuan9527 74c8be756a 代码优化 2020-05-07 14:35:56 +08:00
Captain.B 17c8a98f56 修改资源池状态 2020-05-07 13:37:05 +08:00
Captain.B 028deeae71 获取资源池校验 2020-05-07 11:56:35 +08:00
Captain.B 1d6662e0fa spring boot exclude jars 2020-05-07 10:37:03 +08:00
Captain.B 9a10ff25ad 去掉多余的dep 2020-05-06 21:39:08 +08:00
chenjianxing d511800cc8 查看编辑测试用例报告 2020-05-06 20:29:41 +08:00
chenjianxing 61256ee9e2 修改表结构 2020-05-06 16:42:58 +08:00
chenjianxing 52ead84a20 merge 2020-05-06 16:21:25 +08:00
chenjianxing 4dc949864b 测试报告模版curd 2020-05-06 16:03:39 +08:00
Captain.B 56dd72e0a9 Merge remote-tracking branch 'origin/dev' into dev 2020-05-06 15:45:26 +08:00
Captain.B 0b07295948 资源池加密 2020-05-06 15:44:16 +08:00
shiziyuan9527 cc53d07cd4 删除无用代码 2020-05-06 15:08:53 +08:00
Captain.B 23d759ba59 pid 2020-05-06 14:52:48 +08:00
Captain.B 4ddf036a09 使用lombok 2020-05-06 14:45:57 +08:00
Captain.B 51aa7e88b4 使用lombok 2020-05-06 14:40:51 +08:00
q4speed 94b7ceb1e9 Merge remote-tracking branch 'origin/dev' into dev 2020-05-06 14:21:23 +08:00
q4speed 2bed94efce NaN 2020-05-06 14:21:10 +08:00
shiziyuan9527 b0c5bd52ec 组织，工作空间相关资源关联删除 2020-05-06 14:12:03 +08:00
q4speed 69586479ba Merge remote-tracking branch 'origin/dev' into dev 2020-05-05 19:49:48 +08:00
q4speed 53048f1f3f 生成jmx, run jmx, 未完待续 2020-05-05 19:49:32 +08:00
Captain.B 924362f97e fit2cloud -> metersphere 2020-05-01 09:57:17 +08:00
Captain.B 0e6d7095ca update .gitignore 2020-04-30 22:44:10 +08:00
q4speed 1cae0333f9 Merge remote-tracking branch 'origin/dev' into dev 2020-04-30 16:50:59 +08:00
q4speed d97f72315c 生成jmx 2020-04-30 16:50:43 +08:00
Captain.B 9a404a88e4 log file location changed 2020-04-30 16:30:06 +08:00
Captain.B 52bc04f725 properties location changed 2020-04-30 16:28:15 +08:00
Captain.B 589846cad8 显示日志 2020-04-30 16:00:35 +08:00
Captain.B e2e3d799ab Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-04-30 15:18:56 +08:00
Captain.B e7cfbc235f 校验资源池 2020-04-30 15:18:46 +08:00
shiziyuan9527 98878cd936 bug fix 2020-04-30 14:39:11 +08:00
Captain.B d051b50513 nothing 2020-04-30 11:29:13 +08:00
Captain.B ae6f7b8e71 properties 2020-04-30 11:04:37 +08:00
Captain.B 5cfdebc7d4 csv 2020-04-30 10:36:27 +08:00
Captain.B 3ebccfecdb 去掉不用的配置 2020-04-29 19:06:24 +08:00
chenjianxing e370620c97 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-29 19:01:16 +08:00
chenjianxing 1bd57e5186 测试报告列表 2020-04-29 19:00:58 +08:00
Captain.B 7f965302ad env 2020-04-29 17:50:25 +08:00
chenjianxing b87fa51440 测试报告后段 2020-04-29 16:38:59 +08:00
Captain.B 7e7faa436a log save +1 2020-04-29 15:54:45 +08:00
Captain.B 6cb04e0685 log save +1 2020-04-29 15:51:54 +08:00
Captain.B 7a05a37ba3 Merge remote-tracking branch 'origin/dev' into dev 2020-04-29 14:29:06 +08:00
shiziyuan9527 63f3b96486 删除无用代码 2020-04-29 14:14:01 +08:00
Captain.B 29f0891767 log save 2020-04-29 14:12:51 +08:00
shiziyuan9527 28a2d25ce0 i18n 2020-04-29 13:53:26 +08:00
Captain.B aa34d1726b log save 2020-04-29 11:38:05 +08:00
Captain.B cc8c646faf Merge remote-tracking branch 'origin/dev' into dev 2020-04-29 11:11:31 +08:00
Captain.B df34a7afc7 env 2020-04-29 11:11:11 +08:00
chenjianxing 570149f20f 测试报告ddl 2020-04-28 21:17:06 +08:00
q4speed 181c406826 Merge remote-tracking branch 'origin/dev' into dev 2020-04-27 17:10:36 +08:00
q4speed ec113b1b16 api测试保存jmx 2020-04-27 17:10:21 +08:00
chenjianxing ba6b8dce15 国际化文件utf8编码 2020-04-27 11:22:10 +08:00
chenjianxing e4b02ec997 删除计划前校验 2020-04-27 09:43:08 +08:00
chenjianxing 4b96010d3a Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-26 16:56:08 +08:00
chenjianxing 6854a6f5d3 测试用例批量移动 2020-04-26 16:55:50 +08:00
Captain.B 9d69bf054f bug fix 2020-04-26 16:17:26 +08:00
chenjianxing bc518448a6 fix 测试用例 2020-04-26 14:25:22 +08:00
Captain.B 1556173241 test 移除 2020-04-26 10:58:41 +08:00
Captain.B a572c7fef5 去掉没有用到的类 2020-04-24 18:40:11 +08:00
chenjianxing 83ce0f228a 编辑时更新测试用例状态 2020-04-24 15:08:21 +08:00
chenjianxing c6479e7183 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-24 13:56:57 +08:00
chenjianxing 6e3ec26fc0 克隆测试用例 2020-04-24 13:56:32 +08:00
Captain.B 3d85293dec 去掉没用到的字段 2020-04-24 11:41:30 +08:00
Captain.B 24be510be8 移除代码 2020-04-24 11:10:18 +08:00
Captain.B 61e88258f0 recent report 2020-04-24 10:19:23 +08:00
Captain.B 9e5aad7831 Merge remote-tracking branch 'origin/dev' into dev 2020-04-24 09:51:24 +08:00
Captain.B dcd33833af check status 2020-04-24 09:51:08 +08:00
chenjianxing 2f81508a0e Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-24 00:39:06 +08:00
chenjianxing 8f09b254ab fix bug 2020-04-24 00:38:41 +08:00
Captain.B 5bb3744df1 check status 2020-04-23 19:25:24 +08:00
Captain.B 7aea33c578 tmp 2020-04-23 19:20:55 +08:00
Captain.B 8001fdee09 tmp 2020-04-23 19:18:17 +08:00
Captain.B d0ddd8d869 Merge remote-tracking branch 'origin/dev' into dev 2020-04-23 18:51:55 +08:00
Captain.B cebfba849e reporting 2020-04-23 18:51:00 +08:00
q4speed 1294739df6 run button 2020-04-23 17:08:48 +08:00
shiziyuan9527 8ac8088655 报告-测试概览 2020-04-23 11:05:39 +08:00
Captain.B 3484e9361f 修改页面 2020-04-23 10:13:41 +08:00
q4speed b2d0e0cf3b Merge remote-tracking branch 'origin/dev' into dev 2020-04-22 17:30:07 +08:00
q4speed 6aa69cee66 api测试，未完待续 2020-04-22 17:29:54 +08:00
shiziyuan9527 be78fc5939 报告-测试概览 2020-04-22 17:16:08 +08:00
shiziyuan9527 5ab0bed49b bug fix 2020-04-22 14:18:32 +08:00
shiziyuan9527 58756c1ab6 删除无用代码 2020-04-22 13:40:01 +08:00
Captain.B 57120bb1a0 Merge remote-tracking branch 'origin/dev' into dev 2020-04-22 11:11:16 +08:00
Captain.B 59468b492c 加上loading 2020-04-22 11:10:37 +08:00
shiziyuan9527 192f7922ad 报告-错误记录 2020-04-22 10:59:31 +08:00
Captain.B ad26dc0c65 get logs 2020-04-22 10:03:33 +08:00
shiziyuan9527 fb67139539 报告-请求统计 2020-04-21 17:57:01 +08:00
Captain.B 536a2d7de2 Merge remote-tracking branch 'origin/dev' into dev 2020-04-21 16:59:10 +08:00
Captain.B 31fd266e59 post -> get 2020-04-21 16:35:04 +08:00
chenjianxing 68c7c8f92f Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-21 16:26:59 +08:00
chenjianxing 6e9e053198 优化测试详情编辑 2020-04-21 16:26:37 +08:00
Captain.B 3e655fbc55 容器log 2020-04-21 16:15:20 +08:00
shiziyuan9527 3b0e2c11b7 修改名称 2020-04-21 14:33:10 +08:00
shiziyuan9527 1578a81d8f 修改产生报告的后台代码 2020-04-21 14:27:12 +08:00
Captain.B c8e155fd64 i18n 2020-04-21 12:19:55 +08:00
Captain.B 004b83ebed summary 2020-04-21 11:37:17 +08:00
Captain.B c50b8f2836 Merge remote-tracking branch 'origin/dev' into dev 2020-04-20 17:20:34 +08:00
Captain.B ade105cf3b log 2020-04-20 17:18:28 +08:00
shiziyuan9527 fb92bba0ed 删除报告时修改测试状态 2020-04-20 16:00:17 +08:00
Captain.B 3f93d09a62 testid 2020-04-20 15:29:25 +08:00
Captain.B 825183edd2 不让修改正在运行的测试 2020-04-20 11:33:44 +08:00
Captain.B 22be52a59c Merge remote-tracking branch 'origin/dev' into dev 2020-04-17 18:54:12 +08:00
Captain.B eb4bfcc08b 解决 jmeter.properties 无法加载的问题 2020-04-17 18:53:32 +08:00
shiziyuan9527 0ed0021895 修改响应时间图表 2020-04-17 18:25:17 +08:00
chenjianxing 084e1285bf 分页标 2020-04-17 18:10:03 +08:00
chenjianxing b6b0aca9e0 快速定位我的用例 2020-04-17 17:30:55 +08:00
chenjianxing c640f4566e 批量更改执行人和执行结果 2020-04-17 16:21:39 +08:00
Captain.B 4121d011a9 使用 spring boot 国际化 2020-04-17 10:09:33 +08:00
Captain.B 96c267981b new sample add row 2020-04-16 21:31:31 +08:00
shiziyuan9527 66de947d3d Merge remote-tracking branch 'origin/dev' into dev 2020-04-16 19:39:14 +08:00
shiziyuan9527 1e4d780e76 修改测试概览图表 2020-04-16 19:38:53 +08:00
Captain.B 6feefcc23e 使用 spring boot 国际化 2020-04-16 19:16:28 +08:00
Captain.B 79b4840deb headers 修改 2020-04-16 14:38:11 +08:00
Captain.B e9e27f4211 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	backend/pom.xml
 2020-04-16 10:57:10 +08:00
Captain.B b7ae9c5e08 report 2020-04-16 10:56:22 +08:00
chenjianxing 3634544ae2 fix 测试用例导入 2020-04-16 10:35:53 +08:00
chenjianxing d65c129f3a 导出模版 2020-04-15 18:32:57 +08:00
chenjianxing 98379ac9e1 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-15 16:58:28 +08:00
chenjianxing 276961d97b 测试用例导入 2020-04-15 16:58:04 +08:00
Captain.B 5db5974cc4 enum add status saved 2020-04-15 14:48:58 +08:00
Captain.B 44549ee5b6 enum add status saved 2020-04-15 14:34:15 +08:00
Captain.B 5753a391a2 run test error changed 2020-04-15 14:20:26 +08:00
Captain.B 7dffef5379 run test error 2020-04-15 13:55:54 +08:00
shiziyuan9527 983218d7b0 Merge remote-tracking branch 'origin/dev' into dev 2020-04-14 15:07:23 +08:00
shiziyuan9527 12512357c5 修改报告持续时间 2020-04-14 15:06:55 +08:00
Captain.B 2797786e46 test 2020-04-14 14:57:10 +08:00
Captain.B eead5f2e3f Merge remote-tracking branch 'origin/dev' into dev 2020-04-13 19:04:45 +08:00
Captain.B 78b757302f 分开保存结果 2020-04-13 17:39:28 +08:00
shiziyuan9527 3163cc1b14 修改测试概览Max Users 2020-04-13 17:35:33 +08:00
shiziyuan9527 6948f4042d 修改分页 2020-04-10 17:46:50 +08:00
shiziyuan9527 7d6b494b46 修改报告持续时间 2020-04-10 14:44:09 +08:00
chenjianxing 41a9fcfcf2 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-10 13:57:19 +08:00
chenjianxing 6894ee679a fix 项目查询 2020-04-10 13:56:57 +08:00
Captain.B 5cf402181c 禁止修改创建时间 2020-04-10 12:32:25 +08:00
Captain.B b4cc48f1ed 禁止修改创建时间 2020-04-10 11:54:05 +08:00
Captain.B 2d17d227eb 部分查询 2020-04-10 11:36:18 +08:00
Captain.B c3738739ba 部分查询 2020-04-10 11:17:04 +08:00
Captain.B 9120825caa 页面上的部分查询 2020-04-10 11:14:11 +08:00
shiziyuan9527 97662e56f3 报告时间 2020-04-09 18:07:47 +08:00
chenjianxing 7ba029b96d merge 2020-04-09 17:57:49 +08:00
chenjianxing 78c82517c9 修改测试用例head 2020-04-09 17:47:07 +08:00
shiziyuan9527 96c9a84a2b 报告持续时间 2020-04-09 16:25:25 +08:00
Captain.B 37f41a85fb 修改 url 和组件 2020-04-09 16:04:15 +08:00
chenjianxing d60dc5ec3c Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-09 14:48:08 +08:00
Captain.B 43506a265e workspace name duplicate check 2020-04-09 14:36:45 +08:00
chenjianxing 3c59765b2a 测试详情添加测试计划菜单栏 2020-04-09 13:51:04 +08:00
chenjianxing f735d4c953 界面优化 2020-04-09 11:44:54 +08:00
chenjianxing 51fa6ed5b0 fix test case 2020-04-09 10:25:18 +08:00
chenjianxing 04fa63a1e5 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-09 09:24:36 +08:00
chenjianxing 838e42f1e2 fix test plan rencent 2020-04-09 09:24:13 +08:00
shiziyuan9527 05d6aef53c bug fix 2020-04-08 19:10:30 +08:00
chenjianxing 86c21cfbc2 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-08 18:51:52 +08:00
chenjianxing bcc2b7ea90 优化测试详情编辑页面 2020-04-08 18:51:31 +08:00
Captain.B e1cdc4830f Merge remote-tracking branch 'origin/dev' into dev 2020-04-08 16:47:01 +08:00
Captain.B 41efba1994 测试response assertion 2020-04-08 16:45:14 +08:00
shiziyuan9527 ccc99edd36 修改ChartsData 2020-04-08 16:44:52 +08:00
chenjianxing 54201699a4 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-08 15:42:30 +08:00
chenjianxing 11956de1ea 子页面激活菜单栏 2020-04-08 15:42:06 +08:00
shiziyuan9527 91d78234f2 测试概览图表时间 2020-04-08 13:33:30 +08:00
Captain.B 6a4af34bc8 资源池国际化 2020-04-08 12:46:01 +08:00
Captain.B 35a5c3c13e 资源池国际化0.2 2020-04-07 18:46:44 +08:00
chenjianxing 2364fac57b Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-07 17:57:08 +08:00
chenjianxing f797c8cf67 track recent 2020-04-07 17:56:43 +08:00
Captain.B f9ced9a788 Merge remote-tracking branch 'origin/dev' into dev 2020-04-07 17:46:42 +08:00
Captain.B ec0fa5f0cf 去掉验证状态 2020-04-07 17:46:19 +08:00
shiziyuan9527 ee582bf41b 测试概览ResponseTime图表 2020-04-07 16:43:25 +08:00
chenjianxing c24dd94e0b fix 测试计划 2020-04-07 15:35:58 +08:00
chenjianxing 04bb963c55 编辑测试用例详情 2020-04-06 23:38:25 +08:00
chenjianxing e018f744db Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-06 17:54:32 +08:00
chenjianxing 83fe299506 测试计划关联测试用例 2020-04-06 17:54:11 +08:00
Captain.B b379329ba6 Merge remote-tracking branch 'origin/dev' into dev 2020-04-03 19:12:33 +08:00
Captain.B d90dd18bb0 bug fix 2020-04-03 19:12:17 +08:00
Captain.B 9d9e1c1984 去掉 removeChildren 2020-04-03 18:53:53 +08:00
shiziyuan9527 0b0348995e 测试概览ResponseTime图表接口 2020-04-03 18:36:10 +08:00
Captain.B e5b9800a2c bug fix 2020-04-03 17:52:30 +08:00
shiziyuan9527 1c4b50e760 删除无用代码 2020-04-03 14:13:05 +08:00
shiziyuan9527 66b6a1a63b 查看报告时检查报告状态 2020-04-03 14:12:20 +08:00
chenjianxing d421965476 功能测试->接口测试 2020-04-03 11:25:23 +08:00
chenjianxing b3cc9cd679 slot -> v-slot 2020-04-03 10:09:55 +08:00
chenjianxing b3e14a641b 关联测试用例页面 2020-04-02 18:29:20 +08:00
Captain.B 3612b9b2c7 testplan -> performance 2020-04-02 18:01:24 +08:00
shiziyuan9527 88caa270f3 查看报告时添加状态判断 2020-04-02 17:11:37 +08:00
chenjianxing d800a15a79 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-02 14:30:17 +08:00
chenjianxing c6e384cdbd 测试计划详情 2020-04-02 14:30:05 +08:00
Captain.B 1f67ebd2e0 jmeter image properties 2020-04-02 14:06:40 +08:00
Captain.B 933be35362 version 2020-04-02 13:53:40 +08:00
shiziyuan9527 3c6ed58fab 修改测试概览LoadChart 2020-04-01 17:34:18 +08:00
Captain.B 26c73ae223 Merge remote-tracking branch 'origin/dev' into dev 2020-04-01 16:24:51 +08:00
Captain.B 16168b24b9 load test status 2020-04-01 16:23:51 +08:00
chenjianxing 810927feb9 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-01 16:18:55 +08:00
chenjianxing ab90c2e850 优化前端显示 2020-04-01 16:18:37 +08:00
shiziyuan9527 2bb988af34 测试概览 2020-04-01 15:52:25 +08:00
Captain.B 1841fcfa19 set report id 2020-04-01 15:32:15 +08:00
Captain.B 4f8b2cfdba set report id 2020-04-01 15:20:34 +08:00
Captain.B bc1dc869f6 set report id 2020-04-01 15:15:38 +08:00
Captain.B 5d4c53e15b Merge remote-tracking branch 'origin/dev' into dev 2020-04-01 14:08:29 +08:00
Captain.B 1893f43a68 test status 2020-04-01 14:04:47 +08:00
Captain.B 326c1aff4b report save 2020-04-01 12:58:33 +08:00
chenjianxing 968af6614f Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-04-01 11:50:03 +08:00
chenjianxing 69a21f6989 测试计划列表 2020-04-01 11:43:05 +08:00
Captain.B 812328b907 去掉 registry 2020-04-01 11:16:32 +08:00
Captain.B 742a082689 .jmx 2020-04-01 10:45:33 +08:00
王振 c897e6458c Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-03-31 18:44:14 +08:00
王振 deadc4197d 修改测试资源池 flyway 2020-03-31 18:44:00 +08:00
shiziyuan9527 7345976adb 测试概览Tab页 2020-03-31 18:28:22 +08:00
王振 c01018f5e8 fix sql bug 2020-03-31 18:07:35 +08:00
Captain.B baeae67cfa bug fix 2020-03-31 16:02:42 +08:00
Captain.B e4d64cfb61 response assertion 2020-03-31 15:51:50 +08:00
chenjianxing ba22e480c8 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-03-31 11:54:00 +08:00
chenjianxing 82aa04f935 修复模块树bug 2020-03-31 11:53:35 +08:00
Captain.B 7805076040 不能同时运行测试 2020-03-30 18:35:14 +08:00
Captain.B 43cefe0ed0 Merge remote-tracking branch 'origin/dev' into dev 2020-03-30 17:39:21 +08:00
Captain.B caf9444db4 advanced config 2020-03-30 17:31:39 +08:00
chenjianxing 539e48a26a 去除外键 2020-03-30 16:45:08 +08:00
chenjianxing 98af015e69 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-03-30 16:41:17 +08:00
chenjianxing 49883ba4c2 测试计划增删改 2020-03-30 16:40:58 +08:00
shiziyuan9527 6b34f537bc 请求统计Tab页 2020-03-30 15:06:11 +08:00
chenjianxing 8b1e4f2a79 用例管理国际化 2020-03-30 00:18:36 +08:00
chenjianxing 7382c4dcc3 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-03-29 23:09:56 +08:00
chenjianxing 325b023ccd 测试用例管理 2020-03-29 23:02:24 +08:00
Captain.B fd51757c90 run test 2020-03-29 12:08:38 +08:00
Captain.B 408f3f0d47 删除不用的依赖 2020-03-28 10:49:49 +08:00
Captain.B 30ac861702 m->s 2020-03-28 10:16:48 +08:00
shiziyuan9527 5f162baba2 报告测试概览 2020-03-27 16:42:18 +08:00
shiziyuan9527 5f1c561db6 报告测试概览 2020-03-27 15:16:39 +08:00
shiziyuan9527 ff3ec3ff15 Top 5 Errors by sampler 2020-03-26 17:05:11 +08:00
Captain.B f11437bf19 Merge remote-tracking branch 'origin/dev' into dev 2020-03-26 17:01:07 +08:00
Captain.B 593b6882fa 启动测试 2020-03-26 17:00:43 +08:00
chenjianxing 40473911c2 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-03-26 16:54:50 +08:00
chenjianxing 536d16991f 模块树相关操作 2020-03-26 16:54:32 +08:00
Captain.B 6da2645773 Merge remote-tracking branch 'origin/dev' into dev 2020-03-26 15:59:11 +08:00
Captain.B 792cb2bfe8 启动测试 2020-03-26 15:58:33 +08:00
shiziyuan9527 e81c86cade 错误记录表格 2020-03-26 14:18:26 +08:00
Captain.B d6f285a1d4 启动测试 2020-03-26 13:51:33 +08:00
Captain.B 4cc73c172c Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-03-26 11:27:02 +08:00
shiziyuan9527 57113557bb 修改请求统计表格 2020-03-25 19:10:16 +08:00
Captain.B 564bab0097 registry 2020-03-25 17:14:31 +08:00
Captain.B d9a6cacc0f Merge remote-tracking branch 'origin/dev' into dev 2020-03-25 15:59:11 +08:00
Captain.B ec093c669f registry 2020-03-25 15:58:05 +08:00
shiziyuan9527 54b30d4215 请求统计表格添加合计行 2020-03-25 14:49:33 +08:00
chenjianxing d31382ec2a merge 2020-03-25 13:03:16 +08:00
chenjianxing 592790856f 添加测试用例模块树 2020-03-25 13:02:11 +08:00
Captain.B 115823f739 配置资源池 2020-03-25 10:51:41 +08:00
Captain.B a04c0fc078 调整 2020-03-25 10:17:06 +08:00
Captain.B bab322a8cb 启动测试 2020-03-25 10:05:32 +08:00
Captain.B e1a1175cc9 启动测试 2020-03-25 10:01:24 +08:00
Captain.B c4cfae5bae 按比率启动容器 2020-03-24 22:18:05 +08:00
Captain.B ac369fea63 关于并发数 2020-03-24 20:07:08 +08:00
Captain.B db211cb76b 关于并发数 2020-03-24 19:42:38 +08:00
Captain.B 9d10c1e037 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-03-24 17:12:32 +08:00
W23123 4cfd6b5aad 资源池 状态 用枚举表示 2020-03-24 17:12:15 +08:00
Captain.B 24321e01c1 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-03-24 17:07:28 +08:00
Captain.B b8fcee6a0c k8s 启动 jmeter 2020-03-24 17:05:59 +08:00
W23123 3a383bb546 资源池 修改 flyway 2020-03-24 16:54:32 +08:00
W23123 a72ba55141 Merge remote-tracking branch 'origin/dev' into dev 2020-03-24 16:14:42 +08:00
W23123 c208f0705a 资源池 2020-03-24 16:14:27 +08:00
shiziyuan9527 0e0980ee1f Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-03-24 16:09:29 +08:00
shiziyuan9527 16f16ab89d 修改请求统计表格 2020-03-24 16:07:52 +08:00
W23123 9532e1adc0 资源池 2020-03-24 16:07:19 +08:00
W23123 5dff901211 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	backend/src/main/resources/generatorConfig.xml
 2020-03-24 16:05:13 +08:00
W23123 0329313845 节点信息 存进 test_resource 表 2020-03-24 16:04:43 +08:00
shiziyuan9527 55d7a806fd 报告-请求统计表格 2020-03-24 14:37:30 +08:00
Captain.B 20099c351e Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-03-24 11:33:15 +08:00
Captain.B 6589326868 查询资源池 2020-03-24 11:33:07 +08:00
chenjianxing 6b8c059f99 merge 2020-03-24 10:48:02 +08:00
chenjianxing a9845bf8d4 添加用例跟踪相关 2020-03-24 10:35:07 +08:00
Captain.B fdb6d69050 engine 2020-03-23 18:58:14 +08:00
shiziyuan9527 e699eaf04d jtl test 2020-03-23 18:23:51 +08:00
shiziyuan9527 a06b77b38c jtl parse 2020-03-23 17:35:35 +08:00
Captain.B 17bf685d05 Merge remote-tracking branch 'origin/dev' into dev 2020-03-23 17:11:40 +08:00
Captain.B 8652b0566d 配置资源池 2020-03-23 17:11:07 +08:00
W23123 7a04d8f47a Merge remote-tracking branch 'origin/dev' into dev 2020-03-23 16:39:24 +08:00
W23123 10b005ba0b 添加校验资源池 K8s 和 node 是否有效 2020-03-23 16:39:04 +08:00
Captain.B ffba30cf85 jmx 记录开始时间 2020-03-23 15:44:15 +08:00
Captain.B 952eabf628 Merge remote-tracking branch 'origin/dev' into dev 2020-03-23 15:00:44 +08:00
Captain.B bbdb987b64 csv 解析 2020-03-23 15:00:27 +08:00
chenjianxing 41a712435b 去掉zalenium相关 2020-03-23 13:38:45 +08:00
Captain.B 1210d4c8c3 jmeter report type 2020-03-20 17:14:49 +08:00
Captain.B 48a620c9cd 加载测试数据 2020-03-20 15:40:12 +08:00
Captain.B 6253ac17c6 配合使用csv 2020-03-19 20:58:31 +08:00
Captain.B 9c5d32d4c6 Merge remote-tracking branch 'origin/dev' into dev 2020-03-19 18:56:01 +08:00
Captain.B 86113caae1 多文件上传修改 2020-03-19 18:53:41 +08:00
W23123 28314b6275 Merge remote-tracking branch 'origin/dev' into dev 2020-03-19 16:11:15 +08:00
W23123 3805e40f72 资源池表增加 type、info 字段 和 资源池 table 分页 2020-03-19 16:10:55 +08:00
Captain.B f0dcf4e364 test status 2020-03-19 13:54:59 +08:00
Captain.B ed3186caf8 test status 2020-03-19 11:59:24 +08:00
chenjianxing b6e3b104f3 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-03-18 18:37:07 +08:00
chenjianxing 017f864063 测试报告同步 2020-03-18 18:36:42 +08:00
chenjianxing 147fba84ed 功能测试测试报告同步和展示 2020-03-18 18:34:29 +08:00
Captain.B 27fdb74450 Merge remote-tracking branch 'origin/dev' into dev 2020-03-18 16:36:54 +08:00
Captain.B bdc162e028 tear down 2020-03-18 16:33:40 +08:00
shiziyuan9527 330f9def83 DockerTestEngine 2020-03-18 14:53:31 +08:00
Captain.B e2af4ef462 mybatis version 2020-03-17 19:15:54 +08:00
Captain.B 9888e4acbc test.name 2020-03-17 17:55:14 +08:00
Captain.B 24faaca274 添加自定义字段 2020-03-17 15:42:51 +08:00
Captain.B c6b24f35bd 小改动 2020-03-17 14:30:29 +08:00
Captain.B f90b870c3f rollback 2020-03-16 19:23:04 +08:00
Captain.B 940631faa3 启动测试 0.3 2020-03-16 19:19:52 +08:00
Captain.B fbdd747cb7 启动测试 0.2 2020-03-16 18:57:38 +08:00
Captain.B 4eaaa746df 启动测试 0.1 2020-03-16 17:13:42 +08:00
Captain.B 454320f9a4 file type engine type 2020-03-16 16:18:57 +08:00
Captain.B a1311ca540 file type engine type 2020-03-16 16:11:37 +08:00
Captain.B 4e5e8c9809 file metadata add column engine 2020-03-16 15:07:15 +08:00
Captain.B 4927d97630 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-03-16 10:39:03 +08:00
chenjianxing 96a1b0b95c Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-03-13 21:01:33 +08:00
chenjianxing a950c03a5b 完善功能测试前后端 2020-03-13 21:01:03 +08:00
Captain.B 4a50c10d72 queue size 2020-03-13 13:23:14 +08:00
Captain.B dd333ccbf5 ... 2020-03-12 18:53:01 +08:00
Captain.B f34cc6afe9 logback 2020-03-12 17:33:08 +08:00
Captain.B 56241e6535 后台添加backend-listener 2020-03-12 16:34:48 +08:00
shiziyuan9527 6f64057e3b 首次登录随机选中工作区间和组织 2020-03-10 18:17:52 +08:00
shiziyuan9527 ca45dfe66f 报告页头部面包屑 2020-03-09 18:05:18 +08:00
shiziyuan9527 475ea93a6d 组织工作空间添加移除用户时做资源所属检查 2020-03-09 15:10:27 +08:00
shiziyuan9527 1bd8bcd562 修改用户相关api 2020-03-06 17:10:23 +08:00
Captain.B 0fd99a4dda 删除没有用到的代码 2020-03-06 11:19:41 +08:00
shiziyuan9527 90109ade6a 测试报告页面 2020-03-05 17:55:21 +08:00
Captain.B 0fed287cdb 部分国际化 2020-03-05 15:27:47 +08:00
Captain.B 8025d1102c Merge remote-tracking branch 'origin/dev' into dev 2020-03-05 14:55:58 +08:00
Captain.B cc922865ea flyway 2020-03-05 14:55:02 +08:00
shiziyuan9527 42b4dfac7f 系统菜单下用户搜索 2020-03-05 13:26:54 +08:00
Captain.B caa3d87bc0 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-03-04 20:22:40 +08:00
Captain.B 586ef458ab xml parse 2020-03-04 20:22:14 +08:00
shiziyuan9527 20ed80bf3f 项目编辑时可选择所属工作空间 2020-03-04 18:10:43 +08:00
shiziyuan9527 088bf06f0d 添加@RequiresRoles注解 2020-03-04 15:22:57 +08:00
mokun bba185a6ae server i18n 2020-03-04 14:57:26 +08:00
mokun cb6291bcb0 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-03-04 11:32:39 +08:00
mokun 4423a44c55 server i18n 2020-03-04 11:32:17 +08:00
Captain.B 6a5c6a2d38 全局错误处理 2020-03-04 11:30:22 +08:00
Captain.B 715f654a6f Merge remote-tracking branch 'origin/dev' into dev 2020-03-03 15:36:32 +08:00
Captain.B 1feb471780 jmeter 插件jar 2020-03-03 15:36:11 +08:00
shiziyuan9527 8f80544a6c 添加成员时检查是否是重复添加 2020-03-03 15:09:31 +08:00
Captain.B c23f5bd795 替换jmx值 2020-03-03 14:22:09 +08:00
Captain.B 07f286322d 异常处理 2020-03-03 14:18:20 +08:00
Captain.B f12614199b Merge remote-tracking branch 'origin/dev' into dev 2020-03-03 14:02:04 +08:00
Captain.B 33bd1c55be 异常处理 2020-03-03 14:01:50 +08:00
shiziyuan9527 569c2538e3 系统工作空间增加成员列 2020-03-03 13:28:35 +08:00
Captain.B 2a1ac00ac8 压力配置 2020-03-02 19:23:28 +08:00
Captain.B 25426b299e 去掉模版引擎直接使用html 2020-03-02 18:59:26 +08:00
Captain.B 104b02e242 Merge remote-tracking branch 'origin/dev' into dev 2020-03-02 18:42:01 +08:00
Captain.B 80f3e74a61 简化后端 2020-03-02 18:41:47 +08:00
shiziyuan9527 369b0399cc 修改编辑成员角色时出现的问题 2020-03-02 18:20:14 +08:00
Captain.B 4dbefc9404 菜单权限 2020-03-02 15:29:00 +08:00
Captain.B 0714200b5f 报告菜单 0.1 2020-03-02 15:11:05 +08:00
Captain.B 1adbca1582 删除没有用到的配置 2020-03-02 13:17:19 +08:00
shiziyuan9527 9e11452ebd 系统菜单下工作空间的创建和修改 2020-03-02 10:49:09 +08:00
Captain.B 68d4a44f09 bug fix 2020-02-28 18:57:20 +08:00
Captain.B 85e3556a86 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-02-28 17:28:58 +08:00
Captain.B a7d27e8668 高级设置 +1 2020-02-28 17:27:31 +08:00
shiziyuan9527 586bf457da 邀请组织成员进入工作空间 2020-02-28 17:17:39 +08:00
shiziyuan9527 db8cd75665 工作空间下成员信息可修改 2020-02-28 16:51:08 +08:00
shiziyuan9527 f5a315ffcd 工作空间成员列表添加角色列 2020-02-28 15:57:58 +08:00
shiziyuan9527 44743620d4 编辑组织成员角色 2020-02-28 15:34:02 +08:00
shiziyuan9527 bb23e9b246 修改组织菜单新建成员中的问题 2020-02-27 18:45:58 +08:00
shiziyuan9527 8383b67948 组织增加成员时添加角色信息 2020-02-27 18:09:39 +08:00
shiziyuan9527 84c779ce05 组织菜单成员列表角色列更改查询方式 2020-02-27 17:02:26 +08:00
Captain.B 54963b2fa0 project 2020-02-27 16:18:35 +08:00
shiziyuan9527 27b57dcb9a 组织菜单成员列表添加角色列 2020-02-27 15:27:51 +08:00
Captain.B cf828f87b2 密码校验 2020-02-27 15:09:01 +08:00
Captain.B d4f69fa4ca 编辑测试修改 2020-02-27 13:34:28 +08:00
Captain.B 1ab4b75e79 项目的点击事件 2020-02-26 17:33:59 +08:00
shiziyuan9527 0132219336 系统管理员工作空间管理增加组织列 2020-02-26 16:18:12 +08:00
Captain.B 2d0d1c5279 最近的测试 2020-02-26 14:58:04 +08:00
shiziyuan9527 bbd28d0ef9 新增系统设置中工作空间选项 2020-02-26 13:48:41 +08:00
Captain.B ca9d2cfd22 Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev 2020-02-26 13:31:03 +08:00
Captain.B 32df172547 最近的项目 2020-02-26 13:30:50 +08:00
shiziyuan9527 f228d1792d 个人信息设置页面 2020-02-26 13:28:08 +08:00
shiziyuan9527 5371e09c23 菜单按照组织工作空间隔离 2020-02-25 18:34:46 +08:00
Captain.B 167c8cd675 Merge remote-tracking branch 'origin/dev' into dev 2020-02-25 17:37:48 +08:00
Captain.B 36fd6b904a shiro version 2020-02-25 17:37:34 +08:00
shiziyuan9527 99daa187ae 组织和工作空间切换0.6 2020-02-25 16:35:24 +08:00
shiziyuan9527 9e9951adcb 组织和工作空间切换0.1 2020-02-25 14:53:22 +08:00
Captain.B fe12305ec2 简化配置 2020-02-25 14:29:01 +08:00
Captain.B bfa3ef70cf table use changed 2020-02-25 11:48:39 +08:00
Captain.B 2afa1bca4c roles indexOf bug fix 2020-02-24 18:55:44 +08:00
shiziyuan9527 8c121c39de 组织成员管理 2020-02-24 17:41:09 +08:00
Captain.B 807135e7da user add column language 2020-02-24 17:01:09 +08:00
shiziyuan9527 814c573010 组织成员管理 2020-02-24 14:06:07 +08:00
shiziyuan9527 7ec03015dd 组织成员管理 2020-02-21 15:22:19 +08:00
Captain.B 62873e656e dockerfile 2020-02-21 14:48:30 +08:00