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

231 Commits

Author SHA1 Message Date
chenjianxing e451a47f55 refactor: 修改swagger-parse版本 2021-03-30 10:10:17 +08:00
Captain.B 683430ec8d refactor: jmeter 版本升级 2021-03-25 18:11:58 +08:00
BugKing 77a550dd3a refactor: 修改版本号 2021-03-24 19:14:54 +08:00
Captain.B 6ee30d97bf fix: 修复XStream安全漏洞 
Closes #1671
 2021-03-22 18:28:20 +08:00
shiziyuan9527 82d7be618c fix: 主题色修改 2021-03-15 15:26:56 +08:00
fit2-zhao c5d58d40c3 feat(接口定义): JSONpath 断言增加操作符 2021-03-10 11:14:31 +08:00
fit2-zhao 63b8801aa9 feat(接口自动化): 完善jmx导入功能，增加jmeter相关Sampler依赖jar包 2021-02-20 11:20:58 +08:00
BugKing 3941e2170a refactor: 修改版本号 2021-01-27 14:55:06 +08:00
Captain.B 493e766719 refactor: 单点登录cas提取hidden变量 2021-01-23 13:48:41 +08:00
BugKing ed3ca35749
Merge pull request #142 from metersphere/dependabot/maven/backend/org.apache.zookeeper-zookeeper-3.4.14 
chore(deps): bump zookeeper from 3.4.13 to 3.4.14 in /backend
 2021-01-22 22:20:58 +08:00
Captain.B 43ae3dd2ce feat(xPack): CAS 登录 2021-01-19 15:49:20 +08:00
Captain.B 8e70eefe3c refactor: 接收测试结束的通知 2021-01-13 14:00:19 +08:00
fit2-zhao cd44e90808 feat(接口定义): 完成json编辑器 2021-01-04 19:05:31 +08:00
chenjianxing aed55a9709 refactor: 支持swagger 3.0 2020-12-30 22:00:00 +08:00
Captain.B be95c69af5 refactor: 重构传递测试文件的方式 2020-12-21 15:03:41 +08:00
BugKing cca4e4f129 refactor: 修改版本号 2020-12-17 12:55:56 +08:00
Captain.B e32ff12d22 refactor: 使用k8s资源池 2020-12-15 13:56:23 +08:00
chenjianxing d24c9c43b2 fix: 前端报错 2020-12-08 12:02:12 +08:00
fit2-zhao 77a1724bc7 feat(接口自动化): 场景自动化基本画面完成 2020-12-02 19:22:58 +08:00
fit2-zhao 22108b3048 feat(接口定义): 合并master 最新代码 2020-11-27 13:58:25 +08:00
chenjianxing 5de10c5a5c fix(接口测试): python脚本 2020-11-25 21:04:35 +08:00
chenjianxing 8656fa36bf fi(接口测试): python 脚本失效 2020-11-25 20:45:34 +08:00
BugKing 2543618ace Merge branch 'v1.5' into master 2020-11-25 13:44:57 +08:00
BugKing 7b5dd9c14f refactor: 修改版本号 2020-11-25 11:15:29 +08:00
fit2-zhao e008baaf2e Merge branch 'master' into local-api-delimit 
# Conflicts:
#	backend/src/main/resources/i18n/messages_en_US.properties
#	backend/src/main/resources/i18n/messages_zh_CN.properties
#	backend/src/main/resources/i18n/messages_zh_TW.properties
#	frontend/src/business/components/api/test/ApiTestConfig.vue
 2020-11-23 12:31:48 +08:00
