Commit Graph

653 Commits

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