test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
4,110 Commits 40 Branches 167 Tags 406 MiB
Commit Graph

2026 Commits

Author SHA1 Message Date
wenyann fcfc7a2615 feat: 设置默认值 2020-10-30 10:35:09 +08:00
chenjianxing b2c03a4bde fix: flyway 文件版本冲突 2020-10-30 09:42:42 +08:00
chenjianxing 36bcea6ca6 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-29 20:54:42 +08:00
chenjianxing aa4ba14780 Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-29 20:53:19 +08:00
chenjianxing 3927da1d02 refactor(接口测试): 测试报告格式化优化 2020-10-29 20:52:16 +08:00
shiziyuan9527 af295a9fd8 refactor: flyway 2020-10-29 18:43:29 +08:00
wenyann 12387c9253 feat: 消息设置内容修改 2020-10-29 18:35:07 +08:00
shiziyuan9527 08183e425e Merge branch 'tree-sort' 2020-10-29 18:30:46 +08:00
shiziyuan9527 25d62b6397 feat(测试跟踪): 测试用例同级模块排序 2020-10-29 18:16:35 +08:00
wenyann 9b07c26e05 Merge remote-tracking branch 'origin/v1.4' into v1.4 2020-10-29 17:40:04 +08:00
wenyann 2fd79fdd5c feat: 消息设置内容修改，排序 2020-10-29 17:39:38 +08:00
Captain.B 4a855be014 refactor: 启动失败清理任务 2020-10-29 15:04:48 +08:00
Captain.B 8300285c8b refactor: 去掉不用的import 2020-10-29 14:21:39 +08:00
Captain.B 32fff6a239 refactor: 修改字段长度 2020-10-29 09:35:30 +08:00
chenjianxing aa0a7bfa20 fix: 修复消息通知sql脚本版本 2020-10-28 19:34:12 +08:00
wenyann 753b9da5c1 Merge remote-tracking branch 'origin/v1.4' into v1.4 2020-10-28 18:54:37 +08:00
wenyann 55d41d50a2 feat: 消息设置性能测试 2020-10-28 18:54:02 +08:00
q4speed 9be3a0370c Merge remote-tracking branch 'origin/v1.4' into v1.4 
# Conflicts:
#	frontend/src/business/components/api/test/components/assertion/ApiAssertions.vue
#	frontend/src/business/components/api/test/model/ScenarioModel.js
#	frontend/src/i18n/en-US.js
#	frontend/src/i18n/zh-CN.js
#	frontend/src/i18n/zh-TW.js
 2020-10-28 17:30:19 +08:00
