diff --git a/aucma-admin/src/main/java/com/aucma/web/controller/system/SysLoginController.java b/aucma-admin/src/main/java/com/aucma/web/controller/system/SysLoginController.java index f753337..e03d623 100644 --- a/aucma-admin/src/main/java/com/aucma/web/controller/system/SysLoginController.java +++ b/aucma-admin/src/main/java/com/aucma/web/controller/system/SysLoginController.java @@ -40,13 +40,29 @@ public class SysLoginController private ISysPostService postService; /** - * 登录方法 + * PDA登录 * * @param loginBody 登录信息 * @return 结果 */ @PostMapping("/login") public AjaxResult login(@RequestBody LoginBody loginBody) + { + AjaxResult ajax = AjaxResult.success(); + // 生成令牌 + String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), "PDA_VALIDATE", loginBody.getUuid()); + ajax.put(Constants.TOKEN, token); + return ajax; + } + + /** + * 系统登录 + * + * @param loginBody 登录信息 + * @return 结果 + */ + @PostMapping("/indexLogin") + public AjaxResult indexLogin(@RequestBody LoginBody loginBody) { AjaxResult ajax = AjaxResult.success(); // 生成令牌 diff --git a/aucma-framework/src/main/java/com/aucma/framework/web/service/SysLoginService.java b/aucma-framework/src/main/java/com/aucma/framework/web/service/SysLoginService.java index d19325b..cdd10c5 100644 --- a/aucma-framework/src/main/java/com/aucma/framework/web/service/SysLoginService.java +++ b/aucma-framework/src/main/java/com/aucma/framework/web/service/SysLoginService.java @@ -64,7 +64,9 @@ public class SysLoginService public String login(String username, String password, String code, String uuid) { // 验证码校验 - validateCaptcha(username, code, uuid); + if (StringUtils.isNotEmpty(code) && !code.equals("PDA_VALIDATE")){ + validateCaptcha(username, code, uuid); + } // 登录前置校验 loginPreCheck(username, password); // 用户验证