Compare commits
2 Commits
feature-in
...
feature-Po
| Author | SHA1 | Date | |
|---|---|---|---|
|
03bd1474b5 | ||
|
|
5d3d85a325 |
72
pom.xml
72
pom.xml
@@ -19,18 +19,6 @@
|
||||
<artifactId>spring-boot-starter</artifactId>
|
||||
</dependency>
|
||||
|
||||
|
||||
<dependency>
|
||||
<groupId>org.mybatis</groupId>
|
||||
<artifactId>mybatis</artifactId>
|
||||
<version>3.5.10</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-data-redis</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-web</artifactId>
|
||||
@@ -61,12 +49,6 @@
|
||||
<artifactId>spring-boot-starter-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.mockito</groupId>
|
||||
<artifactId>mockito-inline</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- JUnit Platform Launcher for resolving junit-platform-launcher:1.8.2 issue -->
|
||||
<dependency>
|
||||
@@ -82,18 +64,6 @@
|
||||
<version>3.12.0</version>
|
||||
</dependency>
|
||||
|
||||
<!-- AOP起步依赖 -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-aop</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- WebSocket 起步依赖 -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-websocket</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- 阿里云相关依赖 -->
|
||||
<dependency>
|
||||
<groupId>com.aliyun.oss</groupId>
|
||||
@@ -133,44 +103,6 @@
|
||||
<version>0.2.8</version>
|
||||
</dependency>
|
||||
|
||||
<!-- JWT 相关依赖 -->
|
||||
<dependency>
|
||||
<groupId>io.jsonwebtoken</groupId>
|
||||
<artifactId>jjwt-api</artifactId>
|
||||
<version>0.11.5</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.jsonwebtoken</groupId>
|
||||
<artifactId>jjwt-impl</artifactId>
|
||||
<version>0.11.5</version>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.jsonwebtoken</groupId>
|
||||
<artifactId>jjwt-jackson</artifactId>
|
||||
<version>0.11.5</version>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- 阿里云短信服务SDK -->
|
||||
<dependency>
|
||||
<groupId>com.aliyun</groupId>
|
||||
<artifactId>dysmsapi20170525</artifactId>
|
||||
<version>3.0.0</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Spring Mail 邮件发送 -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-mail</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- Redis 依赖 -->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-data-redis</artifactId>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
@@ -191,8 +123,8 @@
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.8.1</version>
|
||||
<configuration>
|
||||
<source>9</source>
|
||||
<target>9</target>
|
||||
<source>1.8</source>
|
||||
<target>1.8</target>
|
||||
<encoding>UTF-8</encoding>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
@@ -4,32 +4,11 @@ import org.mybatis.spring.annotation.MapperScan;
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
|
||||
@MapperScan("com.bao.dating.mapper")
|
||||
@SpringBootApplication
|
||||
public class DatingApplication {
|
||||
public static void main(String[] args) {
|
||||
SpringApplication.run(DatingApplication.class, args);
|
||||
// 读取并打印 ciallo.txt 文件内容
|
||||
printCialloFile();
|
||||
}
|
||||
|
||||
/**
|
||||
* 读取并打印 ciallo.txt 文件内容
|
||||
*/
|
||||
private static void printCialloFile() {
|
||||
try (InputStream inputStream = DatingApplication.class.getClassLoader().getResourceAsStream("ciallo.txt");
|
||||
BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))) {
|
||||
String line;
|
||||
while ((line = reader.readLine()) != null) {
|
||||
System.out.println(line);
|
||||
}
|
||||
} catch (IOException e) {
|
||||
System.err.println("读取 ciallo.txt 文件时发生错误: " + e.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
package com.bao.dating.anno;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
import java.lang.annotation.Target;
|
||||
|
||||
@Target(ElementType.METHOD)
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
public @interface Log {
|
||||
}
|
||||
@@ -1,48 +0,0 @@
|
||||
package com.bao.dating.aspect;
|
||||
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.aspectj.lang.JoinPoint;
|
||||
import org.aspectj.lang.annotation.*;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* 日志切面
|
||||
* @author KilLze
|
||||
*/
|
||||
@Aspect
|
||||
@Component
|
||||
@Slf4j
|
||||
public class LoggingAspect {
|
||||
@Pointcut("execution(* com.bao.dating.service.impl.*.*(..))")
|
||||
private void pt(){}
|
||||
|
||||
/**
|
||||
* 方法执行前执行
|
||||
* @param joinPoint 方法参数
|
||||
*/
|
||||
@Before("pt()")
|
||||
public void logBeforeMethod(JoinPoint joinPoint){
|
||||
// 获取方法名
|
||||
String methodName = joinPoint.getSignature().getName();
|
||||
// 获取参数
|
||||
Object[] args = joinPoint.getArgs();
|
||||
log.info("方法 {} 开始执行，参数: {}", methodName, args);
|
||||
}
|
||||
|
||||
/**
|
||||
* 方法执行成功后执行
|
||||
* @param joinPoint 方法参数
|
||||
*/
|
||||
@AfterReturning(pointcut = "pt()", returning = "result")
|
||||
public void logAfterMethod(JoinPoint joinPoint, Object result){
|
||||
String methodName = joinPoint.getSignature().getName();
|
||||
log.info("方法 {} 执行成功,返回值: {}", methodName, result);
|
||||
}
|
||||
|
||||
@AfterThrowing(pointcut = "pt()", throwing = "exception")
|
||||
public void logAfterThrowing(JoinPoint joinPoint, Exception exception){
|
||||
String methodName = joinPoint.getSignature().getName();
|
||||
log.error("方法 {} 执行异常", methodName, exception);
|
||||
}
|
||||
}
|
||||
@@ -1,64 +0,0 @@
|
||||
package com.bao.dating.aspect;
|
||||
|
||||
|
||||
import com.bao.dating.context.UserContext;
|
||||
import com.bao.dating.mapper.OperateLogMapper;
|
||||
import com.bao.dating.pojo.entity.OperateLog;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.aspectj.lang.ProceedingJoinPoint;
|
||||
import org.aspectj.lang.annotation.Around;
|
||||
import org.aspectj.lang.annotation.Aspect;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Arrays;
|
||||
|
||||
/**
|
||||
* 记录操作日志
|
||||
* @author KilLze
|
||||
*/
|
||||
@Slf4j
|
||||
@Aspect
|
||||
@Component
|
||||
public class OperateLogAspect {
|
||||
|
||||
@Autowired
|
||||
private OperateLogMapper operateLogMapper;
|
||||
|
||||
@Around("@annotation(com.bao.dating.anno.Log)")
|
||||
public Object logOperate(ProceedingJoinPoint pjp) throws Throwable{
|
||||
|
||||
// 记录方法开始的时间
|
||||
long startTime = System.currentTimeMillis();
|
||||
|
||||
// 执行目标方法
|
||||
Object result = pjp.proceed();
|
||||
|
||||
long endTime = System.currentTimeMillis();
|
||||
long costTime = endTime - startTime;
|
||||
|
||||
|
||||
// 构建日志对象
|
||||
OperateLog operatelog = new OperateLog();
|
||||
operatelog.setOperateUserId(getUserId());
|
||||
operatelog.setOperateTime(LocalDateTime.now());
|
||||
operatelog.setClassName(pjp.getTarget().getClass().getName());
|
||||
operatelog.setMethodName(pjp.getSignature().getName());
|
||||
operatelog.setMethodParams(Arrays.toString(pjp.getArgs()));
|
||||
operatelog.setReturnValue(result != null ? result.toString() : "void");
|
||||
operatelog.setCostTime(costTime);
|
||||
|
||||
log.info("记录操作日志: {}", operatelog);
|
||||
|
||||
operateLogMapper.insert(operatelog);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private Long getUserId() {
|
||||
return UserContext.getUserId();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,36 +1,14 @@
|
||||
package com.bao.dating.common;
|
||||
|
||||
/**
|
||||
* 响应状态码枚举
|
||||
* @author KilLze
|
||||
*/
|
||||
public enum ResultCode {
|
||||
/** 成功 */
|
||||
SUCCESS(200, "成功"),
|
||||
/** 请求已成功处理 */
|
||||
SUCCESS_REVIEW(201, "请求已成功处理"),
|
||||
/** 删除成功 */
|
||||
SUCCESS_DELETE(204, "删除成功"),
|
||||
/** 参数错误 */
|
||||
PARAM_ERROR(400, "参数错误"),
|
||||
/** 未登录或 Token 失效 */
|
||||
UNAUTHORIZED(401, "未登录或 Token 失效"),
|
||||
/** 无权限 */
|
||||
FORBIDDEN(403, "无权限"),
|
||||
/** 数据不存在 */
|
||||
NOT_FOUND(404, "数据不存在"),
|
||||
/** 验证码已发送 */
|
||||
CODE_SENT(200, "验证码已发送"),
|
||||
/** 验证码错误 */
|
||||
CODE_ERROR(400, "验证码错误"),
|
||||
/** 验证码已过期 */
|
||||
CODE_EXPIRED(400, "验证码已过期"),
|
||||
/** 验证码发送失败 */
|
||||
CODE_SEND_FAIL(500, "验证码发送失败"),
|
||||
/** 系统异常 */
|
||||
SYSTEM_ERROR(500, "系统异常"),
|
||||
/** 操作失败 */
|
||||
FAIL(500, "操作失败");
|
||||
SYSTEM_ERROR(500, "系统异常");
|
||||
|
||||
private final int code;
|
||||
private final String msg;
|
||||
@@ -47,4 +25,4 @@ public enum ResultCode {
|
||||
public String msg() {
|
||||
return msg;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,17 +4,16 @@ import com.aliyun.oss.ClientException;
|
||||
import com.aliyun.oss.OSS;
|
||||
import com.aliyun.oss.OSSClientBuilder;
|
||||
import com.aliyun.oss.OSSException;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.time.LocalDate;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
|
||||
/**
|
||||
* 阿里云OSS工具类
|
||||
* @author KilLze
|
||||
*/
|
||||
@Data
|
||||
@Slf4j
|
||||
@Component
|
||||
|
||||
@@ -1,155 +0,0 @@
|
||||
package com.bao.dating.common.aliyun;
|
||||
|
||||
import com.aliyun.dysmsapi20170525.Client;
|
||||
import com.aliyun.dysmsapi20170525.models.SendSmsRequest;
|
||||
import com.aliyun.dysmsapi20170525.models.SendSmsResponse;
|
||||
import com.aliyun.teaopenapi.models.Config;
|
||||
import lombok.Data;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 阿里云短信服务工具类
|
||||
* @author KilLze
|
||||
*/
|
||||
@Data
|
||||
@Slf4j
|
||||
@Component
|
||||
@ConfigurationProperties(prefix = "aliyun.sms")
|
||||
public class SmsUtil {
|
||||
|
||||
/**
|
||||
* 访问密钥ID
|
||||
*/
|
||||
private String accessKeyId;
|
||||
|
||||
/**
|
||||
* 访问密钥Secret
|
||||
*/
|
||||
private String accessKeySecret;
|
||||
|
||||
/**
|
||||
* 短信服务区域节点
|
||||
*/
|
||||
private String regionId = "cn-hangzhou";
|
||||
|
||||
/**
|
||||
* 默认签名名称
|
||||
*/
|
||||
private String signName;
|
||||
|
||||
/**
|
||||
* 默认模板代码
|
||||
*/
|
||||
private String templateCode;
|
||||
|
||||
/**
|
||||
* 创建短信客户端
|
||||
* @return Client对象
|
||||
* @throws Exception 创建失败时抛出异常
|
||||
*/
|
||||
private Client createClient() throws Exception {
|
||||
Config config = new Config()
|
||||
.setAccessKeyId(accessKeyId)
|
||||
.setAccessKeySecret(accessKeySecret)
|
||||
.setEndpoint("dysmsapi.aliyuncs.com");
|
||||
return new Client(config);
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送短信
|
||||
* @param phoneNumber 手机号码
|
||||
* @param templateCode 模板代码（如果为空则使用默认模板代码）
|
||||
* @param templateParam 模板参数（JSON格式字符串，如：{"code":"123456"}）
|
||||
* @return 是否发送成功
|
||||
*/
|
||||
public boolean sendSms(String phoneNumber, String templateCode, String templateParam) {
|
||||
try {
|
||||
Client client = createClient();
|
||||
SendSmsRequest sendSmsRequest = new SendSmsRequest()
|
||||
.setPhoneNumbers(phoneNumber)
|
||||
.setSignName(signName)
|
||||
.setTemplateCode(templateCode != null ? templateCode : this.templateCode)
|
||||
.setTemplateParam(templateParam);
|
||||
|
||||
log.error("TemplateParam 实际值 = {}", templateParam);
|
||||
|
||||
SendSmsResponse response = client.sendSms(sendSmsRequest);
|
||||
|
||||
if ("OK".equals(response.getBody().getCode())) {
|
||||
log.info("短信发送成功，手机号：{}，请求ID：{}", phoneNumber, response.getBody().getRequestId());
|
||||
return true;
|
||||
} else {
|
||||
log.error("短信发送失败，手机号：{}，错误码：{}，错误信息：{}",
|
||||
phoneNumber, response.getBody().getCode(), response.getBody().getMessage());
|
||||
return false;
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error("发送短信异常，手机号：{}，异常信息：{}", phoneNumber, e.getMessage(), e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送短信（使用默认模板代码）
|
||||
* @param phoneNumber 手机号码
|
||||
* @param templateParam 模板参数（JSON格式字符串）
|
||||
* @return 是否发送成功
|
||||
*/
|
||||
public boolean sendSms(String phoneNumber, String templateParam) {
|
||||
return sendSms(phoneNumber, null, templateParam);
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送验证码短信
|
||||
* @param phoneNumber 手机号码
|
||||
* @param code 验证码
|
||||
* @return 是否发送成功
|
||||
*/
|
||||
public boolean sendVerificationCode(String phoneNumber, String code) {
|
||||
String templateParam = String.format("{\"code\":\"%s\"}", code);
|
||||
return sendSms(phoneNumber, templateParam);
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送验证码短信（使用指定模板代码）
|
||||
* @param phoneNumber 手机号码
|
||||
* @param code 验证码
|
||||
* @param templateCode 模板代码
|
||||
* @return 是否发送成功
|
||||
*/
|
||||
public boolean sendVerificationCode(String phoneNumber, String code, String templateCode) {
|
||||
String templateParam = String.format("{\"code\":\"%s\"}", code);
|
||||
return sendSms(phoneNumber, templateCode, templateParam);
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送短信（使用Map参数）
|
||||
* @param phoneNumber 手机号码
|
||||
* @param templateCode 模板代码
|
||||
* @param params 模板参数Map
|
||||
* @return 是否发送成功
|
||||
*/
|
||||
public boolean sendSmsWithParams(String phoneNumber, String templateCode, Map<String, String> params) {
|
||||
StringBuilder jsonBuilder = new StringBuilder("{");
|
||||
boolean first = true;
|
||||
for (Map.Entry<String, String> entry : params.entrySet()) {
|
||||
if (!first) {
|
||||
jsonBuilder.append(",");
|
||||
}
|
||||
jsonBuilder.append("\"").append(entry.getKey()).append("\":\"")
|
||||
.append(entry.getValue()).append("\"");
|
||||
first = false;
|
||||
}
|
||||
jsonBuilder.append("}");
|
||||
return sendSms(phoneNumber, templateCode, jsonBuilder.toString());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
package com.bao.dating.common.result;
|
||||
|
||||
/**
|
||||
* 阿里云 OSS 文件上传结果
|
||||
* @author KilLze
|
||||
*/
|
||||
public class AliOssResult {
|
||||
public static final String IMAGE = "image";
|
||||
public static final String VIDEO = "video";
|
||||
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
package com.bao.dating.common.result;
|
||||
|
||||
/**
|
||||
* 文件上传结果
|
||||
* @author KilLze
|
||||
*/
|
||||
public class FileResult {
|
||||
public static final String JPG = "jpg";
|
||||
public static final String JPEG = "jpeg";
|
||||
public static final String PNG = "png";
|
||||
public static final String GIF = "gif";
|
||||
public static final String MP4 = "mp4";
|
||||
public static final String AVI = "avi";
|
||||
public static final String MOV = "mov";
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
package com.bao.dating.common.result;
|
||||
|
||||
/**
|
||||
* 阿里云敏感内容审核结果
|
||||
* @author KilLze
|
||||
*/
|
||||
public class GreenAuditResult {
|
||||
public static final String PASS = "pass";
|
||||
public static final String REVIEW = "review";
|
||||
public static final String BLOCK = "block";
|
||||
}
|
||||
@@ -1,33 +0,0 @@
|
||||
package com.bao.dating.config;
|
||||
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.data.redis.connection.RedisConnectionFactory;
|
||||
import org.springframework.data.redis.core.RedisTemplate;
|
||||
import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
|
||||
import org.springframework.data.redis.serializer.StringRedisSerializer;
|
||||
|
||||
/**
|
||||
* Redis 配置类
|
||||
* @author KilLze
|
||||
*/
|
||||
@Configuration
|
||||
public class RedisConfig {
|
||||
@Bean
|
||||
public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
|
||||
// 创建RedisTemplate对象
|
||||
RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
|
||||
// 设置redis的连接工厂对象
|
||||
redisTemplate.setConnectionFactory(redisConnectionFactory);
|
||||
|
||||
// 设置redis key的序列化器
|
||||
redisTemplate.setKeySerializer(new StringRedisSerializer());
|
||||
// 设置value的序列化器
|
||||
redisTemplate.setValueSerializer(new GenericJackson2JsonRedisSerializer());
|
||||
// 设置hash类型的key和value的序列化器
|
||||
redisTemplate.setHashKeySerializer(new StringRedisSerializer());
|
||||
redisTemplate.setHashValueSerializer(new GenericJackson2JsonRedisSerializer());
|
||||
|
||||
return redisTemplate;
|
||||
}
|
||||
}
|
||||
@@ -1,36 +0,0 @@
|
||||
package com.bao.dating.config;
|
||||
|
||||
|
||||
import com.bao.dating.interceptor.TokenInterceptor;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
|
||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
||||
|
||||
/**
|
||||
* WebMvc配置类
|
||||
* @author KilLze
|
||||
*/
|
||||
@Configuration
|
||||
public class WebConfig implements WebMvcConfigurer {
|
||||
|
||||
@Autowired
|
||||
private TokenInterceptor tokenInterceptor;
|
||||
|
||||
/**
|
||||
* 添加拦截器到Spring MVC配置中
|
||||
* @param registry 拦截器注册中心
|
||||
*/
|
||||
@Override
|
||||
public void addInterceptors(InterceptorRegistry registry) {
|
||||
//注册自定义拦截器对象
|
||||
registry.addInterceptor(tokenInterceptor)
|
||||
// 拦截所有请求
|
||||
.addPathPatterns("/**")
|
||||
// 忽略的接口
|
||||
.excludePathPatterns(
|
||||
"/user/login",
|
||||
"/user/sendCode"
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1,33 +0,0 @@
|
||||
package com.bao.dating.context;
|
||||
|
||||
/**
|
||||
* 用户上下文类，用于保存当前线程的用户ID
|
||||
* @author lenovo
|
||||
*/
|
||||
public class UserContext {
|
||||
|
||||
private static final ThreadLocal<Long> USER_HOLDER = new ThreadLocal<>();
|
||||
|
||||
/**
|
||||
* 设置当前线程的用户ID
|
||||
* @param userId 用户ID
|
||||
*/
|
||||
public static void setUserId(Long userId) {
|
||||
USER_HOLDER.set(userId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取当前线程的用户ID
|
||||
* @return 当前用户ID，如果未设置则返回null
|
||||
*/
|
||||
public static Long getUserId() {
|
||||
return USER_HOLDER.get();
|
||||
}
|
||||
|
||||
/**
|
||||
* 清除当前线程的用户ID
|
||||
*/
|
||||
public static void clear() {
|
||||
USER_HOLDER.remove();
|
||||
}
|
||||
}
|
||||
@@ -1,52 +0,0 @@
|
||||
package com.bao.dating.controller;
|
||||
|
||||
import com.bao.dating.pojo.entity.Comments;
|
||||
import com.bao.dating.common.Result;
|
||||
import com.bao.dating.common.ResultCode;
|
||||
import com.bao.dating.service.CommentsService;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/comments")
|
||||
@CrossOrigin
|
||||
public class CommentController {
|
||||
@Resource
|
||||
private CommentsService commentsService;
|
||||
|
||||
/**
|
||||
* 添加评论
|
||||
* @param comment 评论对象（含content、userId、dynamicId）
|
||||
*/
|
||||
@PostMapping("/add")
|
||||
public Result<String> addComment(@RequestBody Comments comment) {
|
||||
boolean success = commentsService.addComment(comment);
|
||||
return success ?
|
||||
Result.success(ResultCode.SUCCESS, "评论成功") :
|
||||
Result.error(ResultCode.FAIL, "评论失败");
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除评论
|
||||
* @param user_id 评论ID
|
||||
*/
|
||||
@DeleteMapping("/delete/{user_id}")
|
||||
public Result<String> deleteComment(@PathVariable Long user_id) {
|
||||
boolean success = commentsService.deleteComment(user_id);
|
||||
return success ?
|
||||
Result.success(ResultCode.SUCCESS, "删除成功") :
|
||||
Result.error(ResultCode.FAIL, "删除失败");
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据动态ID查询评论列表
|
||||
* @param post_id 动态ID
|
||||
*/
|
||||
@GetMapping("/list/{post_id}")
|
||||
public Result<List<Comments>> getCommentList(@PathVariable Long post_id) {
|
||||
List<Comments> commentList = commentsService.getCommentByPostId(post_id);
|
||||
return Result.success(ResultCode.SUCCESS, commentList);
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,6 @@
|
||||
package com.bao.dating.controller;
|
||||
|
||||
|
||||
import com.bao.dating.anno.Log;
|
||||
import com.bao.dating.common.Result;
|
||||
import com.bao.dating.common.ResultCode;
|
||||
import com.bao.dating.pojo.dto.PostRequestDTO;
|
||||
@@ -14,11 +13,6 @@ import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 动态接口
|
||||
*
|
||||
* @author KilLze
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/posts")
|
||||
public class PostController {
|
||||
@@ -27,28 +21,27 @@ public class PostController {
|
||||
private PostService postService;
|
||||
|
||||
/**
|
||||
* 上传媒体文件接口 like
|
||||
* 上传媒体文件接口
|
||||
* @param files 媒体文件数组
|
||||
* @return 上传后的文件URL列表
|
||||
*/
|
||||
@Log
|
||||
@PostMapping(value = "/upload", consumes = "multipart/form-data")
|
||||
public Result<List<String>> uploadMedia(@RequestParam("files") MultipartFile[] files) {
|
||||
List<String> fileUrls = postService.uploadMedia(files);
|
||||
return Result.success(ResultCode.SUCCESS, "文件上传成功", fileUrls);
|
||||
return Result.success(ResultCode.SUCCESS_REVIEW, "文件上传成功", fileUrls);
|
||||
}
|
||||
|
||||
/**
|
||||
* 发布动态接口 - JSON格式请求
|
||||
* @param postDTO 动态信息
|
||||
* @param userId 用户ID
|
||||
* @return 发布的动态对象
|
||||
*/
|
||||
@Log
|
||||
@PostMapping( "/createPost")
|
||||
public Result<Post> createPostJson(@RequestBody PostRequestDTO postDTO) {
|
||||
@PostMapping(consumes = "application/json")
|
||||
public Result<Post> createPostJson(@RequestBody PostRequestDTO postDTO, @RequestParam Long userId) {
|
||||
// 调用 Service 层处理发布动态业务逻辑
|
||||
Post result = postService.createPost(postDTO);
|
||||
return Result.success(ResultCode.SUCCESS, "动态发布成功，等待审核。", result);
|
||||
Post result = postService.createPost(userId, postDTO);
|
||||
return Result.success(ResultCode.SUCCESS_REVIEW, "动态发布成功，等待审核。", result);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -57,11 +50,10 @@ public class PostController {
|
||||
* @param postIds 动态ID
|
||||
* @return 删除结果
|
||||
*/
|
||||
@Log
|
||||
@PostMapping("/deletePost")
|
||||
public Result<String> deleteById(@RequestBody List<Long> postIds){
|
||||
int deletedCount = postService.deletePostById(postIds);
|
||||
return Result.success(ResultCode.SUCCESS_DELETE, "成功删除" + deletedCount + "条动态", null);
|
||||
@DeleteMapping
|
||||
public Result<String> deleteById(@RequestParam List<Long> postIds){
|
||||
postService.deletePostById(postIds);
|
||||
return Result.success(ResultCode.SUCCESS_DELETE, "动态删除成功", null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -81,10 +73,9 @@ public class PostController {
|
||||
* @param postRequestDTO 动态信息
|
||||
* @return 更新后的动态对象
|
||||
*/
|
||||
@Log
|
||||
@PostMapping("/{postId}/updatePost")
|
||||
@PutMapping("/{postId}")
|
||||
public Result<PostEditVO> updatePost(@PathVariable Long postId, @RequestBody PostRequestDTO postRequestDTO) {
|
||||
PostEditVO result = postService.updatePost(postId, postRequestDTO);
|
||||
return Result.success(ResultCode.SUCCESS, "动态更新成功", result);
|
||||
return Result.success(ResultCode.SUCCESS_REVIEW, "动态更新成功", result);
|
||||
}
|
||||
}
|
||||
@@ -1,33 +0,0 @@
|
||||
package com.bao.dating.controller;
|
||||
|
||||
import com.bao.dating.common.Result;
|
||||
import com.bao.dating.common.ResultCode;
|
||||
import com.bao.dating.pojo.entity.User;
|
||||
import com.bao.dating.service.PostFavoriteService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/posts")
|
||||
public class PostFavoriteController {
|
||||
@Autowired
|
||||
private PostFavoriteService postFavoriteService;
|
||||
@PostMapping("/{post_id}/favorites")
|
||||
public Result<Map<String,Long>> addPostFavorite(@PathVariable("post_id")Long postId, User user){
|
||||
if (user == null){
|
||||
return Result.error(ResultCode.PARAM_ERROR);
|
||||
}
|
||||
Long userId = user.getUserId();
|
||||
return postFavoriteService.postFavorite(userId,postId);
|
||||
}
|
||||
@DeleteMapping("/{post_id}/favorites")
|
||||
public Result<?> deletePostFavorite(@PathVariable("post_id")Long postId, User user){
|
||||
if (user == null){
|
||||
return Result.error(ResultCode.PARAM_ERROR);
|
||||
}
|
||||
Long userId = user.getUserId();
|
||||
return postFavoriteService.deletePostFavorite(userId, postId);
|
||||
}
|
||||
}
|
||||
@@ -2,11 +2,13 @@ package com.bao.dating.controller;
|
||||
|
||||
import com.bao.dating.common.Result;
|
||||
import com.bao.dating.common.ResultCode;
|
||||
import com.bao.dating.mapper.PostLikeMapper;
|
||||
import com.bao.dating.service.PostLikeService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/posts")
|
||||
@@ -15,12 +17,6 @@ public class PostLikeController {
|
||||
@Autowired
|
||||
private PostLikeService postLikeService;
|
||||
|
||||
/**
|
||||
* 点赞接口
|
||||
* @param postId
|
||||
* @param body
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/{postId}/likes")
|
||||
public Result<?> likePost(@PathVariable Long postId, @RequestBody Map<String, Long> body){
|
||||
// 从请求体中取出 user_id
|
||||
@@ -31,11 +27,6 @@ public class PostLikeController {
|
||||
return postLikeService.likePost(postId,userId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 取消点赞接口
|
||||
* @param postId
|
||||
* @param body
|
||||
*/
|
||||
@DeleteMapping("/{postId}/likes")
|
||||
public void unlike(@PathVariable Long postId, @RequestBody Map<String, Long> body){
|
||||
// 从请求体中获取 user_id
|
||||
|
||||
@@ -1,167 +0,0 @@
|
||||
package com.bao.dating.controller;
|
||||
|
||||
import com.bao.dating.anno.Log;
|
||||
import com.bao.dating.common.Result;
|
||||
import com.bao.dating.common.ResultCode;
|
||||
import com.bao.dating.context.UserContext;
|
||||
import com.bao.dating.pojo.dto.UserInfoUpdateDTO;
|
||||
import com.bao.dating.pojo.dto.UserLoginDTO;
|
||||
import com.bao.dating.pojo.entity.User;
|
||||
import com.bao.dating.pojo.vo.UserInfoVO;
|
||||
import com.bao.dating.pojo.vo.UserLoginVO;
|
||||
import com.bao.dating.service.UserService;
|
||||
import io.jsonwebtoken.Jwt;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.util.List;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 用户接口
|
||||
*
|
||||
* @author KilLze
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/user")
|
||||
public class UserController {
|
||||
|
||||
@Autowired
|
||||
private UserService userService;
|
||||
|
||||
/**
|
||||
* 登录
|
||||
* @param userLoginDTO 登录参数
|
||||
*/
|
||||
@PostMapping("/login")
|
||||
public Result<UserLoginVO> login(@RequestBody UserLoginDTO userLoginDTO) {
|
||||
UserLoginVO userloginVO = userService.userLogin(userLoginDTO);
|
||||
return Result.success(ResultCode.SUCCESS, "登录成功", userloginVO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 退出登录
|
||||
* 从请求头中获取token并将其加入黑名单
|
||||
*/
|
||||
@PostMapping("/logout")
|
||||
public Result<Void> logout(HttpServletRequest request) {
|
||||
String token = request.getHeader("token");
|
||||
userService.logout(token);
|
||||
return Result.success(ResultCode.SUCCESS,"退出登录成功",null);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取用户信息
|
||||
* @return 用户信息
|
||||
*/
|
||||
@GetMapping("/info")
|
||||
public Result<UserInfoVO> getUserInfo() {
|
||||
Long userId = UserContext.getUserId();
|
||||
UserInfoVO userInfoVO = userService.getUserInfo(userId);
|
||||
return Result.success(ResultCode.SUCCESS, "获取用户信息成功", userInfoVO);
|
||||
}
|
||||
|
||||
/**
|
||||
* 上传头像接口
|
||||
* @param file 头像文件
|
||||
* @return 上传后的文件URL列表
|
||||
*/
|
||||
@PostMapping(value = "/info/uploadAvatar", consumes = "multipart/form-data")
|
||||
public Result<String> uploadAvatar(@RequestParam("file") MultipartFile file) {
|
||||
String fileUrl = userService.uploadAvatar(file);
|
||||
return Result.success(ResultCode.SUCCESS, "头像上传成功", fileUrl);
|
||||
}
|
||||
|
||||
/**
|
||||
* 上传背景接口
|
||||
* @param file 背景文件
|
||||
* @return 上传后的文件URL列表
|
||||
*/
|
||||
@PostMapping(value = "/info/uploadBackground", consumes = "multipart/form-data")
|
||||
public Result<String> uploadBackground(@RequestParam("file") MultipartFile file) {
|
||||
String fileUrl = userService.uploadBackground(file);
|
||||
return Result.success(ResultCode.SUCCESS, "背景上传成功", fileUrl);
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新用户信息
|
||||
* @param userInfoUpdateDTO 用户信息更新参数
|
||||
* @return 更新后的用户信息
|
||||
*/
|
||||
@PostMapping("/info/update")
|
||||
public Result<UserInfoVO> userInfoUpdate(@RequestBody UserInfoUpdateDTO userInfoUpdateDTO) {
|
||||
Long userId = UserContext.getUserId();
|
||||
userInfoUpdateDTO.setUserId(userId);
|
||||
UserInfoVO userInfoVO =userService.updateUserInfo(userInfoUpdateDTO);
|
||||
return Result.success(ResultCode.SUCCESS, "用户信息更新成功", userInfoVO);
|
||||
}
|
||||
|
||||
@PostMapping("/sendCode")
|
||||
public Result sendCode(@RequestBody Map<String, String> body) {
|
||||
String phone = body.get("phone");
|
||||
userService.sendSmsCode(phone);
|
||||
return Result.success(ResultCode.SUCCESS, "验证码发送成功");
|
||||
}
|
||||
|
||||
@PostMapping("/loginByCode")
|
||||
public Result loginByCode(@RequestBody Map<String, String> body){
|
||||
boolean ok = userService.verifyCode(body.get("phone"), body.get("code"));
|
||||
return ok ? Result.success(ResultCode.SUCCESS, "登录成功") : Result.error(ResultCode.SYSTEM_ERROR, "登录失败");
|
||||
}
|
||||
|
||||
/**
|
||||
* 登录
|
||||
* @param body 登录参数
|
||||
*/
|
||||
@PostMapping("/loginPhone")
|
||||
public Result<?> loginPhone(@RequestBody Map<String, String> body) {
|
||||
String phone = body.get("phone");
|
||||
String code = body.get("code");
|
||||
|
||||
//校验验证码
|
||||
boolean verify = userService.verifyCode(phone, code);
|
||||
if (!verify){
|
||||
return Result.error(ResultCode.SYSTEM_ERROR, "验证码错误或已过期");
|
||||
}
|
||||
//登录
|
||||
UserLoginVO vo = userService.loginByPhone(phone);
|
||||
return Result.success(ResultCode.SUCCESS, "登录成功", vo);
|
||||
}
|
||||
|
||||
@GetMapping("/nearby")
|
||||
public Result<List<UserInfoVO>> nearby(@RequestParam(defaultValue = "5") double distance){
|
||||
// 获取当前线程的用户 ID
|
||||
Long userId = UserContext.getUserId();
|
||||
if (userId == null) {
|
||||
return Result.error(ResultCode.SYSTEM_ERROR, "用户未登录");
|
||||
}
|
||||
|
||||
// 通过 UserID 获取当前用户的经纬度信息
|
||||
UserInfoVO currentUser = userService.getUserInfo(userId);
|
||||
if (currentUser == null) {
|
||||
return Result.error(ResultCode.SYSTEM_ERROR, "用户信息获取失败");
|
||||
}
|
||||
|
||||
// 获取当前用户的经纬度
|
||||
Double latitude = currentUser.getLatitude();
|
||||
Double longitude = currentUser.getLongitude();
|
||||
|
||||
// 检查经纬度是否为空
|
||||
if (latitude == null || longitude == null) {
|
||||
return Result.error(ResultCode.SYSTEM_ERROR, "用户经纬度信息未完善");
|
||||
}
|
||||
|
||||
// 这里可以添加默认值，比如如果 latitude 或 longitude 为 null，则设置为某个默认值（例如 0）
|
||||
latitude = (latitude != null) ? latitude : 0.0;
|
||||
longitude = (longitude != null) ? longitude : 0.0;
|
||||
|
||||
// 查询附近用户
|
||||
List<UserInfoVO> nearbyUsers = userService.findNearbyUsers(latitude, longitude, distance);
|
||||
|
||||
// 返回成功结果
|
||||
return Result.success(ResultCode.SUCCESS, "查询成功", nearbyUsers);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,90 +0,0 @@
|
||||
package com.bao.dating.controller;
|
||||
|
||||
import com.bao.dating.common.Result;
|
||||
import com.bao.dating.common.ResultCode;
|
||||
import com.bao.dating.service.VerificationCodeService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.util.StringUtils;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
/**
|
||||
* 验证码控制器
|
||||
* @author KilLze
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequestMapping("/api/verification")
|
||||
public class VerificationCodeController {
|
||||
|
||||
@Autowired
|
||||
private VerificationCodeService verificationCodeService;
|
||||
|
||||
/**
|
||||
* 发送邮箱验证码
|
||||
* @param email 邮箱地址
|
||||
* @return 结果
|
||||
*/
|
||||
@PostMapping("/send-email-code")
|
||||
public Result<String> sendEmailCode(@RequestParam String email) {
|
||||
// 参数校验
|
||||
if (!StringUtils.hasText(email)) {
|
||||
return Result.error(ResultCode.PARAM_ERROR, "邮箱地址不能为空");
|
||||
}
|
||||
|
||||
// 简单的邮箱格式校验
|
||||
if (!isValidEmail(email)) {
|
||||
return Result.error(ResultCode.PARAM_ERROR, "邮箱格式不正确");
|
||||
}
|
||||
|
||||
// 发送验证码
|
||||
boolean success = verificationCodeService.sendEmailCode(email);
|
||||
|
||||
if (success) {
|
||||
return Result.success(ResultCode.CODE_SENT, "验证码已发送到您的邮箱，请查收");
|
||||
} else {
|
||||
return Result.error(ResultCode.CODE_SEND_FAIL, "验证码发送失败，请稍后重试");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 验证邮箱验证码
|
||||
* @param email 邮箱地址
|
||||
* @param code 验证码
|
||||
* @return 结果
|
||||
*/
|
||||
@PostMapping("/verify-email-code")
|
||||
public Result<String> verifyEmailCode(@RequestParam String email, @RequestParam String code) {
|
||||
// 参数校验
|
||||
if (!StringUtils.hasText(email)) {
|
||||
return Result.error(ResultCode.PARAM_ERROR, "邮箱地址不能为空");
|
||||
}
|
||||
|
||||
if (!StringUtils.hasText(code)) {
|
||||
return Result.error(ResultCode.PARAM_ERROR, "验证码不能为空");
|
||||
}
|
||||
|
||||
// 验证验证码
|
||||
boolean success = verificationCodeService.verifyEmailCode(email, code);
|
||||
|
||||
if (success) {
|
||||
return Result.success(ResultCode.SUCCESS, "验证码验证成功");
|
||||
} else {
|
||||
return Result.error(ResultCode.CODE_ERROR, "验证码错误或已过期");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 简单的邮箱格式校验
|
||||
* @param email 邮箱地址
|
||||
* @return 是否有效
|
||||
*/
|
||||
private boolean isValidEmail(String email) {
|
||||
if (email == null || email.trim().isEmpty()) {
|
||||
return false;
|
||||
}
|
||||
// 简单的邮箱格式校验：包含@和.
|
||||
return email.contains("@") && email.contains(".") && email.length() > 5;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,113 +0,0 @@
|
||||
package com.bao.dating.handler;
|
||||
|
||||
import com.bao.dating.common.Result;
|
||||
import com.bao.dating.common.ResultCode;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.dao.DuplicateKeyException;
|
||||
import org.springframework.http.converter.HttpMessageNotReadableException;
|
||||
import org.springframework.web.HttpRequestMethodNotSupportedException;
|
||||
import org.springframework.web.bind.MethodArgumentNotValidException;
|
||||
import org.springframework.web.bind.MissingServletRequestParameterException;
|
||||
import org.springframework.web.bind.annotation.ExceptionHandler;
|
||||
import org.springframework.web.bind.annotation.RestControllerAdvice;
|
||||
import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
|
||||
import org.springframework.web.servlet.NoHandlerFoundException;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 全局异常处理器
|
||||
* 统一处理控制器层抛出的异常
|
||||
* @author KilLze
|
||||
*/
|
||||
@Slf4j
|
||||
@RestControllerAdvice
|
||||
public class GlobalExceptionHandler {
|
||||
|
||||
/**
|
||||
* 处理参数验证失败异常
|
||||
*/
|
||||
@ExceptionHandler(MethodArgumentNotValidException.class)
|
||||
public Result<String> handleMethodArgumentNotValidException(MethodArgumentNotValidException e) {
|
||||
log.error("参数验证失败: {}", e.getMessage());
|
||||
String msg = e.getBindingResult()
|
||||
.getFieldErrors()
|
||||
.stream()
|
||||
.map(error -> error.getField() + "：" + error.getDefaultMessage())
|
||||
.collect(Collectors.joining("; "));
|
||||
return Result.error(ResultCode.PARAM_ERROR, msg);
|
||||
}
|
||||
|
||||
/**
|
||||
* 处理请求参数缺失异常
|
||||
*/
|
||||
@ExceptionHandler(MissingServletRequestParameterException.class)
|
||||
public Result<String> handleMissingServletRequestParameterException(MissingServletRequestParameterException e) {
|
||||
log.error("请求参数缺失: 参数名={}, 参数类型={}", e.getParameterName(), e.getParameterType());
|
||||
return Result.error(ResultCode.PARAM_ERROR, "缺少必需的请求参数: " + e.getParameterName());
|
||||
}
|
||||
|
||||
/**
|
||||
* 处理请求参数类型不匹配异常
|
||||
*/
|
||||
@ExceptionHandler(MethodArgumentTypeMismatchException.class)
|
||||
public Result<String> handleMethodArgumentTypeMismatchException(MethodArgumentTypeMismatchException e) {
|
||||
log.error("请求参数类型不匹配: {}", e.getMessage());
|
||||
return Result.error(ResultCode.PARAM_ERROR, "请求参数类型错误: " + e.getName());
|
||||
}
|
||||
|
||||
/**
|
||||
* 处理请求体缺失或格式错误异常
|
||||
*/
|
||||
@ExceptionHandler(HttpMessageNotReadableException.class)
|
||||
public Result<String> handleHttpMessageNotReadableException(HttpMessageNotReadableException e) {
|
||||
log.error("请求体格式错误: {}", e.getMessage());
|
||||
return Result.error(ResultCode.PARAM_ERROR, "请求体格式错误或缺失");
|
||||
}
|
||||
|
||||
/**
|
||||
* 处理不支持的HTTP请求方法异常
|
||||
*/
|
||||
@ExceptionHandler(HttpRequestMethodNotSupportedException.class)
|
||||
public Result<String> handleHttpRequestMethodNotSupportedException(HttpRequestMethodNotSupportedException e) {
|
||||
log.error("不支持的HTTP请求方法: {}", e.getMethod());
|
||||
return Result.error(ResultCode.PARAM_ERROR, "不支持的请求方法: " + e.getMethod());
|
||||
}
|
||||
|
||||
/**
|
||||
* 处理404异常
|
||||
*/
|
||||
@ExceptionHandler(NoHandlerFoundException.class)
|
||||
public Result<String> handleNoHandlerFoundException(HttpServletRequest request, NoHandlerFoundException e) {
|
||||
log.error("请求的接口不存在: {} {}", request.getMethod(), request.getRequestURI());
|
||||
return Result.error(ResultCode.NOT_FOUND, "请求的接口不存在");
|
||||
}
|
||||
|
||||
/**
|
||||
* 处理数据库唯一约束违反异常
|
||||
*/
|
||||
@ExceptionHandler(DuplicateKeyException.class)
|
||||
public Result<String> handleDuplicateKeyException(DuplicateKeyException e) {
|
||||
log.error("数据库唯一约束违反: {}", e.getMessage());
|
||||
return Result.error(ResultCode.FAIL, "数据已存在，操作失败");
|
||||
}
|
||||
|
||||
/**
|
||||
* 处理运行时异常
|
||||
*/
|
||||
@ExceptionHandler(RuntimeException.class)
|
||||
public Result<String> handleRuntimeException(RuntimeException e) {
|
||||
log.error("运行时异常: ", e);
|
||||
return Result.error(ResultCode.SYSTEM_ERROR, e.getMessage());
|
||||
}
|
||||
|
||||
/**
|
||||
* 处理通用异常
|
||||
*/
|
||||
@ExceptionHandler(Exception.class)
|
||||
public Result<String> handleException(HttpServletRequest request, Exception e) {
|
||||
log.error("系统异常 [{} {}]: ", request.getMethod(), request.getRequestURI(), e);
|
||||
return Result.error(ResultCode.SYSTEM_ERROR, "系统内部错误");
|
||||
}
|
||||
}
|
||||
@@ -1,69 +0,0 @@
|
||||
package com.bao.dating.handler;
|
||||
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.core.type.TypeReference;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import org.apache.ibatis.type.JdbcType;
|
||||
import org.apache.ibatis.type.MappedJdbcTypes;
|
||||
import org.apache.ibatis.type.MappedTypes;
|
||||
import org.apache.ibatis.type.TypeHandler;
|
||||
|
||||
import java.sql.PreparedStatement;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* List类型转换成JSON类型
|
||||
* @author KilLze
|
||||
*/
|
||||
@MappedJdbcTypes(JdbcType.VARCHAR)
|
||||
@MappedTypes(List.class)
|
||||
public class ListToJsonTypeHandler implements TypeHandler<List<String>> {
|
||||
|
||||
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
|
||||
|
||||
@Override
|
||||
public void setParameter(PreparedStatement ps, int i, List<String> parameter, JdbcType jdbcType) throws SQLException {
|
||||
if (parameter == null || parameter.isEmpty()) {
|
||||
ps.setNull(i, java.sql.Types.VARCHAR); // 或者 Types.JSON 如果数据库支持
|
||||
return;
|
||||
}
|
||||
try {
|
||||
String json = OBJECT_MAPPER.writeValueAsString(parameter);
|
||||
ps.setString(i, json);
|
||||
} catch (JsonProcessingException e) {
|
||||
throw new SQLException("Error converting list to JSON", e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> getResult(ResultSet rs, String columnName) throws SQLException {
|
||||
String json = rs.getString(columnName);
|
||||
return convertJsonToList(json);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> getResult(ResultSet rs, int columnIndex) throws SQLException {
|
||||
String json = rs.getString(columnIndex);
|
||||
return convertJsonToList(json);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> getResult(java.sql.CallableStatement cs, int columnIndex) throws SQLException {
|
||||
String json = cs.getString(columnIndex);
|
||||
return convertJsonToList(json);
|
||||
}
|
||||
|
||||
private List<String> convertJsonToList(String json) throws SQLException {
|
||||
if (json == null || json.isEmpty()) {
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
return OBJECT_MAPPER.readValue(json, new TypeReference<List<String>>() {});
|
||||
} catch (JsonProcessingException e) {
|
||||
throw new SQLException("Error converting JSON to list", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -6,7 +6,10 @@ import org.apache.ibatis.type.MappedJdbcTypes;
|
||||
import org.apache.ibatis.type.MappedTypes;
|
||||
import org.apache.ibatis.type.TypeHandler;
|
||||
|
||||
import java.sql.*;
|
||||
import java.sql.CallableStatement;
|
||||
import java.sql.PreparedStatement;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
@@ -19,11 +22,6 @@ import java.util.List;
|
||||
public class ListToVarcharTypeHandler implements TypeHandler<List<String>> {
|
||||
@Override
|
||||
public void setParameter(PreparedStatement preparedStatement, int i, List<String> strings, JdbcType jdbcType) throws SQLException {
|
||||
// 允许 null
|
||||
if (strings == null || strings.isEmpty()) {
|
||||
preparedStatement.setNull(i, Types.VARCHAR);
|
||||
return;
|
||||
}
|
||||
// 遍历List类型的入参，拼装为String类型，使用Statement对象插入数据库
|
||||
StringBuffer sb = new StringBuffer();
|
||||
for (int j = 0; j < strings.size(); j++) {
|
||||
|
||||
@@ -1,111 +0,0 @@
|
||||
package com.bao.dating.interceptor;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.bao.dating.context.UserContext;
|
||||
import com.bao.dating.util.JwtUtil;
|
||||
import io.jsonwebtoken.Claims;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.data.redis.core.RedisTemplate;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.method.HandlerMethod;
|
||||
import org.springframework.web.servlet.HandlerInterceptor;
|
||||
|
||||
/**
|
||||
* HttpToken拦截器类
|
||||
* 用于拦截请求并验证JWT token的有效性，同时从token中解析用户信息
|
||||
* @author KilLze
|
||||
*/
|
||||
@Slf4j
|
||||
@Component
|
||||
public class TokenInterceptor implements HandlerInterceptor {
|
||||
|
||||
@Autowired
|
||||
private RedisTemplate<String, Object> redisTemplate;
|
||||
|
||||
/**
|
||||
* 在请求处理之前进行拦截
|
||||
* 从请求头或URL参数中获取token，验证其有效性，并将用户ID保存到ThreadLocal中
|
||||
* @param request HTTP请求对象
|
||||
* @param response HTTP响应对象
|
||||
* @param handler 处理器
|
||||
* @return 验证通过返回true，否则返回false
|
||||
* @throws Exception 异常
|
||||
*/
|
||||
@Override
|
||||
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
|
||||
|
||||
//判断当前拦截到的是Controller的方法还是其他资源
|
||||
if (!(handler instanceof HandlerMethod)) {
|
||||
//当前拦截到的不是动态方法，直接放行
|
||||
return true;
|
||||
}
|
||||
// 从 header 获取 token
|
||||
String token = request.getHeader("token");
|
||||
|
||||
try {
|
||||
log.info("jwt校验: {}", token);
|
||||
|
||||
// 验证 token 是否有效（包括是否过期）
|
||||
if (!JwtUtil.validateToken(token)) {
|
||||
log.error("Token无效或已过期");
|
||||
response.setStatus(401);
|
||||
response.setContentType("application/json;charset=UTF-8");
|
||||
response.getWriter().write("Token无效或已过期");
|
||||
return false;
|
||||
}
|
||||
|
||||
// 检查 token 是否在黑名单中
|
||||
Object blacklistToken = redisTemplate.opsForValue().get("jwt:blacklist:" + token);
|
||||
if (blacklistToken != null) {
|
||||
log.error("Token已在黑名单中");
|
||||
response.setStatus(401);
|
||||
response.setContentType("application/json;charset=UTF-8");
|
||||
response.getWriter().write("登录已失效, 请重新登录");
|
||||
return false;
|
||||
}
|
||||
|
||||
// 解析 token
|
||||
String userId = JwtUtil.getSubjectFromToken(token);
|
||||
|
||||
// 从Redis获取存储的token进行比对
|
||||
Object redisTokenObj = redisTemplate.opsForValue().get("login:token:" + userId);
|
||||
String redisToken = redisTokenObj != null ? redisTokenObj.toString() : null;
|
||||
|
||||
// 验证Redis中的token是否存在且匹配
|
||||
if (redisToken == null || !redisToken.equals(token)) {
|
||||
log.error("登录已失效");
|
||||
response.setStatus(401);
|
||||
response.setContentType("application/json;charset=UTF-8");
|
||||
response.getWriter().write("登录已失效");
|
||||
return false;
|
||||
}
|
||||
|
||||
log.info("用户: {}", userId);
|
||||
// 保存 userId 到 ThreadLocal
|
||||
UserContext.setUserId(Long.valueOf(userId));
|
||||
return true;
|
||||
} catch (Exception e) {
|
||||
log.error("Token 校验失败: {}", e.getMessage());
|
||||
response.setStatus(401);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 在请求完成之后执行清理工作
|
||||
* 清除保存在ThreadLocal中的用户ID，防止内存泄漏
|
||||
* @param request HTTP请求对象
|
||||
* @param response HTTP响应对象
|
||||
* @param handler 处理器
|
||||
* @param ex 异常对象
|
||||
* @throws Exception 异常
|
||||
*/
|
||||
@Override
|
||||
public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
|
||||
UserContext.clear();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,28 +0,0 @@
|
||||
package com.bao.dating.mapper;
|
||||
|
||||
|
||||
import com.bao.dating.pojo.entity.Comments;
|
||||
import org.apache.ibatis.annotations.*;
|
||||
|
||||
import java.util.List;
|
||||
@Mapper
|
||||
public interface CommentsMapper {
|
||||
// 添加评论
|
||||
@Insert("INSERT INTO dating.comments(content, user_id, post_id, created_at) VALUES(#{content}, #{user_id}, #{post_id}, #{created_at})")
|
||||
int addComment(Comments comments);
|
||||
|
||||
// 删除评论
|
||||
@Delete("DELETE FROM dating.comments WHERE user_id = #{user_id}")
|
||||
int deleteComments(@Param("user_id") Long user_id);
|
||||
|
||||
// 根据动态ID查询评论列表
|
||||
@Select("SELECT * FROM dating.comments WHERE post_id = #{post_id} ORDER BY created_at DESC")
|
||||
List<Comments> getCommentsByPostId(@Param("post_id") Long post_id);
|
||||
|
||||
/**
|
||||
* 根据动态ID批量删除评论
|
||||
* @param postIds
|
||||
* @return
|
||||
*/
|
||||
int deleteCommentsByPostIds(@Param("postIds") List<Long> postIds);
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
package com.bao.dating.mapper;
|
||||
|
||||
|
||||
import com.bao.dating.pojo.entity.OperateLog;
|
||||
import org.apache.ibatis.annotations.Insert;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* 操作日志Mapper
|
||||
* @author KilLze
|
||||
*/
|
||||
@Mapper
|
||||
public interface OperateLogMapper {
|
||||
|
||||
@Insert("insert into operate_log (operate_user_id, operate_time, class_name, method_name, method_params, return_value, cost_time) " +
|
||||
"values (#{operateUserId}, #{operateTime}, #{className}, #{methodName}, #{methodParams}, #{returnValue}, #{costTime});")
|
||||
public void insert(OperateLog log);
|
||||
|
||||
}
|
||||
@@ -1,23 +0,0 @@
|
||||
package com.bao.dating.mapper;
|
||||
|
||||
import com.bao.dating.pojo.entity.PostFavorite;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface PostFavoriteMapper {
|
||||
//查询当前已收藏所有用户
|
||||
List<Long> selectUserIDByPostID(@Param("postId") Long postId);
|
||||
int addPostFavorite(PostFavorite postFavorite);
|
||||
int deletePostFavorite(@Param("postId") Long postId);
|
||||
|
||||
/**
|
||||
* 批量删除收藏
|
||||
* @param postIds
|
||||
* @return
|
||||
*/
|
||||
int deleteFavoritesByPostIds(@Param("postIds") List<Long> postIds);
|
||||
|
||||
}
|
||||
@@ -4,8 +4,6 @@ import com.bao.dating.pojo.entity.PostLike;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface PostLikeMapper {
|
||||
/**
|
||||
@@ -33,12 +31,4 @@ public interface PostLikeMapper {
|
||||
* @return
|
||||
*/
|
||||
int deleteByPostIdAndUserId(@Param("postId") Long postId, @Param("userId") Long userId);
|
||||
|
||||
/**
|
||||
* 批量删除点赞记录
|
||||
*
|
||||
* @param postIds
|
||||
* @return
|
||||
*/
|
||||
int deleteLikesByPostIds(@Param("postIds") List<Long> postIds);
|
||||
}
|
||||
|
||||
@@ -6,47 +6,43 @@ import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 动态Mapper
|
||||
*
|
||||
* @author KilLze lanyangyang-yzx
|
||||
*/
|
||||
@Mapper
|
||||
public interface PostMapper {
|
||||
/**
|
||||
* 插入动态
|
||||
*
|
||||
* @param post 动态
|
||||
* @param post
|
||||
*/
|
||||
void insert(Post post);
|
||||
|
||||
/**
|
||||
* 根据ID修改动态状态
|
||||
* 根据ID删除动态
|
||||
*
|
||||
* @param postIds 动态ID
|
||||
*/
|
||||
int updatePublicById(@Param("postIds") List<Long> postIds, @Param("userId") Long userId);
|
||||
void deletePostByIds(@Param("postIds") List<Long> postIds);
|
||||
|
||||
/**
|
||||
* 根据ID查询动态
|
||||
*
|
||||
* @param postId 动态ID
|
||||
* @return 动态
|
||||
* @param postId
|
||||
* @return
|
||||
*/
|
||||
Post selectById(Long postId);
|
||||
Post selectById(@Param("postId") Long postId);
|
||||
|
||||
/**
|
||||
* 根据ID更新动态
|
||||
*
|
||||
* @param post 动态
|
||||
* @param post
|
||||
* @return
|
||||
*/
|
||||
void updateById(Post post);
|
||||
|
||||
/**
|
||||
* 查询点赞数
|
||||
*
|
||||
* @param postId 动态ID
|
||||
* @return 点赞数
|
||||
* @param postId
|
||||
* @return
|
||||
*/
|
||||
int selectLikeCount(Long postId);
|
||||
|
||||
@@ -65,34 +61,4 @@ public interface PostMapper {
|
||||
* @return 影响行数
|
||||
*/
|
||||
int decreaseLikeCount(Long postId);
|
||||
|
||||
/**
|
||||
* 查询当前动态属于哪个用户id
|
||||
* @param postId 动态id
|
||||
* @return 用户id
|
||||
*/
|
||||
Long selectUserIdByPostId(@Param("post_id") Long postId);
|
||||
|
||||
/**
|
||||
* 查询点赞数
|
||||
*
|
||||
* @param postId 动态ID
|
||||
* @return 点赞数
|
||||
*/
|
||||
int selectFavoriteCount(Long postId);
|
||||
|
||||
/**
|
||||
* 收藏数+1
|
||||
*
|
||||
* @param postId 动态ID
|
||||
* @return 影响行数
|
||||
*/
|
||||
int increaseFavoriteCount(Long postId);
|
||||
/**
|
||||
* 收藏数-1
|
||||
*
|
||||
* @param postId 动态ID
|
||||
* @return 影响行数
|
||||
*/
|
||||
int decreaseFavoriteCount(Long postId);
|
||||
}
|
||||
}
|
||||
@@ -1,51 +0,0 @@
|
||||
package com.bao.dating.mapper;
|
||||
|
||||
import com.bao.dating.pojo.dto.UserInfoUpdateDTO;
|
||||
import com.bao.dating.pojo.entity.User;
|
||||
import com.bao.dating.pojo.vo.UserInfoVO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 用户Mapper
|
||||
* @author KilLze
|
||||
*/
|
||||
@Mapper
|
||||
public interface UserMapper {
|
||||
|
||||
/**
|
||||
* 根据用户名查询用户
|
||||
*
|
||||
* @param username 用户名
|
||||
* @return 用户
|
||||
*/
|
||||
User getByUsername(String username);
|
||||
|
||||
/**
|
||||
* 根据用户id查询用户信息
|
||||
*
|
||||
* @param userid 用户id
|
||||
* @return 用户
|
||||
*/
|
||||
User selectByUserId(Long userid);
|
||||
|
||||
/**
|
||||
* 更新用户信息
|
||||
* @param userInfoUpdateDTO 用户信息更新参数
|
||||
*/
|
||||
void updateUserInfoByUserId(UserInfoUpdateDTO userInfoUpdateDTO);
|
||||
|
||||
User selectByPhone(@Param("phone") String phone);
|
||||
|
||||
/**
|
||||
* 根据经纬度范围查询用户
|
||||
* @param minLat 最小纬度
|
||||
* @param maxLat 最大纬度
|
||||
* @param minLng 最小经度
|
||||
* @param maxLng 最大经度
|
||||
* @return 用户列表
|
||||
*/
|
||||
List<UserInfoVO> findByLatLngRange(@Param("minLat") double minLat, @Param("maxLat") double maxLat, @Param("minLng") double minLng, @Param("maxLng") double maxLng);
|
||||
}
|
||||
@@ -2,15 +2,13 @@ package com.bao.dating.pojo.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 动态数据传输对象
|
||||
* @author KilLze
|
||||
*/
|
||||
@Data
|
||||
public class PostRequestDTO implements Serializable{
|
||||
public class PostRequestDTO {
|
||||
private String content;
|
||||
private List<String> mediaOssKeys;
|
||||
private List<String> tags;
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
package com.bao.dating.pojo.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 用户信息更新数据传输对象
|
||||
* @author KilLze
|
||||
*/
|
||||
@Data
|
||||
public class UserInfoUpdateDTO implements Serializable {
|
||||
private Long userId;
|
||||
private String userName;
|
||||
private String nickname;
|
||||
private String avatarUrl;
|
||||
private String backgroundUrl;
|
||||
private Integer gender;
|
||||
private LocalDate birthday;
|
||||
private List<String> hobbies;
|
||||
private String signature;
|
||||
private LocalDateTime updatedAt;
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
package com.bao.dating.pojo.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 用户登录数据传输对象
|
||||
* @author KilLze
|
||||
*/
|
||||
@Data
|
||||
public class UserLoginDTO implements Serializable {
|
||||
private String username;
|
||||
private String password;
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
package com.bao.dating.pojo.entity;
|
||||
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
|
||||
/**
|
||||
* 评论表
|
||||
*/
|
||||
@Data
|
||||
public class Comments implements Serializable {
|
||||
private Long comment_id; // 评论ID
|
||||
private String content; // 评论内容
|
||||
private Long user_id; // 评论人ID
|
||||
private Long post_id; // 关联动态ID
|
||||
private LocalDateTime created_at; // 评论时间
|
||||
}
|
||||
@@ -1,30 +0,0 @@
|
||||
package com.bao.dating.pojo.entity;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 操作日志
|
||||
* @author KilLze
|
||||
*/
|
||||
@Data
|
||||
public class OperateLog implements Serializable {
|
||||
/** ID */
|
||||
private Long id;
|
||||
/** 操作人ID */
|
||||
private Long operateUserId;
|
||||
/** 操作时间 */
|
||||
private LocalDateTime operateTime;
|
||||
/** 操作类名 */
|
||||
private String className;
|
||||
/** 操作方法名 */
|
||||
private String methodName;
|
||||
/** 操作方法参数 */
|
||||
private String methodParams;
|
||||
/** 操作方法返回值 */
|
||||
private String returnValue;
|
||||
/** 操作耗时 */
|
||||
private Long costTime;
|
||||
}
|
||||
@@ -2,7 +2,6 @@ package com.bao.dating.pojo.entity;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
@@ -11,7 +10,7 @@ import java.util.List;
|
||||
* @author KilLze
|
||||
*/
|
||||
@Data
|
||||
public class Post implements Serializable {
|
||||
public class Post {
|
||||
|
||||
private Long postId;
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@ package com.bao.dating.pojo.entity;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
@@ -10,7 +9,7 @@ import java.time.LocalDateTime;
|
||||
* @author KilLze
|
||||
*/
|
||||
@Data
|
||||
public class PostFavorite implements Serializable {
|
||||
public class PostFavorite {
|
||||
|
||||
private Long favoriteId;
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@ package com.bao.dating.pojo.entity;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
@@ -10,7 +9,7 @@ import java.time.LocalDateTime;
|
||||
* @author KilLze
|
||||
*/
|
||||
@Data
|
||||
public class PostLike implements Serializable {
|
||||
public class PostLike {
|
||||
private Long likeId;
|
||||
|
||||
private Long userId;
|
||||
|
||||
@@ -2,17 +2,15 @@ package com.bao.dating.pojo.entity;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 用户表
|
||||
* @author KilLze
|
||||
*/
|
||||
@Data
|
||||
public class User implements Serializable {
|
||||
public class User {
|
||||
|
||||
private Long userId;
|
||||
|
||||
@@ -32,19 +30,11 @@ public class User implements Serializable {
|
||||
|
||||
private LocalDate birthday;
|
||||
|
||||
private List<String> hobbies;
|
||||
private String hobbies;
|
||||
|
||||
private String signature;
|
||||
|
||||
private LocalDateTime createdAt;
|
||||
|
||||
private LocalDateTime updatedAt;
|
||||
|
||||
private String userEmail;
|
||||
|
||||
private String userPhone;
|
||||
|
||||
private Double latitude; // 纬度
|
||||
|
||||
private Double longitude; // 经度
|
||||
}
|
||||
|
||||
@@ -2,16 +2,14 @@ package com.bao.dating.pojo.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 修改内容查询返回数据
|
||||
* @author KilLze
|
||||
*/
|
||||
@Data
|
||||
public class PostEditVO implements Serializable {
|
||||
public class PostEditVO {
|
||||
private Long postId;
|
||||
private String content;
|
||||
private List<String> mediaOssKeys;
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
package com.bao.dating.pojo.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 用户信息VO
|
||||
* @author KilLze
|
||||
*/
|
||||
@Data
|
||||
public class UserInfoVO implements Serializable {
|
||||
private Long userId;
|
||||
private String userName;
|
||||
private String nickname;
|
||||
private String avatarUrl;
|
||||
private String backgroundUrl;
|
||||
private Integer gender;
|
||||
private LocalDate birthday;
|
||||
private List<String> hobbies;
|
||||
private String signature;
|
||||
private LocalDateTime updatedAt;
|
||||
private LocalDateTime createdAt;
|
||||
private Double latitude;
|
||||
private Double longitude;
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
package com.bao.dating.pojo.vo;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 登录返回数据
|
||||
* @author KilLze
|
||||
*/
|
||||
@Data
|
||||
public class UserLoginVO implements Serializable {
|
||||
private Long userId;
|
||||
private String nickname;
|
||||
private String token;
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
package com.bao.dating.service;
|
||||
|
||||
|
||||
import com.bao.dating.pojo.entity.Comments;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface CommentsService{
|
||||
// 添加评论
|
||||
boolean addComment(Comments comments);
|
||||
|
||||
// 删除评论
|
||||
boolean deleteComment(Long user_id);
|
||||
|
||||
// 根据动态ID查询评论
|
||||
List<Comments> getCommentByPostId(Long post_id);
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
package com.bao.dating.service;
|
||||
|
||||
import com.bao.dating.common.Result;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
public interface PostFavoriteService {
|
||||
Result<Map<String,Long>> postFavorite(Long userid,Long postId);
|
||||
Result<?> deletePostFavorite(Long userid,Long postId);
|
||||
}
|
||||
@@ -7,10 +7,6 @@ import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 动态服务
|
||||
* @author bao KilLze lanyangyang-yzx yang
|
||||
*/
|
||||
public interface PostService {
|
||||
/**
|
||||
* 上传媒体文件
|
||||
@@ -21,23 +17,22 @@ public interface PostService {
|
||||
|
||||
/**
|
||||
* 创建动态
|
||||
* @param userId 用户ID
|
||||
* @param postRequestDTO 动态数据传输对象
|
||||
* @return 创建的动态对象
|
||||
*/
|
||||
Post createPost(PostRequestDTO postRequestDTO);
|
||||
Post createPost(Long userId, PostRequestDTO postRequestDTO);
|
||||
|
||||
/**
|
||||
* 批量删除动态（将动态状态改为已删除）
|
||||
* 删除动态
|
||||
* @param postIds 动态ID
|
||||
* @return 删除的动态对象
|
||||
*/
|
||||
int deletePostById(List<Long> postIds);
|
||||
|
||||
void deletePostById(List<Long> postIds);
|
||||
|
||||
/**
|
||||
* 查询动态详情（用于编辑）
|
||||
* @param postId 动态ID
|
||||
* @return 动态详情
|
||||
*/
|
||||
PostEditVO getPostForEdit(Long postId);
|
||||
|
||||
@@ -48,11 +43,4 @@ public interface PostService {
|
||||
* @return 修改后的动态对象
|
||||
*/
|
||||
PostEditVO updatePost(Long postId, PostRequestDTO postRequestDTO);
|
||||
|
||||
/**
|
||||
* 查询
|
||||
* @param postId 动态id
|
||||
* @return 用户id
|
||||
*/
|
||||
Long selectUserIdByPostId(Long postId);
|
||||
}
|
||||
@@ -1,73 +0,0 @@
|
||||
package com.bao.dating.service;
|
||||
|
||||
import com.bao.dating.pojo.dto.UserInfoUpdateDTO;
|
||||
import com.bao.dating.pojo.dto.UserLoginDTO;
|
||||
import com.bao.dating.pojo.entity.User;
|
||||
import com.bao.dating.pojo.vo.UserInfoVO;
|
||||
import com.bao.dating.pojo.vo.UserLoginVO;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 用户服务接口
|
||||
* @author KilLze
|
||||
*/
|
||||
public interface UserService {
|
||||
/**
|
||||
* 登录
|
||||
* @param userLoginDTO 登录参数
|
||||
* @return 登录结果
|
||||
*/
|
||||
UserLoginVO userLogin(UserLoginDTO userLoginDTO);
|
||||
|
||||
/**
|
||||
* 退出登录
|
||||
* @param token 登录凭证
|
||||
* @return 注册结果
|
||||
*/
|
||||
void logout(String token);
|
||||
|
||||
/**
|
||||
* 查询个人信息
|
||||
* @param userId 动态ID
|
||||
* @return 个人信息
|
||||
*/
|
||||
UserInfoVO getUserInfo(Long userId);
|
||||
|
||||
/**
|
||||
* 上传头像
|
||||
* @param file 头像文件
|
||||
* @return 上传后的文件URL列表
|
||||
*/
|
||||
String uploadAvatar(MultipartFile file);
|
||||
|
||||
/**
|
||||
* 上传背景
|
||||
* @param file 背景文件
|
||||
* @return 上传后的文件URL列表
|
||||
*/
|
||||
String uploadBackground(MultipartFile file);
|
||||
|
||||
/**
|
||||
* 更新用户信息
|
||||
* @param userInfoUpdateDTO 用户信息
|
||||
* @return 更新后的用户信息
|
||||
*/
|
||||
UserInfoVO updateUserInfo(UserInfoUpdateDTO userInfoUpdateDTO);
|
||||
|
||||
void sendSmsCode(String phone);
|
||||
|
||||
boolean verifyCode(String phone, String code);
|
||||
|
||||
UserLoginVO loginByPhone(String phone);
|
||||
|
||||
/**
|
||||
* 获取指定经纬度范围内的用户
|
||||
* @param lat 用户纬度
|
||||
* @param lng 用户经度
|
||||
* @param radiusKm 半径 km
|
||||
* @return 用户列表
|
||||
*/
|
||||
List<UserInfoVO> findNearbyUsers(double lat,double lng,double radiusKm);
|
||||
}
|
||||
@@ -1,31 +0,0 @@
|
||||
package com.bao.dating.service;
|
||||
|
||||
/**
|
||||
* 验证码服务接口
|
||||
* @author KilLze
|
||||
*/
|
||||
public interface VerificationCodeService {
|
||||
|
||||
/**
|
||||
* 发送邮箱验证码
|
||||
* @param email 邮箱地址
|
||||
* @return 是否发送成功
|
||||
*/
|
||||
boolean sendEmailCode(String email);
|
||||
|
||||
/**
|
||||
* 验证邮箱验证码
|
||||
* @param email 邮箱地址
|
||||
* @param code 验证码
|
||||
* @return 是否验证成功
|
||||
*/
|
||||
boolean verifyEmailCode(String email, String code);
|
||||
|
||||
/**
|
||||
* 生成验证码
|
||||
* @param length 验证码长度（默认6位）
|
||||
* @return 验证码字符串
|
||||
*/
|
||||
String generateCode(int length);
|
||||
}
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
package com.bao.dating.service.impl;
|
||||
|
||||
import com.bao.dating.pojo.entity.Comments;
|
||||
|
||||
import com.bao.dating.mapper.CommentsMapper;
|
||||
|
||||
|
||||
import com.bao.dating.service.CommentsService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class CommentsServiceImpl implements CommentsService {
|
||||
|
||||
|
||||
|
||||
@Resource
|
||||
private CommentsMapper commentsMapper;
|
||||
|
||||
@Override
|
||||
public boolean addComment(Comments comments) {
|
||||
// 设置创建时间
|
||||
comments.setCreated_at(LocalDateTime.now());
|
||||
return commentsMapper.addComment(comments) > 0;
|
||||
}
|
||||
@Override
|
||||
public boolean deleteComment(Long user_id) {
|
||||
return commentsMapper.deleteComments(user_id) > 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Comments> getCommentByPostId(Long post_id) {
|
||||
return commentsMapper.getCommentsByPostId(post_id);
|
||||
}
|
||||
}
|
||||
@@ -1,61 +0,0 @@
|
||||
package com.bao.dating.service.impl;
|
||||
|
||||
import com.bao.dating.common.Result;
|
||||
import com.bao.dating.common.ResultCode;
|
||||
import com.bao.dating.mapper.PostFavoriteMapper;
|
||||
import com.bao.dating.mapper.PostMapper;
|
||||
import com.bao.dating.pojo.entity.PostFavorite;
|
||||
import com.bao.dating.service.PostFavoriteService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Service
|
||||
public class PostFavoriteServiceImpl implements PostFavoriteService {
|
||||
@Autowired
|
||||
private PostFavoriteMapper postFavoriteMapper;
|
||||
@Autowired
|
||||
private PostMapper postMapper;
|
||||
@Override
|
||||
@Transactional
|
||||
public Result<Map<String, Long>> postFavorite(Long userid, Long postId) {
|
||||
Long userId = postMapper.selectUserIdByPostId(postId);
|
||||
if (userid.equals(userId)){
|
||||
return Result.error(ResultCode.FORBIDDEN,"无法收藏自己发布动态");
|
||||
}
|
||||
List<Long> allUserId = postFavoriteMapper.selectUserIDByPostID(postId);
|
||||
if (allUserId.contains(userid)){
|
||||
return Result.error(ResultCode.FORBIDDEN,"已收藏");
|
||||
}
|
||||
PostFavorite postFavorite = new PostFavorite();
|
||||
postFavorite.setPostId(postId);
|
||||
postFavorite.setUserId(userid);
|
||||
postFavorite.setCreatedAt(LocalDateTime.now());
|
||||
postFavoriteMapper.addPostFavorite(postFavorite);
|
||||
postMapper.increaseFavoriteCount(postId);
|
||||
Long count = (long) postMapper.selectFavoriteCount(postId);
|
||||
Map<String, Long> data = new HashMap<>();
|
||||
data.put("favorite_id",postFavorite.getFavoriteId());
|
||||
data.put("post_id",postId);
|
||||
data.put("user_id",userid);
|
||||
data.put("current_favorites_count",count);
|
||||
return Result.success(ResultCode.SUCCESS_REVIEW,"收藏成功",data);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public Result<?> deletePostFavorite(Long userid, Long postId) {
|
||||
List<Long> allUserId = postFavoriteMapper.selectUserIDByPostID(postId);
|
||||
if (! allUserId.contains(userid)){
|
||||
return Result.error(ResultCode.FORBIDDEN,"请先收藏");
|
||||
}
|
||||
postFavoriteMapper.deletePostFavorite(postId);
|
||||
postMapper.decreaseFavoriteCount(postId);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -2,36 +2,32 @@ package com.bao.dating.service.impl;
|
||||
|
||||
import com.bao.dating.common.aliyun.GreenImageScan;
|
||||
import com.bao.dating.common.aliyun.GreenTextScan;
|
||||
import com.bao.dating.common.result.GreenAuditResult;
|
||||
import com.bao.dating.context.UserContext;
|
||||
import com.bao.dating.mapper.CommentsMapper;
|
||||
import com.bao.dating.mapper.PostFavoriteMapper;
|
||||
import com.bao.dating.mapper.PostLikeMapper;
|
||||
import com.bao.dating.mapper.PostMapper;
|
||||
import com.bao.dating.pojo.dto.PostRequestDTO;
|
||||
import com.bao.dating.pojo.entity.Post;
|
||||
import com.bao.dating.pojo.vo.PostEditVO;
|
||||
import com.bao.dating.service.PostService;
|
||||
import com.bao.dating.common.aliyun.AliOssUtil;
|
||||
import com.bao.dating.service.UserService;
|
||||
import com.bao.dating.util.FileUtil;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* 动态服务实现类
|
||||
*
|
||||
* @author KilLze yang
|
||||
* @author KilLze
|
||||
*/
|
||||
@Service
|
||||
public class PostServiceImpl implements PostService {
|
||||
@@ -48,15 +44,6 @@ public class PostServiceImpl implements PostService {
|
||||
@Autowired
|
||||
private PostMapper postMapper;
|
||||
|
||||
@Autowired
|
||||
private PostLikeMapper postLikeMapper;
|
||||
|
||||
@Autowired
|
||||
private PostFavoriteMapper postFavoriteMapper;
|
||||
|
||||
@Autowired
|
||||
private CommentsMapper commentsMapper;
|
||||
|
||||
/**
|
||||
* 上传媒体文件
|
||||
* @param files 媒体文件数组
|
||||
@@ -64,70 +51,49 @@ public class PostServiceImpl implements PostService {
|
||||
*/
|
||||
@Override
|
||||
public List<String> uploadMedia(MultipartFile[] files) {
|
||||
// 如果没有文件，则返回空列表
|
||||
if (files == null || files.length == 0) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
// 创建媒体文件列表
|
||||
List<String> mediaUrls = new ArrayList<>();
|
||||
|
||||
if (files != null && files.length > 0) {
|
||||
for (MultipartFile file : files) {
|
||||
// 跳过空文件
|
||||
if (file == null || file.isEmpty()) {
|
||||
continue;
|
||||
}
|
||||
// 获取文件名并跳过空文件
|
||||
String originalFilename = file.getOriginalFilename();
|
||||
if (originalFilename == null) {
|
||||
continue;
|
||||
}
|
||||
// 校验文件类型
|
||||
String fileType = FileUtil.getFileType(originalFilename);
|
||||
if (!"image".equals(fileType) && !"video".equals(fileType)) {
|
||||
throw new RuntimeException("不支持的文件类型：" + originalFilename);
|
||||
}
|
||||
|
||||
// 创建目录
|
||||
String dir = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy/MM"));
|
||||
// 获取文件扩展名
|
||||
String extension = FileUtil.getFileExtension(originalFilename);
|
||||
// 生成唯一文件名
|
||||
String newFileName = UUID.randomUUID().toString().replace("-", "") + "." + extension;
|
||||
// 获取用户ID
|
||||
Long userId = UserContext.getUserId();
|
||||
// 创建文件名
|
||||
String fileName = "post/" + userId + "/" + dir + "/" + newFileName;
|
||||
|
||||
if (!file.isEmpty()) {
|
||||
try {
|
||||
// 根据文件扩展名判断文件类型
|
||||
String fileType = FileUtil.getFileType(file.getOriginalFilename());
|
||||
// 创建目录
|
||||
String dir = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy/MM"));
|
||||
// 生成唯一文件名
|
||||
String newFileName = UUID.randomUUID().toString() + "." + FileUtil.getFileExtension(file.getOriginalFilename());
|
||||
String fileName = "post/" + dir + "/" + newFileName;
|
||||
// 获取文件字节数据
|
||||
byte[] fileBytes = file.getBytes();
|
||||
// 上传图片或视频
|
||||
String ossUrl = ossUtil.upload(fileBytes, fileName);
|
||||
if (ossUrl == null || ossUrl.isEmpty()) {
|
||||
throw new RuntimeException("文件上传失败：" + originalFilename);
|
||||
// 根据文件类型处理
|
||||
String ossUrl = "";
|
||||
if ("image".equals(fileType) || "video".equals(fileType)) {
|
||||
// 上传图片或视频
|
||||
ossUrl = ossUtil.upload(fileBytes, fileName);
|
||||
}
|
||||
// 添加上传后的 URL
|
||||
mediaUrls.add(ossUrl);
|
||||
} catch (IOException e) {
|
||||
// 统一异常处理
|
||||
throw new RuntimeException("上传媒体文件失败：" + originalFilename, e);
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return mediaUrls;
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建动态
|
||||
*
|
||||
* @param userId 用户ID
|
||||
* @param postRequestDTO 动态数据传输对象
|
||||
* @return 创建的动态对象
|
||||
*/
|
||||
@Override
|
||||
public Post createPost(PostRequestDTO postRequestDTO) {
|
||||
public Post createPost(Long userId, PostRequestDTO postRequestDTO) {
|
||||
|
||||
// 创建动态对象
|
||||
Post post = new Post();
|
||||
Long userId = UserContext.getUserId();
|
||||
post.setUserId(userId);
|
||||
post.setContent(postRequestDTO.getContent());
|
||||
post.setTags(postRequestDTO.getTags());
|
||||
@@ -144,7 +110,104 @@ public class PostServiceImpl implements PostService {
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException("文本审核失败");
|
||||
}
|
||||
// 文本审核结果
|
||||
String textSuggestion = (String) textResult.get("suggestion");
|
||||
|
||||
// 2. 图片审核（如果有）
|
||||
if (postRequestDTO.getMediaOssKeys() != null && !postRequestDTO.getMediaOssKeys().isEmpty()) {
|
||||
Map imageResult;
|
||||
try {
|
||||
imageResult = greenImageScan.imageScan(postRequestDTO.getMediaOssKeys());
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
// 图片审核结果
|
||||
String imageSuggestion = (String) imageResult.get("suggestion");
|
||||
|
||||
// 根据审核结果设置状态
|
||||
if ("block".equals(textSuggestion) || "block".equals(imageSuggestion)) {
|
||||
// 审核未通过，允许用户修改
|
||||
post.setIsPublic(2);
|
||||
} else if ("review".equals(textSuggestion) || "review".equals(imageSuggestion)) {
|
||||
// 待审核，需人工审核
|
||||
post.setIsPublic(1);
|
||||
} else {
|
||||
// 审核通过
|
||||
post.setIsPublic(0);
|
||||
}
|
||||
} else {
|
||||
// 只有文本内容的情况
|
||||
if ("block".equals(textSuggestion)) {
|
||||
// 审核未通过，允许用户修改
|
||||
post.setIsPublic(2);
|
||||
} else if ("review".equals(textSuggestion)) {
|
||||
// 待审核，需人工审核
|
||||
post.setIsPublic(1);
|
||||
} else {
|
||||
// 审核通过
|
||||
post.setIsPublic(0);
|
||||
}
|
||||
}
|
||||
|
||||
post.setUpdatedAt(LocalDateTime.now());
|
||||
post.setCreatedAt(LocalDateTime.now());
|
||||
|
||||
// 保存动态到数据库
|
||||
postMapper.insert(post);
|
||||
return post;
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除动态
|
||||
*
|
||||
* @param postIds 动态ID
|
||||
* @return 删除的动态对象
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void deletePostById(List<Long> postIds) {
|
||||
// 批量删除动态
|
||||
postMapper.deletePostByIds(postIds);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PostEditVO getPostForEdit(Long postId) {
|
||||
|
||||
Post post = postMapper.selectById(postId);
|
||||
if (post == null) {
|
||||
throw new RuntimeException("动态不存在");
|
||||
}
|
||||
PostEditVO postEditVO = new PostEditVO();
|
||||
BeanUtils.copyProperties(post, postEditVO);
|
||||
return postEditVO;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改动态
|
||||
* @param postId 动态ID
|
||||
* @param postRequestDTO 修改的动态数据传输对象
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public PostEditVO updatePost(Long postId, PostRequestDTO postRequestDTO) {
|
||||
// 查询动态
|
||||
Post post = postMapper.selectById(postId);
|
||||
if (post == null) {
|
||||
throw new RuntimeException("动态不存在");
|
||||
}
|
||||
post.setContent(postRequestDTO.getContent());
|
||||
if (postRequestDTO.getMediaOssKeys() != null && !postRequestDTO.getMediaOssKeys().isEmpty()) {
|
||||
post.setMediaOssKeys(postRequestDTO.getMediaOssKeys());
|
||||
}
|
||||
|
||||
// 1. 文本内容审核
|
||||
Map textResult;
|
||||
try {
|
||||
textResult = greenTextScan.greeTextScan(postRequestDTO.getContent());
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException("文本审核失败");
|
||||
}
|
||||
// 文本审核结果
|
||||
String textSuggestion = (String) textResult.get("suggestion");
|
||||
|
||||
// 2. 图片审核（如果有）
|
||||
@@ -159,10 +222,10 @@ public class PostServiceImpl implements PostService {
|
||||
String imageSuggestion = (String) imageResult.get("suggestion");
|
||||
|
||||
// 根据审核结果设置状态
|
||||
if (GreenAuditResult.BLOCK.equals(textSuggestion) || GreenAuditResult.BLOCK.equals(imageSuggestion)) {
|
||||
if ("block".equals(textSuggestion) || "block".equals(imageSuggestion)) {
|
||||
// 审核未通过，允许用户修改
|
||||
post.setIsPublic(2);
|
||||
} else if (GreenAuditResult.REVIEW.equals(textSuggestion) || GreenAuditResult.REVIEW.equals(imageSuggestion)) {
|
||||
} else if ("review".equals(textSuggestion) || "review".equals(imageSuggestion)) {
|
||||
// 待审核，需人工审核
|
||||
post.setIsPublic(1);
|
||||
} else {
|
||||
@@ -171,136 +234,10 @@ public class PostServiceImpl implements PostService {
|
||||
}
|
||||
} else {
|
||||
// 只有文本内容的情况
|
||||
if (GreenAuditResult.BLOCK.equals(textSuggestion)) {
|
||||
if ("block".equals(textSuggestion)) {
|
||||
// 审核未通过，允许用户修改
|
||||
post.setIsPublic(2);
|
||||
} else if (GreenAuditResult.REVIEW.equals(textSuggestion)) {
|
||||
// 待审核，需人工审核
|
||||
post.setIsPublic(1);
|
||||
} else {
|
||||
// 审核通过
|
||||
post.setIsPublic(0);
|
||||
}
|
||||
}
|
||||
post.setUpdatedAt(LocalDateTime.now());
|
||||
post.setCreatedAt(LocalDateTime.now());
|
||||
|
||||
// 保存动态到数据库
|
||||
postMapper.insert(post);
|
||||
return post;
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除动态（将动态状态改为已删除）
|
||||
*
|
||||
* @param postIds 动态ID
|
||||
* @return 删除的动态对象
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public int deletePostById(List<Long> postIds) {
|
||||
// 判断用户权限
|
||||
Long userId = UserContext.getUserId();
|
||||
|
||||
if (CollectionUtils.isEmpty(postIds)) {
|
||||
return 0;
|
||||
}
|
||||
int affected = postMapper.updatePublicById(postIds, userId);
|
||||
|
||||
if (affected == 0) {
|
||||
throw new RuntimeException("未删除任何动态，可能无权限或动态不存在");
|
||||
}
|
||||
|
||||
// 删除动态下的评论、点赞、收藏
|
||||
commentsMapper.deleteCommentsByPostIds(postIds);
|
||||
postLikeMapper.deleteLikesByPostIds(postIds);
|
||||
postFavoriteMapper.deleteFavoritesByPostIds(postIds);
|
||||
|
||||
return affected;
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询动态详情（用于编辑）
|
||||
*
|
||||
* @param postId 动态ID
|
||||
* @return 动态详情
|
||||
*/
|
||||
@Override
|
||||
public PostEditVO getPostForEdit(Long postId) {
|
||||
Post post = postMapper.selectById(postId);
|
||||
if (post == null) {
|
||||
throw new RuntimeException("动态不存在");
|
||||
}
|
||||
// 判断用户权限
|
||||
Long userId = UserContext.getUserId();
|
||||
if (post.getUserId() == null || !post.getUserId().equals(userId)){
|
||||
throw new RuntimeException("无权限查看此动态");
|
||||
}
|
||||
PostEditVO postEditVO = new PostEditVO();
|
||||
BeanUtils.copyProperties(post, postEditVO);
|
||||
return postEditVO;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改动态
|
||||
* @param postId 动态ID
|
||||
* @param postRequestDTO 修改的动态数据传输对象
|
||||
* @return 修改的动态对象
|
||||
*/
|
||||
@Override
|
||||
public PostEditVO updatePost(Long postId, PostRequestDTO postRequestDTO) {
|
||||
// 查询动态
|
||||
Post post = postMapper.selectById(postId);
|
||||
if (post == null) {
|
||||
throw new RuntimeException("动态不存在");
|
||||
}
|
||||
// 判断用户权限
|
||||
Long userId = UserContext.getUserId();
|
||||
if (post.getUserId() == null || !post.getUserId().equals(userId)){
|
||||
throw new RuntimeException("无权限修改此动态");
|
||||
}
|
||||
post.setContent(postRequestDTO.getContent());
|
||||
// 如果请求中的mediaOssKeys不为null（即使是空列表），则更新为新值
|
||||
post.setMediaOssKeys(postRequestDTO.getMediaOssKeys());
|
||||
|
||||
// 1. 文本内容审核
|
||||
Map textResult;
|
||||
try {
|
||||
textResult = greenTextScan.greeTextScan(postRequestDTO.getContent());
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException("文本审核失败");
|
||||
}
|
||||
// 文本审核结果
|
||||
String textSuggestion = (String) textResult.get("suggestion");
|
||||
|
||||
// 2. 图片审核（如果有媒体文件）
|
||||
if (post.getMediaOssKeys() != null && !post.getMediaOssKeys().isEmpty()) {
|
||||
Map imageResult;
|
||||
try {
|
||||
imageResult = greenImageScan.imageScan(post.getMediaOssKeys());
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
// 图片审核结果
|
||||
String imageSuggestion = (String) imageResult.get("suggestion");
|
||||
|
||||
// 根据审核结果设置状态
|
||||
if (GreenAuditResult.BLOCK.equals(textSuggestion) || GreenAuditResult.BLOCK.equals(imageSuggestion)) {
|
||||
// 审核未通过，允许用户修改
|
||||
post.setIsPublic(2);
|
||||
} else if (GreenAuditResult.REVIEW.equals(textSuggestion) || GreenAuditResult.REVIEW.equals(imageSuggestion)) {
|
||||
// 待审核，需人工审核
|
||||
post.setIsPublic(1);
|
||||
} else {
|
||||
// 审核通过
|
||||
post.setIsPublic(0);
|
||||
}
|
||||
} else {
|
||||
// 只有文本内容的情况
|
||||
if (GreenAuditResult.BLOCK.equals(textSuggestion)) {
|
||||
// 审核未通过，允许用户修改
|
||||
post.setIsPublic(2);
|
||||
} else if (GreenAuditResult.REVIEW.equals(textSuggestion)) {
|
||||
} else if ("review".equals(textSuggestion)) {
|
||||
// 待审核，需人工审核
|
||||
post.setIsPublic(1);
|
||||
} else {
|
||||
@@ -320,15 +257,4 @@ public class PostServiceImpl implements PostService {
|
||||
return postEditVO;
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据动态ID查询用户ID
|
||||
*
|
||||
* @param postId 动态ID
|
||||
* @return 用户ID
|
||||
*/
|
||||
@Override
|
||||
public Long selectUserIdByPostId(Long postId) {
|
||||
return postMapper.selectUserIdByPostId(postId);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,406 +0,0 @@
|
||||
package com.bao.dating.service.impl;
|
||||
|
||||
import com.bao.dating.common.aliyun.AliOssUtil;
|
||||
import com.bao.dating.common.aliyun.GreenImageScan;
|
||||
import com.bao.dating.common.aliyun.GreenTextScan;
|
||||
import com.bao.dating.common.aliyun.SmsUtil;
|
||||
import com.bao.dating.common.result.AliOssResult;
|
||||
import com.bao.dating.common.result.GreenAuditResult;
|
||||
import com.bao.dating.config.RedisConfig;
|
||||
import com.bao.dating.context.UserContext;
|
||||
import com.bao.dating.mapper.UserMapper;
|
||||
import com.bao.dating.pojo.dto.UserInfoUpdateDTO;
|
||||
import com.bao.dating.pojo.dto.UserLoginDTO;
|
||||
import com.bao.dating.pojo.entity.User;
|
||||
import com.bao.dating.pojo.vo.UserInfoVO;
|
||||
import com.bao.dating.pojo.vo.UserLoginVO;
|
||||
import com.bao.dating.service.UserService;
|
||||
import com.bao.dating.util.*;
|
||||
import com.bao.dating.util.CodeUtil;
|
||||
import com.bao.dating.util.FileUtil;
|
||||
import com.bao.dating.util.JwtUtil;
|
||||
import com.bao.dating.util.MD5Util;
|
||||
import io.jsonwebtoken.Claims;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.data.redis.core.RedisTemplate;
|
||||
import org.springframework.data.redis.core.StringRedisTemplate;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
/**
|
||||
* 用户服务实现类
|
||||
*
|
||||
* @author KilLze
|
||||
*/
|
||||
@Service
|
||||
public class UserServiceImpl implements UserService {
|
||||
|
||||
|
||||
@Autowired
|
||||
private SmsUtil smsUtil;
|
||||
|
||||
@Autowired
|
||||
private AliOssUtil ossUtil;
|
||||
|
||||
@Autowired
|
||||
private GreenTextScan greenTextScan;
|
||||
|
||||
@Autowired
|
||||
private GreenImageScan greenImageScan;
|
||||
|
||||
@Autowired
|
||||
private RedisTemplate<String, Object> redisTemplate;
|
||||
|
||||
@Autowired
|
||||
private UserMapper userMapper;
|
||||
|
||||
@Autowired
|
||||
private StringRedisTemplate stringRedisTemplate;
|
||||
|
||||
/**
|
||||
* 用户登录
|
||||
*
|
||||
* @param userLoginDTO 登录参数
|
||||
* @return 登录信息
|
||||
*/
|
||||
@Override
|
||||
public UserLoginVO userLogin(UserLoginDTO userLoginDTO) {
|
||||
// 参数校验
|
||||
if (userLoginDTO == null || userLoginDTO.getUsername() == null || userLoginDTO.getPassword() == null) {
|
||||
throw new RuntimeException("用户名或密码不能为空");
|
||||
}
|
||||
// 查询用户
|
||||
User user = userMapper.getByUsername(userLoginDTO.getUsername());
|
||||
if (user == null) {
|
||||
throw new RuntimeException("用户不存在");
|
||||
}
|
||||
// 密码校验
|
||||
boolean match = MD5Util.verifyWithSalt(
|
||||
userLoginDTO.getPassword(),
|
||||
user.getSalt(),
|
||||
user.getPasswordHash()
|
||||
);
|
||||
if (!match) {
|
||||
throw new RuntimeException("密码错误");
|
||||
}
|
||||
// 生成token
|
||||
String token = JwtUtil.generateToken(String.valueOf(user.getUserId()));
|
||||
|
||||
String redisKey = "login:token:" + user.getUserId();
|
||||
redisTemplate.opsForValue().set(
|
||||
redisKey,
|
||||
token,
|
||||
7,
|
||||
TimeUnit.DAYS
|
||||
);
|
||||
|
||||
// 封装返回
|
||||
UserLoginVO userLoginVO = new UserLoginVO();
|
||||
userLoginVO.setUserId(user.getUserId());
|
||||
userLoginVO.setNickname(user.getNickname());
|
||||
userLoginVO.setToken(token);
|
||||
return userLoginVO;
|
||||
}
|
||||
|
||||
/**
|
||||
* 退出登录
|
||||
* @param token 登录凭证
|
||||
*/
|
||||
@Override
|
||||
public void logout(String token) {
|
||||
Claims claims = JwtUtil.getClaimsFromToken(token);
|
||||
Date expiration = claims.getExpiration();
|
||||
// 判断 token 是否已过期
|
||||
long ttl = expiration.getTime() - System.currentTimeMillis();
|
||||
// 如果 token 已过期，则不用处理
|
||||
if (ttl <= 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
String logoutKey = "jwt:blacklist:" + token;
|
||||
redisTemplate.opsForValue().set(
|
||||
logoutKey,
|
||||
"logout",
|
||||
ttl,
|
||||
TimeUnit.MILLISECONDS);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取用户信息
|
||||
*
|
||||
* @param userId 用户ID
|
||||
* @return 用户信息
|
||||
*/
|
||||
@Override
|
||||
public UserInfoVO getUserInfo(Long userId) {
|
||||
User user = userMapper.selectByUserId(userId);
|
||||
if (user == null) {
|
||||
throw new RuntimeException("用户不存在");
|
||||
}
|
||||
UserInfoVO userInfoVO = new UserInfoVO();
|
||||
BeanUtils.copyProperties(user, userInfoVO);
|
||||
return userInfoVO;
|
||||
}
|
||||
|
||||
/**
|
||||
* 上传头像接口
|
||||
*
|
||||
* @param file 头像文件
|
||||
* @return 上传后的文件URL
|
||||
*/
|
||||
@Override
|
||||
public String uploadAvatar(MultipartFile file) {
|
||||
// 参数校验
|
||||
if (file == null || file.isEmpty()) {
|
||||
throw new RuntimeException("图片不存在");
|
||||
}
|
||||
|
||||
String originalFilename = file.getOriginalFilename();
|
||||
if (originalFilename == null) {
|
||||
throw new RuntimeException("文件名非法");
|
||||
}
|
||||
|
||||
String fileType = FileUtil.getFileType(originalFilename);
|
||||
if (!AliOssResult.IMAGE.equals(fileType)) {
|
||||
throw new RuntimeException("仅支持图片上传");
|
||||
}
|
||||
|
||||
//生成 OSS 路径
|
||||
String extension = FileUtil.getFileExtension(originalFilename);
|
||||
String fileName = UUID.randomUUID().toString().replace("-", "") + "." + extension;
|
||||
Long userId = UserContext.getUserId();
|
||||
String objectKey = "user/" + userId + "/avatar/" + fileName;
|
||||
|
||||
try {
|
||||
byte[] fileBytes = file.getBytes();
|
||||
String ossUrl = ossUtil.upload(fileBytes, objectKey);
|
||||
|
||||
if (ossUrl == null || ossUrl.isEmpty()) {
|
||||
throw new RuntimeException("图片上传失败");
|
||||
}
|
||||
|
||||
return ossUrl;
|
||||
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException("上传图片失败", e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 上传背景图片
|
||||
*
|
||||
* @param file 背景图片文件
|
||||
* @return 上传后的文件URL
|
||||
*/
|
||||
@Override
|
||||
public String uploadBackground(MultipartFile file) {
|
||||
// 参数校验
|
||||
if (file == null || file.isEmpty()) {
|
||||
throw new RuntimeException("图片不存在");
|
||||
}
|
||||
|
||||
String originalFilename = file.getOriginalFilename();
|
||||
if (originalFilename == null) {
|
||||
throw new RuntimeException("文件名非法");
|
||||
}
|
||||
|
||||
String fileType = FileUtil.getFileType(originalFilename);
|
||||
if (!AliOssResult.IMAGE.equals(fileType)) {
|
||||
throw new RuntimeException("仅支持图片上传");
|
||||
}
|
||||
|
||||
//生成 OSS 路径
|
||||
String extension = FileUtil.getFileExtension(originalFilename);
|
||||
String fileName = UUID.randomUUID().toString().replace("-", "") + "." + extension;
|
||||
Long userId = UserContext.getUserId();
|
||||
String objectKey = "user/" + userId + "/background/" + fileName;
|
||||
|
||||
try {
|
||||
byte[] fileBytes = file.getBytes();
|
||||
String ossUrl = ossUtil.upload(fileBytes, objectKey);
|
||||
|
||||
if (ossUrl == null || ossUrl.isEmpty()) {
|
||||
throw new RuntimeException("图片上传失败");
|
||||
}
|
||||
|
||||
return ossUrl;
|
||||
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException("上传图片失败", e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新用户信息
|
||||
*
|
||||
* @param userInfoUpdateDTO 用户信息更新参数
|
||||
*/
|
||||
@Override
|
||||
public UserInfoVO updateUserInfo(UserInfoUpdateDTO userInfoUpdateDTO) {
|
||||
Long userId = userInfoUpdateDTO.getUserId();
|
||||
User user = userMapper.selectByUserId(userId);
|
||||
if (user == null) {
|
||||
throw new RuntimeException("用户不存在");
|
||||
}
|
||||
|
||||
// 将需要审核的内容合并成一个文本，用于减少调用次数
|
||||
StringBuilder textBuilder = new StringBuilder();
|
||||
|
||||
if (userInfoUpdateDTO.getNickname() != null && !userInfoUpdateDTO.getNickname().isEmpty()) {
|
||||
textBuilder.append(userInfoUpdateDTO.getNickname()).append(" ");
|
||||
}
|
||||
if (userInfoUpdateDTO.getHobbies() != null && !userInfoUpdateDTO.getHobbies().isEmpty()) {
|
||||
// 将爱好列表转换为字符串，用空格分隔
|
||||
String hobbiesStr = String.join(" ", userInfoUpdateDTO.getHobbies());
|
||||
textBuilder.append(hobbiesStr).append(" ");
|
||||
}
|
||||
if (userInfoUpdateDTO.getSignature() != null && !userInfoUpdateDTO.getSignature().isEmpty()) {
|
||||
textBuilder.append(userInfoUpdateDTO.getSignature()).append(" ");
|
||||
}
|
||||
// 文本审核
|
||||
if (textBuilder.length() > 0) {
|
||||
Map textResult;
|
||||
try {
|
||||
textResult = greenTextScan.greeTextScan(textBuilder.toString());
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException("用户信息文本审核失败");
|
||||
}
|
||||
|
||||
String suggestion = (String) textResult.get("suggestion");
|
||||
|
||||
if (GreenAuditResult.BLOCK.equals(suggestion)) {
|
||||
throw new RuntimeException("用户信息包含违规内容，修改失败");
|
||||
}
|
||||
if (GreenAuditResult.REVIEW.equals(suggestion)) {
|
||||
throw new RuntimeException("用户信息需要人工审核，暂无法修改");
|
||||
}
|
||||
}
|
||||
|
||||
// 图片审核
|
||||
List<String> imageKeys = new ArrayList<>();
|
||||
if (userInfoUpdateDTO.getAvatarUrl() != null && !userInfoUpdateDTO.getAvatarUrl().isEmpty()) {
|
||||
imageKeys.add(userInfoUpdateDTO.getAvatarUrl());
|
||||
}
|
||||
if (userInfoUpdateDTO.getBackgroundUrl() != null && !userInfoUpdateDTO.getBackgroundUrl().isEmpty()) {
|
||||
imageKeys.add(userInfoUpdateDTO.getBackgroundUrl());
|
||||
}
|
||||
if (!imageKeys.isEmpty()) {
|
||||
Map imageResult;
|
||||
try {
|
||||
imageResult = greenImageScan.imageScan(imageKeys);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException("用户图片审核失败");
|
||||
}
|
||||
|
||||
String suggestion = (String) imageResult.get("suggestion");
|
||||
|
||||
if (GreenAuditResult.BLOCK.equals(suggestion)) {
|
||||
throw new RuntimeException("头像或背景图不合规，修改失败");
|
||||
}
|
||||
if (GreenAuditResult.REVIEW.equals(suggestion)) {
|
||||
throw new RuntimeException("头像或背景图需要人工审核，暂无法修改");
|
||||
}
|
||||
}
|
||||
// 默认昵称兜底
|
||||
if (userInfoUpdateDTO.getNickname() == null || userInfoUpdateDTO.getNickname().trim().isEmpty()) {
|
||||
userInfoUpdateDTO.setNickname(user.getUserName());
|
||||
}
|
||||
userInfoUpdateDTO.setUpdatedAt(LocalDateTime.now());
|
||||
|
||||
// 更新数据库
|
||||
userMapper.updateUserInfoByUserId(userInfoUpdateDTO);
|
||||
|
||||
// 封装返回结果
|
||||
User updatedUser = userMapper.selectByUserId(userInfoUpdateDTO.getUserId());
|
||||
UserInfoVO userInfoVO = new UserInfoVO();
|
||||
BeanUtils.copyProperties(updatedUser, userInfoVO);
|
||||
return userInfoVO;
|
||||
}
|
||||
|
||||
// 发送短信验证码
|
||||
@Override
|
||||
public void sendSmsCode(String phone) {
|
||||
//防刷：60 秒内只能发一次
|
||||
String key = "sms:code:" + phone;
|
||||
Boolean exists = stringRedisTemplate.hasKey(key);
|
||||
if (Boolean.TRUE.equals(exists)){
|
||||
throw new RuntimeException("请勿频繁发送验证码");
|
||||
}
|
||||
|
||||
// 生成验证码
|
||||
String code = CodeUtil.generateCode();
|
||||
// 发送短信
|
||||
smsUtil.sendVerificationCode(phone, code);
|
||||
//存 Redis（5分钟过期）
|
||||
stringRedisTemplate.opsForValue()
|
||||
.set(key,code, 5, TimeUnit.MINUTES);
|
||||
}
|
||||
|
||||
// 校验验证码
|
||||
@Override
|
||||
public boolean verifyCode(String phone, String code) {
|
||||
|
||||
String key = "sms:code:" + phone;
|
||||
String realCode = stringRedisTemplate.opsForValue().get(key);
|
||||
//过期，未发送
|
||||
if (realCode ==null){
|
||||
return false;
|
||||
}
|
||||
//不匹配
|
||||
if (!realCode.equals(code)){
|
||||
return false;
|
||||
}
|
||||
// 校验成功，删除验证码（一次性）
|
||||
stringRedisTemplate.delete(key);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public UserLoginVO loginByPhone(String phone) {
|
||||
//根据手机号查询用户
|
||||
User user = userMapper.selectByPhone(phone);
|
||||
//创建token
|
||||
String token = JwtUtil.generateToken(user.getUserId().toString());
|
||||
//封装返回结果
|
||||
UserLoginVO VO = new UserLoginVO();
|
||||
VO.setUserId(user.getUserId());
|
||||
VO.setToken(token);
|
||||
return VO;
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<UserInfoVO> findNearbyUsers(double lat, double lng, double radiusKm) {
|
||||
//先用经纬度范围筛选（矩形框，提高性能）
|
||||
double delta = radiusKm / 111.0; // 1° ≈ 111km
|
||||
double minLat = lat - delta;// 最小纬度
|
||||
double maxLat = lat + delta;// 最大纬度
|
||||
double minLng = lng - delta;// 最小经度
|
||||
double maxLng = lng + delta;// 最大经度
|
||||
|
||||
// 打印经纬度范围
|
||||
System.out.println("Min Latitude: " + minLat + ", Max Latitude: " + maxLat);
|
||||
System.out.println("Min Longitude: " + minLng + ", Max Longitude: " + maxLng);
|
||||
|
||||
List<UserInfoVO> byLatLngRange = userMapper.findByLatLngRange(minLat, maxLat, minLng, maxLng);
|
||||
|
||||
//精确计算距离，筛选在半径内的用户
|
||||
List<UserInfoVO> result = new ArrayList<>();
|
||||
for (UserInfoVO u:byLatLngRange){
|
||||
// 检查用户是否有经纬度信息
|
||||
if (u.getLatitude() != null && u.getLongitude() != null) {
|
||||
double distance = DistanceUtil.calculate(lat, lng, u.getLatitude(), u.getLongitude());
|
||||
if (distance <= radiusKm){
|
||||
result.add(u);
|
||||
}
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
}
|
||||
@@ -1,122 +0,0 @@
|
||||
package com.bao.dating.service.impl;
|
||||
|
||||
import com.bao.dating.service.VerificationCodeService;
|
||||
import com.bao.dating.util.EmailUtil;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.data.redis.core.StringRedisTemplate;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Random;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
/**
|
||||
* 验证码服务实现类
|
||||
* @author KilLze
|
||||
*/
|
||||
@Slf4j
|
||||
@Service
|
||||
public class VerificationCodeServiceImpl implements VerificationCodeService {
|
||||
|
||||
@Autowired
|
||||
private EmailUtil emailUtil;
|
||||
|
||||
@Autowired
|
||||
private StringRedisTemplate redisTemplate;
|
||||
|
||||
/**
|
||||
* Redis中验证码的key前缀
|
||||
*/
|
||||
private static final String CODE_KEY_PREFIX = "email:code:";
|
||||
|
||||
/**
|
||||
* 验证码过期时间（分钟）
|
||||
*/
|
||||
private static final long CODE_EXPIRE_MINUTES = 10;
|
||||
|
||||
/**
|
||||
* 验证码长度
|
||||
*/
|
||||
private static final int CODE_LENGTH = 6;
|
||||
|
||||
/**
|
||||
* 发送邮箱验证码
|
||||
* @param email 邮箱地址
|
||||
* @return 是否发送成功
|
||||
*/
|
||||
@Override
|
||||
public boolean sendEmailCode(String email) {
|
||||
try {
|
||||
// 生成验证码
|
||||
String code = generateCode(CODE_LENGTH);
|
||||
|
||||
// 存储到Redis，设置过期时间
|
||||
String key = CODE_KEY_PREFIX + email;
|
||||
redisTemplate.opsForValue().set(key, code, CODE_EXPIRE_MINUTES, TimeUnit.MINUTES);
|
||||
|
||||
// 发送邮件
|
||||
boolean sendResult = emailUtil.sendVerificationCode(email, code);
|
||||
|
||||
if (sendResult) {
|
||||
log.info("邮箱验证码发送成功，邮箱：{}，验证码：{}", email, code);
|
||||
return true;
|
||||
} else {
|
||||
// 如果发送失败，删除Redis中的验证码
|
||||
redisTemplate.delete(key);
|
||||
log.error("邮箱验证码发送失败，邮箱：{}", email);
|
||||
return false;
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error("发送邮箱验证码异常，邮箱：{}，异常信息：{}", email, e.getMessage(), e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 验证邮箱验证码
|
||||
* @param email 邮箱地址
|
||||
* @param code 验证码
|
||||
* @return 是否验证成功
|
||||
*/
|
||||
@Override
|
||||
public boolean verifyEmailCode(String email, String code) {
|
||||
try {
|
||||
String key = CODE_KEY_PREFIX + email;
|
||||
String storedCode = redisTemplate.opsForValue().get(key);
|
||||
|
||||
if (storedCode == null) {
|
||||
log.warn("验证码不存在或已过期，邮箱：{}", email);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (storedCode.equals(code)) {
|
||||
// 验证成功后，删除验证码（防止重复使用）
|
||||
redisTemplate.delete(key);
|
||||
log.info("邮箱验证码验证成功，邮箱：{}", email);
|
||||
return true;
|
||||
} else {
|
||||
log.warn("邮箱验证码错误，邮箱：{}，输入的验证码：{}，正确的验证码：{}", email, code, storedCode);
|
||||
return false;
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error("验证邮箱验证码异常，邮箱：{}，异常信息：{}", email, e.getMessage(), e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 生成验证码
|
||||
* @param length 验证码长度
|
||||
* @return 验证码字符串
|
||||
*/
|
||||
@Override
|
||||
public String generateCode(int length) {
|
||||
Random random = new Random();
|
||||
StringBuilder code = new StringBuilder();
|
||||
for (int i = 0; i < length; i++) {
|
||||
code.append(random.nextInt(10)); // 生成0-9的随机数字
|
||||
}
|
||||
return code.toString();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
package com.bao.dating.util;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
public class CodeUtil {
|
||||
// 生成6位数字验证码
|
||||
public static String generateCode() {
|
||||
Random random = new Random();
|
||||
int code=100000+random.nextInt(900000);
|
||||
return String.valueOf(code);
|
||||
}
|
||||
}
|
||||
@@ -1,29 +0,0 @@
|
||||
package com.bao.dating.util;
|
||||
|
||||
//Haversine 公式（标准写法）
|
||||
|
||||
public class DistanceUtil {
|
||||
private static final double EARTH_RADIUS = 6371.0; // 地球半径 km
|
||||
|
||||
/**
|
||||
* 计算两点之间距离（单位：km）
|
||||
*/
|
||||
public static double calculate(
|
||||
double lat1, double lon1,
|
||||
double lat2, double lon2) {
|
||||
|
||||
double dLat = Math.toRadians(lat2 - lat1);
|
||||
double dLon = Math.toRadians(lon2 - lon1);
|
||||
|
||||
lat1 = Math.toRadians(lat1);
|
||||
lat2 = Math.toRadians(lat2);
|
||||
|
||||
double a = Math.sin(dLat / 2) * Math.sin(dLat / 2)
|
||||
+ Math.cos(lat1) * Math.cos(lat2)
|
||||
* Math.sin(dLon / 2) * Math.sin(dLon / 2);
|
||||
|
||||
double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
|
||||
|
||||
return EARTH_RADIUS * c;
|
||||
}
|
||||
}
|
||||
@@ -1,178 +0,0 @@
|
||||
package com.bao.dating.util;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.mail.SimpleMailMessage;
|
||||
import org.springframework.mail.javamail.JavaMailSender;
|
||||
import org.springframework.mail.javamail.MimeMessageHelper;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import javax.mail.MessagingException;
|
||||
import javax.mail.internet.MimeMessage;
|
||||
import java.io.File;
|
||||
|
||||
/**
|
||||
* 邮箱工具类
|
||||
* 提供邮件发送功能（支持普通文本邮件和HTML邮件）
|
||||
* @author KilLze
|
||||
*/
|
||||
@Slf4j
|
||||
@Component
|
||||
public class EmailUtil {
|
||||
|
||||
/**
|
||||
* 邮件发送器（由Spring自动注入）
|
||||
*/
|
||||
private final JavaMailSender mailSender;
|
||||
|
||||
/**
|
||||
* 发件人邮箱地址（从配置中读取）
|
||||
*/
|
||||
private final String from;
|
||||
|
||||
/**
|
||||
* 构造函数，用于注入JavaMailSender和配置
|
||||
* @param mailSender 邮件发送器
|
||||
* @param from 发件人邮箱地址
|
||||
*/
|
||||
public EmailUtil(JavaMailSender mailSender, @Value("${spring.mail.username}") String from) {
|
||||
this.mailSender = mailSender;
|
||||
this.from = from;
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送简单文本邮件
|
||||
* @param to 收件人邮箱地址
|
||||
* @param subject 邮件主题
|
||||
* @param text 邮件内容
|
||||
* @return 是否发送成功
|
||||
*/
|
||||
public boolean sendSimpleMail(String to, String subject, String text) {
|
||||
try {
|
||||
SimpleMailMessage message = new SimpleMailMessage();
|
||||
message.setFrom(from);
|
||||
message.setTo(to);
|
||||
message.setSubject(subject);
|
||||
message.setText(text);
|
||||
mailSender.send(message);
|
||||
log.info("简单邮件发送成功，收件人：{}，主题：{}", to, subject);
|
||||
return true;
|
||||
} catch (Exception e) {
|
||||
log.error("简单邮件发送失败，收件人：{}，异常信息：{}", to, e.getMessage(), e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送HTML格式邮件
|
||||
* @param to 收件人邮箱地址
|
||||
* @param subject 邮件主题
|
||||
* @param htmlContent HTML内容
|
||||
* @return 是否发送成功
|
||||
*/
|
||||
public boolean sendHtmlMail(String to, String subject, String htmlContent) {
|
||||
try {
|
||||
MimeMessage message = mailSender.createMimeMessage();
|
||||
MimeMessageHelper helper = new MimeMessageHelper(message, true, "UTF-8");
|
||||
helper.setFrom(from);
|
||||
helper.setTo(to);
|
||||
helper.setSubject(subject);
|
||||
helper.setText(htmlContent, true);
|
||||
mailSender.send(message);
|
||||
log.info("HTML邮件发送成功，收件人：{}，主题：{}", to, subject);
|
||||
return true;
|
||||
} catch (MessagingException e) {
|
||||
log.error("HTML邮件发送失败，收件人：{}，异常信息：{}", to, e.getMessage(), e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送带附件的邮件
|
||||
* @param to 收件人邮箱地址
|
||||
* @param subject 邮件主题
|
||||
* @param text 邮件内容
|
||||
* @param attachmentPath 附件文件路径
|
||||
* @param attachmentName 附件显示名称
|
||||
* @return 是否发送成功
|
||||
*/
|
||||
public boolean sendMailWithAttachment(String to, String subject, String text,
|
||||
String attachmentPath, String attachmentName) {
|
||||
try {
|
||||
MimeMessage message = mailSender.createMimeMessage();
|
||||
MimeMessageHelper helper = new MimeMessageHelper(message, true, "UTF-8");
|
||||
helper.setFrom(from);
|
||||
helper.setTo(to);
|
||||
helper.setSubject(subject);
|
||||
helper.setText(text);
|
||||
|
||||
File file = new File(attachmentPath);
|
||||
if (file.exists()) {
|
||||
helper.addAttachment(attachmentName, file);
|
||||
} else {
|
||||
log.warn("附件文件不存在：{}", attachmentPath);
|
||||
return false;
|
||||
}
|
||||
|
||||
mailSender.send(message);
|
||||
log.info("带附件邮件发送成功，收件人：{}，主题：{}，附件：{}", to, subject, attachmentName);
|
||||
return true;
|
||||
} catch (MessagingException e) {
|
||||
log.error("带附件邮件发送失败，收件人：{}，异常信息：{}", to, e.getMessage(), e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送验证码邮件
|
||||
* @param to 收件人邮箱地址
|
||||
* @param code 验证码
|
||||
* @return 是否发送成功
|
||||
*/
|
||||
public boolean sendVerificationCode(String to, String code) {
|
||||
String subject = "验证码";
|
||||
String htmlContent = String.format(
|
||||
"<html><body>" +
|
||||
"<h2>您的验证码</h2>" +
|
||||
"<p>验证码：<strong style='color: #1890ff; font-size: 24px;'>%s</strong></p>" +
|
||||
"<p>验证码有效期为10分钟，请勿泄露给他人。</p>" +
|
||||
"</body></html>", code);
|
||||
return sendHtmlMail(to, subject, htmlContent);
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送验证码邮件（自定义主题）
|
||||
* @param to 收件人邮箱地址
|
||||
* @param code 验证码
|
||||
* @param subject 邮件主题
|
||||
* @return 是否发送成功
|
||||
*/
|
||||
public boolean sendVerificationCode(String to, String code, String subject) {
|
||||
String htmlContent = String.format(
|
||||
"<html><body>" +
|
||||
"<h2>您的验证码</h2>" +
|
||||
"<p>验证码：<strong style='color: #1890ff; font-size: 24px;'>%s</strong></p>" +
|
||||
"<p>验证码有效期为10分钟，请勿泄露给他人。</p>" +
|
||||
"</body></html>", code);
|
||||
return sendHtmlMail(to, subject, htmlContent);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量发送邮件
|
||||
* @param toList 收件人邮箱地址数组
|
||||
* @param subject 邮件主题
|
||||
* @param text 邮件内容
|
||||
* @return 成功发送的数量
|
||||
*/
|
||||
public int sendBatchMail(String[] toList, String subject, String text) {
|
||||
int successCount = 0;
|
||||
for (String to : toList) {
|
||||
if (sendSimpleMail(to, subject, text)) {
|
||||
successCount++;
|
||||
}
|
||||
}
|
||||
log.info("批量邮件发送完成，总数：{}，成功：{}", toList.length, successCount);
|
||||
return successCount;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
package com.bao.dating.util;
|
||||
|
||||
import com.bao.dating.common.result.FileResult;
|
||||
|
||||
/**
|
||||
* 文件工具类
|
||||
* @author KilLze
|
||||
@@ -15,9 +13,9 @@ public class FileUtil {
|
||||
public static String getFileType(String fileUrl) {
|
||||
String extension = getFileExtension(fileUrl);
|
||||
|
||||
if (FileResult.JPG.equals(extension) || FileResult.JPEG.equals(extension) || FileResult.PNG.equals(extension) || FileResult.GIF.equals(extension)) {
|
||||
if (extension.equals("jpg") || extension.equals("jpeg") || extension.equals("png") || extension.equals("gif")) {
|
||||
return "image";
|
||||
} else if (FileResult.MP4.equals(extension) || FileResult.AVI.equals(extension) || FileResult.MOV.equals(extension)) {
|
||||
} else if (extension.equals("mp4") || extension.equals("avi") || extension.equals("mov")) {
|
||||
return "video";
|
||||
}
|
||||
return "unknown";
|
||||
|
||||
@@ -1,204 +0,0 @@
|
||||
package com.bao.dating.util;
|
||||
|
||||
import io.jsonwebtoken.Claims;
|
||||
import io.jsonwebtoken.Jwts;
|
||||
import io.jsonwebtoken.SignatureAlgorithm;
|
||||
import io.jsonwebtoken.security.Keys;
|
||||
|
||||
import javax.crypto.SecretKey;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* JWT工具类
|
||||
* 提供JWT Token的生成、解析和验证功能
|
||||
* @author KilLze
|
||||
*/
|
||||
public class JwtUtil {
|
||||
|
||||
/**
|
||||
* 默认密钥（建议从配置文件读取）
|
||||
*/
|
||||
private static final String DEFAULT_SECRET = "dating-application-secret-key-for-jwt-token-generation-2025";
|
||||
|
||||
/**
|
||||
* 默认过期时间（毫秒）- 7天
|
||||
*/
|
||||
private static final long DEFAULT_EXPIRATION = 7 * 24 * 60 * 60 * 1000L;
|
||||
|
||||
/**
|
||||
* 生成JWT Token
|
||||
* @param subject 主题（通常是用户ID或用户名）
|
||||
* @return JWT Token字符串
|
||||
*/
|
||||
public static String generateToken(String subject) {
|
||||
return generateToken(subject, DEFAULT_EXPIRATION);
|
||||
}
|
||||
|
||||
/**
|
||||
* 生成JWT Token（自定义过期时间）
|
||||
* @param subject 主题（通常是用户ID或用户名）
|
||||
* @param expiration 过期时间（毫秒）
|
||||
* @return JWT Token字符串
|
||||
*/
|
||||
public static String generateToken(String subject, long expiration) {
|
||||
return generateToken(subject, expiration, null);
|
||||
}
|
||||
|
||||
/**
|
||||
* 生成JWT Token（带自定义claims）
|
||||
* @param subject 主题（通常是用户ID或用户名）
|
||||
* @param expiration 过期时间（毫秒）
|
||||
* @param claims 自定义claims
|
||||
* @return JWT Token字符串
|
||||
*/
|
||||
public static String generateToken(String subject, long expiration, Map<String, Object> claims) {
|
||||
Date now = new Date();
|
||||
Date expiryDate = new Date(now.getTime() + expiration);
|
||||
|
||||
SecretKey key = getSecretKey();
|
||||
|
||||
if (claims == null) {
|
||||
claims = new HashMap<>();
|
||||
}
|
||||
|
||||
return Jwts.builder()
|
||||
.setClaims(claims)
|
||||
.setSubject(subject)
|
||||
.setIssuedAt(now)
|
||||
.setExpiration(expiryDate)
|
||||
.signWith(key, SignatureAlgorithm.HS256)
|
||||
.compact();
|
||||
}
|
||||
|
||||
/**
|
||||
* 生成JWT Token（使用自定义密钥）
|
||||
* @param subject 主题
|
||||
* @param expiration 过期时间（毫秒）
|
||||
* @param secret 自定义密钥
|
||||
* @return JWT Token字符串
|
||||
*/
|
||||
public static String generateTokenWithSecret(String subject, long expiration, String secret) {
|
||||
Date now = new Date();
|
||||
Date expiryDate = new Date(now.getTime() + expiration);
|
||||
|
||||
SecretKey key = getSecretKey(secret);
|
||||
|
||||
return Jwts.builder()
|
||||
.setSubject(subject)
|
||||
.setIssuedAt(now)
|
||||
.setExpiration(expiryDate)
|
||||
.signWith(key, SignatureAlgorithm.HS256)
|
||||
.compact();
|
||||
}
|
||||
|
||||
/**
|
||||
* 从Token中获取Claims
|
||||
* @param token JWT Token
|
||||
* @return Claims对象
|
||||
*/
|
||||
public static Claims getClaimsFromToken(String token) {
|
||||
return getClaimsFromToken(token, DEFAULT_SECRET);
|
||||
}
|
||||
|
||||
/**
|
||||
* 从Token中获取Claims（使用自定义密钥）
|
||||
* @param token JWT Token
|
||||
* @param secret 密钥
|
||||
* @return Claims对象
|
||||
*/
|
||||
public static Claims getClaimsFromToken(String token, String secret) {
|
||||
try {
|
||||
SecretKey key = getSecretKey(secret);
|
||||
return Jwts.parserBuilder()
|
||||
.setSigningKey(key)
|
||||
.build()
|
||||
.parseClaimsJws(token)
|
||||
.getBody();
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException("解析JWT Token失败", e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 从Token中获取主题（通常是用户ID）
|
||||
* @param token JWT Token
|
||||
* @return 主题字符串
|
||||
*/
|
||||
public static String getSubjectFromToken(String token) {
|
||||
Claims claims = getClaimsFromToken(token);
|
||||
return claims.getSubject();
|
||||
}
|
||||
|
||||
/**
|
||||
* 验证Token是否有效
|
||||
* @param token JWT Token
|
||||
* @return 是否有效
|
||||
*/
|
||||
public static boolean validateToken(String token) {
|
||||
return validateToken(token, DEFAULT_SECRET);
|
||||
}
|
||||
|
||||
/**
|
||||
* 验证Token是否有效（使用自定义密钥）
|
||||
* @param token JWT Token
|
||||
* @param secret 密钥
|
||||
* @return 是否有效
|
||||
*/
|
||||
public static boolean validateToken(String token, String secret) {
|
||||
try {
|
||||
Claims claims = getClaimsFromToken(token, secret);
|
||||
return !isTokenExpired(claims);
|
||||
} catch (Exception e) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查Token是否过期
|
||||
* @param claims Claims对象
|
||||
* @return 是否过期
|
||||
*/
|
||||
private static boolean isTokenExpired(Claims claims) {
|
||||
Date expiration = claims.getExpiration();
|
||||
return expiration.before(new Date());
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取Token的过期时间
|
||||
* @param token JWT Token
|
||||
* @return 过期时间
|
||||
*/
|
||||
public static Date getExpirationDateFromToken(String token) {
|
||||
Claims claims = getClaimsFromToken(token);
|
||||
return claims.getExpiration();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取默认密钥的SecretKey对象
|
||||
* @return SecretKey对象
|
||||
*/
|
||||
private static SecretKey getSecretKey() {
|
||||
return getSecretKey(DEFAULT_SECRET);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据字符串密钥生成SecretKey对象
|
||||
* @param secret 密钥字符串
|
||||
* @return SecretKey对象
|
||||
*/
|
||||
private static SecretKey getSecretKey(String secret) {
|
||||
// 确保密钥长度至少为256位（32字节）以支持HS256算法
|
||||
byte[] keyBytes = secret.getBytes(StandardCharsets.UTF_8);
|
||||
if (keyBytes.length < 32) {
|
||||
// 如果密钥太短，进行填充
|
||||
byte[] paddedKey = new byte[32];
|
||||
System.arraycopy(keyBytes, 0, paddedKey, 0, Math.min(keyBytes.length, 32));
|
||||
return Keys.hmacShaKeyFor(paddedKey);
|
||||
}
|
||||
return Keys.hmacShaKeyFor(keyBytes);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,90 +0,0 @@
|
||||
package com.bao.dating.util;
|
||||
|
||||
import java.security.MessageDigest;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
|
||||
/**
|
||||
* MD5工具类
|
||||
* 提供MD5加密功能
|
||||
* @author KilLze
|
||||
*/
|
||||
public class MD5Util {
|
||||
|
||||
/**
|
||||
* 对字符串进行MD5加密
|
||||
* @param input 待加密的字符串
|
||||
* @return MD5加密后的32位小写字符串
|
||||
*/
|
||||
public static String encrypt(String input) {
|
||||
if (input == null || input.isEmpty()) {
|
||||
return null;
|
||||
}
|
||||
|
||||
try {
|
||||
MessageDigest md = MessageDigest.getInstance("MD5");
|
||||
byte[] digest = md.digest(input.getBytes());
|
||||
return bytesToHex(digest);
|
||||
} catch (NoSuchAlgorithmException e) {
|
||||
throw new RuntimeException("MD5算法不可用", e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 对字符串进行MD5加密（带盐值）
|
||||
* @param input 待加密的字符串
|
||||
* @param salt 盐值
|
||||
* @return MD5加密后的32位小写字符串
|
||||
*/
|
||||
public static String encryptWithSalt(String input, String salt) {
|
||||
if (input == null || input.isEmpty()) {
|
||||
return null;
|
||||
}
|
||||
if (salt == null) {
|
||||
salt = "";
|
||||
}
|
||||
return encrypt(input + salt);
|
||||
}
|
||||
|
||||
/**
|
||||
* 验证字符串与MD5值是否匹配
|
||||
* @param input 原始字符串
|
||||
* @param md5Hash MD5哈希值
|
||||
* @return 是否匹配
|
||||
*/
|
||||
public static boolean verify(String input, String md5Hash) {
|
||||
if (input == null || md5Hash == null) {
|
||||
return false;
|
||||
}
|
||||
return encrypt(input).equalsIgnoreCase(md5Hash);
|
||||
}
|
||||
|
||||
/**
|
||||
* 验证字符串与MD5值是否匹配（带盐值）
|
||||
* @param input 原始字符串
|
||||
* @param salt 盐值
|
||||
* @param md5Hash MD5哈希值
|
||||
* @return 是否匹配
|
||||
*/
|
||||
public static boolean verifyWithSalt(String input, String salt, String md5Hash) {
|
||||
if (input == null || md5Hash == null) {
|
||||
return false;
|
||||
}
|
||||
if (salt == null) {
|
||||
salt = "";
|
||||
}
|
||||
return encryptWithSalt(input, salt).equalsIgnoreCase(md5Hash);
|
||||
}
|
||||
|
||||
/**
|
||||
* 将字节数组转换为十六进制字符串
|
||||
* @param bytes 字节数组
|
||||
* @return 十六进制字符串
|
||||
*/
|
||||
private static String bytesToHex(byte[] bytes) {
|
||||
StringBuilder sb = new StringBuilder();
|
||||
for (byte b : bytes) {
|
||||
sb.append(String.format("%02x", b));
|
||||
}
|
||||
return sb.toString();
|
||||
}
|
||||
}
|
||||
@@ -1,72 +0,0 @@
|
||||
server:
|
||||
port: 8080
|
||||
|
||||
spring:
|
||||
mvc:
|
||||
throw-exception-if-no-handler-found: true
|
||||
web:
|
||||
resources:
|
||||
add-mappings: false
|
||||
datasource:
|
||||
url: jdbc:mysql://110.42.41.177:3306/dating?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
|
||||
username: root
|
||||
password: JoyeeServe2025
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
redis:
|
||||
host: 110.42.41.177
|
||||
port: 6389
|
||||
password: ""
|
||||
database: 0
|
||||
timeout: 10000
|
||||
# 连接池配置（lettuce是Spring Boot默认Redis客户端，性能更优）
|
||||
lettuce:
|
||||
pool:
|
||||
max-active: 8 # 连接池最大连接数（默认8，可根据业务并发调整）
|
||||
max-wait: -1 # 连接池最大阻塞等待时间（毫秒，-1表示无限制）
|
||||
max-idle: 8 # 连接池最大空闲连接数（默认8）
|
||||
min-idle: 1 # 连接池最小空闲连接数（默认0，建议设置1-4，提高连接复用率）
|
||||
# 邮箱SMTP配置
|
||||
mail:
|
||||
host: smtp.163.com # QQ邮箱SMTP服务器地址
|
||||
port: 465 # SMTP端口
|
||||
username: 19271189822@163.com # 发件人邮箱
|
||||
password: CAwXh39PXajy3fyH # 邮箱授权码
|
||||
default-encoding: UTF-8
|
||||
properties:
|
||||
mail:
|
||||
smtp:
|
||||
auth: true
|
||||
starttls:
|
||||
enable: true
|
||||
required: true
|
||||
ssl:
|
||||
enable: true # 使用587端口时设为false，使用465端口时设为true
|
||||
connectiontimeout: 10000 # 连接超时时间（毫秒）
|
||||
timeout: 10000 # 读取超时时间（毫秒）
|
||||
writetimeout: 10000 # 写入超时时间（毫秒）
|
||||
|
||||
# MyBatis 配置
|
||||
mybatis:
|
||||
mapper-locations: classpath:mapper/*.xml
|
||||
type-aliases-package: com.bao.dating.pojo
|
||||
configuration:
|
||||
map-underscore-to-camel-case: true
|
||||
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
|
||||
|
||||
# 阿里云 OSS 配置
|
||||
aliyun:
|
||||
oss:
|
||||
endpoint: oss-cn-beijing.aliyuncs.com
|
||||
access-key-id: LTAI5t5vpcbCZwweNHEDDDaF
|
||||
access-key-secret: bBHBAPiCqGyVBHUv07348wsHXkKqrk
|
||||
bucket-name: heimatoo
|
||||
accessKeyId: LTAI5t5vpcbCZwweNHEDDDaF
|
||||
secret: bBHBAPiCqGyVBHUv07348wsHXkKqrk
|
||||
scenes: antispam
|
||||
# 阿里云短信服务配置
|
||||
sms:
|
||||
access-key-id: LTAI5t5vpcbCZwweNHEDDDaF
|
||||
access-key-secret: bBHBAPiCqGyVBHUv07348wsHXkKqrk
|
||||
region-id: cn-hangzhou
|
||||
sign-name: 速通互联验证码
|
||||
template-code: 100001
|
||||
@@ -1,9 +0,0 @@
|
||||
|
||||
▄▄▄▄ ██ ▄▄▄▄ ▄▄▄▄ ▄▄ ▄▄
|
||||
██▀▀▀▀█ ▀▀ ▀▀██ ▀▀██ ██ ▄▄ ██
|
||||
██▀ ████ ▄█████▄ ██ ██ ▄████▄ ▄▄▄ ▄█▀ ▄█▀ ██ █▄ ▄▄▄█ ▀█▄ ▄▄▄▄
|
||||
██ ██ ▀ ▄▄▄██ ██ ██ ██▀ ▀██ ▀ ▀▀▄▄ ▄ ██ ▄█▀ ██ ██ ██ ▄▄█▀▀▀ ██ █▀▀ ▀█▄ █▄
|
||||
██▄ ██ ▄██▀▀▀██ ██ ██ ██ ██ ▀▀▀ ██ ▄█▄▄▄▄▄ ▀▀ ██ ██ ██ ▀▀█▄▄▄ ██ █▀ █ ▀▀████▀
|
||||
██▄▄▄▄█ ▄▄▄██▄▄▄ ██▄▄▄███ ██▄▄▄ ██▄▄▄ ▀██▄▄██▀ ▀█▄ ▀▀▀▀▀▀▀▀ ██▄██▄██ ▀▀▀█ ▄█▀ █▀▀█
|
||||
▀▀▀▀ ▀▀▀▀▀▀▀▀ ▀▀▀▀ ▀▀ ▀▀▀▀ ▀▀▀▀ ▀▀▀▀ ██ ▀▀▀ ▀▀▀ ██
|
||||
▀▀ ▀▀
|
||||
@@ -1,15 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.bao.dating.mapper.CommentsMapper">
|
||||
|
||||
<!-- 批量删除动态下的所有评论 -->
|
||||
<delete id="deleteCommentsByPostIds">
|
||||
DELETE FROM comments
|
||||
WHERE post_id IN
|
||||
<foreach collection="postIds" item="postId" open="(" close=")" separator=",">
|
||||
#{postId}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
</mapper>
|
||||
@@ -1,27 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.bao.dating.mapper.PostFavoriteMapper">
|
||||
<!--添加动态收藏-->
|
||||
<insert id="addPostFavorite">
|
||||
insert into post_favorite values (null,#{userId},#{postId},#{createdAt})
|
||||
</insert>
|
||||
<!--删除动态收藏-->
|
||||
<delete id="deletePostFavorite">
|
||||
delete from post_favorite where post_id = #{postId}
|
||||
</delete>
|
||||
<!--查询当前已收藏所有用户-->
|
||||
<select id="selectUserIDByPostID" resultType="java.lang.Long">
|
||||
SELECT user_id FROM post_favorite WHERE post_id = #{postId}
|
||||
</select>
|
||||
|
||||
<!--批量删除动态收藏-->
|
||||
<delete id="deleteFavoritesByPostIds">
|
||||
DELETE FROM post_favorite
|
||||
WHERE post_id IN
|
||||
<foreach collection="postIds" item="postId" open="(" close=")" separator=",">
|
||||
#{postId}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
</mapper>
|
||||
@@ -14,14 +14,4 @@
|
||||
<delete id="deleteByPostIdAndUserId">
|
||||
delete from dating.post_like where post_id = #{postId} and user_id = #{userId}
|
||||
</delete>
|
||||
|
||||
<!--批量删除点赞记录-->
|
||||
<delete id="deleteLikesByPostIds">
|
||||
DELETE FROM post_like
|
||||
WHERE post_id IN
|
||||
<foreach collection="postIds" item="postId" open="(" close=")" separator=",">
|
||||
#{postId}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
</mapper>
|
||||
@@ -28,19 +28,25 @@
|
||||
#{isPublic}, 0, 0, #{createdAt}, #{updatedAt})
|
||||
</insert>
|
||||
|
||||
<!--修改动态状态-->
|
||||
<update id="updatePublicById">
|
||||
UPDATE post
|
||||
<set>
|
||||
is_public = 3,
|
||||
updated_at = NOW()
|
||||
</set>
|
||||
WHERE post_id IN
|
||||
<!--动态删除-->
|
||||
<delete id="deletePostByIds">
|
||||
DELETE FROM post WHERE post_id IN
|
||||
<foreach item="postId" index="index" collection="postIds" separator="," open="(" close=")">
|
||||
#{postId}
|
||||
</foreach>
|
||||
AND user_id = #{userId}
|
||||
</update>
|
||||
</delete>
|
||||
<!--删除收藏记录-->
|
||||
<delete id="1">
|
||||
DELETE FROM post_favorite WHERE post_id = #{postId}
|
||||
</delete>
|
||||
<!--删除点赞记录-->
|
||||
<delete id="2">
|
||||
DELETE FROM post_like WHERE post_id = #{postId}
|
||||
</delete>
|
||||
<!--动态评论删除-->
|
||||
<delete id="3">
|
||||
DELETE FROM comments WHERE post_id = #{postId}
|
||||
</delete>
|
||||
|
||||
<!--动态查询-->
|
||||
<resultMap id="PostResultMap" type="com.bao.dating.pojo.entity.Post">
|
||||
@@ -76,10 +82,10 @@
|
||||
<update id="updateById">
|
||||
UPDATE post
|
||||
<set>
|
||||
<if test="content != null and content != '' ">
|
||||
<if test="content != null">
|
||||
content = #{content},
|
||||
</if>
|
||||
<if test="tags != null and tags != '' ">
|
||||
<if test="tags != null">
|
||||
tags = #{tags, typeHandler=com.bao.dating.handler.ListToVarcharTypeHandler},
|
||||
</if>
|
||||
<if test="mediaOssKeys != null">
|
||||
@@ -101,26 +107,10 @@
|
||||
<update id="decreaseLikeCount">
|
||||
update dating.post set like_count= like_count - 1 where post.post_id = #{postId}
|
||||
</update>
|
||||
<!--增加收藏数量-->
|
||||
<update id="increaseFavoriteCount">
|
||||
update post set favorite_count = favorite_count + 1 where post_id = #{post_id}
|
||||
</update>
|
||||
<!--减少收藏数量-->
|
||||
<update id="decreaseFavoriteCount">
|
||||
update post set favorite_count = favorite_count - 1 where post_id = #{post_id}
|
||||
</update>
|
||||
|
||||
<!--查询点赞当前数量-->
|
||||
<select id="selectLikeCount" resultType="java.lang.Integer">
|
||||
select dating.post.like_count from dating.post where post.post_id = #{postId}
|
||||
</select>
|
||||
<!--查询当前动态的用户id-->
|
||||
<select id="selectUserIdByPostId" resultType="java.lang.Long">
|
||||
SELECT user_id FROM post WHERE post_id = #{post_id}
|
||||
</select>
|
||||
<!--查询当前收藏数量-->
|
||||
<select id="selectFavoriteCount" resultType="java.lang.Integer">
|
||||
select dating.post.favorite_count from dating.post where post.post_id = #{postId}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@@ -1,118 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
|
||||
<mapper namespace="com.bao.dating.mapper.UserMapper">
|
||||
|
||||
<!--根据用户名查询用户-->
|
||||
<select id="getByUsername" resultType="com.bao.dating.pojo.entity.User">
|
||||
SELECT
|
||||
user_id,
|
||||
user_name,
|
||||
password_hash,
|
||||
salt,
|
||||
nickname
|
||||
FROM user WHERE user_name = #{userName}
|
||||
</select>
|
||||
|
||||
<!--根据用户id查询用户信息-->
|
||||
<resultMap id="UserResultMap" type="com.bao.dating.pojo.entity.User">
|
||||
<id property="userId" column="user_id"/>
|
||||
<result property="userName" column="user_name"/>
|
||||
<result property="nickname" column="nickname"/>
|
||||
<result property="avatarUrl" column="avatar_url"/>
|
||||
<result property="backgroundUrl" column="background_url"/>
|
||||
<result property="gender" column="gender"/>
|
||||
<result property="birthday" column="birthday"/>
|
||||
<result property="hobbies" column="hobbies" typeHandler="com.bao.dating.handler.ListToJsonTypeHandler"/>
|
||||
<result property="signature" column="signature"/>
|
||||
<result property="createdAt" column="created_at"/>
|
||||
<result property="updatedAt" column="updated_at"/>
|
||||
<result property="latitude" column="user_latitude"/>
|
||||
<result property="longitude" column="user_longitude"/>
|
||||
</resultMap>
|
||||
<select id="selectByUserId" resultMap="UserResultMap">
|
||||
SELECT
|
||||
user_id,
|
||||
user_name,
|
||||
nickname,
|
||||
avatar_url,
|
||||
background_url,
|
||||
gender,
|
||||
birthday,
|
||||
hobbies,
|
||||
signature,
|
||||
created_at,
|
||||
updated_at,
|
||||
user_latitude,
|
||||
user_longitude
|
||||
FROM dating.user WHERE user_id = #{userId}
|
||||
</select>
|
||||
|
||||
<!--根据ID更新动态-->
|
||||
<update id="updateUserInfoByUserId">
|
||||
UPDATE user
|
||||
<set>
|
||||
<if test="nickname != null">
|
||||
nickname = #{nickname},
|
||||
</if>
|
||||
<if test="avatarUrl != null">
|
||||
avatar_url = #{avatarUrl},
|
||||
</if>
|
||||
<if test="backgroundUrl != null">
|
||||
background_url = #{backgroundUrl},
|
||||
</if>
|
||||
<if test="gender != null">
|
||||
gender = #{gender},
|
||||
</if>
|
||||
<if test="birthday != null">
|
||||
birthday = #{birthday},
|
||||
</if>
|
||||
<if test="hobbies != null">
|
||||
hobbies = #{hobbies, typeHandler=com.bao.dating.handler.ListToJsonTypeHandler},
|
||||
</if>
|
||||
<if test="signature != null">
|
||||
signature = #{signature},
|
||||
</if>
|
||||
updated_at = #{updatedAt}
|
||||
</set>
|
||||
WHERE user_id = #{userId}
|
||||
</update>
|
||||
|
||||
<select id="selectByPhone" resultType="com.bao.dating.pojo.entity.User">
|
||||
select * from dating.user where user_phone =#{phone}
|
||||
</select>
|
||||
<resultMap id="UserInfoVOResultMap" type="com.bao.dating.pojo.vo.UserInfoVO">
|
||||
<id property="userId" column="user_id"/>
|
||||
<result property="userName" column="user_name"/>
|
||||
<result property="nickname" column="nickname"/>
|
||||
<result property="avatarUrl" column="avatar_url"/>
|
||||
<result property="backgroundUrl" column="background_url"/>
|
||||
<result property="gender" column="gender"/>
|
||||
<result property="birthday" column="birthday"/>
|
||||
<result property="hobbies" column="hobbies" typeHandler="com.bao.dating.handler.ListToJsonTypeHandler"/>
|
||||
<result property="signature" column="signature"/>
|
||||
<result property="createdAt" column="created_at"/>
|
||||
<result property="updatedAt" column="updated_at"/>
|
||||
<result property="latitude" column="user_latitude"/>
|
||||
<result property="longitude" column="user_longitude"/>
|
||||
</resultMap>
|
||||
|
||||
<select id="findByLatLngRange" resultMap="UserInfoVOResultMap">
|
||||
SELECT
|
||||
user_id,
|
||||
user_name,
|
||||
nickname,
|
||||
avatar_url,
|
||||
background_url,
|
||||
gender,
|
||||
birthday,
|
||||
hobbies,
|
||||
signature,
|
||||
created_at,
|
||||
updated_at,
|
||||
user_latitude,
|
||||
user_longitude
|
||||
FROM user WHERE user_latitude BETWEEN #{minLat} AND #{maxLat} AND user_longitude BETWEEN #{minLng} AND #{maxLng}
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -31,7 +31,10 @@ public class DatingApplicationTests {
|
||||
public void testUploadAndScanImageFromUrl() {
|
||||
try {
|
||||
// 阿里oss图片url
|
||||
String imageUrl = "https://heimatoo.oss-cn-beijing.aliyuncs.com/ScreenShot_2025-12-01_135624_491.png?x-oss-credential=LTAI5t5vpcbCZwweNHEDDDaF%2F20251222%2Fcn-beijing%2Foss%2Faliyun_v4_request&x-oss-date=20251222T092951Z&x-oss-expires=32400&x-oss-signature-version=OSS4-HMAC-SHA256&x-oss-signature=c06742a4e530c7a095aa4c376c3c88e605dddcd232d0ee07da76988e5ccb7727";
|
||||
String imageUrl = "https://heimato.oss-cn-beijing.aliyuncs.com/75d067b3-8605-494a-a839-b0a9d32c993a.jpg" +
|
||||
"?x-oss-credential=LTAI5tKo9TpWH1aW6JxWm1Gp%2F20251218%2Fcn-beijing%2Foss%2Faliyun_v4_request" +
|
||||
"&x-oss-date=20251218T164128Z&x-oss-expires=32400&x-oss-signature-version=OSS4-HMAC-SHA256" +
|
||||
"&x-oss-signature=e9c46381a5d33e5c541fe2e838ff3ebeeb5dbc51f792ed31ae992aa0a4109d8a";
|
||||
|
||||
// 将图片URL添加到列表中进行检测
|
||||
List<String> imageUrls = Arrays.asList(imageUrl);
|
||||
|
||||
@@ -1,304 +0,0 @@
|
||||
package com.bao.dating.common.aliyun;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.net.URL;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Paths;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* OSS图片上传测试类
|
||||
* @author KilLze
|
||||
*/
|
||||
@SpringBootTest
|
||||
public class OssUploadTest {
|
||||
|
||||
@Autowired
|
||||
private AliOssUtil aliOssUtil;
|
||||
|
||||
/**
|
||||
* 测试上传本地图片文件
|
||||
*/
|
||||
@Test
|
||||
public void testUploadLocalImage() {
|
||||
try {
|
||||
// 本地图片文件路径（请修改为实际存在的图片路径）
|
||||
String localImagePath = "D:/image/image.jpg"; // 请修改为实际路径
|
||||
|
||||
File imageFile = new File(localImagePath);
|
||||
if (!imageFile.exists()) {
|
||||
System.out.println("图片文件不存在: " + localImagePath);
|
||||
System.out.println("请修改localImagePath为实际存在的图片路径");
|
||||
return;
|
||||
}
|
||||
|
||||
// 读取文件字节
|
||||
byte[] imageBytes = Files.readAllBytes(Paths.get(localImagePath));
|
||||
|
||||
// 生成OSS对象名称（使用时间戳和UUID确保唯一性）
|
||||
String objectName = generateObjectName("test", "jpg");
|
||||
|
||||
// 上传到OSS
|
||||
String fileUrl = aliOssUtil.upload(imageBytes, objectName);
|
||||
|
||||
System.out.println("========== 本地图片上传测试 ==========");
|
||||
System.out.println("本地文件路径: " + localImagePath);
|
||||
System.out.println("文件大小: " + imageBytes.length + " 字节");
|
||||
System.out.println("OSS对象名称: " + objectName);
|
||||
System.out.println("文件访问URL: " + fileUrl);
|
||||
System.out.println("上传结果: 成功");
|
||||
System.out.println("=====================================");
|
||||
|
||||
} catch (IOException e) {
|
||||
System.out.println("上传失败: " + e.getMessage());
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 测试从网络URL下载图片并上传到OSS
|
||||
*/
|
||||
@Test
|
||||
public void testUploadImageFromUrl() {
|
||||
try {
|
||||
// 网络图片URL（请修改为实际的图片URL）
|
||||
String imageUrl = "https://example.com/image.jpg"; // 请修改为实际URL
|
||||
|
||||
System.out.println("========== 网络图片上传测试 ==========");
|
||||
System.out.println("开始下载图片: " + imageUrl);
|
||||
|
||||
// 从URL下载图片
|
||||
URL url = new URL(imageUrl);
|
||||
try (InputStream inputStream = url.openStream()) {
|
||||
byte[] imageBytes = readAllBytes(inputStream);
|
||||
|
||||
// 从URL中提取文件扩展名
|
||||
String extension = getFileExtensionFromUrl(imageUrl);
|
||||
if (extension.isEmpty()) {
|
||||
extension = "jpg"; // 默认扩展名
|
||||
}
|
||||
|
||||
// 生成OSS对象名称
|
||||
String objectName = generateObjectName("download", extension);
|
||||
|
||||
// 上传到OSS
|
||||
String fileUrl = aliOssUtil.upload(imageBytes, objectName);
|
||||
|
||||
System.out.println("图片下载成功");
|
||||
System.out.println("文件大小: " + imageBytes.length + " 字节");
|
||||
System.out.println("OSS对象名称: " + objectName);
|
||||
System.out.println("文件访问URL: " + fileUrl);
|
||||
System.out.println("上传结果: 成功");
|
||||
}
|
||||
|
||||
System.out.println("=====================================");
|
||||
|
||||
} catch (Exception e) {
|
||||
System.out.println("上传失败: " + e.getMessage());
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 测试上传不同格式的图片
|
||||
*/
|
||||
@Test
|
||||
public void testUploadDifferentImageFormats() {
|
||||
String[] imagePaths = {
|
||||
"D:/test/image1.jpg", // 请修改为实际路径
|
||||
"D:/test/image2.png", // 请修改为实际路径
|
||||
"D:/test/image3.gif" // 请修改为实际路径
|
||||
};
|
||||
|
||||
System.out.println("========== 多格式图片上传测试 ==========");
|
||||
|
||||
for (String imagePath : imagePaths) {
|
||||
try {
|
||||
File imageFile = new File(imagePath);
|
||||
if (!imageFile.exists()) {
|
||||
System.out.println("跳过不存在的文件: " + imagePath);
|
||||
continue;
|
||||
}
|
||||
|
||||
// 读取文件
|
||||
byte[] imageBytes = Files.readAllBytes(Paths.get(imagePath));
|
||||
|
||||
// 获取文件扩展名
|
||||
String extension = getFileExtension(imagePath);
|
||||
|
||||
// 生成OSS对象名称
|
||||
String objectName = generateObjectName("format-test", extension);
|
||||
|
||||
// 上传
|
||||
String fileUrl = aliOssUtil.upload(imageBytes, objectName);
|
||||
|
||||
System.out.println("\n文件: " + imagePath);
|
||||
System.out.println("格式: " + extension);
|
||||
System.out.println("大小: " + imageBytes.length + " 字节");
|
||||
System.out.println("URL: " + fileUrl);
|
||||
System.out.println("状态: 成功");
|
||||
|
||||
} catch (Exception e) {
|
||||
System.out.println("\n文件: " + imagePath);
|
||||
System.out.println("状态: 失败 - " + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
System.out.println("\n=====================================");
|
||||
}
|
||||
|
||||
/**
|
||||
* 测试上传图片到指定目录
|
||||
*/
|
||||
@Test
|
||||
public void testUploadImageToDirectory() {
|
||||
try {
|
||||
// 本地图片文件路径
|
||||
String localImagePath = "D:/test/image.jpg"; // 请修改为实际路径
|
||||
|
||||
File imageFile = new File(localImagePath);
|
||||
if (!imageFile.exists()) {
|
||||
System.out.println("图片文件不存在: " + localImagePath);
|
||||
return;
|
||||
}
|
||||
|
||||
// 读取文件
|
||||
byte[] imageBytes = Files.readAllBytes(Paths.get(localImagePath));
|
||||
|
||||
// 上传到指定目录（例如：images/2025/12/24/xxx.jpg）
|
||||
String directory = "images/" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy/MM/dd"));
|
||||
String fileName = UUID.randomUUID().toString() + ".jpg";
|
||||
String objectName = directory + "/" + fileName;
|
||||
|
||||
// 上传
|
||||
String fileUrl = aliOssUtil.upload(imageBytes, objectName);
|
||||
|
||||
System.out.println("========== 目录上传测试 ==========");
|
||||
System.out.println("目录: " + directory);
|
||||
System.out.println("文件名: " + fileName);
|
||||
System.out.println("完整路径: " + objectName);
|
||||
System.out.println("文件访问URL: " + fileUrl);
|
||||
System.out.println("上传结果: 成功");
|
||||
System.out.println("=================================");
|
||||
|
||||
} catch (Exception e) {
|
||||
System.out.println("上传失败: " + e.getMessage());
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 测试使用FileInputStream上传
|
||||
*/
|
||||
@Test
|
||||
public void testUploadWithFileInputStream() {
|
||||
try {
|
||||
// 本地图片文件路径
|
||||
String localImagePath = "D:/test/image.jpg"; // 请修改为实际路径
|
||||
|
||||
File imageFile = new File(localImagePath);
|
||||
if (!imageFile.exists()) {
|
||||
System.out.println("图片文件不存在: " + localImagePath);
|
||||
return;
|
||||
}
|
||||
|
||||
// 使用FileInputStream读取文件
|
||||
try (FileInputStream fis = new FileInputStream(imageFile)) {
|
||||
byte[] imageBytes = new byte[(int) imageFile.length()];
|
||||
fis.read(imageBytes);
|
||||
|
||||
// 生成OSS对象名称
|
||||
String objectName = generateObjectName("stream", "jpg");
|
||||
|
||||
// 上传
|
||||
String fileUrl = aliOssUtil.upload(imageBytes, objectName);
|
||||
|
||||
System.out.println("========== FileInputStream上传测试 ==========");
|
||||
System.out.println("文件路径: " + localImagePath);
|
||||
System.out.println("文件大小: " + imageBytes.length + " 字节");
|
||||
System.out.println("OSS对象名称: " + objectName);
|
||||
System.out.println("文件访问URL: " + fileUrl);
|
||||
System.out.println("上传结果: 成功");
|
||||
System.out.println("===========================================");
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
System.out.println("上传失败: " + e.getMessage());
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 生成OSS对象名称
|
||||
* @param prefix 前缀
|
||||
* @param extension 文件扩展名
|
||||
* @return 对象名称
|
||||
*/
|
||||
private String generateObjectName(String prefix, String extension) {
|
||||
// 格式: prefix/yyyyMMdd/HHmmss-uuid.extension
|
||||
String dateTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMdd/HHmmss"));
|
||||
String uuid = UUID.randomUUID().toString().substring(0, 8);
|
||||
return String.format("%s/%s-%s.%s", prefix, dateTime, uuid, extension);
|
||||
}
|
||||
|
||||
/**
|
||||
* 从文件路径获取扩展名
|
||||
* @param filePath 文件路径
|
||||
* @return 扩展名
|
||||
*/
|
||||
private String getFileExtension(String filePath) {
|
||||
int lastDot = filePath.lastIndexOf('.');
|
||||
if (lastDot > 0 && lastDot < filePath.length() - 1) {
|
||||
return filePath.substring(lastDot + 1).toLowerCase();
|
||||
}
|
||||
return "jpg"; // 默认扩展名
|
||||
}
|
||||
|
||||
/**
|
||||
* 从URL获取文件扩展名
|
||||
* @param url URL地址
|
||||
* @return 扩展名
|
||||
*/
|
||||
private String getFileExtensionFromUrl(String url) {
|
||||
try {
|
||||
// 移除查询参数
|
||||
String path = url.split("\\?")[0];
|
||||
int lastDot = path.lastIndexOf('.');
|
||||
int lastSlash = path.lastIndexOf('/');
|
||||
|
||||
if (lastDot > lastSlash && lastDot < path.length() - 1) {
|
||||
return path.substring(lastDot + 1).toLowerCase();
|
||||
}
|
||||
} catch (Exception e) {
|
||||
// 忽略异常
|
||||
}
|
||||
return "jpg"; // 默认扩展名
|
||||
}
|
||||
|
||||
/**
|
||||
* 从InputStream读取所有字节（兼容方法）
|
||||
* @param inputStream 输入流
|
||||
* @return 字节数组
|
||||
* @throws IOException IO异常
|
||||
*/
|
||||
private byte[] readAllBytes(InputStream inputStream) throws IOException {
|
||||
ByteArrayOutputStream buffer = new ByteArrayOutputStream();
|
||||
byte[] data = new byte[8192]; // 8KB缓冲区
|
||||
int nRead;
|
||||
while ((nRead = inputStream.read(data, 0, data.length)) != -1) {
|
||||
buffer.write(data, 0, nRead);
|
||||
}
|
||||
return buffer.toByteArray();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,91 +0,0 @@
|
||||
package com.bao.dating.service;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
|
||||
/**
|
||||
* 验证码服务测试类
|
||||
* @author KilLze
|
||||
*/
|
||||
@SpringBootTest
|
||||
public class VerificationCodeServiceTest {
|
||||
|
||||
@Autowired
|
||||
private VerificationCodeService verificationCodeService;
|
||||
|
||||
/**
|
||||
* 测试发送邮箱验证码
|
||||
*/
|
||||
@Test
|
||||
public void testSendEmailCode() {
|
||||
String email = "test@example.com"; // 请修改为实际邮箱地址
|
||||
|
||||
System.out.println("========== 发送邮箱验证码测试 ==========");
|
||||
System.out.println("邮箱地址: " + email);
|
||||
|
||||
boolean result = verificationCodeService.sendEmailCode(email);
|
||||
|
||||
System.out.println("发送结果: " + (result ? "成功" : "失败"));
|
||||
System.out.println("=====================================");
|
||||
}
|
||||
|
||||
/**
|
||||
* 测试验证邮箱验证码
|
||||
*/
|
||||
@Test
|
||||
public void testVerifyEmailCode() {
|
||||
String email = "test@example.com"; // 请修改为实际邮箱地址
|
||||
String code = "123456"; // 请修改为实际收到的验证码
|
||||
|
||||
System.out.println("========== 验证邮箱验证码测试 ==========");
|
||||
System.out.println("邮箱地址: " + email);
|
||||
System.out.println("验证码: " + code);
|
||||
|
||||
boolean result = verificationCodeService.verifyEmailCode(email, code);
|
||||
|
||||
System.out.println("验证结果: " + (result ? "成功" : "失败"));
|
||||
System.out.println("=====================================");
|
||||
}
|
||||
|
||||
/**
|
||||
* 测试完整流程：发送验证码 -> 验证验证码
|
||||
*/
|
||||
@Test
|
||||
public void testCompleteFlow() {
|
||||
String email = "test@example.com"; // 请修改为实际邮箱地址
|
||||
|
||||
System.out.println("========== 完整流程测试 ==========");
|
||||
System.out.println("邮箱地址: " + email);
|
||||
|
||||
// 1. 发送验证码
|
||||
System.out.println("\n1. 发送验证码...");
|
||||
boolean sendResult = verificationCodeService.sendEmailCode(email);
|
||||
System.out.println("发送结果: " + (sendResult ? "成功" : "失败"));
|
||||
|
||||
if (sendResult) {
|
||||
// 2. 等待用户输入验证码（这里模拟，实际应该从控制台或API获取）
|
||||
System.out.println("\n2. 请查看邮箱获取验证码，然后手动测试验证功能");
|
||||
System.out.println(" 使用 testVerifyEmailCode() 方法进行验证");
|
||||
}
|
||||
|
||||
System.out.println("\n=====================================");
|
||||
}
|
||||
|
||||
/**
|
||||
* 测试生成验证码
|
||||
*/
|
||||
@Test
|
||||
public void testGenerateCode() {
|
||||
System.out.println("========== 生成验证码测试 ==========");
|
||||
|
||||
// 测试不同长度的验证码
|
||||
for (int length = 4; length <= 8; length++) {
|
||||
String code = verificationCodeService.generateCode(length);
|
||||
System.out.println(length + "位验证码: " + code);
|
||||
}
|
||||
|
||||
System.out.println("=====================================");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,78 +0,0 @@
|
||||
package com.bao.dating.util;
|
||||
|
||||
import com.bao.dating.common.aliyun.SmsUtil;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 邮箱和短信发送测试类
|
||||
* @author KilLze
|
||||
*/
|
||||
@SpringBootTest
|
||||
public class EmailAndSmsTest {
|
||||
|
||||
@Autowired
|
||||
private EmailUtil emailUtil;
|
||||
|
||||
@Autowired
|
||||
private SmsUtil smsUtil;
|
||||
|
||||
/**
|
||||
* 测试发送简单文本邮件
|
||||
*/
|
||||
@Test
|
||||
public void testSendSimpleMail() {
|
||||
String to = "n_1127@qq.com";
|
||||
String subject = "测试邮件 - 简单文本";
|
||||
String text = "这是一封测试邮件，用于测试简单文本邮件发送功能。\n\n如果您收到此邮件，说明邮件发送功能正常。";
|
||||
|
||||
boolean result = emailUtil.sendSimpleMail(to, subject, text);
|
||||
System.out.println("简单邮件发送结果: " + (result ? "成功" : "失败"));
|
||||
}
|
||||
|
||||
/**
|
||||
* 测试发送HTML格式邮件
|
||||
*/
|
||||
@Test
|
||||
public void testSendHtmlMail() {
|
||||
String to = "n_1127@qq.com";
|
||||
String subject = "测试邮件 - HTML格式";
|
||||
String htmlContent = "<html><body>" +
|
||||
"<h2 style='color: #1890ff;'>欢迎使用我们的服务</h2>" +
|
||||
"<p>这是一封<strong>HTML格式</strong>的测试邮件。</p>" +
|
||||
"<p>邮件内容支持：</p>" +
|
||||
"<ul>" +
|
||||
"<li>HTML标签</li>" +
|
||||
"<li>样式设置</li>" +
|
||||
"<li>富文本内容</li>" +
|
||||
"</ul>" +
|
||||
"<p style='color: #999;'>感谢您的使用！</p>" +
|
||||
"</body></html>";
|
||||
|
||||
boolean result = emailUtil.sendHtmlMail(to, subject, htmlContent);
|
||||
System.out.println("HTML邮件发送结果: " + (result ? "成功" : "失败"));
|
||||
}
|
||||
|
||||
/**
|
||||
* 测试发送验证码邮件
|
||||
*/
|
||||
@Test
|
||||
public void testSendVerificationCodeEmail() {
|
||||
String to = "n_1127@qq.com";
|
||||
String code = "123456";
|
||||
|
||||
boolean result = emailUtil.sendVerificationCode(to, code);
|
||||
System.out.println("验证码邮件发送结果: " + (result ? "成功" : "失败"));
|
||||
System.out.println("验证码: " + code);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user