chenjianxing 21ea6bc70a refactor: 升级jyphon 2020-11-23 11:37:01 +08:00
q4speed 5a3310a837 refactor(接口测试): 后台转换JMX 2020-11-11 13:40:24 +08:00
q4speed b7ce2f8025 fix(接口测试): pom去掉重复依赖 2020-10-30 13:50:49 +08:00
q4speed 2063612252 fix(接口测试): 修复dubbo客户端v2.7.7以上版本在进行泛化调用server端为v2.6.x以前版本时出现No Provider错误 2020-10-30 12:07:41 +08:00
dependabot[bot] a9d76e666a
chore(deps): bump zookeeper from 3.4.13 to 3.4.14 in /backend 
Bumps zookeeper from 3.4.13 to 3.4.14.

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-26 03:34:30 +00: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 ee56ab2750 fix(接口测试): 解决支持jar包后无法加载部分类的问题 2020-10-22 14:16:07 +08:00
BugKing 144803a8c2 refactor: 更改版本号 2020-10-20 16:50:16 +08:00
chenjianxing 1c9050d833 fix: 解决冲突 2020-10-20 13:11:10 +08:00
chenjianxing bd43116ff4 feat(接口测试): 上传jar包 2020-10-20 12:54:09 +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
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 8582a4f04f feat(接口测试): 增加TCP协议的接口测试 2020-10-09 18:08:49 +08:00
q4speed a3e1ab4653 fix(接口测试): 修复Dubbo重复请求的bug 2020-10-09 13:47:46 +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
BugKing 7d2b2a4cc9 refactor: 修改版本号 2020-09-21 10:28:24 +08:00
chenjianxing 98a46cc5f4 fix: shiro 升级至 1.6.0 2020-09-17 21:19:29 +08:00
chenjianxing e1eba35e13 feat(接口测试): 支持 Oracle 2020-09-17 15:11:00 +08:00
chenjianxing d4439f01ad feat(接口测试): 支持 postgresql 2020-09-17 13:03:33 +08:00
chenjianxing 21ad96c691 feat(接口测试): 支持sqlserver 2020-09-17 11:02:16 +08:00
fit2-zhao 95b44e7fd0 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	backend/pom.xml
 2020-09-16 19:32:11 +08:00
fit2-zhao 76b09b4751 feat(测试跟踪): 支持思维导图导入用例 2020-09-16 18:47:04 +08:00
Captain.B 142c32705f fix: 误删jira的包 2020-09-16 10:47:09 +08:00
wenyann 124c93dc7b fix: 删除无用代码 2020-09-16 10:37:19 +08:00
wenyann 43bfebfcaa Merge branch 'master' of https://github.com/metersphere/metersphere 
 Conflicts:
	backend/src/main/resources/i18n/messages_en_US.properties
	backend/src/main/resources/i18n/messages_zh_CN.properties
	backend/src/main/resources/i18n/messages_zh_TW.properties
 2020-09-16 10:03:31 +08:00
