1

zj

2024-08-05 a522f170fe22ffeb03e2b6bc81ae40243fb4cecb

 websocketSerivce/src/main/java/org/example/controller/UserController.java

@@ -59,11 +59,11 @@
        try {
            User user = userService.getOne(new LambdaQueryWrapper<User>().eq(User::getAccount, account));
            if(null == user){
                return ServerResponse.createBySuccessMsg("用户不存在");
                return ServerResponse.createByErrorMsg("用户不存在");
            }

            if (!MD5Util.verify(password, user.getPassword())) {
                return ServerResponse.createBySuccessMsg("密码错误");
                return ServerResponse.createByErrorMsg("密码错误");
            }
            List<Menu> menus = menuMapper.selectList(new LambdaQueryWrapper<Menu>());
            if(user.getIsRoot() == 1){
@@ -72,17 +72,18 @@
                map.put("token",token);
                map.put("user",user);
                map.put("menu",menus);
                extracted(account, request);
                return ServerResponse.createBySuccess(map);
            }

            //判断是否锁定
            if(user.getIsLock() == 1){
                return ServerResponse.createBySuccessMsg("账号已被锁定");
                return ServerResponse.createByErrorMsg("账号已被锁定");
            }

            //判断是否到期
            if(new java.util.Date().after(user.getEndTime())){
                return ServerResponse.createBySuccessMsg("账号已到期");
                return ServerResponse.createByErrorMsg("账号已到期");
            }

            String token = JwtUtil.getToken(user);
@@ -93,24 +94,25 @@
            map.put("user",user);
            String key = "user_";
            RedisUtil.set(key+user.getId(),token);
            String ip = IpAddressUtil.getIpAddress(request);
            String address = null;
            address = IpAddressUtil.getIpPossessionByFile(ip);
            if(null == address){
                address = IpAddressUtil.getIpAddressByOnline(ip);

            extracted(account, request);
            return ServerResponse.createBySuccess(map);
        }catch (Exception e){
            e.printStackTrace();
            log.error("登录异常："+e.getMessage());
            }
        return ServerResponse.createByErrorMsg("系统异常");
    }

    private void extracted(String account, HttpServletRequest request) {
        String ip = IpAddressUtil.getIpAddress(request);
        String address = IpAddressUtil.getIpPossessionByFile(ip);
            Log log = new Log();
            log.setIp(ip);
            log.setAccount(account);
            log.setLoginTime(new java.util.Date());
            log.setAddress(address);
            logMapper.insert(log);
            return ServerResponse.createBySuccess(map);
        }catch (Exception e){
            e.printStackTrace();
            log.error("登录异常："+e.getMessage());
        }
        return ServerResponse.createBySuccessMsg("系统异常");
    }

    @PostMapping("/saveConfig")
@@ -193,13 +195,12 @@
    }

    @PostMapping("/updateUser")
    public ServerResponse deleteUser(UpdateUserVo updateUserVo) {
    public ServerResponse deleteUser(@RequestBody UpdateUserVo updateUserVo) {
        User user = userService.getById(updateUserVo.getId());
        if(null == user || user.getIsRoot() == 1){
            return ServerResponse.createByErrorMsg("用户不存在");
        }
        user.setAccount(updateUserVo.getAccount());
        user.setPassword(MD5Util.encrypt(updateUserVo.getPassword()));
        user.setEndTime(updateUserVo.getEndTime());
        user.setIsLock(updateUserVo.getIsLock());
        userService.updateById(user);