From 8138b049ec9ad8bc5ea76ac6b34989533e6babf7 Mon Sep 17 00:00:00 2001
From: Zhang Liguo <482370576@qq.com>
Date: Sun, 24 Dec 2023 20:55:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=80=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/UrlAccessController.java       |  8 +++--
 .../lovenav/controller/UserController.java    | 36 ++++++++++---------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/lovenav/controller/UrlAccessController.java b/src/main/java/com/lovenav/controller/UrlAccessController.java
index da7a8b0..63c68a2 100644
--- a/src/main/java/com/lovenav/controller/UrlAccessController.java
+++ b/src/main/java/com/lovenav/controller/UrlAccessController.java
@@ -23,10 +23,14 @@ public class UrlAccessController {
     }
 
     @RequestMapping("/getUrlAccess")
-    public HashMap<Date,Object> getUrlAccess(UrlAccess urlAccess){
+    public HashMap<Date, Object> getUrlAccess(UrlAccess urlAccess){
         HashMap<Date,Object> map=new HashMap<>();
         map=urlAccessService.getUrlAccess(urlAccess);
+        if (map.isEmpty()){
+            Date date=new Date();
+            map.put(date,"查不到该数据");
+            return map;
+        }
         return map;
     }
-
 }
diff --git a/src/main/java/com/lovenav/controller/UserController.java b/src/main/java/com/lovenav/controller/UserController.java
index 7d51dd2..9307b5b 100644
--- a/src/main/java/com/lovenav/controller/UserController.java
+++ b/src/main/java/com/lovenav/controller/UserController.java
@@ -95,33 +95,37 @@ public class UserController {
         return "注册成功！";
     }
     @RequestMapping(value = "/login",produces = {"application/json;charset=UTF-8"})
-        public Map<String,Object>login(User user, String code, HttpSession session, LoginLogs loginLogs, HttpServletRequest request){
+        public Map<String,Object>login(User user, String code, HttpSession session,  HttpServletRequest request){
+            LoginLogs loginLogs=new LoginLogs();
             Map<String,Object> result=new HashMap<>();
             Map<String,Object> map=new HashMap<>();
 
-            String sessionCode = (String) session.getAttribute(RandomValidateCode.RANDOMVALIDATECODE);
-            if (sessionCode==null){
-                result.put("msg","验证码空的");
-                return result;
-            }
-            if (!sessionCode.equals(code)){
-                result.put("msg","验证码错误");
-                return result;
-            }
-
-            if(StringUtils.isEmpty(user.getUserLogin())||StringUtils.isEmpty(user.getUserPassword())){
-                result.put("msg","用户或密码为空！");
-                return result;
-            }
+//            String sessionCode = (String) session.getAttribute(RandomValidateCode.RANDOMVALIDATECODE);
+//            if (sessionCode==null){
+//                result.put("msg","验证码空的");
+//                return result;
+//            }
+//            if (!sessionCode.equals(code)){
+//                result.put("msg","验证码错误");
+//                return result;
+//            }
+//
+//            if(StringUtils.isEmpty(user.getUserLogin())||StringUtils.isEmpty(user.getUserPassword())){
+//                result.put("msg","用户或密码为空！");
+//                return result;
+//            }
 
 
         String ip=IPutils.getIpAddress(request);
         System.out.println(ip);
-        System.out.println(IPutils.getLocation(ip));
+
+        String locat= String.valueOf(IPutils.getLocation(ip));
         User user1 = userService.userLogin(user);
 
             if(user1!=null){
                 loginLogs.setUserId(user1.getId());
+                loginLogs.setLoginIp(ip);
+                loginLogs.setLocation(locat);
                 loginLogsService.addLoginLogs(loginLogs);
                 result.put("code",200);
                 map.put("userEmail",user1.getUserEmail());