yexuejc007/PlayEdu
1
0
Fork 0
mirror of https://github.com/PlayEdu/PlayEdu synced 2025-07-23 17:49:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

代码优化

Browse Source
This commit is contained in:
xxx 2023-11-14 13:38:27 +08:00
parent 040dcdfaed
commit 3c9b354aea
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
playedu-api/src/main/java/xyz/playedu/api/controller/frontend/LoginController.java
View File

@ -32,19 +32,18 @@ import xyz.playedu.api.cache.LoginLockCache;
import xyz.playedu.api.event.UserLogoutEvent; import xyz.playedu.api.event.UserLogoutEvent;
import xyz.playedu.api.request.frontend.LoginLdapRequest; import xyz.playedu.api.request.frontend.LoginLdapRequest;
import xyz.playedu.api.request.frontend.LoginPasswordRequest; import xyz.playedu.api.request.frontend.LoginPasswordRequest;
import xyz.playedu.common.constant.ConfigConstant;
import xyz.playedu.common.context.FCtx; import xyz.playedu.common.context.FCtx;
import xyz.playedu.common.domain.User; import xyz.playedu.common.domain.User;
import xyz.playedu.common.exception.LimitException; import xyz.playedu.common.exception.LimitException;
import xyz.playedu.common.exception.ServiceException; import xyz.playedu.common.exception.ServiceException;
import xyz.playedu.common.service.*; import xyz.playedu.common.service.*;
import xyz.playedu.common.types.JsonResponse; import xyz.playedu.common.types.JsonResponse;
import xyz.playedu.common.types.LdapConfig;
import xyz.playedu.common.util.*; import xyz.playedu.common.util.*;
import xyz.playedu.common.util.ldap.LdapTransformUser; import xyz.playedu.common.util.ldap.LdapTransformUser;
import xyz.playedu.common.util.ldap.LdapUtil; import xyz.playedu.common.util.ldap.LdapUtil;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map;
@RestController @RestController
@RequestMapping("/api/v1/auth/login") @RequestMapping("/api/v1/auth/login")
@ -100,15 +99,7 @@ public class LoginController {
public JsonResponse ldap(@RequestBody @Validated LoginLdapRequest req) { public JsonResponse ldap(@RequestBody @Validated LoginLdapRequest req) {
String username = req.getUsername(); String username = req.getUsername();
// 系统配置 LdapConfig ldapConfig = appConfigService.ldapConfig();
Map<String, String> config = appConfigService.keyValues();
String url = config.get(ConfigConstant.LDAP_URL);
String adminUser = config.get(ConfigConstant.LDAP_ADMIN_USER);
String adminPass = config.get(ConfigConstant.LDAP_ADMIN_PASS);
String baseDN = config.get(ConfigConstant.LDAP_BASE_DN);
if (url.isEmpty() || adminUser.isEmpty() || adminPass.isEmpty() || baseDN.isEmpty()) {
return JsonResponse.error("LDAP服务未配置");
}
String mail = null; String mail = null;
String uid = null; String uid = null;
@ -129,7 +120,13 @@ public class LoginController {
try { try {
LdapTransformUser ldapTransformUser = LdapTransformUser ldapTransformUser =
LdapUtil.loginByMailOrUid( LdapUtil.loginByMailOrUid(
url, adminUser, adminPass, baseDN, mail, uid, req.getPassword()); ldapConfig.getUrl(),
ldapConfig.getAdminUser(),
ldapConfig.getAdminPass(),
ldapConfig.getBaseDN(),
mail,
uid,
req.getPassword());
if (ldapTransformUser == null) { if (ldapTransformUser == null) {
return JsonResponse.error("登录失败.请检查账号和密码"); return JsonResponse.error("登录失败.请检查账号和密码");
} }