From 11b3b3d5ee1db8a4b0f504a1aec4a4c8ac9e9bd1 Mon Sep 17 00:00:00 2001 From: xuwangcheng Date: Mon, 28 Jun 2021 18:16:23 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/resource/message/interface.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/resource/message/interface.js b/src/main/webapp/resource/message/interface.js index 90ecfe0..53bad64 100644 --- a/src/main/webapp/resource/message/interface.js +++ b/src/main/webapp/resource/message/interface.js @@ -414,7 +414,7 @@ var eventList = { }, "#import-data-from-excel":function() { createImportExcelMark("Excel导入接口信息", "../../excel/upload_interface_template.xlsx" - , REQUEST_URL.FILE.UPLOAD_FILE, REQUEST_URL.INTERFACE.IMPORT_FROM_EXCEL + + "?projectId=" + top.currentProjectId); + , REQUEST_URL.FILE.UPLOAD_FILE, REQUEST_URL.INTERFACE.IMPORT_FROM_EXCEL + "?projectId=" + top.currentProjectId); }, "#choose-business-system":function () {//选择测试环境 $.post(REQUEST_URL.BUSINESS_SYSTEM.LIST_ALL, {protocolType:$("#interfaceProtocol").val()}, function (json) { -- Gitee From 910436a5cbebe2d8acd5829b2ecc07f268506eea Mon Sep 17 00:00:00 2001 From: xuwangcheng Date: Thu, 18 Nov 2021 10:58:40 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/yi/master/constant/SystemConsts.java | 2 +- src/main/resources/db_druid.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/yi/master/constant/SystemConsts.java b/src/main/java/yi/master/constant/SystemConsts.java index 9c2c00a..9fa2aad 100644 --- a/src/main/java/yi/master/constant/SystemConsts.java +++ b/src/main/java/yi/master/constant/SystemConsts.java @@ -267,7 +267,7 @@ public interface SystemConsts { /** * 检查版本升级的网址 */ - String CHECK_VERSION_UPGRADE_URL = "http://www.xuwangcheng.com/yi/api/checkVersion"; + String CHECK_VERSION_UPGRADE_URL = "https://www.xuwangcheng.com/yi/api/checkVersion"; //String CHECK_VERSION_UPGRADE_URL = "http://localhost:8080/api/checkVersion"; /** diff --git a/src/main/resources/db_druid.properties b/src/main/resources/db_druid.properties index be7f0dd..4d82e7d 100644 --- a/src/main/resources/db_druid.properties +++ b/src/main/resources/db_druid.properties @@ -1,7 +1,7 @@ jdbc.url=jdbc:mysql://localhost:3306/atp?characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&useSSL=false jdbc.driverClassName=com.mysql.jdbc.Driver jdbc.username=root -jdbc.password=KeYpZrZx +jdbc.password=DCtest_0123 druid.filters=stat druid.maxActive=20 druid.initialSize=1 -- Gitee From 73a2f918ecb659e5bee4a328e8cd4c9bf3d688c5 Mon Sep 17 00:00:00 2001 From: xuwangcheng Date: Thu, 18 Nov 2021 11:24:58 +0800 Subject: [PATCH 3/6] =?UTF-8?q?readme=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5813d11..b7f592e 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ QQ群交流：468324085，加群验证：易大师 [更新日志](https://gitee.com/xuwangcheng/masteryi-automated-testing/wikis/pages?title=%E6%9B%B4%E6%96%B0%E8%AF%B4%E6%98%8E&parent=) [使用文档](https://gitee.com/xuwangcheng/masteryi-automated-testing/wikis/) -[演示地址](http://www.xuwangcheng.com/yi)（账号 tester/11111111） +[演示地址](https://www.xuwangcheng.com/yi)（账号 tester/11111111） [交流论坛](https://yi.xuwangcheng.com/) [常见使用问题](https://gitee.com/xuwangcheng/masteryi-automated-testing/wikis/pages?sort_id=1559135&doc_id=196989) #### 一键安装 for windows -- Gitee From e438f22513b6f48e51301deaae47605baf58055d Mon Sep 17 00:00:00 2001 From: xuwangcheng Date: Tue, 14 Dec 2021 17:10:02 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=97=B6=E9=BB=98=E8=AE=A4=E8=A7=92=E8=89=B2=E4=B8=BAdefault?= =?UTF-8?q?=5Frole?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/api/service/user/ApiUserService.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/yi/master/business/api/service/user/ApiUserService.java b/src/main/java/yi/master/business/api/service/user/ApiUserService.java index bd22849..c7186e0 100644 --- a/src/main/java/yi/master/business/api/service/user/ApiUserService.java +++ b/src/main/java/yi/master/business/api/service/user/ApiUserService.java @@ -1,18 +1,17 @@ package yi.master.business.api.service.user; -import java.security.NoSuchAlgorithmException; -import java.sql.Timestamp; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - import yi.master.business.api.bean.ApiReturnInfo; import yi.master.business.user.bean.Role; import yi.master.business.user.bean.User; import yi.master.business.user.service.UserService; import yi.master.constant.SystemConsts; -import yi.master.util.MD5Util; import yi.master.util.FrameworkUtil; +import yi.master.util.MD5Util; + +import java.security.NoSuchAlgorithmException; +import java.sql.Timestamp; @Service public class ApiUserService { @@ -45,7 +44,7 @@ public class ApiUserService { user.setUsername(""); user.setRealName(username); user.setStatus("0"); - user.setRole(new Role(SystemConsts.DefaultObjectId.ADMIN_ROLE.getId())); + user.setRole(new Role(SystemConsts.DefaultObjectId.DEFAULT_ROLE.getId())); userService.edit(user); return new ApiReturnInfo(ApiReturnInfo.SUCCESS_CODE, "添加用户信息成功!", null); } -- Gitee From 57498725eff5613915968e8485a2ba1a120a5fcb Mon Sep 17 00:00:00 2001 From: xuwangcheng Date: Thu, 6 Jan 2022 18:07:41 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=87=BA=E5=8F=82=EF=BC=8C=E9=98=B2=E6=AD=A2?= =?UTF-8?q?=E5=BD=B1=E5=93=8D=E6=80=A7=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/yi/master/interceptor/CallMethodInterceptor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/yi/master/interceptor/CallMethodInterceptor.java b/src/main/java/yi/master/interceptor/CallMethodInterceptor.java index d149bee..f1a2e8e 100644 --- a/src/main/java/yi/master/interceptor/CallMethodInterceptor.java +++ b/src/main/java/yi/master/interceptor/CallMethodInterceptor.java @@ -180,7 +180,7 @@ public class CallMethodInterceptor extends AbstractInterceptor { + "ms.执行耗时：" + executeTime + "ms."); if (action != null) { - responseParams = JSONObject.fromObject(action.getJsonObject()).toString(); + //responseParams = JSONObject.fromObject(action.getJsonObject()).toString(); logger.info("[" + timeTag + "]接口" + callUrl + "出参\n" + responseParams); } @@ -260,7 +260,7 @@ public class CallMethodInterceptor extends AbstractInterceptor { + "ms.执行耗时：" + executeTime + "ms."); if (action != null) { - responseParams = JSONObject.fromObject(action.getJsonObject()).toString(); + //responseParams = JSONObject.fromObject(action.getJsonObject()).toString(); logger.info("[" + timeTag + "]接口" + callUrl + "出参\n" + responseParams); } -- Gitee From 079f26a197a1ad1614cc57912baa59ab63afc269 Mon Sep 17 00:00:00 2001 From: xuwangcheng Date: Fri, 18 Feb 2022 20:03:15 +0800 Subject: [PATCH 6/6] =?UTF-8?q?v1.1.4=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/yi/master/constant/SystemConsts.java | 2 +- src/main/java/yi/master/listener/VersionUpdateUtil.java | 1 + src/main/resources/update/1.1.4 | 3 +++ update.md | 8 ++++++++ 4 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/update/1.1.4 diff --git a/src/main/java/yi/master/constant/SystemConsts.java b/src/main/java/yi/master/constant/SystemConsts.java index 9fa2aad..d4b90eb 100644 --- a/src/main/java/yi/master/constant/SystemConsts.java +++ b/src/main/java/yi/master/constant/SystemConsts.java @@ -13,7 +13,7 @@ public interface SystemConsts { /** * 当前版本号 */ - String VERSION = "1.1.3"; + String VERSION = "1.1.4"; /** diff --git a/src/main/java/yi/master/listener/VersionUpdateUtil.java b/src/main/java/yi/master/listener/VersionUpdateUtil.java index fb8a7ec..9ac1bc7 100644 --- a/src/main/java/yi/master/listener/VersionUpdateUtil.java +++ b/src/main/java/yi/master/listener/VersionUpdateUtil.java @@ -55,6 +55,7 @@ public class VersionUpdateUtil { ALL_VERSION_LIST.add("1.1.1"); ALL_VERSION_LIST.add("1.1.2"); ALL_VERSION_LIST.add("1.1.3"); + ALL_VERSION_LIST.add("1.1.4"); } /** diff --git a/src/main/resources/update/1.1.4 b/src/main/resources/update/1.1.4 new file mode 100644 index 0000000..979f41e --- /dev/null +++ b/src/main/resources/update/1.1.4 @@ -0,0 +1,3 @@ +SET FOREIGN_KEY_CHECKS=0; +ALTER TABLE `at_message_scene` MODIFY COLUMN `response_example` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT '返回示例报文' AFTER `scene_name`; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file diff --git a/update.md b/update.md index 1503f73..079ad71 100644 --- a/update.md +++ b/update.md @@ -1,3 +1,11 @@ +### v1.1.4 +#### 2022.02.18 +- 用户同步成功时默认角色修改为default_role( 之前为admin角色)，用户可自行配置该角色的权限； +- 去除后台日志打印出参，防止出参信息过多时影响性能； +- 修改at_message_scene的response_example字段类型为longtext，解决在返回出参数据过多时保存返回示例出错的问题； +- 其他问题修复； +> 声明：该版本目前为该平台的最后一个版本，以后不再对此平台进行任何维护更新，有问题请先查询码云上的WIKI，如果自定义的需求需要开发，请自行下载源码，（接受有偿的功能开发）。 + ### v1.1.3 #### 2021.02.04 - 增加全局变量动态组合接口类型，通过组合场景去获取变量参数; -- Gitee