diff --git a/backend/src/main/java/io/metersphere/api/dto/automation/parse/HarScenarioParser.java b/backend/src/main/java/io/metersphere/api/dto/automation/parse/HarScenarioParser.java index 92cc0b654c..d0ed200928 100644 --- a/backend/src/main/java/io/metersphere/api/dto/automation/parse/HarScenarioParser.java +++ b/backend/src/main/java/io/metersphere/api/dto/automation/parse/HarScenarioParser.java @@ -46,8 +46,6 @@ public class HarScenarioParser extends HarScenarioAbstractParser String harName = request.getFileName(); // 场景步骤 LinkedList apiScenarioWithBLOBs = new LinkedList<>(); -// ApiScenarioWithBLOBs scenario = new ApiScenarioWithBLOBs(); -// scenario.setName(harName); MsScenario msScenario = new MsScenario(); msScenario.setName(harName); diff --git a/backend/src/main/java/io/metersphere/service/UserService.java b/backend/src/main/java/io/metersphere/service/UserService.java index d151a8df46..02f28680b1 100644 --- a/backend/src/main/java/io/metersphere/service/UserService.java +++ b/backend/src/main/java/io/metersphere/service/UserService.java @@ -1,7 +1,6 @@ package io.metersphere.service; import com.alibaba.excel.EasyExcelFactory; -import io.metersphere.api.dto.automation.ApiScenarioRequest; import io.metersphere.base.domain.*; import io.metersphere.base.mapper.*; import io.metersphere.base.mapper.ext.ExtOrganizationMapper; @@ -10,7 +9,10 @@ import io.metersphere.base.mapper.ext.ExtUserRoleMapper; import io.metersphere.commons.constants.*; import io.metersphere.commons.exception.MSException; import io.metersphere.commons.user.SessionUser; -import io.metersphere.commons.utils.*; +import io.metersphere.commons.utils.CodingUtil; +import io.metersphere.commons.utils.CommonBeanFactory; +import io.metersphere.commons.utils.LogUtil; +import io.metersphere.commons.utils.SessionUtils; import io.metersphere.controller.ResultHolder; import io.metersphere.controller.request.LoginRequest; import io.metersphere.controller.request.member.AddMemberRequest; @@ -26,20 +28,16 @@ import io.metersphere.dto.UserRoleDTO; import io.metersphere.dto.WorkspaceDTO; import io.metersphere.excel.domain.*; import io.metersphere.excel.listener.EasyExcelListener; -import io.metersphere.excel.listener.TestCaseDataListener; import io.metersphere.excel.listener.UserDataListener; import io.metersphere.excel.utils.EasyExcelExporter; import io.metersphere.i18n.Translator; import io.metersphere.notice.domain.UserDetail; import io.metersphere.security.MsUserToken; -import io.metersphere.track.request.testcase.QueryTestCaseRequest; -import io.metersphere.xmind.XmindCaseParser; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.*; import org.apache.shiro.authz.UnauthorizedException; import org.apache.shiro.subject.Subject; -import org.python.antlr.ast.Str; import org.springframework.beans.BeanUtils; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -648,6 +646,8 @@ public class UserService { UserExcelData data = new UserExcelData(); data.setId("user_id_" + i); data.setName(Translator.get("user") + i); + data.setPassword(Translator.get("required")+";"+Translator.get("password_format_is_incorrect")); + data.setEmail(Translator.get("required")); String workspace = ""; for (int workspaceIndex = 1; workspaceIndex <= i; workspaceIndex++) { if (workspaceIndex == 1) { diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties index cfdf27f777..38f4f61e45 100644 --- a/backend/src/main/resources/i18n/messages.properties +++ b/backend/src/main/resources/i18n/messages.properties @@ -59,5 +59,7 @@ module_created_automatically= options= options_yes= options_no= +required= +password_format_is_incorrect= please_input_workspace_member= test_case_report_template_repeat= \ No newline at end of file diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties index 5c066f75fd..7983790370 100644 --- a/backend/src/main/resources/i18n/messages_en_US.properties +++ b/backend/src/main/resources/i18n/messages_en_US.properties @@ -138,6 +138,8 @@ module_created_automatically=If there is no such module, will be created automat options=options options_yes=Yes options_no=No +required=Required +password_format_is_incorrect=Valid password: 8-30 digits, English upper and lower case letters + numbers + special characters (optional) please_input_workspace_member=Please input workspace merber test_case_report_template_repeat=The workspace has the same name template plan_name_already_exists=Test plan name already exists diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties index e0f23126e3..9d335a49e3 100644 --- a/backend/src/main/resources/i18n/messages_zh_CN.properties +++ b/backend/src/main/resources/i18n/messages_zh_CN.properties @@ -138,6 +138,8 @@ module_created_automatically=若无该模块将自动创建 options=选项 options_yes=是 options_no=否 +required=必填 +password_format_is_incorrect=有效密码:8-30位,英文大小写字母+数字+特殊字符(可选) please_input_workspace_member=请填写该工作空间相关人员 test_case_report_template_repeat=同一工作空间下不能存在同名模版 plan_name_already_exists=测试计划名称已存在 diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties index 88ed5da387..6cab6f1a81 100644 --- a/backend/src/main/resources/i18n/messages_zh_TW.properties +++ b/backend/src/main/resources/i18n/messages_zh_TW.properties @@ -138,6 +138,8 @@ module_created_automatically=若無該模塊將自動創建 options=選項 options_yes=是 options_no=否 +required=必填 +password_format_is_incorrect=有效密碼:8-30位,英文大小寫字母+數字+特殊字符(可選) please_input_workspace_member=請填寫該工作空間相關人員 test_case_report_template_repeat=同壹工作空間下不能存在同名模版 plan_name_already_exists=測試計劃名稱已存在