Commit Graph

1077 Commits

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