From 717d2a0ad50a353533ac1388ae6854b7011261e9 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Sun, 16 Feb 2025 10:30:43 +0800
Subject: [PATCH] bonus_houqin

---
 .../java/com/bonus/auth/controller/TokenController.java     | 6 ++++++
 .../com/bonus/auth/service/PhonePasswordLoginStrategy.java  | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/bonus-auth/src/main/java/com/bonus/auth/controller/TokenController.java b/bonus-auth/src/main/java/com/bonus/auth/controller/TokenController.java
index 806a564..d1eba2d 100644
--- a/bonus-auth/src/main/java/com/bonus/auth/controller/TokenController.java
+++ b/bonus-auth/src/main/java/com/bonus/auth/controller/TokenController.java
@@ -156,6 +156,12 @@ public class TokenController {
             login.setExpireIn((Long) map.get("expires_in"));
             login.setLogin((boolean) map.get("isLogin"));
             return R.ok(login);
+        } else if (LoginType.PHONE_PASSWORD.equals(form.getLoginType()) || LoginType.PHONE_OTP.equals(form.getLoginType())) {
+            Map<String, Object> map = tokenService.createToken(login);
+            login.setToken((String) map.get("access_token"));
+            login.setExpireIn((Long) map.get("expires_in"));
+            login.setLogin((boolean) map.get("isLogin"));
+            return R.ok(login);
         } else {
             return R.ok(tokenService.createToken(login));
         }
diff --git a/bonus-auth/src/main/java/com/bonus/auth/service/PhonePasswordLoginStrategy.java b/bonus-auth/src/main/java/com/bonus/auth/service/PhonePasswordLoginStrategy.java
index c580ed2..390959c 100644
--- a/bonus-auth/src/main/java/com/bonus/auth/service/PhonePasswordLoginStrategy.java
+++ b/bonus-auth/src/main/java/com/bonus/auth/service/PhonePasswordLoginStrategy.java
@@ -3,6 +3,7 @@ package com.bonus.auth.service;
 import com.bonus.common.core.constant.SecurityConstants;
 import com.bonus.common.core.domain.R;
 import com.bonus.common.core.exception.ServiceException;
+import com.bonus.common.core.utils.encryption.AesEncryptUtil;
 import com.bonus.common.core.utils.encryption.Sm4Utils;
 import com.bonus.config.SystemConfig;
 import com.bonus.system.api.RemoteUserService;
@@ -47,7 +48,8 @@ public class PhonePasswordLoginStrategy implements LoginStrategy {
         // 处理IP校验
         passwordValidatorService.validateIpBlacklist(user.getUserName());
         // 验证密码
-        passwordService.validate(user, password, System.currentTimeMillis());
+        String inputPassword = AesEncryptUtil.aesDecode(password); //绿智食堂前端把密码加密后传至后端，需先解开再做比较
+        passwordService.validate(user, inputPassword, System.currentTimeMillis());
         //校验用户启用状态
         passwordValidatorService.validateUserStatus(user.getUserName(), user);