wenyann
|
ba6a0a6a6b
|
feat(测试跟踪):去掉描述html标签
|
2020-08-21 18:26:37 +08:00 |
q4speed
|
be574b1b40
|
chore: update submodule
|
2020-08-21 14:29:00 +08:00 |
|
q4speed
|
cb8b73d9ad
|
feat(性能测试): 增加资源池限额过滤
|
2020-08-21 11:14:47 +08:00 |
chenjianxing
|
9a9d702aca
|
Merge branch 'master' of https://github.com/metersphere/server
|
2020-08-20 18:16:45 +08:00 |
|
chenjianxing
|
eceb099545
|
feactor: 用户ID支持特殊字符
|
2020-08-20 18:16:28 +08:00 |
|
q4speed
|
3c96650b79
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# backend/src/main/java/io/metersphere/xpack
|
2020-08-20 18:06:53 +08:00 |
|
q4speed
|
2b77e43050
|
feat(性能测试): 增加性能测试限额检查
|
2020-08-20 18:06:02 +08:00 |
shiziyuan9527
|
1abd168b5c
|
Merge branch 'master' of https://github.com/metersphere/metersphere
|
2020-08-20 16:16:57 +08:00 |
|
shiziyuan9527
|
07a34181c8
|
fix: 批量更新用例后用例更新时间没修改的bug
|
2020-08-20 16:16:17 +08:00 |
|
shiziyuan9527
|
0602044d6a
|
feat: 删除用例时删除关联的缺陷
|
2020-08-20 16:03:02 +08:00 |
|
chenjianxing
|
72010207ea
|
Merge branch 'master' of https://github.com/metersphere/server
|
2020-08-20 15:53:52 +08:00 |
|
chenjianxing
|
53b2833ee4
|
fix(测试跟踪): 只读用户创建用户测试报告
|
2020-08-20 15:53:16 +08:00 |
|
shiziyuan9527
|
1038f50c3f
|
fix: 修改缺陷描述
|
2020-08-20 15:00:18 +08:00 |
|
shiziyuan9527
|
639830b58b
|
fix: 测试计划状态执行结果无法更新的问题
|
2020-08-20 14:59:35 +08:00 |
|
chenjianxing
|
3ebee20b90
|
Merge branch 'master' of https://github.com/metersphere/server
|
2020-08-20 14:37:25 +08:00 |
|
chenjianxing
|
84e9c23486
|
feat(接口测试): 添加超时设置
|
2020-08-20 14:37:05 +08:00 |
Captain.B
|
a50666f1d6
|
Updating the submodule to the latest version
|
2020-08-20 12:12:20 +08:00 |
|
chenjianxing
|
fbed4ecda4
|
fix: 解决冲突
|
2020-08-19 18:10:31 +08:00 |
|
chenjianxing
|
948e489626
|
fix(接口调试): 接口调试响应不更新问题
|
2020-08-19 18:04:42 +08:00 |
|
Captain.B
|
9791463ead
|
fix(接口测试): 修复 post url 格式不对的问题
|
2020-08-19 17:43:22 +08:00 |
|
Captain.B
|
f1b8bf4c9f
|
fix(接口测试): 修复 post url 格式不对的问题
|
2020-08-19 17:39:40 +08:00 |
|
q4speed
|
bf414059fa
|
Merge remote-tracking branch 'origin/master'
|
2020-08-19 17:07:08 +08:00 |
|
q4speed
|
20674b1c7a
|
feat(接口测试): 增加接口测试数量限额检查
|
2020-08-19 17:06:26 +08:00 |
|
shiziyuan9527
|
12e288016d
|
fix: 测试计划测试用例页面获取不到备注的bug
|
2020-08-19 16:34:07 +08:00 |
|
chenjianxing
|
83c21a33b5
|
Merge branch 'master' of https://github.com/metersphere/server
|
2020-08-19 15:41:24 +08:00 |
|
chenjianxing
|
478d6db83b
|
feat(接口测试): 场景和接口支持禁用和启用
|
2020-08-19 15:41:14 +08:00 |
|
Captain.B
|
0c2f7e27e6
|
refactor: 修改ignore
|
2020-08-19 13:20:43 +08:00 |
|
Captain.B
|
b39db8c97b
|
refactor: 修改ignore
|
2020-08-19 13:19:44 +08:00 |
|
q4speed
|
44540d813f
|
refactor: 删除无用代码
|
2020-08-19 10:39:10 +08:00 |
|
q4speed
|
0197515077
|
chore: 子模块
|
2020-08-19 10:22:04 +08:00 |
|
wenyann
|
29f5e772a1
|
Merge branch 'master' of https://github.com/metersphere/metersphere
|
2020-08-19 10:02:22 +08:00 |
|
wenyann
|
d9b3831b3e
|
feat(测试跟踪): 新增缺陷列表，缺陷数
|
2020-08-19 10:02:02 +08:00 |
|
chenjianxing
|
d820bf400c
|
feat(接口测试): dubbo BeanShell
|
2020-08-18 19:01:49 +08:00 |
|
q4speed
|
cadcf9eb7b
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# backend/src/main/java/io/metersphere/xpack
|
2020-08-18 18:10:02 +08:00 |
|
q4speed
|
a26a12fb17
|
fix: 修复保存工作控件配额时超出组织的配额的bug
|
2020-08-18 18:08:50 +08:00 |
|
Captain.B
|
052fae882e
|
refactor: 打包的时候保留jmeter的jar
|
2020-08-18 17:09:54 +08:00 |
|
Captain.B
|
0fb9f69d83
|
refactor: 打包的时候保留jmeter的jar
|
2020-08-18 16:52:30 +08:00 |
|
shiziyuan9527
|
7ffb6812cf
|
fix: 取消集成后,解除项目关联
|
2020-08-18 15:44:41 +08:00 |
|
shiziyuan9527
|
ab07bc3de8
|
Merge branch 'master' of https://github.com/metersphere/metersphere
|
2020-08-18 14:34:43 +08:00 |
|
shiziyuan9527
|
46d52334bf
|
feat: 测试计划测试用例列表显示缺陷数
|
2020-08-18 14:33:52 +08:00 |
|
chenjianxing
|
ab0790a8a2
|
Merge branch 'master' of https://github.com/metersphere/server
|
2020-08-18 14:32:38 +08:00 |
|
chenjianxing
|
fcb8eeedf2
|
feat(接口测试): 支持Beanshell脚本
|
2020-08-18 14:32:24 +08:00 |
|
Captain.B
|
c8c53a9030
|
fix: 删除资源池时检查是否存在关联的性能测试
|
2020-08-18 13:22:05 +08:00 |
|
Captain.B
|
c95afcc29e
|
refactor: 代码调整，不强制电脑上有 /opt/jmeter/ 目录
|
2020-08-18 12:26:34 +08:00 |
|
Captain.B
|
94c3902c61
|
Merge remote-tracking branch 'origin/master' into master
|
2020-08-18 11:39:23 +08:00 |
|
Captain.B
|
be18d0b9ab
|
refactor: 代码调整，不强制电脑上有 /opt/jmeter/ 目录
|
2020-08-18 11:39:00 +08:00 |
|
chenjianxing
|
163fae2e51
|
Merge branch 'master' of https://github.com/metersphere/server
|
2020-08-18 10:21:13 +08:00 |
|
chenjianxing
|
a3bc670b44
|
fix: 修改sso名称
|
2020-08-18 10:20:39 +08:00 |
|
shiziyuan9527
|
240ac7ab26
|
feat: 集成Jira
|
2020-08-17 22:01:15 +08:00 |
|
chenjianxing
|
60ed8a0535
|
Merge branch 'master' of https://github.com/metersphere/server
|
2020-08-17 19:23:53 +08:00 |
|
chenjianxing
|
5ec095673c
|
feat(接口测试): 前后置脚本页面
|
2020-08-17 19:23:29 +08:00 |
|
chenjianxing
|
c1c2bc7f76
|
fix: swagger body参数循环依赖问题
|
2020-08-17 15:24:11 +08:00 |
|
Captain.B
|
1a9d1e1971
|
refactor: 单接口调试处理mock数据
|
2020-08-17 13:31:42 +08:00 |
|
Captain.B
|
32ba381ac0
|
Merge remote-tracking branch 'origin/master'
|
2020-08-17 13:13:58 +08:00 |
|
Captain.B
|
90dc63c15e
|
refactor: 后台处理mock参数
|
2020-08-17 13:13:43 +08:00 |
|
chenjianxing
|
0f92569e22
|
Merge branch 'master' of https://github.com/metersphere/server
|
2020-08-17 13:07:09 +08:00 |
|
chenjianxing
|
263aba9b57
|
fix: 单接口调试
|
2020-08-17 13:06:41 +08:00 |
|
Captain.B
|
d9894309d1
|
Merge remote-tracking branch 'origin/master'
|
2020-08-17 12:28:55 +08:00 |
|
Captain.B
|
b4ed0a5d61
|
refactor: 后台处理mock参数
|
2020-08-17 12:28:37 +08:00 |
|
chenjianxing
|
064304ba28
|
refactor: 适配cas
|
2020-08-17 10:09:19 +08:00 |
|
Captain.B
|
6e7fe725a1
|
Merge remote-tracking branch 'origin/master'
|
2020-08-14 19:20:11 +08:00 |
|
Captain.B
|
fa23fcdfcd
|
feat(接口测试): 代码调整
|
2020-08-14 19:19:53 +08:00 |
|
shiziyuan9527
|
f52a5cc078
|
feat: 集成Tapd
|
2020-08-14 18:07:42 +08:00 |
|
shiziyuan9527
|
5b61ff1f99
|
Merge branch 'master' of https://github.com/metersphere/metersphere
|
2020-08-14 14:50:47 +08:00 |
|
shiziyuan9527
|
ce96ec0a4b
|
feat: 修改sql
|
2020-08-14 14:50:06 +08:00 |
|
wenyann
|
1cff9c1d02
|
Merge remote-tracking branch 'origin/master'
|
2020-08-14 14:33:57 +08:00 |
|
q4speed
|
b43c2f4962
|
refactor: merge db.migration
|
2020-08-14 13:38:41 +08:00 |
|
q4speed
|
2fb347bd85
|
Merge remote-tracking branch 'origin/master'
|
2020-08-14 13:35:34 +08:00 |
|
q4speed
|
3783d30d7e
|
feat: 增加配额管理
|
2020-08-14 13:34:18 +08:00 |
|
Captain.B
|
9ba78978c0
|
refactor: 删掉不用的controller
|
2020-08-14 12:37:48 +08:00 |
|
wenyann
|
ccf7c0e52f
|
Merge branch 'master' of https://github.com/metersphere/metersphere
|
2020-08-13 19:09:14 +08:00 |
|
wenyann
|
bf71b37cf4
|
style: 测试报告优化
|
2020-08-13 19:09:02 +08:00 |
|
shiziyuan9527
|
3ddc3ffa29
|
feat: 修改sql
|
2020-08-13 17:27:33 +08:00 |
|
shiziyuan9527
|
f42a920fcf
|
feat: 集成TAPD平台
|
2020-08-13 17:15:19 +08:00 |
|
shiziyuan9527
|
47fad33be1
|
feat: 服务集成
|
2020-08-12 17:37:14 +08:00 |
|
shiziyuan9527
|
b13fb0f001
|
feat: 服务集成
|
2020-08-11 17:17:25 +08:00 |
|
wenyann
|
a8671ca4f3
|
Merge branch 'master' of https://github.com/metersphere/metersphere
Conflicts:
frontend/src/business/components/api/report/components/ScenarioResults.vue
frontend/src/business/components/common/head/ShowAll.vue
|
2020-08-11 14:52:02 +08:00 |
|
wenyann
|
66b6c179e8
|
feat(接口测试):增加接口测试一键运行功能
|
2020-08-11 14:40:18 +08:00 |
|
chenjianxing
|
e187d91c76
|
feat(接口测试): dubbo 单接口调试
|
2020-08-11 10:36:18 +08:00 |
|
chenjianxing
|
22950f0893
|
Merge branch 'master' of https://github.com/metersphere/server
|
2020-08-10 21:59:26 +08:00 |
|
chenjianxing
|
4e0b340c20
|
feat(接口测试): 单接口调试
|
2020-08-10 21:59:11 +08:00 |
|
Captain.B
|
ece541e80e
|
Merge remote-tracking branch 'origin/master'
|
2020-08-10 18:07:55 +08:00 |
|
Captain.B
|
dfd66d3793
|
feat: 显示性能测试的压力配置
|
2020-08-10 18:07:17 +08:00 |
|
q4speed
|
09d1a1822e
|
feat: 增加对Jmeter内置函数支持
|
2020-08-10 17:06:05 +08:00 |
|
shiziyuan9527
|
f247807c3d
|
feat(测试跟踪): 测试计划和测试用例页面搜索框可以根据名称或者ID搜索用例
|
2020-08-10 14:26:51 +08:00 |
|
shiziyuan9527
|
2646dc94b4
|
feat(测试跟踪): 测试计划下用例按照ID字段排序
|
2020-08-10 14:17:16 +08:00 |
|
Captain.B
|
fa13003865
|
Merge branch 'master' of github.com:fit2cloudrd/metersphere-server
|
2020-08-07 17:37:45 +08:00 |
|
chenjianxing
|
683fed8ec9
|
feat: 接口调试部分代码
|
2020-08-07 17:16:24 +08:00 |
|
Captain.B
|
fdda9b00b0
|
feat: 使用java运行js脚本，添加相关js
|
2020-08-07 16:26:54 +08:00 |
|
q4speed
|
9a954934af
|
fix(接口测试): 修复无法正确调用接口的bug
|
2020-08-07 13:29:16 +08:00 |
|
chenjianxing
|
9b294a00f8
|
Merge branch 'v1.1' of https://github.com/metersphere/server
|
2020-08-07 11:36:01 +08:00 |
|
chenjianxing
|
df2f972c9a
|
Merge branch 'master' of https://github.com/metersphere/server
|
2020-08-07 11:26:10 +08:00 |
|
chenjianxing
|
76ae0969c4
|
feat: 场景内cookie共享
|
2020-08-07 11:25:56 +08:00 |
|
chenjianxing
|
a9d6c98c09
|
Merge branch 'master' of https://github.com/metersphere/server
|
2020-08-07 10:03:33 +08:00 |
|
chenjianxing
|
18c7a30a03
|
refactor: 首页只显示运行中的定时任务
|
2020-08-07 10:03:22 +08:00 |
|
q4speed
|
b48f7e7468
|
fix(接口测试): 修复ServiceKey与ServiceInterface颠倒的bug
|
2020-08-06 15:51:28 +08:00 |
|
Captain.B
|
e8c682e402
|
feat: 使用java运行js脚本，添加相关jar
|
2020-08-06 15:50:45 +08:00 |
|
q4speed
|
7ce75319bb
|
fix(XPack): 修复ClassNotFound bug
|
2020-08-06 14:58:11 +08:00 |
wangzhen-fit2cloud
|
e5c4885d3f
|
build: 暂时去掉allatori
|
2020-08-06 13:36:49 +08:00 |
|
chenjianxing
|
b04904d105
|
Merge branch 'v1.1'
|
2020-08-05 20:07:04 +08:00 |
|
chenjianxing
|
cef3c8dea7
|
fix: swagger 参数描述中带有/导入报错
|
2020-08-05 20:06:21 +08:00 |
|
chenjianxing
|
60d863208b
|
fix: 接口测试首页定时任务
|
2020-08-05 18:21:15 +08:00 |
|
q4speed
|
018f7caf88
|
fix(接口测试): 修复zookeeper无限重连bug，修复Registry Center更新后无法生效bug
|
2020-08-05 16:57:54 +08:00 |
|
chenjianxing
|
f10fef30bf
|
Merge branch 'master' of https://github.com/metersphere/server
|
2020-08-05 13:10:40 +08:00 |
|
chenjianxing
|
ff7d0e0343
|
fix: 解决冲突
|
2020-08-05 13:10:24 +08:00 |
|
chenjianxing
|
3a8dc9ee04
|
fix: 修复插件导入kv类型body报错
|
2020-08-05 13:08:18 +08:00 |
|
chenjianxing
|
1faa4b6e8c
|
fix: 测试用例导入功能测试不能选择自动方式
|
2020-08-05 10:55:21 +08:00 |
|
chenjianxing
|
e1089b1eb1
|
Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1
|
2020-08-05 10:14:11 +08:00 |
|
chenjianxing
|
7de5205b99
|
fix: 模块树拖拽
|
2020-08-05 10:13:56 +08:00 |
|
wenyann
|
74ea612f2e
|
fix(测试计划): 修复测试用例筛选条件
|
2020-08-04 19:04:03 +08:00 |
|
wenyann
|
5fb0fc59b7
|
Merge remote-tracking branch 'origin/master'
|
2020-08-04 17:36:30 +08:00 |
|
wenyann
|
b4658c2a9a
|
feat(测试跟踪): 修改新增字段长度
|
2020-08-04 17:35:58 +08:00 |
|
chenjianxing
|
998750d77f
|
性能测试首页定时任务列表
|
2020-08-04 17:35:09 +08:00 |
|
wenyann
|
833d80faf5
|
Merge remote-tracking branch 'origin/master'
|
2020-08-04 16:45:17 +08:00 |
|
wenyann
|
4359861a50
|
feat(测试跟踪): 导出用例，备注显示文本框名字
|
2020-08-04 16:44:56 +08:00 |
|
chenjianxing
|
4ad4a698cd
|
Merge branch 'master' of https://github.com/metersphere/server
|
2020-08-04 16:38:06 +08:00 |
|
chenjianxing
|
002ace6b16
|
接口测试首页定时任务列表
|
2020-08-04 16:37:42 +08:00 |
|
wenyann
|
b29720930e
|
feat(测试跟踪): 测试方式自动时关联用例增加其它选项
|
2020-08-04 16:36:04 +08:00 |
|
Captain.B
|
9f4dd6e49c
|
Merge branch 'v1.1'
# Conflicts:
# frontend/src/business/components/api/test/components/ApiScenarioVariables.vue
# frontend/src/business/components/api/test/model/ScenarioModel.js
|
2020-08-04 16:07:26 +08:00 |
|
wenyann
|
82eb4a4e7a
|
style(api): 删除无用代码
|
2020-08-03 18:44:14 +08:00 |
|
wenyann
|
cb58177c62
|
fix(测试跟踪): 修复case导出后，xls打开顺序不一致
|
2020-08-03 14:52:03 +08:00 |
|
shiziyuan9527
|
a0600ed4b9
|
refactor(测试跟踪): 优先级名称变更为用例等级
|
2020-08-03 14:14:50 +08:00 |
|
chenjianxing
|
7cbb202309
|
fix: 非管理员用户点击高级搜索退出登入
|
2020-07-31 18:10:44 +08:00 |
|
Captain.B
|
bcdbabc54a
|
refactor: 修改性能测试结果字段的长度为LONGTEXT
|
2020-07-31 14:26:54 +08:00 |
|
chenjianxing
|
6e6ce650f7
|
Merge branch 'master' of https://github.com/metersphere/server
|
2020-07-30 18:45:55 +08:00 |
|
chenjianxing
|
1b0dc296fc
|
Merge branch 'v1.1'
|
2020-07-30 18:45:14 +08:00 |
|
chenjianxing
|
2d2ac4f632
|
feat: 断言支持JSONPath
|
2020-07-30 17:01:04 +08:00 |
|
q4speed
|
85d6b34bdb
|
build: 增加allatori
|
2020-07-30 16:52:00 +08:00 |
|
q4speed
|
b54ae2769b
|
feat: Demo
|
2020-07-30 15:27:28 +08:00 |
|
q4speed
|
8704c43929
|
feat: 添加submodule
|
2020-07-30 12:25:39 +08:00 |
|
chenjianxing
|
dc375e1b4a
|
fix: 导出用例默认按更新时间排序
|
2020-07-30 11:52:41 +08:00 |
|
chenjianxing
|
2a0cc4c7ea
|
Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1
|
2020-07-30 09:26:13 +08:00 |
|
chenjianxing
|
022534038c
|
Merge branch 'v1.1' of https://github.com/metersphere/server
|
2020-07-30 09:24:04 +08:00 |
|
chenjianxing
|
e8f7ee688a
|
refactor: merge v1.1
|
2020-07-29 18:41:01 +08:00 |
|
Captain.B
|
f7e59049d7
|
Merge remote-tracking branch 'origin/v1.1' into v1.1
|
2020-07-29 18:39:01 +08:00 |
|
chenjianxing
|
e498b287d8
|
Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1
|
2020-07-29 18:38:46 +08:00 |
|
Captain.B
|
9716376e34
|
refactor(deps): 更新pom使用2.7.8版本的 dubbo plugin
|
2020-07-29 18:38:42 +08:00 |
|
chenjianxing
|
5933e0a27c
|
fix: swagger 导入post请求body格式化
|
2020-07-29 18:38:21 +08:00 |
|
shiziyuan9527
|
cdc790e90d
|
feat(LDAP): LDAP设置中添加对phone字段的属性映射
|
2020-07-29 18:32:05 +08:00 |
|
chenjianxing
|
9ca6055c0f
|
Merge branch 'master' of https://github.com/metersphere/server
|
2020-07-29 18:22:55 +08:00 |
|
chenjianxing
|
3bb35a4452
|
Merge branch 'v1.1'
|
2020-07-29 18:22:05 +08:00 |
|
q4speed
|
67aa2a0585
|
docs: 修改Readme
|
2020-07-29 18:11:58 +08:00 |
|
chenjianxing
|
24a2d357b3
|
Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1
|
2020-07-29 14:09:21 +08:00 |
|
chenjianxing
|
ea60dae2d4
|
fix: postman 导入body异常
|
2020-07-29 14:09:02 +08:00 |
|
chenjianxing
|
ccf90308dd
|
fix: postman 导入body异常
|
2020-07-29 14:08:08 +08:00 |
|
Captain.B
|
2f4561f78c
|
Merge remote-tracking branch 'origin/v1.1' into v1.1
|
2020-07-29 13:41:59 +08:00 |
|
Captain.B
|
999dc8654e
|
refactor: 修改性能测试查询报告状态判断
|
2020-07-29 13:41:31 +08:00 |
|
chenjianxing
|
7528053dd0
|
Merge branch 'v1.1'
|
2020-07-29 13:33:09 +08:00 |
|
chenjianxing
|
df7865bcf0
|
Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1
|
2020-07-29 13:23:53 +08:00 |
|
chenjianxing
|
5b9279b116
|
fix: postman 多级目录导入
|
2020-07-29 13:16:46 +08:00 |
|
Captain.B
|
55be1a7386
|
refactor(deps): 使用中央仓库的 jar
|
2020-07-29 11:24:47 +08:00 |
|
Captain.B
|
81ce9fab91
|
fix: 修复 Thread Iterations Limit 为1的bug
|
2020-07-29 10:40:18 +08:00 |
|
Captain.B
|
f21790e089
|
fix: 修复 mvn clean 没有删除 static 和 templates
|
2020-07-28 20:55:30 +08:00 |
|
chenjianxing
|
f0e3fd22a0
|
Merge branch 'v1.1'
|
2020-07-28 19:16:36 +08:00 |
|
chenjianxing
|
5aca08a677
|
Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1
|
2020-07-28 19:16:15 +08:00 |
|
chenjianxing
|
e181a4867c
|
feat: post 请求支持参数格式化
|
2020-07-28 19:16:00 +08:00 |
|
shiziyuan9527
|
f31ac1b1b6
|
fix(系统设置): 修改sql，根据ID或邮箱查询用户
|
2020-07-28 18:36:06 +08:00 |
|
shiziyuan9527
|
270e816599
|
feat(系统设置): 组织菜单下，一次可以添加多个成员
|
2020-07-28 18:29:25 +08:00 |
|
chenjianxing
|
15798a7726
|
Merge branch 'v1.1'
|
2020-07-28 16:23:08 +08:00 |
|
Captain.B
|
665700d03f
|
feat(deps): 增加actuator实现服务监控
Closes 156
|
2020-07-28 14:35:43 +08:00 |
|
Captain.B
|
ec424af9af
|
refactor(deps): 去掉POM中的slf4j
Closes 155
|
2020-07-28 13:54:27 +08:00 |
|
Captain.B
|
e64ada7ae9
|
fix: 修复不停的输出dubbo日志的问题
|
2020-07-28 13:36:54 +08:00 |
|
shiziyuan9527
|
5bf3f355f5
|
feat: 启用LDAP认证后才显示LDAP登录选项
|
2020-07-27 18:09:34 +08:00 |
|
shiziyuan9527
|
ff9965b2e7
|
feat: 导入用例时，用例所有字段值都相同才判断用例重复
|
2020-07-27 16:42:12 +08:00 |
|
Captain.B
|
492dca961c
|
feat: 优化停止性能测试是否保留报告
|
2020-07-27 13:25:47 +08:00 |
|
Captain.B
|
e6b171a21d
|
fix: 修复不停的输出dubbo日志的问题
|
2020-07-27 12:26:50 +08:00 |
|
chenjianxing
|
10d7441487
|
Merge branch 'master' of https://github.com/metersphere/server
|
2020-07-24 18:24:02 +08:00 |
|
chenjianxing
|
ce2b3e4c98
|
Merge branch 'v1.1'
|
2020-07-24 18:23:18 +08:00 |
|
chenjianxing
|
3841ff55d8
|
Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1
|
2020-07-24 18:22:46 +08:00 |
|
chenjianxing
|
8d389f0298
|
fix: post 参数encoding
|
2020-07-24 18:22:31 +08:00 |
|
wenyann
|
dd39904c5d
|
refactor: 修改方法名；调整条件筛选sql
|
2020-07-24 18:20:15 +08:00 |
|
wenyann
|
404bcff3b7
|
refactor(deps): 调整条件筛选sql
|
2020-07-24 17:48:55 +08:00 |
|
shiziyuan9527
|
56e0415ddb
|
refactor: 简化代码
|
2020-07-24 15:04:38 +08:00 |
|
shiziyuan9527
|
fd8b9b3a1c
|
refactor: 修改判断测试用例是否存在的方法
|
2020-07-24 14:42:16 +08:00 |
|
q4speed
|
f7f8258371
|
refactor: 简化代码
|
2020-07-23 17:39:26 +08:00 |
|
Captain.B
|
ebefc9df76
|
Merge branch 'v1.1'
|
2020-07-23 13:24:11 +08:00 |
|
Captain.B
|
a95d4465f5
|
Merge remote-tracking branch 'origin/v1.1' into v1.1
|
2020-07-23 12:32:56 +08:00 |
|
Captain.B
|
b863e78469
|
refactor: 修改性能测试日志下载flush
|
2020-07-23 12:32:41 +08:00 |
|
chenjianxing
|
c3e54df8bb
|
Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1
|
2020-07-23 11:56:04 +08:00 |
|
chenjianxing
|
fb0653c0f0
|
fix: 插件导入请求头等信息缺失
|
2020-07-23 11:55:42 +08:00 |
|
chenjianxing
|
0e53f0bdd2
|
fix: 插件导入请求头等信息缺失
|
2020-07-23 11:54:35 +08:00 |
|
Captain.B
|
d107be2985
|
refactor: 修改性能测试日志查询的pagesize
|
2020-07-23 11:22:44 +08:00 |
|
chenjianxing
|
fffea1a1da
|
Merge branch 'master' of https://github.com/metersphere/server
|
2020-07-23 10:42:52 +08:00 |
|
chenjianxing
|
896594e9d9
|
Merge branch 'v1.1'
|
2020-07-23 10:42:22 +08:00 |
|
chenjianxing
|
aca349e590
|
erge branch 'v1.1' of https://github.com/metersphere/server into v1.1
|
2020-07-23 10:41:45 +08:00 |
|
chenjianxing
|
354c6afca4
|
fix: URL导入失败
|
2020-07-23 10:41:31 +08:00 |
|
wangzhen-fit2cloud
|
57c02609b8
|
refactor: Merge branch 'v1.1'
|
2020-07-23 10:31:27 +08:00 |
|
Captain.B
|
b5f2afc4f8
|
Merge branch 'v1.1' of github.com:fit2cloudrd/metersphere-server into v1.1
|
2020-07-23 10:26:46 +08:00 |
|
Captain.B
|
bd3ea709b2
|
fix: 修复下载性能测试日志的oom
|
2020-07-23 10:26:39 +08:00 |
|
q4speed
|
344b9f6f77
|
Merge remote-tracking branch 'origin/master'
|
2020-07-23 10:20:56 +08:00 |
|
q4speed
|
b316344788
|
fix(高级查询): 修复部分高级查询报错的bug
|
2020-07-23 10:20:40 +08:00 |
|
chenjianxing
|
55a2a96da3
|
Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1
|
2020-07-23 10:12:53 +08:00 |
|
chenjianxing
|
28a58b7ecf
|
fix: 解决冲突
|
2020-07-23 10:12:15 +08:00 |
|
chenjianxing
|
9d5164ed9f
|
fix: 删除测试时停止任务
|
2020-07-23 10:11:06 +08:00 |
|
Captain.B
|
6107789244
|
Merge remote-tracking branch 'origin/v1.1' into v1.1
|
2020-07-23 10:05:33 +08:00 |
|
Captain.B
|
c517952a20
|
fix: 修复日志查询时的排序
|
2020-07-23 10:05:14 +08:00 |
|
chenjianxing
|
c20e4c4e8c
|
Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1
|
2020-07-23 09:59:09 +08:00 |
|
chenjianxing
|
1637dd53cf
|
fix: 删除测试时删除定时任务
|
2020-07-23 09:58:52 +08:00 |
|
chenjianxing
|
e3e3a166e6
|
fix: 删除测试时删除定时任务
|
2020-07-23 09:57:44 +08:00 |
|
Captain.B
|
50c6cfa4d2
|
style: 格式化代码，优化 import
|
2020-07-23 09:38:19 +08:00 |
|
chenjianxing
|
b877e03e5c
|
Merge branch 'master' of https://github.com/metersphere/server
|
2020-07-23 07:36:59 +08:00 |
|
wenyann
|
0e54e56c20
|
Merge remote-tracking branch 'origin/v1.1' into v1.1
|
2020-07-22 21:26:28 +08:00 |
|
wenyann
|
8bb657c28e
|
fix: 修改导出用例请求方法
|
2020-07-22 21:26:03 +08:00 |
|
wangzhen-fit2cloud
|
b0e02f2b50
|
refactor: 修改版本号为 1.1
|
2020-07-22 19:43:15 +08:00 |
|
wangzhen-fit2cloud
|
aea6d2a438
|
refactor: Merge branch 'v1.1'
|
2020-07-22 19:13:39 +08:00 |
|
Captain.B
|
2e05128188
|
Merge branch 'v1.1' of github.com:fit2cloudrd/metersphere-server into v1.1
|
2020-07-22 19:07:56 +08:00 |
|
Captain.B
|
59cd84efa2
|
fix: 修复下载性能测试日志的oom
|
2020-07-22 19:07:40 +08:00 |
|
q4speed
|
78ccfcd99b
|
Merge remote-tracking branch 'origin/master'
|
2020-07-22 17:52:37 +08:00 |
|
q4speed
|
473cbe8274
|
fix(高级查询): 修复高级查询执行查询操作后不能保留查询条件的bug
|
2020-07-22 17:52:23 +08:00 |
|
chenjianxing
|
af03676879
|
Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1
|
2020-07-22 17:00:31 +08:00 |
|
chenjianxing
|
9846a364b6
|
fix: 导入插件文件
|
2020-07-22 17:00:08 +08:00 |
|
Captain.B
|
90489ae2a3
|
fix: 修复下载性能测试日志的排序问题
|
2020-07-22 16:16:59 +08:00 |
|
shiziyuan9527
|
2660ebb975
|
Merge branch 'v1.1'
# Conflicts:
# backend/src/main/java/io/metersphere/api/service/APITestService.java
|
2020-07-22 15:56:40 +08:00 |
|
Captain.B
|
c3176d1a6e
|
Merge remote-tracking branch 'origin/v1.1' into v1.1
|
2020-07-22 13:58:12 +08:00 |
|
Captain.B
|
1f09dbb24a
|
refactor: 调整session过期时间为可配置，默认1800s
|
2020-07-22 13:57:53 +08:00 |
|
chenjianxing
|
451f7311bf
|
fix: 解决冲突
|
2020-07-22 13:38:31 +08:00 |
|
chenjianxing
|
d1f2251536
|
refactor: swagger 增加url导入
|
2020-07-22 13:36:49 +08:00 |
|
Captain.B
|
23351a71e2
|
feat: 增加测试用例和测试计划的高级搜索
|
2020-07-22 13:22:54 +08:00 |
|
q4speed
|
fc278e6bf7
|
fix(接口测试): 使用Dubbo常量
|
2020-07-22 12:26:49 +08:00 |
|
q4speed
|
7365355d8e
|
fix(接口测试): 修复interface重复bug
|
2020-07-22 12:22:29 +08:00 |
|
shiziyuan9527
|
0b1a0964d1
|
Merge branch 'v1.1' of https://github.com/metersphere/metersphere into v1.1
|
2020-07-22 11:35:30 +08:00 |
|
shiziyuan9527
|
ffd4ae427d
|
fix: LDAP支持邮箱登录
|
2020-07-22 11:35:19 +08:00 |
|
chenjianxing
|
a4cad32132
|
Merge branch 'v1.1'
|
2020-07-22 00:06:56 +08:00 |
|
chenjianxing
|
c075308efc
|
fix: 解决Github仓库冲突
|
2020-07-22 00:06:21 +08:00 |
|
chenjianxing
|
bac8f3215e
|
refactor: merge v1.1
|
2020-07-22 00:04:16 +08:00 |
|
chenjianxing
|
f62c6bdb4e
|
refactor: 修改报告图表顺序
|
2020-07-21 23:54:03 +08:00 |
|
chenjianxing
|
feeebf7205
|
fix: 模块重名校验
|
2020-07-21 22:08:30 +08:00 |
|
chenjianxing
|
4eeede9322
|
Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1
|
2020-07-21 20:09:29 +08:00 |
|
chenjianxing
|
43f9f190f7
|
fix: postman 导入GET请求报错
|
2020-07-21 19:16:52 +08:00 |
|
Captain.B
|
d60dc04648
|
refactor: 修改容器停止失败的提示
|
2020-07-21 18:41:44 +08:00 |
|
q4speed
|
1db793a11b
|
fix(接口测试):
场景的Dubbo配置自动赋值给空的请求配置;
Interface配置中提供getProviderList功能
|
2020-07-21 17:49:08 +08:00 |
|
Captain.B
|
b196e88014
|
Merge remote-tracking branch 'origin/v1.1' into v1.1
|
2020-07-21 14:55:29 +08:00 |
|
Captain.B
|
9a5c02827b
|
feat: 增加测试用例和测试计划的高级搜索
|
2020-07-21 14:53:42 +08:00 |
|
shiziyuan9527
|
7bd9f429c2
|
fix: 系统菜单用户列表能修改LDAP来源用户的密码
|
2020-07-21 13:52:12 +08:00 |
|
shiziyuan9527
|
f29dfbf018
|
fix: 接口权限
|
2020-07-21 13:27:12 +08:00 |
|
Captain.B
|
6ece43e71b
|
refactor(deps): 采用外部的dubbo插件
|
2020-07-21 11:50:11 +08:00 |
|
Captain.B
|
2ca4d75916
|
refactor(deps): 采用外部的dubbo插件
|
2020-07-21 11:48:54 +08:00 |
|
q4speed
|
382087086f
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# backend/src/main/java/io/metersphere/api/parse/ApiImportAbstractParser.java
|
2020-07-21 11:37:21 +08:00 |
|
q4speed
|
390384c6a4
|
feat(接口测试): 增加Dubbo支持
|
2020-07-21 11:34:30 +08:00 |
|
Captain.B
|
ebe0fdf2d9
|
fix: 修复user-keys-controller没加权限的问题
|
2020-07-21 11:09:06 +08:00 |
|
Captain.B
|
1f4dc99864
|
fix: 修复session到期之后测试计划，测试用例与模块不对应
|
2020-07-21 11:05:50 +08:00 |
|
Captain.B
|
801ee5edd5
|
fix: 修改系统参数只允许系统管理员操作
|
2020-07-21 10:41:01 +08:00 |
|
Captain.B
|
52b0b93510
|
fix: 修改初始化数据的时间戳
|
2020-07-21 10:37:41 +08:00 |
|
Captain.B
|
4262a1833a
|
fix: 修改系统参数只允许系统管理员操作
|
2020-07-21 10:26:51 +08:00 |
|
wenyann
|
9ca7fdf576
|
Merge remote-tracking branch 'origin/v1.1' into v1.1
|
2020-07-21 10:16:35 +08:00 |
|
wenyann
|
e4cb8647d5
|
fix: 1.导入用例维护人信息错误 2关联用例后更新用例优先级
3系统参数默认显示错误
|
2020-07-21 10:15:47 +08:00 |
|
chenjianxing
|
2a5eea722e
|
Merge branch 'v1.1'
|
2020-07-21 01:57:02 +08:00 |
|
chenjianxing
|
c41a29e863
|
fix: 环境保存请求头变量失败
|
2020-07-21 01:03:11 +08:00 |
|
Captain.B
|
9535758d0d
|
fix: 修复停止性能测试的时候无法关闭socket造成空指针的错误
|
2020-07-20 14:32:46 +08:00 |
|
Captain.B
|
0edc40b09e
|
refactor: 设置restTemplateWithTimeout 超时时间10s
|
2020-07-20 14:13:59 +08:00 |
|
shiziyuan9527
|
ca11d787c7
|
refactor: 修改sql
|
2020-07-20 13:50:12 +08:00 |
AgAngle
|
e24ab7a2ad
|
refactor: 优化定时任务页面
|
2020-07-19 16:17:16 +08:00 |
|
chenjianxing
|
f20c9ca591
|
Merge branch 'master' of https://github.com/metersphere/server
|
2020-07-17 18:26:00 +08:00 |
|
chenjianxing
|
985385aba2
|
refactor: 优化接口测试导入
|
2020-07-17 18:25:09 +08:00 |
|
Captain.B
|
27990fdacc
|
refactor: 去掉无用的接口
|
2020-07-17 16:56:24 +08:00 |
|
wenyann
|
7c04bf4ca5
|
Merge remote-tracking branch 'origin/master'
|
2020-07-17 15:38:14 +08:00 |
|
Captain.B
|
2850017733
|
refactor: 记录容器停止失败的日志，并返回报错信息
|
2020-07-17 15:32:54 +08:00 |
|
wenyann
|
9e0653947c
|
Merge branch 'v1.0'
|
2020-07-17 14:42:02 +08:00 |
|
wenyann
|
cf216d1d84
|
Merge remote-tracking branch 'origin/master'
|
2020-07-17 14:05:56 +08:00 |
|
wenyann
|
b5dc9ff8ff
|
fix: 导入导出图标交换，jenkins按计划查询，模块全部查询
|
2020-07-17 14:05:19 +08:00 |
|
shiziyuan9527
|
8312f13a66
|
Merge branch 'master' of https://github.com/metersphere/metersphere
|
2020-07-17 13:57:05 +08:00 |
|
shiziyuan9527
|
95abc82d44
|
fix: 测试计划编辑用例时因为用例关联的测试不存在而产生的bug
|
2020-07-17 13:54:28 +08:00 |
|
Captain.B
|
e15ad8f025
|
feat: 增加cacos作为dubbo的注册中心
|
2020-07-17 11:18:46 +08:00 |
|
Captain.B
|
142a1fb748
|
refactor: 优化容器停止失败的提示
|
2020-07-17 10:28:51 +08:00 |
|
Captain.B
|
430b1e9fca
|
Merge branch 'master' of github.com:fit2cloudrd/metersphere-server
|
2020-07-17 10:19:40 +08:00 |
|
Captain.B
|
1b89890016
|
feat: 增加查询 dubbo 接口的方法
|
2020-07-17 10:17:47 +08:00 |
|
chenjianxing
|
d830cc85db
|
fix: postman 导入body格式
|
2020-07-17 09:34:39 +08:00 |
|
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 |