test/MeterSphere
1
0
Fork 0
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git synced 2024-12-05 05:29:29 +08:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity
10,284 Commits 43 Branches 172 Tags 416 MiB
1edf880672
Commit Graph

5431 Commits

Author SHA1 Message Date
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
haifeng414
b6e24a9644 支持压力配置rps参数 2020-02-20 21:02:39 +08:00
haifeng414
36544f3621 Merge remote-tracking branch 'origin/dev' into dev 2020-02-20 20:01:15 +08:00
haifeng414
405eb63997 fix 编辑的时候修改文件后无法运行 2020-02-20 20:00:46 +08:00
Captain.B
2c84557bc1 file download 2020-02-20 17:47:58 +08:00
Captain.B
09a5c11ab0 查询project 2020-02-20 17:12:22 +08:00
Captain.B
ad2dfef8a3 保留一份配置 2020-02-20 13:32:41 +08:00
Captain.B
61715c2d52 Merge branch 'dev' of bin.github.com:fit2cloudrd/metersphere-server into dev 2020-02-20 12:56:22 +08:00
Captain.B
6dac23d291 文件格式修改 2020-02-20 12:55:26 +08:00
haifeng414
7c968eda35 fix直接点击保存并运行按钮无法运行 2020-02-20 12:43:34 +08:00
haifeng414
8239567c9e 暂时取消压缩功能 2020-02-20 12:29:19 +08:00
haifeng414
5f6368d1b5 Merge remote-tracking branch 'origin/dev' into dev 2020-02-20 12:10:47 +08:00
haifeng414
3ce09effdb 脚本内容压缩 2020-02-20 12:10:32 +08:00
Captain.B
7816dc56b9 切换工工作空间修改 2020-02-20 11:14:54 +08:00
Captain.B
8c546b7afa project search 2020-02-20 09:45:28 +08:00
shiziyuan9527
fe2e2e3e73 切换组织和切换工作空间0.1 2020-02-19 22:40:57 +08:00
haifeng414
2c70faf180 完成前端运行逻辑10% 2020-02-19 21:39:43 +08:00
haifeng414
b9f58a8910 完成解析jmx文件逻辑 2020-02-19 20:25:18 +08:00
haifeng414
5457a369da Merge remote-tracking branch 'origin/dev' into dev 2020-02-19 18:07:58 +08:00
haifeng414
98d54b3183 修改包名 2020-02-19 18:04:44 +08:00
Captain.B
0728ad91af project workspace name check 2020-02-19 16:51:11 +08:00
Captain.B
e5f57dc68b 去掉todo 2020-02-19 16:28:15 +08:00
Captain.B
a6cca8e701 project set workspace_id 2020-02-19 15:42:03 +08:00
Captain.B
40c8b42834 SessionUser 2020-02-19 14:33:23 +08:00
Captain.B
182d5b2450 set roles 2020-02-19 11:43:16 +08:00
shiziyuan9527
9a316738e3 用户列表分页和组织列表分页 2020-02-18 22:43:13 +08:00
haifeng414
19478566a1 删除无用的日志 2020-02-18 21:31:28 +08:00
haifeng414
e6b2a577cb Merge remote-tracking branch 'origin/dev' into dev 2020-02-18 21:26:21 +08:00
haifeng414
951fe9f5d2 通过保存并运行按钮本地运行上传文件 2020-02-18 21:25:51 +08:00
W23123
d085c2a27d 成员管理 0.999 2020-02-18 17:41:51 +08:00
W23123
7773eda15a Merge remote-tracking branch 'origin/dev' into dev 2020-02-18 17:20:44 +08:00
W23123
71cf45d8af 成员管理 0.9 2020-02-18 17:20:21 +08:00
Captain.B
40f0159f89 workspace check owner 2020-02-18 16:27:25 +08:00
Captain.B
6c93ec36f9 require roles 2020-02-18 16:21:31 +08:00
Captain.B
59b47db3bf rollback column last_role_id 2020-02-18 16:07:26 +08:00
Captain.B
ae13d33279 user add column last_role_id 2020-02-18 15:35:31 +08:00
Captain.B
d5470c33c9 Merge branch 'dev' of bin.github.com:fit2cloudrd/metersphere-server into dev 2020-02-18 13:49:47 +08:00
Captain.B
16a152e5ea workspace page limit 2020-02-18 13:49:06 +08:00
haifeng414
677bdb959a Merge remote-tracking branch 'origin/dev' into dev 2020-02-18 13:41:31 +08:00
haifeng414
828faeba0a 修改过滤器位置 2020-02-18 13:40:32 +08:00
W23123
f668fd6891 成员管理后端接口 加上角色验证 2020-02-18 11:34:33 +08:00
W23123
a086e80574 成员管理后端接口 2020-02-18 11:26:07 +08:00
shiziyuan9527
dac30f47a5 角色切换 2020-02-17 23:58:09 +08:00
haifeng414
a30af57c28 完成创建和编辑测试时文件保存相关逻辑 2020-02-17 21:59:34 +08:00
haifeng414
e7bbfe074d 将文件信息和文件内容分成两个表 2020-02-17 17:32:47 +08:00
haifeng414
a5de8cebbb 测试列表按照名称搜索 2020-02-17 16:55:33 +08:00
haifeng414
25a8ca4604 Merge remote-tracking branch 'origin/dev' into dev 2020-02-17 16:25:29 +08:00
haifeng414
54ad67d899 上传的文件保存到数据库 2020-02-17 15:00:13 +08:00
Captain.B
1269d6b8af project backend 2020-02-17 11:33:48 +08:00
haifeng414
de2ad1337b 保存测试到数据库 2020-02-15 14:04:05 +08:00
shiziyuan9527
092ddc069c TestResource CURD and getUserRoleList 2020-02-14 17:43:15 +08:00
haifeng414
6f70ceea9a 编辑测试时回显一部分数据 2020-02-14 12:34:14 +08:00
haifeng414
c9f185366c 解决路由跳转传参问题 2020-02-13 22:49:39 +08:00
haifeng414
416553217a 测试列表的分页实现 2020-02-13 18:24:38 +08:00
Captain.B
b7e76ccedc pager 2020-02-13 17:39:12 +08:00
Captain.B
ebf322cde3 登录设置权限 0.1 2020-02-13 15:40:51 +08:00
shiziyuan9527
89fd3c1f6b TestResourcePool CURD 2020-02-13 13:24:11 +08:00
haifeng414
10a9991252 Merge remote-tracking branch 'origin/dev' into dev 2020-02-13 12:22:12 +08:00
haifeng414
62c7ab8617 完成简单的保存逻辑 2020-02-13 12:21:56 +08:00
Captain.B
b70d79bd90 login demo 2020-02-13 11:57:26 +08:00
Captain.B
53979cc3b7 login demo 2020-02-13 11:51:42 +08:00
Captain.B
5a7c21304a Merge branch 'master' into dev 2020-02-12 22:25:05 +08:00
haifeng414
a732a7291b 文件下载和删除的前端逻辑 2020-02-12 20:55:02 +08:00
shiziyuan9527
a3de4322ff User enable/disable 2020-02-12 19:16:00 +08:00
Captain.B
7579953c51 Merge branch 'master' into dev 2020-02-12 14:40:31 +08:00
haifeng414
be712b42f7 上传文件并输出到控制台 2020-02-12 14:21:23 +08:00
shiziyuan9527
be55317212 Organization CURD 2020-02-12 13:03:10 +08:00
shiziyuan9527
f2b2de0aa2 user update 2020-02-12 12:28:13 +08:00
shiziyuan9527
27098f14e2 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-02-11 17:36:36 +08:00
Captain.B
3982976042 workspace delete 2020-02-11 17:34:03 +08:00
shiziyuan9527
8b227c09ac add User.vue and User delete,list 2020-02-11 17:24:30 +08:00
Captain.B
7ca97ac14a workspace list 2020-02-11 15:51:59 +08:00
Captain.B
b09ffedbac workspace add 2020-02-11 15:24:24 +08:00
shiziyuan9527
eb9767c2d1 add user api 2020-02-10 18:32:28 +08:00
Captain.B
b501cd3cb2 mapper and xml 2020-02-05 10:34:47 +08:00
Captain.B
8830231352 package name changed. 2020-02-03 16:30:16 +08:00
Captain.B
253a7da6cc 8888 port not working on my mac 2020-02-03 15:16:37 +08:00
Captain.B
da8e7b101d shiro dialect 2020-02-03 14:28:08 +08:00
Captain.B
c27167a3ba frontend backend 2020-02-03 14:04:27 +08:00