From b8ca417fbde73719bb9fdf8a011a58dad2d2031d Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Tue, 27 Jun 2023 20:10:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/user/controller/app/AppUserController.java   | 8 ++++++--
 .../main/java/com/njcn/user/service/IAppUserService.java  | 2 +-
 .../com/njcn/user/service/impl/AppUserServiceImpl.java    | 4 +---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/app/AppUserController.java b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/app/AppUserController.java
index bd8602393..ea72f41ab 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/app/AppUserController.java
+++ b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/app/AppUserController.java
@@ -85,9 +85,13 @@ public class AppUserController extends BaseController {
     @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD)
     @PostMapping("autoLogin")
     @ApiOperation("app用户注册完自动登录")
-    public HttpResult<Object> autoLogin() {
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "phone", value = "手机号", required = true, paramType = "query"),
+            @ApiImplicitParam(name = "devCode", value = "设备码", required = true, paramType = "query")
+    })
+    public HttpResult<Object> autoLogin(@Param("phone") String phone,@Param("devCode") String devCode) {
         String methodDescribe = getMethodDescribe("autoLogin");
-        Object object = appUserService.autoLogin();
+        Object object = appUserService.autoLogin(phone,devCode);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, object, methodDescribe);
     }
 
diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/IAppUserService.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/IAppUserService.java
index 3afbdb60f..9f77fdcca 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/IAppUserService.java
+++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/IAppUserService.java
@@ -26,7 +26,7 @@ public interface IAppUserService {
     /**
      * 手机app注册完自动登录
      */
-    Object autoLogin();
+    Object autoLogin(String phone, String devCode);
 
     /**
      * 用户设置密码
diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/AppUserServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/AppUserServiceImpl.java
index 4acc30526..8a981d8a7 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/AppUserServiceImpl.java
+++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/AppUserServiceImpl.java
@@ -199,13 +199,11 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, User> impleme
             appInfoSet.setSystemInfo(1);
             appInfoSet.setHarmonicInfo(1);
             appInfoSetService.save(appInfoSet);
-            redisUtil.saveByKeyWithExpire("autoLogin",phone,5L);
         }
     }
 
     @Override
-    public Object autoLogin() {
-        String phone = redisUtil.getStringByKey("autoLogin");
+    public Object autoLogin(String phone, String devCode) {
         //发送密码短信
         //sendPasswordMessage(phone,newUser.getId());
         //获取登录信息