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

fix(国际化): 接口返回信息国际化 

--user=郭雨琦 接口返回信息国际化
This commit is contained in:
guoyuqi 2021-12-22 16:19:18 +08:00 committed by xiaomeinvG
parent 77602e8122
commit 08d9c80b96
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
backend/src/main/java/io/metersphere/service/EnvironmentGroupService.java
View File

@ -19,14 +19,12 @@ import org.apache.ibatis.session.SqlSession;
import org.apache.ibatis.session.SqlSessionFactory; import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.SqlSessionUtils; import org.mybatis.spring.SqlSessionUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList; import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@ -159,9 +157,16 @@ public class EnvironmentGroupService {
} }
private void checkEnvironmentGroup(EnvironmentGroupRequest request) { private void checkEnvironmentGroup(EnvironmentGroupRequest request) {
Locale locale = LocaleContextHolder.getLocale();
String name = request.getName(); String name = request.getName();
if (StringUtils.isBlank(name)) { if (StringUtils.isBlank(name)) {
MSException.throwException("environment group name is null."); if(Locale.US.toString().equalsIgnoreCase(locale.toString())){
MSException.throwException("environment group name is null.");
}else if(Locale.TRADITIONAL_CHINESE.toString().equalsIgnoreCase(locale.toString())){
MSException.throwException("環境組名稱不存在。");
}else{
MSException.throwException("环境组名称不存在。");
}
} }
EnvironmentGroupExample environmentGroupExample = new EnvironmentGroupExample(); EnvironmentGroupExample environmentGroupExample = new EnvironmentGroupExample();
@ -173,7 +178,13 @@ public class EnvironmentGroupService {
} }
if (environmentGroupMapper.countByExample(environmentGroupExample) > 0) { if (environmentGroupMapper.countByExample(environmentGroupExample) > 0) {
MSException.throwException("环境组名称 " + request.getName() + " 已存在！"); if(Locale.US.toString().equalsIgnoreCase(locale.toString())){
MSException.throwException("Environment group name " + request.getName() + " already exists！");
}else if(Locale.TRADITIONAL_CHINESE.toString().equalsIgnoreCase(locale.toString())){
MSException.throwException("環境組名稱 " + request.getName() + " 已存在！");
}else{
MSException.throwException("环境组名称 " + request.getName() + " 已存在！");
}
} }
} }