q4speed b7af640080 feat(接口测试): 增加脚本断言 2020-10-28 17:25:41 +08:00
shiziyuan9527 5b305a288a fix(用例评审): 用例评审列表用户ID修改为用户名 2020-10-28 17:05:23 +08:00
Captain.B baa5b09b0d feat(性能测试): 性能测试error统计 2020-10-28 16:42:19 +08:00
Captain.B 20e7b04d5b fix: 修复改了资源池之后资源池ID变了的问题 2020-10-28 12:33:57 +08:00
Captain.B 9a34a5f27f fix: 修复改了资源池之后资源池ID变了的问题 2020-10-28 12:19:19 +08:00
Captain.B d26c05a306 feat: 测试计划用例列表高级搜索中增加按执行人搜索 2020-10-28 10:37:01 +08:00
chenjianxing 319b54ca7e fix(测试跟踪): 测试用例导出报错 2020-10-28 09:58:48 +08:00
chenjianxing 4dfc963c40 Merge branch 'v1.4' 2020-10-27 23:47:44 +08:00
chenjianxing c63327397a Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-27 23:47:00 +08:00
chenjianxing 72006d16f0 fix(测试跟踪): 解决旧版本保存用例导出报错 2020-10-27 23:45:53 +08:00
Captain.B f119fe08d1 Merge branch 'v1.4' into master 2020-10-27 17:55:05 +08:00
Captain.B c16bc0ca8e feat(LDAP): 支持LDAPS, 区分ldap和ldaps 2020-10-27 17:53:48 +08:00
Captain.B d55a2605cf Merge branch 'v1.4' into master 2020-10-27 17:45:06 +08:00
Captain.B 8988059e54 feat(LDAP): 支持LDAPS 2020-10-27 17:43:50 +08:00
Captain.B 32f130c05e Merge branch 'v1.4' into master 2020-10-27 13:26:00 +08:00
fit2-zhao f239183989 Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-27 11:44:32 +08:00
fit2-zhao 200c397950 feat(测试跟踪): 添加索引 2020-10-27 11:29:05 +08:00
shiziyuan9527 7add174a32 feat(测试跟踪): 用例评审评论支持编辑和删除 2020-10-27 11:26:34 +08:00
chenjianxing 32771d7c6e Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-26 19:12:58 +08:00
chenjianxing 8efda5ef5e refactor(接口测试): 优化jsonpath推荐 2020-10-26 19:12:46 +08:00
Captain.B 04d10717de Merge branch 'v1.4' into master 2020-10-26 17:49:42 +08:00
wenyann d9db503bb3 Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-26 17:13:11 +08:00
wenyann 6b5361f8b2 fix(消息设置):性能测试通知 2020-10-26 17:12:50 +08:00
chenjianxing acdca004f5 merge origin 2020-10-26 14:36:49 +08:00
chenjianxing fd962b2c1d fix(接口测试): TCP请求导入报错 2020-10-26 14:32:39 +08:00
Captain.B da55ae6ca3 Merge branch 'v1.4' into master 2020-10-26 14:22:24 +08:00
Captain.B d5e635d872 fix: 修复logback中的sql日志无法配置的问题 2020-10-26 14:21:29 +08:00
Captain.B a186fda880 Merge branch 'v1.4' into master 2020-10-26 13:51:40 +08:00
chenjianxing 42ef1bcc89 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-26 11:34:46 +08:00
pencui 712de81915
新增http请求，jsonpath断言批量功能 (#599) 
* 新增jsonpath断言批量推荐功能

* 修复xpack下错误的代码结构

* 补正改版后的jsonpath解析功能

Co-authored-by: root <root@localhost.localdomain>
 2020-10-26 11:33:36 +08:00
chenjianxing 76455e54a5 refactor(接口测试): swagger 导入请求名称使用Summary 2020-10-26 10:57:04 +08:00
wenyann bc07ab7a98 feat: 消息设置测试计划时间处理 2020-10-23 18:30:37 +08:00
Captain.B e095691cdb fix: 测试计划任务通知接收人列表会变成英文 2020-10-23 16:46:30 +08:00
Captain.B 9b3b8739eb Merge branch 'v1.4' into master 2020-10-23 15:24:11 +08:00
Captain.B 868ab546ef refactor: 禁用用户之后剔除用户 2020-10-23 15:23:41 +08:00
wenyann 10b258a9b0 fix(消息设置):消息设置修改 2020-10-23 14:52:53 +08:00
Captain.B 54c198ab8e Merge branch 'master' into v1.4 2020-10-23 14:26:46 +08:00
Captain.B fb2c45f1e4 refactor: 本地开发控制台打印sql日志 
修改 /opt/metersphere/conf/metershpere.properties 添加
logging.sql.level=debug
 2020-10-23 14:00:32 +08:00
wenyann f64d7a21b0 Merge remote-tracking branch 'origin/master' 2020-10-23 14:00:03 +08:00
wenyann 056ea0aea1 fix(消息设置):消息设置人员范围 2020-10-23 13:48:24 +08:00
Captain.B 1485bb069d Merge branch 'v1.4' into master 2020-10-23 13:35:38 +08:00
Captain.B 70602c9d95 fix: 去掉sql上的分号 2020-10-23 13:35:00 +08:00
chenjianxing 4b7a42d2e8 Merge branch 'v1.4' of https://github.com/metersphere/metersphere into v1.4 2020-10-23 12:47:24 +08:00
chenjianxing 196bcec3bf fix(接口测试): 引用复制场景保存测试报错 2020-10-23 12:47:06 +08:00
wenyann 2c839b0d61 feat: 消息设置 2020-10-23 11:25:18 +08:00
wenyann e59926abee Merge branch 'v1.4' 2020-10-23 11:23:01 +08:00
wenyann 25e9bff303 feat: 消息设置 2020-10-23 11:20:51 +08:00
fit2-zhao 6f1f3c8901 fix(XPack): 恢复误提交内容 2020-10-23 11:13:45 +08:00
wenyann e367075c58 fix(消息设置): 消息设置 2020-10-23 09:55:22 +08:00
wenyann 0a3e0574da fix(消息设置): 消息设置 2020-10-23 09:55:04 +08:00
chenjianxing 709a18697d Merge branch 'master' of https://github.com/metersphere/server 2020-10-22 18:19:33 +08:00
chenjianxing b4fd4dc910 refactor(接口测试): 修改请求参数、请求内容名称 2020-10-22 18:19:23 +08:00
Captain.B 633bfd3e12 refactor: 检查 userIds 是否为空 2020-10-22 17:59:56 +08:00
Captain.B dd8d52a32d Merge remote-tracking branch 'origin/master' into master 2020-10-22 17:53:49 +08:00
Captain.B ba0bc4dded refactor: 发送消息通知使用非事务方式, 声明写在类上面 2020-10-22 17:53:02 +08:00
shiziyuan9527 6e4a8f1ab4 fix: 修复评审的发起人不能关联用例的问题 2020-10-22 17:21:52 +08:00
Captain.B badbe8eda0 refactor: 发送消息通知使用非事务方式 2020-10-22 15:23:52 +08:00
shiziyuan9527 318383afea Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-22 15:02:18 +08:00
shiziyuan9527 5bde8dfef4 fix: 修复创建测试计划失败的问题 2020-10-22 15:01:44 +08:00
chenjianxing b1baa5d493 Merge branch 'v1.4' of https://github.com/metersphere/server into v1.4 2020-10-22 14:16:27 +08:00
chenjianxing ee56ab2750 fix(接口测试): 解决支持jar包后无法加载部分类的问题 2020-10-22 14:16:07 +08:00
wenyann dd5ee58e28 Merge remote-tracking branch 'origin/v1.4' into v1.4 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
 2020-10-22 10:21:46 +08:00
wenyann b5db4991e4 feat: 消息设置 2020-10-22 10:13:26 +08:00
chenjianxing 038ae06c45 fix: 只读用户点测试跟踪自动跳转 2020-10-22 10:07:36 +08:00
chenjianxing 935ad0f4f0 fix(接口测试): 修复误删代码 2020-10-22 09:43:39 +08:00
shiziyuan9527 040b10c2f5 fix(测试跟踪): 修复复制测试用例时附件未复制的问题 2020-10-21 21:36:25 +08:00
Captain.B 0d6d47091d Merge branch 'v1.4' into master 2020-10-21 20:49:04 +08:00
Captain.B 2fc8e96219 fix(测试计划): 修复测试计划高级搜索 SQL 报错 2020-10-21 20:47:44 +08:00
chenjianxing 8c22317947 refactor: 删除无用代码 2020-10-21 19:47:37 +08:00
fit2-zhao 2d5982aac6 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-21 18:29:56 +08:00
fit2-zhao 892fcdebe4 fix(测试跟踪): xmind 2020 版本 导入异常修复 2020-10-21 18:29:40 +08:00
chenjianxing 4a07f74706 Merge branch 'master' of https://github.com/metersphere/server 2020-10-21 18:26:09 +08:00
chenjianxing 71a54ba8bf fix(性能测试): 全选后切换显示数量后批量删除报错 2020-10-21 18:26:00 +08:00
Captain.B 005cdc9eb5 Merge branch 'master' into v1.4 2020-10-21 17:15:39 +08:00
Captain.B 01e19e4baa Merge remote-tracking branch 'origin/v1.4' into v1.4 2020-10-21 16:15:35 +08:00
Captain.B 92ab3f7ba3 fix(性能测试): 测试计划高级搜索 SQL 报错 2020-10-21 16:15:12 +08:00
BugKing 7c2d0dd8af Merge branch 'master' into v1.4 2020-10-21 16:04:46 +08:00
shiziyuan9527 fe1bea3316 feat(测试跟踪): 用例相关的计划和评审中展示附件列表 2020-10-21 16:04:41 +08:00
fit2-zhao c29dc84782 fix(测试跟踪): 修复关联用例列表显示缺陷 2020-10-21 15:53:34 +08:00
chenjianxing 0b6ee308eb refactor(测试跟踪): 模块树最大深度8层 2020-10-21 14:40:42 +08:00
chenjianxing 42d3e2098b Merge branch 'master' of https://github.com/metersphere/server 2020-10-21 14:32:42 +08:00
chenjianxing 6daec8eff0 fix(接口测试): 加载jar包 2020-10-21 14:32:22 +08:00
shiziyuan9527 49bd060cad refactor(测试跟踪): 测试用例附件的修改时间改为上传时间 2020-10-21 13:41:09 +08:00
q4speed 4b1b420f33 refactor(接口测试): 优化代码 2020-10-21 10:42:11 +08:00
Captain.B 17d060d279 Merge branch 'master' into v1.4 2020-10-21 10:25:53 +08:00
chenjianxing 8f4460a880 refactor: 回退jar包部分代码 2020-10-21 10:21:32 +08:00
Captain.B 2b99693b3f refactor: 调整flyway 2020-10-21 09:43:52 +08:00
Captain.B 40d217b75b refactor: 调整flyway 2020-10-21 09:41:53 +08:00
Captain.B 869a4a315e Merge branch 'master' into v1.4 2020-10-21 09:26:06 +08:00
wenyann e35a400bb0 Merge remote-tracking branch 'origin/master' 2020-10-21 00:10:19 +08:00
wenyann b38fbf034e feat: 消息设置 2020-10-21 00:09:23 +08:00
q4speed eeab90cb50 refactor(接口测试): 优化报告 2020-10-20 18:31:20 +08:00
q4speed 5fe7786d2e Merge remote-tracking branch 'origin/master' 2020-10-20 18:30:30 +08:00
q4speed 2c9daecf13 fix(接口测试): 修复TCP测试报告显示bug 2020-10-20 18:28:18 +08:00
fit2-zhao 0616c483b0 refactor(测试跟踪): 提示消息优化 2020-10-20 17:55:12 +08:00
fit2-zhao f6f533f9bf refactor(测试跟踪): 删除冗余方法 2020-10-20 17:48:51 +08:00
fit2-zhao fa95095110 refactor(测试跟踪): 重命名Util 2020-10-20 17:45:45 +08:00
fit2-zhao fd0ee661a5 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-20 17:41:21 +08:00
fit2-zhao 6ee4ca0921 refactor(测试跟踪): 导入用例提示消息优化，按照类型进行划分 2020-10-20 17:41:06 +08:00
shiziyuan9527 fd77afcfc6 feat(测试跟踪): 测试用例附件预览 2020-10-20 16:59:27 +08:00
BugKing 144803a8c2 refactor: 更改版本号 2020-10-20 16:50:16 +08:00
chenjianxing 8dad580a6a Merge branch 'master' of https://github.com/metersphere/server 2020-10-20 16:48:45 +08:00
chenjianxing 510850db51 feat(接口测试): 支持提取多个值 2020-10-20 16:48:37 +08:00
fit2-zhao c44b72e5fa fix(测试跟踪): 修复选中关联单个模块用例实际上关联整个项目的用例缺陷 2020-10-20 14:44:07 +08:00
fit2-zhao 51e67a0b3c Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-20 14:19:35 +08:00
fit2-zhao 7c2254830f refactor(测试跟踪): 案例加载优化子查询 2020-10-20 14:19:26 +08:00
chenjianxing 1c9050d833 fix: 解决冲突 2020-10-20 13:11:10 +08:00
chenjianxing 764567d5f8 refactor(接口测试): 删除无用代码 2020-10-20 12:58:00 +08:00
chenjianxing bd43116ff4 feat(接口测试): 上传jar包 2020-10-20 12:54:09 +08:00
chenjianxing 9a009dbf28 feat(接口测试): 上传jar包 2020-10-20 12:53:09 +08:00
wenyann 736d46c983 Merge remote-tracking branch 'origin/master' 2020-10-20 10:34:58 +08:00
wenyann 87f53cbebf feat: 消息设置 2020-10-20 10:34:31 +08:00
Captain.B 47f3cd1397 refactor: 调整flyway 2020-10-20 10:02:47 +08:00
wenyann f872fb6692 Merge remote-tracking branch 'origin/master' 2020-10-19 18:49:27 +08:00
wenyann 1b4047386e feat: 消息设置 2020-10-19 18:48:56 +08:00
fit2-zhao 07c108f85a Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-19 17:55:56 +08:00
fit2-zhao f64e4e7b32 style(测试跟踪): 新增方法注释规范 2020-10-19 17:55:50 +08:00
shiziyuan9527 24217c96c8 feat(测试跟踪): 用例评审页面标明评审结果 2020-10-19 17:30:15 +08:00
fit2-zhao fdcb58c6e3 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-19 16:52:33 +08:00
fit2-zhao fc6fb5eafb fix(测试跟踪): 修复导入案例类型和优先级校验问题 2020-10-19 16:52:25 +08:00
wenyann dd86a0f53a fix:修复预览详情格式，添加message表字段 2020-10-19 15:44:43 +08:00
shiziyuan9527 9b7ca67649 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-19 14:03:07 +08:00
shiziyuan9527 d1fa9ca32a fix(测试跟踪): 修复测试用例上传附件报错的问题 2020-10-19 14:02:06 +08:00
Captain.B d2b1473c71 refactor: 去掉message_task中的username字段，字段名以下划线分割 2020-10-19 13:17:31 +08:00
q4speed ff5a52d966 Merge remote-tracking branch 'origin/master' 2020-10-19 13:00:30 +08:00
q4speed fb224d2289 feat(接口测试): 断言增加忽略状态 2020-10-19 12:59:29 +08:00
wenyann 49c5b0f342 feat: 性能测试报告字段优化 2020-10-19 12:30:16 +08:00
wenyann eccbaa639d Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
 2020-10-19 12:28:55 +08:00
wenyann d838073c59 feat: 性能测试报告字段优化 2020-10-19 12:27:03 +08:00
Captain.B 8a31d89503 fix(测试跟踪): 用例评审，评审人显示null 2020-10-19 12:18:50 +08:00
Captain.B db44972ac3 fix(测试跟踪): 修复测试用例-操作-编辑-保存，报500 2020-10-19 11:54:52 +08:00
fit2-zhao af127e45fe Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-19 10:49:52 +08:00
fit2-zhao 70cfa135c6 fix(测试跟踪): 修复导入提示语问题 2020-10-19 10:49:45 +08:00
q4speed ae474fadd7 feat: 最近的评审改为我最近的评审。 2020-10-16 23:39:41 +08:00
wenyann f18c55b67f Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-16 15:58:58 +08:00
wenyann 1169f46fac feat: 前置条件字符长度限制 2020-10-16 15:51:55 +08:00
fit2-zhao ce90cf9cb5 fix(测试跟踪): 修复用例关联全部问题 2020-10-16 14:28:17 +08:00
wenyann ce222275fb Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-16 14:25:41 +08:00
wenyann 07dea85f7c feat: 消息设置 2020-10-16 14:25:24 +08:00
fit2-zhao cbf2b89742 Merge branch 'master' of https://github.com/metersphere/metersphere 
# Conflicts:
#	frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue
 2020-10-15 18:22:27 +08:00
fit2-zhao b4af198897 refactor(测试跟踪): 测试计划，用例评审 两处关联测试用例一次加载全部优化 2020-10-15 18:08:41 +08:00
chenjianxing b21c799ba2 feat(接口测试): jar包管理 2020-10-15 17:37:49 +08:00
fit2-zhao 92122e0546 refactor(测试跟踪): 关联测试用例一次加载全部优化 2020-10-14 18:56:27 +08:00
shiziyuan9527 8ce89cf4a7 feat(测试跟踪): 测试用例上传附件 2020-10-14 17:53:43 +08:00
chenjianxing 69a29e2c0f fix(接口测试): 断言失败显示成功 2020-10-14 17:45:40 +08:00
chenjianxing 16506bee0a feat(接口测试): 添加数据库连接性检测 2020-10-14 16:39:39 +08:00
chenjianxing cccb100ed0 refactor(接口测试): sql 添加自定义变量 2020-10-14 14:37:49 +08:00
chenjianxing ad0dcbaa74 Merge branch 'master' of https://github.com/metersphere/server 2020-10-14 12:41:00 +08:00
fit2-zhao a02cb2cc46 fix(接口测试): 导入用例名称长度保护 2020-10-14 11:44:12 +08:00
chenjianxing 08b973c03e refactor(接口测试): POST 支持 multipart/form-data 2020-10-14 10:55:52 +08:00
chenjianxing bc59848dec Merge branch 'master' of https://github.com/metersphere/server 2020-10-13 19:26:15 +08:00
chenjianxing 5d81523f52 Merge branch 'v1.3' 2020-10-13 19:24:59 +08:00
shiziyuan9527 d11f0363c5 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-13 17:58:16 +08:00
shiziyuan9527 7b69e810ef refactor(测试跟踪): 重构缺陷管理部分的代码 2020-10-13 17:55:08 +08:00
chenjianxing 782f32ce8e fix(接口测试): 一键执行文件上传接口报错 2020-10-13 17:44:52 +08:00
Captain.B 0e23dbd564 Merge remote-tracking branch 'origin/master' into master 2020-10-13 17:17:57 +08:00
Captain.B a262c03e53 feat(测试跟踪): 测试计划-执行人可筛选 2020-10-13 17:17:31 +08:00
chenjianxing 1abf0de61e Merge branch 'v1.3' 2020-10-13 15:49:05 +08:00
chenjianxing 971bc350bd fix(接口测试): 无法导入内置python包 2020-10-13 14:10:58 +08:00
q4speed fea3738797 Merge remote-tracking branch 'origin/master' 2020-10-12 17:39:35 +08:00
q4speed 7fdb637948 refactor(接口测试): 补充提交 2020-10-12 17:39:20 +08:00
shiziyuan9527 05c1e619ef fix(测试计划): 修复查询测试计划时出现的数据不一致问题 2020-10-12 17:36:31 +08:00
shiziyuan9527 797c9f0776 feat(测试计划): 测试计划结果为通过时自动跳转到下一用例 2020-10-12 17:35:19 +08:00
chenjianxing f138d0271b Merge branch 'v1.3' 2020-10-12 16:07:26 +08:00
chenjianxing d4c762bfe4 Merge branch 'v1.3' of https://github.com/metersphere/server into v1.3 2020-10-12 16:03:40 +08:00
chenjianxing 9b1ff67b7f fix(接口测试): 测试用例导入表头提示优化 2020-10-12 16:03:17 +08:00
wenyann e4dde84d15 Merge remote-tracking branch 'origin/v1.3' into v1.3 2020-10-12 13:05:31 +08:00
wenyann a043722a05 fix: 导出测试用例加备注 2020-10-12 13:05:07 +08:00
chenjianxing 70d677c4fc fit(接口测试): 导入测试请求参数未勾选 2020-10-12 11:34:38 +08:00
chenjianxing 47344ab909 Merge branch 'v1.3' of https://github.com/metersphere/server into v1.3 2020-10-12 10:09:44 +08:00
chenjianxing 827d43c4e5 fix(接口测试): swagger导入报错 2020-10-12 10:08:47 +08:00
Captain.B 3e1ca62e62 Merge branch 'v1.3' into master 2020-10-10 17:55:33 +08:00
Captain.B 80fdee00b9 Merge branch 'v1.3' of github.com:metersphere/metersphere into v1.3 2020-10-10 17:51:53 +08:00
Captain.B 4cfaa9a1bb fix: 修复用例表中维护人字段长度不够的bug 
Closes 531
 2020-10-10 17:51:46 +08:00
shiziyuan9527 0a57ff4940 fix: 修复登录用户可以查看其他工作空间的bug 2020-10-10 17:05:19 +08:00
Captain.B bf554738cd refactor: 删除不用的代码 2020-10-10 14:44:37 +08:00
fit2-zhao 06418c23cb refactor(测试跟踪): 静态代码规范调整 2020-10-10 13:57:46 +08:00
fit2-zhao 04b4d7aa8d Merge branch 'v1.3' 2020-10-10 13:24:52 +08:00
fit2-zhao ab6b566cb3 refactor(测试跟踪): 统一变量,名称规范调整 2020-10-10 12:40:17 +08:00
fit2-zhao 534383b8f8 Merge branch 'v1.3' of https://github.com/metersphere/metersphere into v1.3 2020-10-10 11:32:23 +08:00
fit2-zhao 956358e3b0 refactor(测试跟踪): 统一变量 2020-10-10 11:32:05 +08:00
q4speed 6ca14fe393 feat: 最近的测试，用例，计划改为我最近的测试，用例，计划。 2020-10-10 11:13:46 +08:00
shiziyuan9527 42a9074074 Merge remote-tracking branch 'origin/v1.3' into v1.3 2020-10-09 18:40:02 +08:00
shiziyuan9527 e9619aba99 feat: 测试跟踪首页我的评审中添加结果分布列 2020-10-09 18:35:33 +08:00
q4speed af046d0f91 Merge remote-tracking branch 'origin/master' 2020-10-09 18:09:02 +08:00
q4speed 8582a4f04f feat(接口测试): 增加TCP协议的接口测试 2020-10-09 18:08:49 +08:00
fit2-zhao 7833150db9 refactor(测试跟踪): 规范日志输出 2020-10-09 17:32:29 +08:00
fit2-zhao f8d2322386 refactor(测试跟踪): 加强导入校验，有效判断模版合规性 2020-10-09 17:31:12 +08:00
shiziyuan9527 9a0c0857bc feat: 测试评审关联测试用例时增加状态列 2020-10-09 16:29:27 +08:00
Captain.B 446f0cdcde fix: 修复测试计划列表页面，“负责人”应展示成员姓名，非展示成员ID 
Closes 406
 2020-10-09 16:27:37 +08:00
fit2-zhao 021e6b51fa refactor(测试跟踪): 统一导入校验的过程变量 2020-10-09 16:02:54 +08:00
shiziyuan9527 47ed214502 feat: 测试用例增加状态列 2020-10-09 15:49:33 +08:00
fit2-zhao a98717517d Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-09 15:38:00 +08:00
fit2-zhao 6336d33330 fix(接口测试): 支持Dubbo协议和sql 提取值 2020-10-09 15:37:36 +08:00
q4speed 831741c97d refactor: Request改为类，增加公共属性 2020-10-09 13:50:50 +08:00
q4speed 4f3af764d5 Merge remote-tracking branch 'origin/master' 2020-10-09 13:48:53 +08:00
q4speed a3e1ab4653 fix(接口测试): 修复Dubbo重复请求的bug 2020-10-09 13:47:46 +08:00
fit2-zhao 5c83c7136e fix(接口测试): 执行没有返回结果时提取变量保护处理 2020-10-09 10:41:05 +08:00
fit2-zhao 7972c91170 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-10-09 10:40:07 +08:00
Captain.B 0a3a5e2ecc Merge remote-tracking branch 'origin/v1.3' into v1.3 2020-09-30 17:34:16 +08:00
Captain.B fa0841a36b fix: 修复登录用户可以查看其他工作空间的bug 2020-09-30 17:33:49 +08:00
fit2-zhao fd09d77563 Merge branch 'v1.3' of https://github.com/metersphere/metersphere into v1.3 2020-09-30 17:10:35 +08:00
fit2-zhao c64f5847f8 fix(测试跟踪): 修复上传的文件为空时异常 2020-09-30 17:10:16 +08:00
shiziyuan9527 794af4605e fix: 修复个人设置中修改密码失败的问题 2020-09-30 16:24:07 +08:00
shiziyuan9527 81d64b5932 Merge branch 'v1.3' of https://github.com/metersphere/metersphere into v1.3 2020-09-30 11:37:28 +08:00
shiziyuan9527 c671c8a557 fix(用例评审): 修复查询用例评审时会报错的问题 2020-09-30 11:20:54 +08:00
fit2-zhao 8ba24261b6 fix(测试跟踪): 导入xmind支持 自由主题风格/支持多画布 2020-09-30 11:14:01 +08:00
chenjianxing 1c7ce5e20b fix(接口测试): 点击最近项目跳转后菜单栏未激活 2020-09-29 18:54:20 +08:00
fit2-zhao 2b1023b7bb Merge branch 'v1.3' of https://github.com/metersphere/metersphere into v1.3 2020-09-29 18:00:21 +08:00
fit2-zhao a0009de2e6 fix(测试跟踪): 异常格式处理 2020-09-29 18:00:02 +08:00
shiziyuan9527 ee47268c68 feat(测试计划): 测试报告中失败用例支持跳转 2020-09-29 17:32:11 +08:00
chenjianxing 0cf960b7d1 Merge branch 'v1.3' of https://github.com/metersphere/server into v1.3 2020-09-29 17:05:05 +08:00
chenjianxing e2da03f0a3 fix(测试跟踪): 只读用户访问测试跟踪退出登入 2020-09-29 17:04:16 +08:00
fit2-zhao e4a7c2eb34 refactor(测试跟踪): 合并导入所有校验方法 2020-09-29 17:00:58 +08:00
fit2-zhao cb8fb36297 Merge branch 'v1.3' of https://github.com/metersphere/metersphere into v1.3 2020-09-29 16:37:13 +08:00
fit2-zhao 61eaeb45e9 fix(测试跟踪): 导入xmind 模块标题有效性校验 2020-09-29 16:36:59 +08:00
wenyann bd13c3ccb1 fix: 性能测试报告链接id修改 2020-09-29 16:32:57 +08:00
Captain.B f5036e85c9 fix: 修复删除在线用户之后用户还能操作的问题 2020-09-29 15:48:14 +08:00
Captain.B 81c8c5c15e Merge branch 'v1.3' into temp 2020-09-29 13:46:30 +08:00
Captain.B e247248652 fix: 修复重复打开outputstream的问题 2020-09-29 13:45:45 +08:00
Captain.B 19a70d6e1a refactor: 暂时回退到 jetty 2020-09-29 11:56:12 +08:00
Captain.B 948f6fc9d2 refactor: 尝试解决jetty后台报错的问题 2020-09-29 10:46:02 +08:00
Captain.B 08a0408b5f Merge remote-tracking branch 'origin/v1.3' into v1.3 2020-09-29 10:23:25 +08:00
Captain.B 436914947b refactor: 继续重构通知部分 2020-09-29 10:21:55 +08:00
chenjianxing 2659818d95 merge v1.3 2020-09-29 10:05:54 +08:00
fit2-zhao 2e70bab362 style(接口测试): 去除多余import 2020-09-28 15:43:41 +08:00
fit2-zhao bc94f1cedb fix(接口测试): 保持线程变量的生命周期一致性 2020-09-28 15:41:38 +08:00
shiziyuan9527 d95ded1f38 refactor: i18n 2020-09-28 15:04:31 +08:00
fit2-zhao ce7eb2391e Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-28 15:02:21 +08:00
fit2-zhao abcd4b299b refactor(接口测试): 重写提取方法 2020-09-28 15:02:12 +08:00
chenjianxing 3ca92d1a9c fix(测试跟踪): 测试计划开始结束时间无法修改 2020-09-28 11:59:12 +08:00
fit2-zhao 34a0f005f3 fix(接口测试): 完善提取功能 2020-09-28 10:48:05 +08:00
fit2-zhao ccd209880f Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-28 10:46:49 +08:00
wenyann 39f1d77464 fix:评审内容修改 2020-09-27 21:02:12 +08:00
chenjianxing 20b88800e0 merge origin 2020-09-27 20:36:54 +08:00
chenjianxing 7e97818cf2 Merge branch 'v1.3' of https://github.com/metersphere/server into v1.3 2020-09-27 20:35:37 +08:00
chenjianxing 8770ed47f9 fix(测试跟踪): 用例导入导出国际化问题 2020-09-27 20:35:24 +08:00
fit2-zhao 5f8c7ef45d fix(接口测试): 修复提取变量相关问题 2020-09-27 19:42:13 +08:00
shiziyuan9527 95293a7377 Merge branch 'v1.3' of https://github.com/metersphere/metersphere into v1.3 2020-09-27 18:43:44 +08:00
shiziyuan9527 5e8e533c93 refactor(用例评审): 修改多选样式 2020-09-27 18:43:24 +08:00
Captain.B 6b53db6a7e Merge branch 'v1.3' of github.com:metersphere/metersphere into v1.3 2020-09-27 18:14:27 +08:00
Captain.B d44cc8d16e refactor: 使用StringUtils对比字符串 2020-09-27 18:14:19 +08:00
fit2-zhao a934214100 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-27 18:03:02 +08:00
fit2-zhao 7bccd9f502 fix(测试跟踪): 修复未能导入没有用例的空模块问题 2020-09-27 18:00:34 +08:00
fit2-zhao 3ab95127c1 refactor(接口测试): 重构提取方法 2020-09-27 17:08:16 +08:00
wenyann 977182a193 Merge remote-tracking branch 'origin/v1.3' into v1.3 2020-09-27 16:47:22 +08:00
wenyann 6916b376d0 fix: 链接类型修改 2020-09-27 16:47:02 +08:00
chenjianxing 479528d6a7 fix: 解决v1.3.0升级报错 2020-09-27 16:07:41 +08:00
chenjianxing 02cffc3447 Merge branch 'v1.3' of https://github.com/metersphere/server into v1.3 2020-09-27 15:09:23 +08:00
chenjianxing 85e320910e fix(接口测试): 修复请求头删除报错 2020-09-27 15:09:07 +08:00
Captain.B 7d91d48fa4 refactor: 重构邮件通知部分 2020-09-27 14:57:53 +08:00
Captain.B 6fa096f319 refactor: 重构邮件通知部分 2020-09-27 14:45:57 +08:00
Captain.B ecd95efb6a Merge remote-tracking branch 'origin/v1.3' into v1.3 2020-09-27 14:41:40 +08:00
Captain.B 5ae9f9a2df refactor: 重构邮件通知部分 2020-09-27 14:41:04 +08:00
shiziyuan9527 5927f0fc2b Merge branch 'v1.3' of https://github.com/metersphere/metersphere into v1.3 2020-09-27 14:16:08 +08:00
Captain.B 22b0a423bd fix: 修复notice没有主键及相关问题 2020-09-27 14:14:17 +08:00
shiziyuan9527 b63eef6e87 Merge branch 'v1.3' of https://github.com/metersphere/metersphere into v1.3 2020-09-27 14:10:58 +08:00
fit2-zhao 561ece01e8 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-27 14:10:55 +08:00
fit2-zhao 364c008351 refactor(接口测试): 重构提取内容相关方法 2020-09-27 14:10:47 +08:00
shiziyuan9527 10c9d73b5d fix(测试计划): 修复关闭缺陷时会把缺陷删除的问题 2020-09-27 14:09:44 +08:00
wenyann f3e8667fbf fix: 重构邮箱代码，修复一键运行报错 
(cherry picked from commit 666532bd8c)
 2020-09-27 13:19:11 +08:00
Captain.B 45779f5480 Merge remote-tracking branch 'origin/v1.3' into v1.3 2020-09-27 11:44:18 +08:00
Captain.B 6cc36f69bd refactor: 用户密码字段脱敏 2020-09-27 11:43:59 +08:00
shiziyuan9527 7bca400593 Merge branch 'v1.3' of https://github.com/metersphere/metersphere into v1.3 2020-09-27 11:32:11 +08:00
shiziyuan9527 228bac8277 fix(测试计划): 修复选中一条用例时不显示更多操作按钮的问题 2020-09-27 11:31:44 +08:00
fit2-zhao 6ebac26151 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-27 11:29:26 +08:00
fit2-zhao 3476c93bea feat(接口测试): 添加提取变量的结果数据展示 2020-09-27 11:29:17 +08:00
wenyann d30cb9246a Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-27 11:26:52 +08:00
wenyann 666532bd8c fix: 重构邮箱代码，修复一键运行报错 2020-09-27 11:26:28 +08:00
chenjianxing fa307f8be3 merge master 2020-09-25 20:53:54 +08:00
chenjianxing 5275a708b3 fix(测试跟踪): 关联接口测试报错 2020-09-25 20:39:18 +08:00
q4speed e7f8c25a70 feat(接口测试): 报告里增加请求开始时间 2020-09-25 17:25:13 +08:00
shiziyuan9527 9e8a8d9caf fix(用例评审): 修复用例评审获取评论时会出现的空指针问题 2020-09-25 14:59:45 +08:00
shiziyuan9527 236e572d9b fix(测试计划): 修改测试计划所属项目 2020-09-25 14:46:43 +08:00
Captain.B f7acb158a0 Merge remote-tracking branch 'origin/master' into master 2020-09-25 14:03:23 +08:00
Captain.B cdfadc7091 refactor: 去掉不用的类 2020-09-25 14:03:08 +08:00
chenjianxing 7b69571840 Merge branch 'master' of https://github.com/metersphere/server 2020-09-25 13:59:54 +08:00
chenjianxing 3813cdc120 fix(接口测试): 修复文件上传参数值勾选等问题 2020-09-25 13:59:45 +08:00
wenyann 6edbd5af27 fix: 修改类的位置 2020-09-25 13:13:16 +08:00
wenyann 8cd9371b3d fix: 修复冲突 2020-09-25 11:42:42 +08:00
wenyann b9f4fa628b fix: 修复冲突 2020-09-25 11:40:53 +08:00
wenyann e145abc57e Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
#	backend/src/main/java/io/metersphere/notice/controller/NoticeController.java
#	backend/src/main/java/io/metersphere/notice/service/MailService.java
#	backend/src/main/java/io/metersphere/notice/service/NoticeService.java
 2020-09-25 11:25:35 +08:00
wenyann 761ceaf186 fix: 添加评审和报告链接，增加性能测试通知功能 2020-09-25 11:02:24 +08:00
Captain.B fe019babdf refactor: 发送邮件代码重构 2020-09-25 10:44:01 +08:00
Captain.B c4f1e23291 refactor: 发送邮件代码重构 2020-09-25 10:23:08 +08:00
Captain.B b5ea0a3d50 refactor: 发送邮件代码重构 2020-09-25 10:22:18 +08:00
Captain.B 7c04ac5f92 refactor: 发送邮件代码重构 2020-09-25 10:01:01 +08:00
BugKing cbcc5b0c84 fix(flyway): 修复版本冲突 2020-09-25 09:34:48 +08:00
chenjianxing cc364cf1fc Merge branch 'master' of https://github.com/metersphere/server 2020-09-24 18:42:18 +08:00
chenjianxing 4093f39b58 feat(系统设置): 增加当前站点配置 2020-09-24 18:42:05 +08:00
wenyann 6aa78a33af fix: 修复邮件变量没有替换的问题 2020-09-24 17:54:04 +08:00
BugKing aeccceca76 feat(测试跟踪): 增加测试计划相关flyway 2020-09-24 17:54:04 +08:00
fit2-zhao f9d7e09d1f refactor(测试跟踪): 相关校验进行重构 2020-09-24 17:54:04 +08:00
xuxm 399df44978 update：增加test_plan表插入新增实际字段的逻辑 2020-09-24 17:54:04 +08:00
xuxm 96dc485e77 update：增加test_plan增加字段的定义 2020-09-24 17:54:04 +08:00
xuxm 8da67954ea update：增加test_plan表增加字段的维护 2020-09-24 17:54:04 +08:00
xuxm f0bc93176e update：增加test_plan增加字段的定义 2020-09-24 17:54:04 +08:00
wenyann 5212d4b723 fix: 修复邮件变量没有替换的问题 2020-09-24 17:50:04 +08:00
wenyann 117786310e fix: 修改邮件发送空指针异常 2020-09-24 16:56:35 +08:00
Captain.B 7f28d4b8aa refactor: 发送邮件代码重构 2020-09-24 16:17:55 +08:00
Captain.B e944120624 Merge branch 'temp' into master 2020-09-24 16:12:58 +08:00
Captain.B a3e9059e24 refactor: 发送邮件代码重构 2020-09-24 16:12:16 +08:00
shiziyuan9527 fdb593be58 feat(用例评审): 非用例评审人员不可取消或关联用例 2020-09-24 15:15:38 +08:00
wenyann c04a4049c5 fix: i18n 2020-09-24 11:39:42 +08:00
q4speed b34e279269 fix(接口测试): 修复dubbo和sql请求不能添加控制器的bug 2020-09-23 16:49:10 +08:00
wenyann 94748c71c0 Merge remote-tracking branch 'origin/master' 2020-09-23 16:06:03 +08:00
wenyann 72e653ae41 feat: 测试评审任务添加评论通知用例维护人 2020-09-23 16:05:28 +08:00
shiziyuan9527 8028fdcd5f fix(用例评审): 修复开始评审后按钮不可点击的问题 2020-09-23 14:01:16 +08:00
chenjianxing 7338513ec2 refactor: 代码优化 2020-09-23 11:55:15 +08:00
wenyann 8e19cc9ca3 Merge remote-tracking branch 'origin/master' 2020-09-23 11:47:09 +08:00
wenyann f73a81da66 feat: 测试评审任务添加评论和完成通知 2020-09-23 11:46:49 +08:00
q4speed 5b5a8a7acd refactor(XPack): update submodule 2020-09-23 11:40:21 +08:00
fit2-zhao 5ad828ec05 fix(XPack): 修复被重构丢失的代码引发的问题 2020-09-23 09:59:33 +08:00
fit2-zhao f28e0c7229 fix(XPack): 恢复被误删的类 2020-09-23 09:41:09 +08:00
q4speed 569b01f589 refactor(XPack): License接口都放到XPack内 2020-09-22 21:29:53 +08:00
q4speed 22020e48d0 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-22 21:10:32 +08:00
fit2-zhao 8f807044ad fix(XPack): license 验证缺陷修复 2020-09-22 19:48:44 +08:00
shiziyuan9527 d370a5bb7b fix(用例评审): 编辑用例评审时出现的问题 2020-09-22 18:37:18 +08:00
wenyann 4d374fcc4f fix:修复一键运行报错 2020-09-22 18:05:05 +08:00
q4speed 8bdfeced41 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-22 17:13:13 +08:00
shiziyuan9527 c128021dc3 fix(测试跟踪): 删除测试用例时删除关联的评论 2020-09-22 15:32:04 +08:00
wenyann 24bfb51f79 Merge remote-tracking branch 'origin/master' 2020-09-22 15:02:33 +08:00
wenyann 629ec87958 feat: 测试评审任务发起通知 2020-09-22 15:01:41 +08:00
chenjianxing 1d2ef25f39 Merge branch 'master' of https://github.com/metersphere/server 2020-09-22 14:56:36 +08:00
chenjianxing 968ff5f470 feat(性能测试): 导出性能测试报告 2020-09-22 14:56:25 +08:00
q4speed 6eaec2972a Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-22 14:39:18 +08:00
q4speed 3b2059de14 refactor(XPack): update submodule 2020-09-22 14:39:08 +08:00
shiziyuan9527 178e22dca8 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-22 14:35:54 +08:00
shiziyuan9527 a88f81de2e fix(用例评审): 删除评审时删除关联的用例 2020-09-22 14:35:25 +08:00
fit2-zhao c46b8dccb6 style(测试跟踪): 统一util对象 2020-09-22 14:33:17 +08:00
q4speed a52ae19526 Merge remote-tracking branch 'origin/master' 2020-09-22 14:27:21 +08:00
fit2-zhao fa9aec151f style(XPack): 代码写法规范化 2020-09-22 14:19:36 +08:00
fit2-zhao b65a571a51 style(测试跟踪): 优化格式 2020-09-22 13:32:01 +08:00
fit2-zhao 9e785552cb fix(XPack): dto引用修改 2020-09-22 13:00:47 +08:00
fit2-zhao c089e27ff9 Merge remote-tracking branch 'origin/master' 2020-09-22 12:35:50 +08:00
fit2-zhao e50a952944 refactor(XPack): 认证机制重构，权限修改 2020-09-22 12:35:07 +08:00
shiziyuan9527 9845acf786 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-22 11:45:51 +08:00
shiziyuan9527 74878cd806 refactor: i18n 2020-09-22 11:45:20 +08:00
fit2-zhao 421b522cc6 refactor(测试跟踪): 重构pojo 2020-09-22 11:04:27 +08:00
fit2-zhao 5a385c6d34 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-22 11:03:41 +08:00
fit2-zhao 1e7a1aa83f refactor(测试跟踪): 重构xmind 导入方法 2020-09-22 11:03:14 +08:00
shiziyuan9527 c91ef4b982 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-22 10:51:28 +08:00
shiziyuan9527 d9a9d96342 fix(用例评审): 用例评审列表发起人显示用户名 2020-09-22 10:50:16 +08:00
q4speed 18d3694b3e Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	backend/src/main/java/io/metersphere/xpack
#	frontend/src/business/components/xpack
 2020-09-22 10:49:28 +08:00
q4speed 625a870629 refactor(XPack): update submodule 2020-09-22 10:49:03 +08:00
Captain.B 81bf333e29 Merge branch 'v1.3' into master 2020-09-22 10:41:20 +08:00
chenjianxing c347c1d56d Merge branch 'master' of https://github.com/metersphere/server 2020-09-22 10:36:23 +08:00
chenjianxing e00265b577 feat(测试跟踪): 测试计划报告导出 2020-09-22 10:35:59 +08:00
shiziyuan9527 1c51bc57e9 feat: 测试评审修改评审人和所属项目 2020-09-21 21:19:58 +08:00
q4speed fd24ed1246 refactor(XPack): 同步submodule 2020-09-21 18:02:50 +08:00
wenyann c045db32a5 fix:修改缺陷处理人 2020-09-21 14:09:04 +08:00
BugKing 7d2b2a4cc9 refactor: 修改版本号 2020-09-21 10:28:24 +08:00
shiziyuan9527 3751cebd7e feat: 用例评审flyway 2020-09-20 12:17:37 +08:00
shiziyuan9527 18a68f3041 feat(测试跟踪): 测试跟踪首页我的评审 2020-09-20 09:48:25 +08:00
shiziyuan9527 ef33833794 feat(测试跟踪): 用例评审 2020-09-19 23:52:09 +08:00
shiziyuan9527 b9579d61a0 feat(测试跟踪): 保存评审结果 2020-09-19 11:52:49 +08:00
shiziyuan9527 3135bf3406 feat(测试跟踪): 用例评审关联测试用例 2020-09-18 23:56:43 +08:00
shiziyuan9527 95b722e86c fix(测试计划): 测试计划修改所属项目时的提示问题 2020-09-18 17:04:50 +08:00
fit2-zhao 1786fb23ec fix(XPack): 合并丢失的I18n提示 2020-09-18 15:12:10 +08:00
chenjianxing 5badcc3a21 Merge branch 'master' of https://github.com/metersphere/server 2020-09-18 11:50:16 +08:00
chenjianxing e3b437827b refactor(接口测试): 支持提取接口到变量 2020-09-18 11:48:46 +08:00
fit2-zhao c5d52a6906 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-18 11:41:25 +08:00
fit2-zhao 56db0e077b refactor(XPack): license增强校验，并对过期时间进行展示 2020-09-18 11:14:44 +08:00
shiziyuan9527 7a6151ab79 feat(测试计划): 测试计划可以修改所属项目 2020-09-18 11:09:37 +08:00
Captain.B afcbe9bcdc Merge branch 'master' of github.com:fit2cloudrd/metersphere-server into master 2020-09-18 10:56:45 +08:00
Captain.B 316617d04a refactor(性能测试): 修改Kafka acks配置 2020-09-18 10:55:36 +08:00
q4speed 0952b270a1 fix(接口测试): 修复浏览器插件录制的脚本导入到测试平台后，接口顺序发生变化的bug 
Closes #396
 2020-09-18 10:40:15 +08:00
shiziyuan9527 2bad9f925d Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-17 21:27:36 +08:00
shiziyuan9527 5c9c645016 fix(系统设置): 修复创建用户时ID含中文可以创建的问题 2020-09-17 21:27:02 +08:00
chenjianxing 98a46cc5f4 fix: shiro 升级至 1.6.0 2020-09-17 21:19:29 +08:00
chenjianxing d78cdd45e6 fix: AutoCloseable 优化 2020-09-17 21:10:54 +08:00
chenjianxing 1e808df7ba Merge branch 'master' of https://github.com/metersphere/server 2020-09-17 19:37:52 +08:00
chenjianxing cd42469860 fix(接口测试): swagger 导入报错 2020-09-17 19:37:28 +08:00
fit2-zhao 7b8aaaebb6 refactor(测试跟踪): 删除多余模版文件 2020-09-17 18:58:33 +08:00
fit2-zhao 5374525783 fix(测试跟踪): 修改文件流关闭 2020-09-17 18:43:29 +08:00
fit2-zhao a13c3b2de3 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-17 18:41:48 +08:00
fit2-zhao c575a94e7f fix(测试跟踪): 导入缺陷修复 2020-09-17 18:38:49 +08:00
chenjianxing 7b0045d1a7 refactor: 解决冲突 2020-09-17 18:37:38 +08:00
wenyann bd42309f73 Merge remote-tracking branch 'origin/master' 2020-09-17 18:24:54 +08:00
wenyann a537892de2 fix:接口测试不执行 2020-09-17 18:24:26 +08:00
chenjianxing 6e72c03e2e fix: ScenarioModel.js 报错 2020-09-17 18:16:53 +08:00
q4speed d4199e85b4 Merge remote-tracking branch 'origin/master' 2020-09-17 18:09:28 +08:00