diff --git a/README.md b/README.md index 5813d11202c2d0a66ae953263ab79d859603b5de..b7f592e955372001d9d95c67ea2a7d27b2067f67 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 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 bd228494e6317084cf51e562f3906971cd8501ca..c7186e0ba3cb7a504856e10670140ab4faa043c1 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); } diff --git a/src/main/java/yi/master/constant/SystemConsts.java b/src/main/java/yi/master/constant/SystemConsts.java index 9c2c00a42aeae0b3ff65178f8b67311ac0e083a0..d4b90eb081aa88dcdb040a2182ba808936781f29 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"; /** @@ -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/java/yi/master/interceptor/CallMethodInterceptor.java b/src/main/java/yi/master/interceptor/CallMethodInterceptor.java index d149bee5316b7bf6a8bdc429dd040bc48130623f..f1a2e8e258107c81efc6f1a52758635e12b3dd9f 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); } diff --git a/src/main/java/yi/master/listener/VersionUpdateUtil.java b/src/main/java/yi/master/listener/VersionUpdateUtil.java index fb8a7ec080dafc5743a63893f7e6f5efee7e311f..9ac1bc7b83bd00aebf93ba1c544a3a9bed352551 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/db_druid.properties b/src/main/resources/db_druid.properties index be7f0ddcbe045f60d04858c68b2ab1679c56bb09..4d82e7d373a690c38a0990720bf4b1b65c960067 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 diff --git a/src/main/resources/update/1.1.4 b/src/main/resources/update/1.1.4 new file mode 100644 index 0000000000000000000000000000000000000000..979f41e2a20d311dcdc4675df8ee84b58b0c6252 --- /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/src/main/webapp/resource/message/interface.js b/src/main/webapp/resource/message/interface.js index 90ecfe0da9f4756bc4ddd9681fbd83e02f297e22..53bad646c15bc9e252c71e7df403311091343144 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) { diff --git a/update.md b/update.md index 1503f7341ef41e87e603a28219794702b5780e37..079ad71e42af02af7efa08b0d9371897331e9858 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 - 增加全局变量动态组合接口类型，通过组合场景去获取变量参数;