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 |