Commit Graph

94 Commits

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