From 4a79b4c9bc6f9f1c6c0f2d8b5edf755535ba2ad1 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sun, 24 Aug 2025 03:43:43 +0800
Subject: [PATCH] 1
---
ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java | 84 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 81 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java
index 2ab0c4a..9bd8f0e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java
@@ -1,10 +1,24 @@
package com.ruoyi.im;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.im.comm.Result;
+import com.ruoyi.im.config.IpUtils;
import com.ruoyi.im.dto.UpdateUserBusinessDto;
import com.ruoyi.im.service.ImApiServcie;
import com.ruoyi.im.dto.RegisterDto;
+import com.ruoyi.im.util.SymmetricCryptoUtil;
+import com.ruoyi.system.domain.GroupWelcomeConfig;
+import com.ruoyi.system.domain.IpBlacklist;
+import com.ruoyi.system.domain.UserAccount;
+import com.ruoyi.system.domain.vo.UserAccountUpdateVo;
+import com.ruoyi.system.service.GroupWelcomeConfigService;
+import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.system.service.IpBlacklistService;
+import com.ruoyi.system.service.UserAccountService;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +29,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
@@ -22,6 +37,7 @@
import java.nio.file.Paths;
import java.nio.file.attribute.PosixFilePermission;
import java.nio.file.attribute.PosixFilePermissions;
+import java.util.Date;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
@@ -34,6 +50,13 @@
@Autowired
private ImApiServcie imApiServcie;
+ @Autowired
+ IpBlacklistService ipBlacklistService;
+
+ @Autowired
+ UserAccountService userAccountService;
+
+
@Value("${file.upload-dir}")
private String uploadDir;
@@ -43,15 +66,70 @@
/**
- * 获取参数配置列表
+ * 注册
*/
@PostMapping("/register")
public Result register(@Validated RegisterDto dto){
try {
return imApiServcie.register(dto);
+ } catch (RuntimeException e) {
+ // 从异常消息中解析Result对象
+ return JSON.parseObject(e.getMessage(), Result.class);
+ }
+ }
+
+
+ /**
+ * 修改用户信息只有数据库
+ * @return
+ */
+ @PostMapping("/updateUser")
+ public Result updateUser(UserAccountUpdateVo vo){
+ try {
+ UserAccount userAccount = userAccountService.getOne(new LambdaQueryWrapper<UserAccount>().eq(UserAccount::getAccount,vo.getAccountId()));
+
+ if (StringUtils.isNotBlank(vo.getNickname())) {
+ userAccount.setNickname(vo.getNickname());
+ }
+
+ if (StringUtils.isNotBlank(vo.getSignature())) {
+ userAccount.setSignature(vo.getSignature());
+ }
+
+ userAccount.setUpdateTime(new Date());
+ userAccountService.updateById(userAccount);
+ return Result.success();
+ } catch (RuntimeException e) {
+ e.printStackTrace();
+ log.error("修改用户数据库信息失败");
+ return Result.error("修改失败！");
+ }
+ }
+
+ /**
+ * 获取ip地址并判断是否在黑名单
+ */
+ @GetMapping("/blacklist")
+ public Result blacklist(HttpServletRequest request,@RequestParam("account") String account){
+ try {
+ String clientIp = IpUtils.getClientIp(request);
+ if(StringUtils.isEmpty(clientIp)){
+ return Result.success();
+ }
+ long count = ipBlacklistService.count(new LambdaQueryWrapper<IpBlacklist>().eq(IpBlacklist::getIpAddress, clientIp));
+ if(count > 0){
+ return Result.error("账号异常，禁止登录！");
+ }
+ UserAccount userAccount = userAccountService.getOne(new LambdaQueryWrapper<>(UserAccount.class).eq(UserAccount::getCloudMessageAccount, account));
+ if(ObjectUtil.isEmpty(userAccount)){
+ return Result.error("账号不存在！");
+ }
+ userAccount.setLoginIp(clientIp);
+ userAccountService.updateById(userAccount);
+ return Result.success();
}catch (Exception e){
- log.error("注册报错：",e);
- return Result.error("注册失败，请稍后再试！");
+ log.error("登录错误：",e);
+ return Result.error("登录错误，请稍后再试！");
}
}
--
Gitblit v1.9.3