From ee9932c912ffaa508f9b92684ece658f6127f079 Mon Sep 17 00:00:00 2001
From: 77 <77@77.com>
Date: Fri, 26 Apr 2024 00:11:18 +0800
Subject: [PATCH] init

---
 .../com/ruoyi/test/business/RefreshTest.java  |  5 +++
 .../xq/controller/app/AuthAppController.java  | 11 ++---
 .../java/com/ruoyi/xq/job/JobManager.java     | 43 +++++++++++++++++++
 .../com/ruoyi/xq/manager/LoginManager.java    |  2 +-
 4 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/business/RefreshTest.java b/ruoyi-admin/src/test/java/com/ruoyi/test/business/RefreshTest.java
index efa0f8c..c568424 100644
--- a/ruoyi-admin/src/test/java/com/ruoyi/test/business/RefreshTest.java
+++ b/ruoyi-admin/src/test/java/com/ruoyi/test/business/RefreshTest.java
@@ -34,6 +34,11 @@ public class RefreshTest {
         jobManager.updateAge();
     }
 
+    @Test
+    public void refreshUserAreaCode(){
+        jobManager.refreshUserAreaCode();
+    }
+
 
     @Test
     public void checkBaseStatus(){
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/AuthAppController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/AuthAppController.java
index 73505e3..1f62f03 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/AuthAppController.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/AuthAppController.java
@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
 import java.util.Map;
 
 @RestController
@@ -96,11 +97,11 @@ public class AuthAppController {
     @PostMapping("/resetPassword/checkCode")
     @Operation(summary = "重置密码-验证码校验")
     @Log(title = "重置密码-验证码校验", businessType = BusinessType.OTHER, isSaveDb = false)
-    public R<String> resetPasswordCheck(@RequestBody RegisterCodeCheck code){
-        String check = loginManager.resetPasswordCheck(code.getMobile(), code.getCode());
-        R<String> ok = R.ok();
-        ok.setData(check);
-        return R.ok();
+    public R<Map<String,String>> resetPasswordCheck(@RequestBody RegisterCodeCheck code){
+        String token = loginManager.resetPasswordCheck(code.getMobile(), code.getCode());
+        Map<String,String> map = new HashMap<>();
+        map.put("token",token);
+        return R.ok(map);
     }
 
     @PostMapping("/resetPassword")
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/job/JobManager.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/job/JobManager.java
index 41d8c80..eb17b94 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/job/JobManager.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/job/JobManager.java
@@ -2,7 +2,9 @@ package com.ruoyi.xq.job;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.xq.domain.AreaCode;
 import com.ruoyi.xq.domain.User;
+import com.ruoyi.xq.service.AreaCodeService;
 import com.ruoyi.xq.service.UserService;
 import com.ruoyi.xq.util.AgeUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +16,8 @@ import java.util.List;
 public class JobManager {
     @Autowired
     private UserService userService;
+    @Autowired
+    private AreaCodeService areaCodeService;
 
     public void updateAge(){
         int current = 0;
@@ -38,4 +42,43 @@ public class JobManager {
             }
         }
     }
+
+    public void refreshUserAreaCode() {
+        int current = 0;
+        while (true){
+            current++;
+            IPage<User> page = new Page<>();
+            page.setCurrent(current);
+            page.setSize(100);
+            IPage<User> userPage = userService.page(page);
+            List<User> records = userPage.getRecords();
+            if(records.isEmpty()){
+                break;
+            }
+            for (User record : records) {
+                boolean updateFlag = false;
+                User update = new User();
+                update.setId(record.getId());
+                if(record.getAddressCode() != null){
+                    AreaCode areaCode = areaCodeService.getById(record.getAddressCode());
+                    if(areaCode != null){
+                        updateFlag = true;
+                        update.setAddressName(areaCode.getFullname());
+                    }
+                }
+                if(record.getResidenceCode() != null){
+                    AreaCode areaCode = areaCodeService.getById(record.getResidenceCode());
+                    if(areaCode != null){
+                        updateFlag = true;
+                        update.setResidenceName(areaCode.getFullname());
+                        update.setResidenceCityCode(areaCode.getPcode());
+                        update.setResidenceCityName(areaCode.getPname());
+                    }
+                }
+                if(updateFlag){
+                    userService.updateById(update);
+                }
+            }
+        }
+    }
 }
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/manager/LoginManager.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/manager/LoginManager.java
index ad9078d..2e56e0d 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/manager/LoginManager.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/manager/LoginManager.java
@@ -271,7 +271,7 @@ public class LoginManager {
         String key = String.format(RedisHttpConstant.RESET_PASSWORD_CHECK_REDIS, token);
         RBucket<String> bucket = redissonClient.getBucket(key);
         String value = bucket.get();
-        if(StringUtils.isEmpty(value) || value.equals(mobile)){
+        if(StringUtils.isEmpty(value) || !value.equals(mobile)){
             throw new ServiceException("验证码已过期");
         }
         userService.resetPassword(user.getId(),password);