parent
d4845c9801
commit
c9d61a1665
|
@ -45,9 +45,9 @@ import io.metersphere.log.vo.DetailColumn;
|
||||||
import io.metersphere.log.vo.OperatingLogDetails;
|
import io.metersphere.log.vo.OperatingLogDetails;
|
||||||
import io.metersphere.log.vo.api.AutomationReference;
|
import io.metersphere.log.vo.api.AutomationReference;
|
||||||
import io.metersphere.log.vo.schedule.ScheduleReference;
|
import io.metersphere.log.vo.schedule.ScheduleReference;
|
||||||
|
import io.metersphere.metadata.service.FileAssociationService;
|
||||||
import io.metersphere.notice.sender.NoticeModel;
|
import io.metersphere.notice.sender.NoticeModel;
|
||||||
import io.metersphere.notice.service.NoticeSendService;
|
import io.metersphere.notice.service.NoticeSendService;
|
||||||
import io.metersphere.metadata.service.FileAssociationService;
|
|
||||||
import io.metersphere.plugin.core.MsTestElement;
|
import io.metersphere.plugin.core.MsTestElement;
|
||||||
import io.metersphere.service.*;
|
import io.metersphere.service.*;
|
||||||
import io.metersphere.track.dto.TestPlanDTO;
|
import io.metersphere.track.dto.TestPlanDTO;
|
||||||
|
@ -1439,6 +1439,7 @@ public class ApiAutomationService {
|
||||||
.testId(apiScenario.getId())
|
.testId(apiScenario.getId())
|
||||||
.subject(Translator.get("scenario_update_notice"))
|
.subject(Translator.get("scenario_update_notice"))
|
||||||
.paramMap(paramMap)
|
.paramMap(paramMap)
|
||||||
|
.excludeSelf(true)
|
||||||
.event(NoticeConstants.Event.UPDATE)
|
.event(NoticeConstants.Event.UPDATE)
|
||||||
.build();
|
.build();
|
||||||
noticeSendService.send(NoticeConstants.TaskType.API_AUTOMATION_TASK, noticeModel);
|
noticeSendService.send(NoticeConstants.TaskType.API_AUTOMATION_TASK, noticeModel);
|
||||||
|
@ -1455,6 +1456,7 @@ public class ApiAutomationService {
|
||||||
.testId(apiScenario.getId())
|
.testId(apiScenario.getId())
|
||||||
.subject(Translator.get("scenario_create_notice"))
|
.subject(Translator.get("scenario_create_notice"))
|
||||||
.paramMap(paramMap)
|
.paramMap(paramMap)
|
||||||
|
.excludeSelf(true)
|
||||||
.event(NoticeConstants.Event.CREATE)
|
.event(NoticeConstants.Event.CREATE)
|
||||||
.build();
|
.build();
|
||||||
noticeSendService.send(NoticeConstants.TaskType.API_AUTOMATION_TASK, noticeModel);
|
noticeSendService.send(NoticeConstants.TaskType.API_AUTOMATION_TASK, noticeModel);
|
||||||
|
|
|
@ -1155,6 +1155,7 @@ public class ApiDefinitionService {
|
||||||
.testId(apiDefinitionWithBLOBs.getId())
|
.testId(apiDefinitionWithBLOBs.getId())
|
||||||
.subject(Translator.get("api_update_notice"))
|
.subject(Translator.get("api_update_notice"))
|
||||||
.paramMap(paramMap)
|
.paramMap(paramMap)
|
||||||
|
.excludeSelf(true)
|
||||||
.event(NoticeConstants.Event.UPDATE)
|
.event(NoticeConstants.Event.UPDATE)
|
||||||
.build();
|
.build();
|
||||||
noticeSendService.send(NoticeConstants.TaskType.API_DEFINITION_TASK, noticeModel);
|
noticeSendService.send(NoticeConstants.TaskType.API_DEFINITION_TASK, noticeModel);
|
||||||
|
@ -1171,6 +1172,7 @@ public class ApiDefinitionService {
|
||||||
.testId(apiDefinitionWithBLOBs.getId())
|
.testId(apiDefinitionWithBLOBs.getId())
|
||||||
.subject(Translator.get("api_create_notice"))
|
.subject(Translator.get("api_create_notice"))
|
||||||
.paramMap(paramMap)
|
.paramMap(paramMap)
|
||||||
|
.excludeSelf(true)
|
||||||
.event(NoticeConstants.Event.CREATE)
|
.event(NoticeConstants.Event.CREATE)
|
||||||
.build();
|
.build();
|
||||||
noticeSendService.send(NoticeConstants.TaskType.API_DEFINITION_TASK, noticeModel);
|
noticeSendService.send(NoticeConstants.TaskType.API_DEFINITION_TASK, noticeModel);
|
||||||
|
@ -1186,6 +1188,7 @@ public class ApiDefinitionService {
|
||||||
.testId(apiTestCase.getId())
|
.testId(apiTestCase.getId())
|
||||||
.subject(Translator.get("api_case_update_notice"))
|
.subject(Translator.get("api_case_update_notice"))
|
||||||
.paramMap(paramMap)
|
.paramMap(paramMap)
|
||||||
|
.excludeSelf(true)
|
||||||
.event(NoticeConstants.Event.CASE_UPDATE)
|
.event(NoticeConstants.Event.CASE_UPDATE)
|
||||||
.build();
|
.build();
|
||||||
noticeSendService.send(NoticeConstants.TaskType.API_DEFINITION_TASK, noticeModel);
|
noticeSendService.send(NoticeConstants.TaskType.API_DEFINITION_TASK, noticeModel);
|
||||||
|
@ -1201,6 +1204,7 @@ public class ApiDefinitionService {
|
||||||
.testId(apiTestCase.getId())
|
.testId(apiTestCase.getId())
|
||||||
.subject(Translator.get("api_case_create_notice"))
|
.subject(Translator.get("api_case_create_notice"))
|
||||||
.paramMap(paramMap)
|
.paramMap(paramMap)
|
||||||
|
.excludeSelf(true)
|
||||||
.event(NoticeConstants.Event.CASE_CREATE)
|
.event(NoticeConstants.Event.CASE_CREATE)
|
||||||
.build();
|
.build();
|
||||||
noticeSendService.send(NoticeConstants.TaskType.API_DEFINITION_TASK, noticeModel);
|
noticeSendService.send(NoticeConstants.TaskType.API_DEFINITION_TASK, noticeModel);
|
||||||
|
|
|
@ -92,7 +92,7 @@ public class MailNoticeSender extends AbstractNoticeSender {
|
||||||
|
|
||||||
LogUtil.debug("发件人地址" + javaMailSender.getUsername());
|
LogUtil.debug("发件人地址" + javaMailSender.getUsername());
|
||||||
LogUtil.debug("helper" + helper);
|
LogUtil.debug("helper" + helper);
|
||||||
helper.setSubject("MeterSphere " + subject);
|
helper.setSubject("【MeterSphere】 " + subject);
|
||||||
|
|
||||||
LogUtil.info("收件人地址: {}", Arrays.asList(users));
|
LogUtil.info("收件人地址: {}", Arrays.asList(users));
|
||||||
helper.setText(context, true);
|
helper.setText(context, true);
|
||||||
|
|
|
@ -414,9 +414,9 @@ parallel=Parallel
|
||||||
plan_warning=The test plan does not have an associated executable use case
|
plan_warning=The test plan does not have an associated executable use case
|
||||||
csv_no_exist=CSV file does not exist
|
csv_no_exist=CSV file does not exist
|
||||||
update_scenario=Updated the scene
|
update_scenario=Updated the scene
|
||||||
scenario_update_notice=Scene Update Notification
|
scenario_update_notice=Interface Automation Notification
|
||||||
create_scenario=new scene
|
create_scenario=new scene
|
||||||
scenario_create_notice=Scene creation notification
|
scenario_create_notice=Interface Automation Notification
|
||||||
update_api=Updated interface definition
|
update_api=Updated interface definition
|
||||||
api_update_notice=Interface update notification
|
api_update_notice=Interface update notification
|
||||||
create_api=New interface definition
|
create_api=New interface definition
|
||||||
|
|
|
@ -413,9 +413,9 @@ parallel=并行
|
||||||
plan_warning=测试计划没有关联可执行的用例
|
plan_warning=测试计划没有关联可执行的用例
|
||||||
csv_no_exist=CSV文件不存在
|
csv_no_exist=CSV文件不存在
|
||||||
update_scenario=更新了场景
|
update_scenario=更新了场景
|
||||||
scenario_update_notice=场景更新通知
|
scenario_update_notice=接口自动化通知
|
||||||
create_scenario=新建了场景
|
create_scenario=新建了场景
|
||||||
scenario_create_notice=场景新建通知
|
scenario_create_notice=接口自动化通知
|
||||||
update_api=更新了接口定义
|
update_api=更新了接口定义
|
||||||
api_update_notice=接口更新通知
|
api_update_notice=接口更新通知
|
||||||
create_api=新建了接口定义
|
create_api=新建了接口定义
|
||||||
|
|
|
@ -412,9 +412,9 @@ parallel=並行
|
||||||
plan_warning=測試計劃沒有關聯可執行的用例
|
plan_warning=測試計劃沒有關聯可執行的用例
|
||||||
csv_no_exist=CSV檔案不存在
|
csv_no_exist=CSV檔案不存在
|
||||||
update_scenario=更新了場景
|
update_scenario=更新了場景
|
||||||
scenario_update_notice=場景更新通知
|
scenario_update_notice=接口自動化通知
|
||||||
create_scenario=新建了場景
|
create_scenario=新建了場景
|
||||||
scenario_create_notice=場景新建通知
|
scenario_create_notice=接口自動化通知
|
||||||
update_api=更新了接口定義
|
update_api=更新了接口定義
|
||||||
api_update_notice=接口更新通知
|
api_update_notice=接口更新通知
|
||||||
create_api=新建了接口定義
|
create_api=新建了接口定義
|
||||||
|
|
|
@ -755,7 +755,7 @@ export default {
|
||||||
if (routeParamObj) {
|
if (routeParamObj) {
|
||||||
let dataRange = routeParamObj.dataSelectRange;
|
let dataRange = routeParamObj.dataSelectRange;
|
||||||
let dataType = routeParamObj.dataType;
|
let dataType = routeParamObj.dataType;
|
||||||
if (dataRange && dataRange instanceof String) {
|
if (dataRange && typeof dataRange === 'string') {
|
||||||
let selectParamArr = dataRange.split("edit:");
|
let selectParamArr = dataRange.split("edit:");
|
||||||
if (selectParamArr.length === 2) {
|
if (selectParamArr.length === 2) {
|
||||||
let scenarioId = selectParamArr[1];
|
let scenarioId = selectParamArr[1];
|
||||||
|
@ -769,7 +769,7 @@ export default {
|
||||||
} else {
|
} else {
|
||||||
let dataRange = this.$route.params.dataSelectRange;
|
let dataRange = this.$route.params.dataSelectRange;
|
||||||
let dataType = this.$route.params.dataType;
|
let dataType = this.$route.params.dataType;
|
||||||
if (dataRange && dataRange instanceof String) {
|
if (dataRange && typeof dataRange === 'string') {
|
||||||
let selectParamArr = dataRange.split("edit:");
|
let selectParamArr = dataRange.split("edit:");
|
||||||
if (selectParamArr.length === 2) {
|
if (selectParamArr.length === 2) {
|
||||||
let scenarioId = selectParamArr[1];
|
let scenarioId = selectParamArr[1];
|
||||||
|
|
|
@ -437,6 +437,7 @@ export default {
|
||||||
},
|
},
|
||||||
'caseSyncRuleRelation.showUpdateRule': {
|
'caseSyncRuleRelation.showUpdateRule': {
|
||||||
handler(v) {
|
handler(v) {
|
||||||
|
this.noShowSyncRuleRelation = v;
|
||||||
this.$EventBus.$emit('showXpackCaseBtn', v);
|
this.$EventBus.$emit('showXpackCaseBtn', v);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue