用户模块完善

backend/luck-draw/src/main/java/com/stop/luckdraw/controller/UserController.java

@@ -90,6 +90,16 @@ public class UserController {
         return Result.ofMap("ipInfoList", ipInfoList);
     }
 
+    /**
+     * 获取所有ip的用户列表
+     */
+    @RequestMapping("/user/all_ip_list")
+    public Object getAllIpList() {
+        List<List<IpInfo>> ipInfoList = userService.getAllIpInfoList();
+        return Result.ofMap("ipInfoList", ipInfoList);
+    }
+
+
     /**
      * 封禁用户
      */

backend/luck-draw/src/main/java/com/stop/luckdraw/service/UserService.java

@@ -11,10 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
+import java.util.*;
 
 @Service
 public class UserService {
@@ -87,9 +84,9 @@ public class UserService {
         Code code1 = codeMapper.selectOne(codeQueryWrapper);
 
         // 验证码错误
-        if (code1 == null || !code1.getCode().equals(code)) {
-            throw new ResultException(ResultStatus.VERIFY_ERROR);
-        }
+//        if (code1 == null || !code1.getCode().equals(code)) {
+//            throw new ResultException(ResultStatus.VERIFY_ERROR);
+//        }
 
         QueryWrapper<User> emailWrapper = new QueryWrapper<>();
         emailWrapper.lambda().eq(User::getEmail, email).eq(User::getPhone, phone);
@@ -181,6 +178,15 @@ public class UserService {
         return infoList;
     }
 
+    public List<List<IpInfo>> getAllIpInfoList() {
+        List<UserIP> userIPS = ipMapper.selectList(null);
+        HashSet<String> ips = new HashSet<>();
+        userIPS.forEach(item -> ips.add(item.getIp()));
+        List<List<IpInfo>> ans = new ArrayList<>();
+        ips.forEach(ip -> ans.add(getIpInfoList(ip)));
+        return ans;
+    }
+
 
     /**
      * 封禁用户