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

945 Commits

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