wenyann b221a51d4c feat: 定时任务通知 2020-09-16 09:57:55 +08:00
chenjianxing 14531a571a Merge branch 'master' of https://github.com/metersphere/server 2020-09-15 11:29:12 +08:00
chenjianxing cbb1976f77 feat(接口测试): sql 请求 2020-09-15 11:26:29 +08:00
fit2-zhao 3445ac4656 Merge branch 'master' of https://github.com/metersphere/metersphere 2020-09-14 15:57:20 +08:00
fit2-zhao 1644a03cf6 feat(XPack): 【企业版】【公共】License 认证机制 2020-09-14 15:51:37 +08:00
chenjianxing 2deec48cd5 fix(接口测试): python 执行失败 2020-09-08 17:25:57 +08:00
Captain.B 433aa6bf19 refactor: 修改定时任务的配置类 2020-09-03 14:47:12 +08:00
chenjianxing 7d6cf859df feat(接口测试): 支持python脚本 2020-09-02 15:29:01 +08:00
shiziyuan9527 9d5523f2f0 fix: jira缺陷描述文本格式 2020-08-26 14:42:55 +08:00
chenjianxing 52049d61d4 refacotr: 合并v1.1 2020-08-25 15:44:07 +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
chenjianxing fcb8eeedf2 feat(接口测试): 支持Beanshell脚本 2020-08-18 14:32:24 +08:00
chenjianxing 064304ba28 refactor: 适配cas 2020-08-17 10:09:19 +08:00
q4speed 09d1a1822e feat: 增加对Jmeter内置函数支持 2020-08-10 17:06:05 +08:00
q4speed 9a954934af fix(接口测试): 修复无法正确调用接口的bug 2020-08-07 13:29:16 +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
q4speed 018f7caf88 fix(接口测试): 修复zookeeper无限重连bug，修复Registry Center更新后无法生效bug 2020-08-05 16:57:54 +08:00
q4speed 85d6b34bdb build: 增加allatori 2020-07-30 16:52:00 +08:00
Captain.B 9716376e34 refactor(deps): 更新pom使用2.7.8版本的 dubbo plugin 2020-07-29 18:38:42 +08:00
Captain.B 55be1a7386 refactor(deps): 使用中央仓库的 jar 2020-07-29 11:24:47 +08:00
Captain.B f21790e089 fix: 修复 mvn clean 没有删除 static 和 templates 2020-07-28 20:55:30 +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
wangzhen-fit2cloud b0e02f2b50 refactor: 修改版本号为 1.1 2020-07-22 19:43:15 +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
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 e15ad8f025 feat: 增加cacos作为dubbo的注册中心 2020-07-17 11:18:46 +08:00
Captain.B 1b89890016 feat: 增加查询 dubbo 接口的方法 2020-07-17 10:17:47 +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
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
chenjianxing cee30dd126 修改quartz-spring-boot-starter仓库地址 2020-07-07 10:02:29 +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
chenjianxing 94dbd9ca17 解决定时任务集群问题 2020-06-28 20:43:43 +08:00
Captain.B c480483858 openapi 3.0 2020-06-23 11:13:17 +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
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
Captain.B 66b60dbbc6 删除无用的代码 2020-06-08 11:56:31 +08:00
wenyann 7f06194cff 邮件服务设置 2020-05-20 17:22:45 +08:00
Captain.B 1d6662e0fa spring boot exclude jars 2020-05-07 10:37:03 +08:00
Captain.B 9a10ff25ad 去掉多余的dep 2020-05-06 21:39:08 +08:00
Captain.B 51aa7e88b4 使用lombok 2020-05-06 14:40:51 +08:00
Captain.B ae6f7b8e71 properties 2020-04-30 11:04:37 +08:00
Captain.B 5cfdebc7d4 csv 2020-04-30 10:36:27 +08:00
q4speed ec113b1b16 api测试保存jmx 2020-04-27 17:10:21 +08:00
Captain.B a572c7fef5 去掉没有用到的类 2020-04-24 18:40:11 +08:00
q4speed 6aa69cee66 api测试，未完待续 2020-04-22 17:29:54 +08:00
Captain.B e9e27f4211 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	backend/pom.xml
 2020-04-16 10:57:10 +08:00
Captain.B b7ae9c5e08 report 2020-04-16 10:56:22 +08:00
chenjianxing 276961d97b 测试用例导入 2020-04-15 16:58:04 +08:00
Captain.B 408f3f0d47 删除不用的依赖 2020-03-28 10:49:49 +08:00
Captain.B bbdb987b64 csv 解析 2020-03-23 15:00:27 +08:00
Captain.B 1210d4c8c3 jmeter report type 2020-03-20 17:14:49 +08:00
chenjianxing b6e3b104f3 Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev 2020-03-18 18:37:07 +08:00
chenjianxing 017f864063 测试报告同步 2020-03-18 18:36:42 +08:00
Captain.B e2af4ef462 mybatis version 2020-03-17 19:15:54 +08:00
Captain.B 4e5e8c9809 file metadata add column engine 2020-03-16 15:07:15 +08:00
Captain.B cc922865ea flyway 2020-03-05 14:55:02 +08:00
mokun 4423a44c55 server i18n 2020-03-04 11:32:17 +08:00
Captain.B 1feb471780 jmeter 插件jar 2020-03-03 15:36:11 +08:00
Captain.B 25426b299e 去掉模版引擎直接使用html 2020-03-02 18:59:26 +08:00
Captain.B 80f3e74a61 简化后端 2020-03-02 18:41:47 +08:00
Captain.B 36fd6b904a shiro version 2020-02-25 17:37:34 +08:00
haifeng414 3ce09effdb 脚本内容压缩 2020-02-20 12:10:32 +08:00
haifeng414 951fe9f5d2 通过保存并运行按钮本地运行上传文件 2020-02-18 21:25:51 +08:00
Captain.B 8830231352 package name changed. 2020-02-03 16:30:16 +08:00
Captain.B da8e7b101d shiro dialect 2020-02-03 14:28:08 +08:00
Captain.B c27167a3ba frontend backend 2020-02-03 14:04:27 +08:00