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

fix(系统设置): LDAP登录提示信息国际化 

--bug=1017678 --user=李玉号 【登录】密码输入错误，提示信息没有汉化
https://www.tapd.cn/55049933/s/1276612
This commit is contained in:
shiziyuan9527 2022-10-25 16:10:44 +08:00 committed by 刘瑞斌
parent 7c2d529fdf
commit 6c9c780c85
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/gateway/src/main/java/io/metersphere/gateway/service/LdapService.java
View File

@ -13,6 +13,7 @@ import io.metersphere.i18n.Translator;
import io.metersphere.ldap.service.SSLLdapContextSource; import io.metersphere.ldap.service.SSLLdapContextSource;
import io.metersphere.request.LoginRequest; import io.metersphere.request.LoginRequest;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.ldap.AuthenticationException; import org.springframework.ldap.AuthenticationException;
import org.springframework.ldap.InvalidNameException; import org.springframework.ldap.InvalidNameException;
import org.springframework.ldap.InvalidSearchFilterException; import org.springframework.ldap.InvalidSearchFilterException;
@ -69,6 +70,9 @@ public class LdapService {
} }
public Optional<SessionUser> login(LoginRequest request, WebSession session, Locale locale) { public Optional<SessionUser> login(LoginRequest request, WebSession session, Locale locale) {
if (locale != null) {
LocaleContextHolder.setLocale(locale, true);
}
String isOpen = service.getValue(ParamConstants.LDAP.OPEN.getValue()); String isOpen = service.getValue(ParamConstants.LDAP.OPEN.getValue());
if (StringUtils.isBlank(isOpen) || StringUtils.equals(Boolean.FALSE.toString(), isOpen)) { if (StringUtils.isBlank(isOpen) || StringUtils.equals(Boolean.FALSE.toString(), isOpen)) {
MSException.throwException(Translator.get("ldap_authentication_not_enabled")); MSException.throwException(Translator.get("ldap_authentication_not_enabled"));