test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(消息管理): 修复语言环境失败问题

This commit is contained in:
guoyuqi 2024-02-06 16:42:02 +08:00 committed by 刘瑞斌
parent 4a30fb7436
commit 3264666aac
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
backend/services/case-management/src/main/java/io/metersphere/functional/service/ReviewSendNoticeService.java
View File

@ -12,11 +12,14 @@ import io.metersphere.system.notice.utils.MessageTemplateUtils;
import io.metersphere.system.service.NoticeSendService;
import jakarta.annotation.Resource;
import org.apache.commons.beanutils.BeanMap;
import org.apache.commons.lang3.StringUtils;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@Service
@ -34,6 +37,7 @@ public class ReviewSendNoticeService {
@Async
public void sendNotice(List<String> relatedUsers, String userId, String reviewId, String task, String event) {
User user = userMapper.selectByPrimaryKey(userId);
setLanguage(user.getLanguage());
CaseReview caseReview = caseReviewMapper.selectByPrimaryKey(reviewId);
Map<String, String> defaultTemplateMap = MessageTemplateUtils.getDefaultTemplateMap();
String template = defaultTemplateMap.get(task + "_" + event);
@ -59,6 +63,7 @@ public class ReviewSendNoticeService {
public void sendNoticeCase(List<String> relatedUsers, String userId, String caseId, String task, String event,String reviewId) {
FunctionalCase functionalCase = functionalCaseMapper.selectByPrimaryKey(caseId);
User user = userMapper.selectByPrimaryKey(userId);
setLanguage(user.getLanguage());
CaseReview caseReview = caseReviewMapper.selectByPrimaryKey(reviewId);
Map<String, String> defaultTemplateMap = MessageTemplateUtils.getDefaultTemplateMap();
String template = defaultTemplateMap.get(task + "_" + event);
@ -82,4 +87,14 @@ public class ReviewSendNoticeService {
noticeSendService.send(task, noticeModel);
}
private static void setLanguage(String language) {
Locale locale = Locale.SIMPLIFIED_CHINESE;
if (StringUtils.containsIgnoreCase("US",language)) {
locale = Locale.US;
} else if (StringUtils.containsIgnoreCase("TW",language)){
locale = Locale.TAIWAN;
}
LocaleContextHolder.setLocale(locale);
}
}

1
backend/services/system-setting/src/main/java/io/metersphere/system/service/NoticeSendService.java
View File

@ -129,6 +129,7 @@ public class NoticeSendService {
*/
@Async
public void send(Project project, String taskType, NoticeModel noticeModel) {
setLanguage(noticeModel);
try {
List<MessageDetail> messageDetails = messageDetailService.searchMessageByTypeAndProjectId(taskType, project.getId());
// 异步发送通知