init: 合并代码

# Conflicts:
#	src/main/java/com/bao/dating/controller/PostController.java

pom.xml

@@ -19,6 +19,13 @@
             <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-web</artifactId>
@@ -50,6 +57,14 @@
             <scope>test</scope>
         </dependency>
 
+        <!-- JUnit Platform Launcher for resolving junit-platform-launcher:1.8.2 issue -->
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-launcher</artifactId>
+            <version>1.8.2</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
@@ -73,6 +88,60 @@
             <version>1.2.83</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-core</artifactId>
+            <version>4.6.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-green</artifactId>
+            <version>3.4.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>imageaudit20191230</artifactId>
+            <version>2.0.6</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>tea-openapi</artifactId>
+            <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>
+
     </dependencies>
     <dependencyManagement>
         <dependencies>
@@ -93,8 +162,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>9</source>
+                    <target>9</target>
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>

src/main/java/com/bao/dating/DatingApplication.java

@@ -1,9 +1,10 @@
 package com.bao.dating;
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-
+@MapperScan("com.bao.dating.mapper")
 @SpringBootApplication
 public class DatingApplication {
     public static void main(String[] args) {

src/main/java/com/bao/dating/common/Comments.java

@@ -0,0 +1,19 @@
+package com.bao.dating.common;
+
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+
+/**
+ * 评论表
+ */
+@Data
+public class Comments {
+    private Long comment_id;   // 评论ID
+    private String content;  // 评论内容
+    private Long user_id;     // 评论人ID
+    private Long post_id;  // 关联动态ID
+    private LocalDateTime created_at; // 评论时间
+}

src/main/java/com/bao/dating/common/Post.java

@@ -0,0 +1,16 @@
+package com.bao.dating.common;
+
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+/**
+ * 动态表
+ */
+@Data
+public class Post {
+    private Long post_id;         // 动态ID
+    private String content;  // 动态内容
+    private Long user_id;     // 发布人ID
+    private LocalDateTime created_at; // 创建时间
+}

src/main/java/com/bao/dating/common/Result.java

@@ -57,4 +57,5 @@ public class Result<T> {
     public static <T> Result<T> error(ResultCode code, String msg) {
         return new Result<>(code.code(), msg, null);
     }
+
 }

src/main/java/com/bao/dating/common/ResultCode.java

@@ -3,11 +3,13 @@ package com.bao.dating.common;
 public enum ResultCode {
     SUCCESS(200, "成功"),
     SUCCESS_REVIEW(201, "请求已成功处理"),
+    SUCCESS_DELETE(204, "删除成功"),
     PARAM_ERROR(400, "参数错误"),
     UNAUTHORIZED(401, "未登录或 Token 失效"),
     FORBIDDEN(403, "无权限"),
     NOT_FOUND(404, "数据不存在"),
-    SYSTEM_ERROR(500, "系统异常");
+    SYSTEM_ERROR(500, "系统异常"),
+    FAIL(500, "操作失败");
 
     private final int code;
     private final String msg;

src/main/java/com/bao/dating/common/aliyun/AliOssUtil.java

@@ -1,4 +1,4 @@
-package com.bao.dating.util;
+package com.bao.dating.common.aliyun;
 
 import com.aliyun.oss.ClientException;
 import com.aliyun.oss.OSS;
@@ -7,12 +7,15 @@ 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;
 
 @Data
-@AllArgsConstructor
 @Slf4j
+@Component
+@ConfigurationProperties(prefix = "aliyun.oss")
 public class AliOssUtil {
 
     private String endpoint;

src/main/java/com/bao/dating/common/aliyun/GreenImageScan.java

@@ -0,0 +1,102 @@
+package com.bao.dating.common.aliyun;
+
+import com.alibaba.fastjson.JSON;
+import com.aliyun.imageaudit20191230.models.ScanImageRequest;
+import com.aliyun.imageaudit20191230.models.ScanImageResponse;
+import com.aliyun.imageaudit20191230.models.ScanImageResponseBody;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+
+@Getter
+@Setter
+@Component
+@ConfigurationProperties(prefix = "aliyun")
+public class GreenImageScan {
+
+    private String accessKeyId;
+    private String secret;
+    private String scenes;
+
+    public Map imageScan(List<String> imageList) throws Exception {
+        com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config()
+                .setAccessKeyId(accessKeyId)
+                .setAccessKeySecret(secret);
+        // 访问的域名 - 修改为北京区域
+        config.endpoint = "imageaudit.cn-shanghai.aliyuncs.com";
+
+        com.aliyun.imageaudit20191230.Client client = new com.aliyun.imageaudit20191230.Client(config);
+
+        List<ScanImageRequest.ScanImageRequestTask> taskList = new ArrayList<>();
+
+        for (String img: imageList) {
+            ScanImageRequest.ScanImageRequestTask task = new ScanImageRequest.ScanImageRequestTask();
+            task.setImageURL(img);
+            task.setDataId(UUID.randomUUID().toString());
+            task.setImageTimeMillisecond(1L);
+            task.setInterval(1);
+            task.setMaxFrames(1);
+            taskList.add(task);
+        }
+
+        //场景
+        List<String> sceneList = new ArrayList<>();
+        // 移除了不支持的"antispam"场景，使用支持的场景
+        sceneList.add("porn");      // 涉黄识别
+        sceneList.add("terrorism"); // 暴恐识别
+        sceneList.add("ad");        // 图片广告
+        sceneList.add("live");      // 不不良场景
+        sceneList.add("logo");      // logo识别
+
+        com.aliyun.imageaudit20191230.models.ScanImageRequest scanImageRequest = new com.aliyun.imageaudit20191230.models.ScanImageRequest()
+                .setTask(taskList)
+                .setScene(sceneList);
+        com.aliyun.teautil.models.RuntimeOptions runtime = new com.aliyun.teautil.models.RuntimeOptions();
+        try {
+            ScanImageResponse scanImageResponse = client.scanImageWithOptions(scanImageRequest, runtime);
+            Map<String, String> resultMap = new HashMap<>();
+
+            if (scanImageResponse.getStatusCode() == 200) {
+
+                List<ScanImageResponseBody.ScanImageResponseBodyDataResults> results = scanImageResponse.body.data.results;
+
+                // 遍历每一张图片的审核结果
+                for (ScanImageResponseBody.ScanImageResponseBodyDataResults result : results) {
+                    List<ScanImageResponseBody.ScanImageResponseBodyDataResultsSubResults> subResults = result.getSubResults();
+                    
+                    // 检查这张图片的所有子审核项
+                    for (ScanImageResponseBody.ScanImageResponseBodyDataResultsSubResults subResult : subResults) {
+                        // 如果有任何一项未通过审核，则整个审核不通过
+                        if (!subResult.suggestion.equals("pass")) {
+                            resultMap.put("suggestion", subResult.suggestion);
+                            resultMap.put("label", subResult.label);
+                            return resultMap;
+                        }
+                    }
+                }
+                
+                // 所有图片的所有审核项都通过时，返回pass结果
+                resultMap.put("suggestion", "pass");
+                resultMap.put("label", "normal");
+                return resultMap;
+
+            } else {
+                System.out.println("the whole image scan request failed. response:" + JSON.toJSONString(scanImageResponse));
+                return null;
+            }
+
+        } catch (com.aliyun.tea.TeaException teaException) {
+            // 获取整体报错信息
+            System.out.println(com.aliyun.teautil.Common.toJSONString(teaException));
+            // 获取单个字段
+            System.out.println(teaException.getCode());
+            return null;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+}

src/main/java/com/bao/dating/common/aliyun/GreenTextScan.java

@@ -0,0 +1,127 @@
+package com.bao.dating.common.aliyun;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.aliyun.green20220302.Client;
+import com.aliyun.green20220302.models.TextModerationRequest;
+import com.aliyun.green20220302.models.TextModerationResponse;
+import com.aliyun.green20220302.models.TextModerationResponseBody;
+import com.aliyun.teaopenapi.models.Config;
+import com.aliyun.teautil.models.RuntimeOptions;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Getter
+@Setter
+@Component
+@ConfigurationProperties(prefix = "aliyun")
+public class GreenTextScan {
+
+
+    private String accessKeyId;
+    private String secret;
+
+    public Map greeTextScan(String content) throws Exception {
+//        accessKeyId = "LTAI5tKo9TpWH1aW6JxWm1Gp";
+//        secret = "LHk9DdHECKCwIdaIM9fkGgEuowt18W";
+        Config config = new Config();
+        config.setAccessKeyId(accessKeyId);
+        config.setAccessKeySecret(secret);
+        //接入区域和地址请根据实际情况修改
+        config.setRegionId("cn-shanghai");
+        config.setEndpoint("green-cip.cn-shanghai.aliyuncs.com");
+        //连接时超时时间，单位毫秒（ms）。
+        config.setReadTimeout(6000);
+        //读取时超时时间，单位毫秒（ms）。
+        config.setConnectTimeout(3000);
+        Client client = new Client(config);
+
+        // 创建RuntimeObject实例并设置运行参数。
+        RuntimeOptions runtime = new RuntimeOptions();
+        runtime.readTimeout = 10000;
+        runtime.connectTimeout = 10000;
+
+        //检测参数构造
+        JSONObject serviceParameters = new JSONObject();
+        serviceParameters.put("content", content);
+
+        //检测结果构造
+        Map<String,String> resultMap = new HashMap<>();
+        if (serviceParameters.get("content") == null || serviceParameters.getString("content").trim().length() == 0) {
+
+            resultMap.put("suggestion","检测内容为空");
+            System.out.println("text moderation content is empty");
+            return resultMap;
+        }
+        TextModerationRequest textModerationRequest = new TextModerationRequest();
+        /*
+        文本检测service：内容安全控制台文本增强版规则配置的serviceCode，示例：chat_detection
+        */
+        textModerationRequest.setService("comment_detection");
+        textModerationRequest.setServiceParameters(serviceParameters.toJSONString());
+
+        try {
+
+            // 调用方法获取检测结果。
+            TextModerationResponse response = client.textModerationWithOptions(textModerationRequest, runtime);
+
+            // 自动路由。
+            if (response != null) {
+
+                // 服务端错误，区域切换到cn-beijing。
+                if (500 == response.getStatusCode()) {
+
+                    // 接入区域和地址请根据实际情况修改。
+                    config.setRegionId("cn-beijing");
+                    config.setEndpoint("green-cip.cn-beijing.aliyuncs.com");
+                    client = new Client(config);
+                    response = client.textModerationWithOptions(textModerationRequest, runtime);
+                }
+
+            }
+            // 打印检测结果。
+            if (response != null) {
+
+                if (response.getStatusCode() == 200) {
+
+                    TextModerationResponseBody result = response.getBody();
+                    System.out.println(JSON.toJSONString(result));
+                    // 直接使用JSON解析来获取code值，避免类型不匹配问题
+                    JSONObject resultJson = JSON.parseObject(JSON.toJSONString(result));
+                    String code = resultJson.getString("code");
+
+                    if (code != null && "200".equals(code)) {
+
+                        TextModerationResponseBody.TextModerationResponseBodyData data = result.getData();
+                        if (data.getLabels().isEmpty() && data.getReason().isEmpty()) {
+
+                            resultMap.put("suggestion", "pass");
+                        }else {
+
+                            resultMap.put("suggestion","block");
+                            resultMap.put("labels",data.getLabels());
+                            resultMap.put("reason", data.getReason());
+                        }
+                        System.out.println("labels = [" + data.getLabels() + "]");
+                        System.out.println("reason = [" + data.getReason() + "]");
+                    } else {
+
+                        System.out.println("text moderation not success. code:" + code);
+                    }
+                } else {
+
+                    System.out.println("response not success. status:" + response.getStatusCode());
+                }
+            }
+        } catch (Exception e) {
+
+            e.printStackTrace();
+        }
+        return resultMap;
+    }
+}

src/main/java/com/bao/dating/common/aliyun/SmsUtil.java

@@ -0,0 +1,149 @@
+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);
+
+            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());
+    }
+}
+

src/main/java/com/bao/dating/common/aliyun/util/ClientUploader.java

@@ -0,0 +1,195 @@
+package com.bao.dating.common.aliyun.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.aliyun.oss.OSSClient;
+import com.aliyun.oss.model.ObjectMetadata;
+import com.aliyun.oss.model.PutObjectResult;
+import com.aliyuncs.DefaultAcsClient;
+import com.aliyuncs.IAcsClient;
+import com.aliyuncs.green.model.v20180509.UploadCredentialsRequest;
+import com.aliyuncs.http.FormatType;
+import com.aliyuncs.http.HttpResponse;
+import com.aliyuncs.http.ProtocolType;
+import com.aliyuncs.profile.IClientProfile;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * 用于本地图片文件检测时，上传本地图片
+ */
+public class ClientUploader {
+
+    private IClientProfile profile;
+    private volatile UploadCredentials uploadCredentials;
+    private Map<String, String> headers;
+    private String prefix;
+
+    private boolean internal = false;
+
+    private Object lock = new Object();
+
+    private ClientUploader(IClientProfile profile, String prefix, boolean internal) {
+        this.profile = profile;
+        this.uploadCredentials = null;
+        this.headers = new HashMap<String, String>();
+        this.prefix = prefix;
+        this.internal = internal;
+    }
+
+
+    public static ClientUploader getImageClientUploader(IClientProfile profile, boolean internal){
+        return  new ClientUploader(profile, "images", internal);
+    }
+
+    public static ClientUploader getVideoClientUploader(IClientProfile profile, boolean internal){
+        return  new ClientUploader(profile, "videos", internal);
+    }
+
+    public static ClientUploader getVoiceClientUploader(IClientProfile profile, boolean internal){
+        return  new ClientUploader(profile, "voices", internal);
+    }
+
+    public static ClientUploader getFileClientUploader(IClientProfile profile, boolean internal){
+        return  new ClientUploader(profile, "files", internal);
+    }
+
+    /**
+     * 上传并获取上传后的图片链接
+     * @param filePath
+     * @return
+     */
+    public String uploadFile(String filePath){
+        FileInputStream inputStream = null;
+        OSSClient ossClient = null;
+        try {
+            File file = new File(filePath);
+            UploadCredentials uploadCredentials = getCredentials();
+            if(uploadCredentials == null){
+                throw new RuntimeException("can not get upload credentials");
+            }
+            ObjectMetadata meta = new ObjectMetadata();
+            meta.setContentLength(file.length());
+            inputStream = new FileInputStream(file);
+
+            ossClient = new OSSClient(getOssEndpoint(uploadCredentials), uploadCredentials.getAccessKeyId(), uploadCredentials.getAccessKeySecret(), uploadCredentials.getSecurityToken());
+
+            String object = uploadCredentials.getUploadFolder() + '/' + this.prefix + '/' + String.valueOf(filePath.hashCode());
+            PutObjectResult ret = ossClient.putObject(uploadCredentials.getUploadBucket(), object, inputStream, meta);
+            return "oss://" + uploadCredentials.getUploadBucket() + "/" + object;
+        } catch (Exception e) {
+            throw new RuntimeException("upload file fail.", e);
+        } finally {
+            if(ossClient != null){
+                ossClient.shutdown();
+            }
+            if(inputStream != null){
+                try {
+                    inputStream.close();
+                }catch (Exception e){
+
+                }
+            }
+        }
+    }
+
+
+    private String getOssEndpoint(UploadCredentials uploadCredentials){
+        if(this.internal){
+            return uploadCredentials.getOssInternalEndpoint();
+        }else{
+            return uploadCredentials.getOssEndpoint();
+        }
+    }
+
+    /**
+     * 上传并获取上传后的图片链接
+     * @param bytes
+     * @return
+     */
+    public String uploadBytes(byte[] bytes){
+        OSSClient ossClient = null;
+        try {
+            UploadCredentials uploadCredentials = getCredentials();
+            if(uploadCredentials == null){
+                throw new RuntimeException("can not get upload credentials");
+            }
+
+            ossClient = new OSSClient(getOssEndpoint(uploadCredentials), uploadCredentials.getAccessKeyId(), uploadCredentials.getAccessKeySecret(), uploadCredentials.getSecurityToken());
+
+            String object = uploadCredentials.getUploadFolder() + '/' + this.prefix + '/' + UUID.randomUUID().toString();
+            PutObjectResult ret = ossClient.putObject(uploadCredentials.getUploadBucket(), object, new ByteArrayInputStream(bytes));
+            return "oss://" + uploadCredentials.getUploadBucket() + "/" + object;
+        } catch (Exception e) {
+            throw new RuntimeException("upload file fail.", e);
+        } finally {
+            if(ossClient != null){
+                ossClient.shutdown();
+            }
+        }
+    }
+
+
+    public void addHeader(String key, String value){
+        this.headers.put(key, value);
+    }
+
+
+    private UploadCredentials getCredentials() throws Exception{
+        if(this.uploadCredentials == null || this.uploadCredentials.getExpiredTime() < System.currentTimeMillis()){
+            synchronized(lock){
+                if(this.uploadCredentials == null || this.uploadCredentials.getExpiredTime() < System.currentTimeMillis()){
+                    this.uploadCredentials = getCredentialsFromServer();
+                }
+            }
+        }
+        return this.uploadCredentials;
+    }
+
+    /**
+     * 从服务器端获取上传凭证
+     * @return
+     * @throws Exception
+     */
+    private UploadCredentials getCredentialsFromServer() throws Exception{
+        UploadCredentialsRequest uploadCredentialsRequest =  new UploadCredentialsRequest();
+        uploadCredentialsRequest.setAcceptFormat(FormatType.JSON); // 指定api返回格式
+        uploadCredentialsRequest.setMethod(com.aliyuncs.http.MethodType.POST); // 指定请求方法
+        uploadCredentialsRequest.setEncoding("utf-8");
+        uploadCredentialsRequest.setProtocol(ProtocolType.HTTP);
+        for (Map.Entry<String, String> kv : this.headers.entrySet()) {
+            uploadCredentialsRequest.putHeaderParameter(kv.getKey(), kv.getValue());
+        }
+
+        uploadCredentialsRequest.setHttpContent(new JSONObject().toJSONString().getBytes("UTF-8"), "UTF-8", FormatType.JSON);
+
+        IAcsClient client = null;
+        try{
+            client = new DefaultAcsClient(profile);
+            HttpResponse httpResponse =  client.doAction(uploadCredentialsRequest);
+            if (httpResponse.isSuccess()) {
+                JSONObject scrResponse = JSON.parseObject(new String(httpResponse.getHttpContent(), "UTF-8"));
+                if (200 == scrResponse.getInteger("code")) {
+                    JSONObject data = scrResponse.getJSONObject("data");
+                    return new UploadCredentials(data.getString("accessKeyId"), data.getString("accessKeySecret"),
+                            data.getString("securityToken"), data.getLongValue("expiredTime"),
+                            data.getString("ossEndpoint"), data.getString("ossInternalEndpoint"), data.getString("uploadBucket"), data.getString("uploadFolder"));
+                }
+
+                String requestId = scrResponse.getString("requestId");
+                throw new RuntimeException("get upload credential from server fail. requestId:" + requestId + ", code:" + scrResponse.getInteger("code"));
+            }
+            throw new RuntimeException("get upload credential from server fail. http response status:" + httpResponse.getStatus());
+        }finally {
+            client.shutdown();
+        }
+    }
+
+
+
+}

src/main/java/com/bao/dating/common/aliyun/util/CustomLibUploader.java

@@ -0,0 +1,159 @@
+package com.bao.dating.common.aliyun.util;
+
+
+import javax.activation.MimetypesFileTypeMap;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.*;
+
+/**
+ * 用于自定义图库上传图片
+ */
+public class CustomLibUploader {
+
+
+    public String uploadFile(String host, String uploadFolder, String ossAccessKeyId,
+                             String policy, String signature,
+                             String filepath) throws Exception {
+        LinkedHashMap<String, String> textMap = new LinkedHashMap<String, String>();
+        // key
+        String objectName = uploadFolder + "/imglib_" + UUID.randomUUID().toString() + ".jpg";
+        textMap.put("key", objectName);
+        // Content-Disposition
+        textMap.put("Content-Disposition", "attachment;filename="+filepath);
+        // OSSAccessKeyId
+        textMap.put("OSSAccessKeyId", ossAccessKeyId);
+        // policy
+        textMap.put("policy", policy);
+        // Signature
+        textMap.put("Signature", signature);
+
+        Map<String, String> fileMap = new HashMap<String, String>();
+        fileMap.put("file", filepath);
+
+        String ret = formUpload(host, textMap, fileMap);
+        System.out.println("[" + host + "] post_object:" + objectName);
+        System.out.println("post reponse:" + ret);
+        return objectName;
+    }
+
+    private static String formUpload(String urlStr, Map<String, String> textMap, Map<String, String> fileMap) throws Exception {
+        String res = "";
+        HttpURLConnection conn = null;
+        String BOUNDARY = "9431149156168";
+        try {
+            URL url = new URL(urlStr);
+            conn = (HttpURLConnection) url.openConnection();
+            conn.setConnectTimeout(5000);
+            conn.setReadTimeout(10000);
+            conn.setDoOutput(true);
+            conn.setDoInput(true);
+            conn.setRequestMethod("POST");
+            conn.setRequestProperty("User-Agent",
+                    "Mozilla/5.0 (Windows; U; Windows NT 6.1; zh-CN; rv:1.9.2.6)");
+            conn.setRequestProperty("Content-Type",
+                    "multipart/form-data; boundary=" + BOUNDARY);
+
+            OutputStream out = new DataOutputStream(conn.getOutputStream());
+            // text
+            if (textMap != null) {
+                StringBuffer strBuf = new StringBuffer();
+                Iterator iter = textMap.entrySet().iterator();
+                int i = 0;
+                while (iter.hasNext()) {
+                    Map.Entry entry = (Map.Entry) iter.next();
+                    String inputName = (String) entry.getKey();
+                    String inputValue = (String) entry.getValue();
+                    if (inputValue == null) {
+                        continue;
+                    }
+                    if (i == 0) {
+                        strBuf.append("--").append(BOUNDARY).append(
+                                "\r\n");
+                        strBuf.append("Content-Disposition: form-data; name=\""
+                                + inputName + "\"\r\n\r\n");
+                        strBuf.append(inputValue);
+                    } else {
+                        strBuf.append("\r\n").append("--").append(BOUNDARY).append(
+                                "\r\n");
+                        strBuf.append("Content-Disposition: form-data; name=\""
+                                + inputName + "\"\r\n\r\n");
+
+                        strBuf.append(inputValue);
+                    }
+
+                    i++;
+                }
+                out.write(strBuf.toString().getBytes());
+            }
+
+            // file
+            if (fileMap != null) {
+                Iterator iter = fileMap.entrySet().iterator();
+                while (iter.hasNext()) {
+                    Map.Entry entry = (Map.Entry) iter.next();
+                    String inputName = (String) entry.getKey();
+                    String inputValue = (String) entry.getValue();
+                    if (inputValue == null) {
+                        continue;
+                    }
+                    File file = new File(inputValue);
+                    String filename = file.getName();
+                    String contentType = new MimetypesFileTypeMap().getContentType(file);
+                    if (contentType == null || contentType.equals("")) {
+                        contentType = "application/octet-stream";
+                    }
+
+                    StringBuffer strBuf = new StringBuffer();
+                    strBuf.append("\r\n").append("--").append(BOUNDARY).append(
+                            "\r\n");
+                    strBuf.append("Content-Disposition: form-data; name=\""
+                            + inputName + "\"; filename=\"" + filename
+                            + "\"\r\n");
+                    strBuf.append("Content-Type: " + contentType + "\r\n\r\n");
+
+                    out.write(strBuf.toString().getBytes());
+
+                    DataInputStream in = new DataInputStream(new FileInputStream(file));
+                    int bytes = 0;
+                    byte[] bufferOut = new byte[1024];
+                    while ((bytes = in.read(bufferOut)) != -1) {
+                        out.write(bufferOut, 0, bytes);
+                    }
+                    in.close();
+                }
+                StringBuffer strBuf = new StringBuffer();
+                out.write(strBuf.toString().getBytes());
+            }
+
+            byte[] endData = ("\r\n--" + BOUNDARY + "--\r\n").getBytes();
+            out.write(endData);
+            out.flush();
+            out.close();
+
+            // 读取返回数据
+            StringBuffer strBuf = new StringBuffer();
+            BufferedReader reader = new BufferedReader(new InputStreamReader(
+                    conn.getInputStream()));
+            String line = null;
+            while ((line = reader.readLine()) != null) {
+                strBuf.append(line).append("\n");
+            }
+            res = strBuf.toString();
+            reader.close();
+            reader = null;
+        } catch (Exception e) {
+            System.err.println("发送POST请求出错: " + urlStr);
+            throw e;
+        } finally {
+            if (conn != null) {
+                conn.disconnect();
+                conn = null;
+            }
+        }
+        return res;
+    }
+
+
+}

src/main/java/com/bao/dating/common/aliyun/util/UploadCredentials.java

@@ -0,0 +1,90 @@
+package com.bao.dating.common.aliyun.util;
+
+import java.io.Serializable;
+
+public class UploadCredentials implements Serializable {
+
+    private String accessKeyId;
+    private String  accessKeySecret;
+    private String  securityToken;
+    private Long  expiredTime;
+    private String  ossEndpoint;
+    private String  ossInternalEndpoint;
+    private String  uploadBucket;
+    private String  uploadFolder;
+
+    public UploadCredentials(String accessKeyId, String accessKeySecret, String securityToken, Long expiredTime, String ossEndpoint, String ossInternalEndpoint, String uploadBucket, String uploadFolder) {
+        this.accessKeyId = accessKeyId;
+        this.accessKeySecret = accessKeySecret;
+        this.securityToken = securityToken;
+        this.expiredTime = expiredTime;
+        this.ossEndpoint = ossEndpoint;
+        this.ossInternalEndpoint = ossInternalEndpoint;
+        this.uploadBucket = uploadBucket;
+        this.uploadFolder = uploadFolder;
+    }
+
+    public String getAccessKeyId() {
+        return accessKeyId;
+    }
+
+    public void setAccessKeyId(String accessKeyId) {
+        this.accessKeyId = accessKeyId;
+    }
+
+    public String getAccessKeySecret() {
+        return accessKeySecret;
+    }
+
+    public void setAccessKeySecret(String accessKeySecret) {
+        this.accessKeySecret = accessKeySecret;
+    }
+
+    public String getSecurityToken() {
+        return securityToken;
+    }
+
+    public void setSecurityToken(String securityToken) {
+        this.securityToken = securityToken;
+    }
+
+    public Long getExpiredTime() {
+        return expiredTime;
+    }
+
+    public void setExpiredTime(Long expiredTime) {
+        this.expiredTime = expiredTime;
+    }
+
+    public String getOssEndpoint() {
+        return ossEndpoint;
+    }
+
+    public void setOssEndpoint(String ossEndpoint) {
+        this.ossEndpoint = ossEndpoint;
+    }
+
+    public String getUploadBucket() {
+        return uploadBucket;
+    }
+
+    public void setUploadBucket(String uploadBucket) {
+        this.uploadBucket = uploadBucket;
+    }
+
+    public String getUploadFolder() {
+        return uploadFolder;
+    }
+
+    public void setUploadFolder(String uploadFolder) {
+        this.uploadFolder = uploadFolder;
+    }
+
+    public String getOssInternalEndpoint() {
+        return ossInternalEndpoint;
+    }
+
+    public void setOssInternalEndpoint(String ossInternalEndpoint) {
+        this.ossInternalEndpoint = ossInternalEndpoint;
+    }
+}

src/main/java/com/bao/dating/config/OssConfiguration.java

@@ -1,26 +0,0 @@
-package com.bao.dating.config;
-
-
-import com.bao.dating.properties.AliOssProperties;
-import com.bao.dating.util.AliOssUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * 配置类，用于创建AliOssUtil对象
- */
-@Configuration
-@Slf4j
-public class OssConfiguration {
-    @Bean
-    @ConditionalOnMissingBean
-    public AliOssUtil aliOssUtil(AliOssProperties aliOssProperties){
-        log.info("开始创建阿里云文件上传工具类对象：{}",aliOssProperties);
-        return new AliOssUtil(aliOssProperties.getEndpoint(),
-                aliOssProperties.getAccessKeyId(),
-                aliOssProperties.getAccessKeySecret(),
-                aliOssProperties.getBucketName());
-    }
-}

src/main/java/com/bao/dating/controller/CommentController.java

@@ -0,0 +1,52 @@
+package com.bao.dating.controller;
+
+import com.bao.dating.common.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);
+    }
+}

src/main/java/com/bao/dating/controller/PostController.java

@@ -5,6 +5,7 @@ import com.bao.dating.common.Result;
 import com.bao.dating.common.ResultCode;
 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -41,4 +42,39 @@ public class PostController {
         Post result = postService.createPost(postRequestDTO);
         return Result.success(ResultCode.SUCCESS_REVIEW, "动态发布成功，等待审核。", result);
     }
+
+    /**
+     * 删除动态
+     *
+     * @param postId 动态ID
+     * @return 删除结果
+     */
+    @DeleteMapping("/{postId}")
+    public Result<String> deleteById(@PathVariable Integer postId){
+        postService.deletePostById(postId);
+        return Result.success(ResultCode.SUCCESS_DELETE, "动态删除成功", null);
+    }
+
+    /**
+     * 根据ID查询动态接口
+     * @param postId 动态ID
+     * @return 动态对象
+     */
+    @GetMapping("/{postId}")
+    public Result<PostEditVO> getPostById(@PathVariable Long postId) {
+        PostEditVO postEditVO = postService.getPostForEdit(postId);
+        return Result.success(ResultCode.SUCCESS,"查询成功", postEditVO);
+    }
+
+    /**
+     * 更新动态接口
+     * @param postId 动态ID
+     * @param postRequestDTO 动态信息
+     * @return 更新后的动态对象
+     */
+    @PutMapping("/{postId}")
+    public Result<PostEditVO> updatePost(@PathVariable Long postId, @RequestBody PostRequestDTO postRequestDTO) {
+        PostEditVO result = postService.updatePost(postId, postRequestDTO);
+        return Result.success(ResultCode.SUCCESS_REVIEW, "动态更新成功", result);
+    }
 }

src/main/java/com/bao/dating/controller/PostFavoriteController.java

@@ -0,0 +1,34 @@
+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 com.bao.dating.service.PostService;
+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);
+    }
+}

src/main/java/com/bao/dating/controller/PostLikeController.java

@@ -0,0 +1,47 @@
+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")
+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
+        Long userId = body.get("user_id");
+        if (userId ==null){
+            return Result.error(ResultCode.PARAM_ERROR);
+        }
+        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
+        Long userId = body.get("user_id");
+        postLikeService.unlike(postId,userId);
+    }
+ }

src/main/java/com/bao/dating/mapper/CommentsMapper.java

@@ -0,0 +1,22 @@
+package com.bao.dating.mapper;
+
+
+import com.bao.dating.common.Comments;
+import com.bao.dating.common.Post;
+import org.apache.ibatis.annotations.*;
+
+import java.util.List;
+
+public interface CommentsMapper {
+    // 添加评论
+    @Insert("INSERT INTO comments(content, user_id, post_id, created_at) VALUES(#{content}, #{user_id}, #{post_id}, #{created_at})")
+    int addComment(Comments comments);
+
+    // 删除评论
+    @Delete("DELETE FROM comments WHERE user_id = #{user_id}")
+    int deleteComments(@Param("user_id") Long user_id);
+
+    // 根据动态ID查询评论列表
+    @Select("SELECT * FROM comments WHERE post_id = #{post_id} ORDER BY created_at DESC")
+    List<Comments> getCommentsByPostId(@Param("post_id") Long post_id);
+}

src/main/java/com/bao/dating/mapper/PostFavoriteMapper.java

@@ -0,0 +1,15 @@
+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);
+}

src/main/java/com/bao/dating/mapper/PostLikeMapper.java

@@ -0,0 +1,34 @@
+package com.bao.dating.mapper;
+
+import com.bao.dating.pojo.entity.PostLike;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface PostLikeMapper {
+    /**
+     * 根据 postId 和 userId 查询点赞记录 用于判断是否已经点赞
+     * @param postId
+     * @param userId
+     * @return
+     */
+    PostLike findByPostAndUser(@Param("postId") Long postId, @Param("userId") Long userId);
+
+    /**
+     * 插入点赞记录
+     *
+     * @param postLike
+     * @return
+     */
+    int insert(PostLike postLike);
+
+    /**
+     * 删除点赞记录
+     * 根据 postId + userId 删除点赞
+     *
+     * @param postId
+     * @param userId
+     * @return
+     */
+    int deleteByPostIdAndUserId(@Param("postId") Long postId, @Param("userId") Long userId);
+}

src/main/java/com/bao/dating/mapper/PostMapper.java

@@ -2,8 +2,91 @@ package com.bao.dating.mapper;
 
 import com.bao.dating.pojo.entity.Post;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface PostMapper {
-    int insert(Post post);
+    /**
+     * 插入动态
+     *
+     * @param post
+     */
+    void insert(Post post);
+
+    /**
+     * 根据ID删除动态
+     *
+     * @param postId 动态ID
+     */
+    void deletePostById(@Param("postId") Long postId);
+
+    /**
+     * 根据ID查询动态
+     *
+     * @param postId
+     * @return
+     */
+    Post selectById(@Param("postId") Long postId);
+
+    /**
+     * 根据ID更新动态
+     *
+     * @param post
+     * @return
+     */
+    void updateById(Post post);
+
+    /**
+     * 查询点赞数
+     *
+     * @param postId
+     * @return
+     */
+    int selectLikeCount(Long postId);
+
+    /**
+     * 点赞数+1
+     *
+     * @param postId 动态ID
+     * @return 影响行数
+     */
+    int increaseLikeCount(Long postId);
+
+    /**
+     * 点赞数-1
+     *
+     * @param postId 动态ID
+     * @return 影响行数
+     */
+    int decreaseLikeCount(Long postId);
+
+    /**
+     * 查询当前动态属于哪个用户id
+     * @param postId 动态id
+     * @return 用户id
+     */
+    Long selectUserIdByPostId(@Param("post_id") Long postId);
+
+    /**
+     * 查询点赞数
+     *
+     * @param postId
+     * @return
+     */
+    int selectFavoriteCount(Long postId);
+
+    /**
+     * 收藏数+1
+     *
+     * @param postId 动态ID
+     * @return 影响行数
+     */
+    int increaseFavoriteCount(Long postId);
+    /**
+     * 收藏数-1
+     *
+     * @param postId 动态ID
+     * @return 影响行数
+     */
+    int decreaseFavoriteCount(Long postId);
 }

src/main/java/com/bao/dating/pojo/dto/PostRequestDTO.java

@@ -1,14 +1,15 @@
 package com.bao.dating.pojo.dto;
 
 import lombok.Data;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
+/**
+ * 动态数据传输对象
+ */
 @Data
 public class PostRequestDTO {
-    private Integer userId;
     private String content;
+    private List<String> mediaOssKeys;
     private List<String> tags;
-    private List<String> mediaUrls;
 }

src/main/java/com/bao/dating/pojo/entity/Post.java

@@ -12,9 +12,9 @@ import java.util.List;
 @Data
 public class Post {
 
-    private Integer postId;
+    private Long postId;
 
-    private Integer userId;
+    private Long userId;
 
     private String content;
 
@@ -33,4 +33,4 @@ public class Post {
     private LocalDateTime createdAt;
 
     private LocalDateTime updatedAt;
-}
+}

src/main/java/com/bao/dating/pojo/entity/PostFavorite.java

@@ -11,11 +11,11 @@ import java.time.LocalDateTime;
 @Data
 public class PostFavorite {
 
-    private Integer favoriteId;
+    private Long favoriteId;
 
-    private Integer userId;
+    private Long userId;
 
-    private Integer postId;
+    private Long postId;
 
     private LocalDateTime createdAt;
 }

src/main/java/com/bao/dating/pojo/entity/PostLike.java

@@ -10,11 +10,11 @@ import java.time.LocalDateTime;
  */
 @Data
 public class PostLike {
-    private Integer likeId;
+    private Long likeId;
 
-    private Integer userId;
+    private Long userId;
 
-    private Integer postId;
+    private Long postId;
 
     private LocalDateTime createdAt;
 }

src/main/java/com/bao/dating/pojo/entity/User.java

@@ -12,7 +12,7 @@ import java.time.LocalDateTime;
 @Data
 public class User {
 
-    private Integer userId;
+    private Long userId;
 
     private String userName;
 

src/main/java/com/bao/dating/pojo/vo/PostEditVO.java

@@ -0,0 +1,19 @@
+package com.bao.dating.pojo.vo;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 修改内容查询返回数据
+ */
+@Data
+public class PostEditVO {
+    private Long postId;
+    private String content;
+    private List<String> mediaOssKeys;
+    private List<String> tags;
+    private Integer isPublic;
+    private LocalDateTime updatedAt;
+}

src/main/java/com/bao/dating/properties/AliOssProperties.java

@@ -1,15 +0,0 @@
-package com.bao.dating.properties;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-@Component
-@ConfigurationProperties(prefix = "aliyun.oss")
-@Data
-public class AliOssProperties {
-    private String endpoint;
-    private String accessKeyId;
-    private String accessKeySecret;
-    private String bucketName;
-}

src/main/java/com/bao/dating/service/CommentsService.java

@@ -0,0 +1,20 @@
+package com.bao.dating.service;
+
+
+import com.bao.dating.common.Comments;
+
+import java.util.List;
+
+public interface CommentsService{
+    // 添加评论
+    boolean addComment(Comments comments);
+
+    // 删除评论
+    boolean deleteComment(Long user_id);
+
+    // 根据动态ID查询评论
+    List<Comments> getCommentByPostId(Long post_id);
+
+
+
+}

src/main/java/com/bao/dating/service/PostFavoriteService.java

@@ -0,0 +1,10 @@
+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);
+}

src/main/java/com/bao/dating/service/PostLikeService.java

@@ -0,0 +1,22 @@
+package com.bao.dating.service;
+
+import com.bao.dating.common.Result;
+
+public interface PostLikeService {
+    /**
+     * 点赞指定的 post
+     *
+     * @param postId 帖子ID
+     * @param userId 用户ID
+     * @return 统一返回结果
+     */
+    Result<?> likePost(Long postId, Long userId);
+
+    /**
+     * 取消点赞指定的 post
+     *
+     * @param postId 帖子ID
+     * @param userId 用户ID
+     */
+    void unlike(Long postId, Long userId);
+}

src/main/java/com/bao/dating/service/PostService.java

@@ -2,6 +2,7 @@ package com.bao.dating.service;
 
 import com.bao.dating.pojo.dto.PostRequestDTO;
 import com.bao.dating.pojo.entity.Post;
+import com.bao.dating.pojo.vo.PostEditVO;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -16,8 +17,39 @@ public interface PostService {
 
     /**
      * 创建动态
-     * @param postRequestDTO 动态请求数据传输对象
+     *
+     * @param postRequestDTO 动态数据传输对象
      * @return 创建的动态对象
      */
     Post createPost(PostRequestDTO postRequestDTO);
+
+    /**
+     * 删除动态
+     * @param postId 动态ID
+     * @return 删除的动态对象
+     */
+    void deletePostById(Long postId);
+
+    void deletePostById(Integer postId);
+
+    /**
+     * 查询动态详情（用于编辑）
+     * @param postId 动态ID
+     */
+    PostEditVO getPostForEdit(Long postId);
+
+    /**
+     * 修改动态
+     * @param postId 动态ID
+     * @param postRequestDTO 修改的动态数据传输对象
+     * @return 修改后的动态对象
+     */
+    PostEditVO updatePost(Long postId, PostRequestDTO postRequestDTO);
+
+    /**
+     * 查询
+     * @param postId 动态id
+     * @return 用户id
+     */
+    Long selectUserIdByPostId(Long postId);
 }

src/main/java/com/bao/dating/service/impl/CommentsServiceImpl.java

@@ -0,0 +1,39 @@
+package com.bao.dating.service.impl;
+
+import com.bao.dating.common.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);
+    }
+}

src/main/java/com/bao/dating/service/impl/PostFavoriteServiceImpl.java

@@ -0,0 +1,61 @@
+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;
+    }
+}

src/main/java/com/bao/dating/service/impl/PostLikeServiceImpl.java

@@ -0,0 +1,77 @@
+package com.bao.dating.service.impl;
+
+import com.bao.dating.common.Result;
+import com.bao.dating.common.ResultCode;
+import com.bao.dating.mapper.PostLikeMapper;
+import com.bao.dating.mapper.PostMapper;
+import com.bao.dating.pojo.entity.PostLike;
+import com.bao.dating.service.PostLikeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+public class PostLikeServiceImpl implements PostLikeService {
+
+    @Autowired
+    private PostMapper postMapper;
+
+    @Autowired
+    private PostLikeMapper postLikeMapper;
+
+
+
+    /**
+     * 点赞指定的 post
+     *
+     * @param postId 帖子ID
+     * @param userId 用户ID
+     * @return 统一返回结果
+     */
+    @Override
+    @Transactional // 保证点赞 + 点赞数更新是一个事务
+    public Result<?> likePost(Long postId, Long userId) {
+        // 查询是否已经点过赞（防止重复点赞）
+        PostLike exist  = postLikeMapper.findByPostAndUser(postId, userId);
+        if (exist != null){
+            return Result.error(ResultCode.SUCCESS_REVIEW,"您已经点过赞了。");
+        }
+        // 创建点赞对象
+        PostLike postLike = new PostLike();
+        postLike.setPostId(postId);
+        postLike.setUserId(userId);
+        //插入点赞记录
+        postLikeMapper.insert(postLike);
+        //点赞数+1
+        postMapper.increaseLikeCount(postId);
+        //查询最新的点赞数
+        Integer i = postMapper.selectLikeCount(postId);
+        //封装返回数据
+        Map<String,Object> data = new HashMap<>();
+        data.put("like_id",postLike.getLikeId());
+        data.put("post_id",postLike.getPostId());
+        data.put("user_id",postLike.getUserId());
+        data.put("like_count",i);
+        return Result.success(ResultCode.SUCCESS_REVIEW,"点赞成功",data);
+    }
+
+    /**
+     * 取消点赞指定的 post
+     *
+     * @param postId 帖子ID
+     * @param userId 用户ID
+     */
+    @Override
+    @Transactional
+    public void unlike(Long postId, Long userId) {
+        // 删除点赞记录
+        int i = postLikeMapper.deleteByPostIdAndUserId(postId, userId);
+        // 如果确实删除成功，才减少点赞数
+        if (i > 0){
+            postMapper.decreaseLikeCount(postId);
+        }
+    }
+}

src/main/java/com/bao/dating/service/impl/PostServiceImpl.java

@@ -1,11 +1,15 @@
 package com.bao.dating.service.impl;
 
+import com.bao.dating.common.aliyun.GreenImageScan;
+import com.bao.dating.common.aliyun.GreenTextScan;
 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.util.AliOssUtil;
+import com.bao.dating.common.aliyun.AliOssUtil;
 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.web.multipart.MultipartFile;
@@ -14,6 +18,7 @@ import java.io.IOException;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 /**
@@ -27,6 +32,12 @@ public class PostServiceImpl implements PostService {
     @Autowired
     private AliOssUtil ossUtil;
 
+    @Autowired
+    private GreenTextScan greenTextScan;
+
+    @Autowired
+    private GreenImageScan greenImageScan;
+
     @Autowired
     private PostMapper postMapper;
 
@@ -68,23 +79,71 @@ public class PostServiceImpl implements PostService {
     /**
      * 创建动态
      *
-     * @param postRequestDTO 动态请求数据传输对象
+     * @param postRequestDTO 动态数据传输对象
      * @return 创建的动态对象
      */
     @Override
     public Post createPost(PostRequestDTO postRequestDTO) {
+
+        // 创建动态对象
         Post post = new Post();
-        post.setUserId(postRequestDTO.getUserId());
+        post.setUserId(userId);
         post.setContent(postRequestDTO.getContent());
         post.setTags(postRequestDTO.getTags());
         post.setMediaOssKeys(new ArrayList<>());
-        
         // 如果有传入的媒体链接，则使用它们
-        if (postRequestDTO.getMediaUrls() != null && !postRequestDTO.getMediaUrls().isEmpty()) {
-            post.setMediaOssKeys(postRequestDTO.getMediaUrls());
+        if (postRequestDTO.getMediaOssKeys() != null && !postRequestDTO.getMediaOssKeys().isEmpty()) {
+            post.setMediaOssKeys(postRequestDTO.getMediaOssKeys());
         }
 
-        post.setIsPublic(0);
+        // 1. 文本内容审核
+        Map textResult;
+        try {
+            textResult = greenTextScan.greeTextScan(postRequestDTO.getContent());
+        } catch (Exception e) {
+            throw new RuntimeException("文本审核失败");
+        }
+
+        String textSuggestion = (String) textResult.get("suggestion");
+        if ("block".equals(textSuggestion)) {
+            throw new RuntimeException("动态内容违规，禁止发布");
+        }
+
+        // 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());
 
@@ -92,4 +151,119 @@ public class PostServiceImpl implements PostService {
         postMapper.insert(post);
         return post;
     }
+
+    @Override
+    public void deletePostById(Long postId) {
+        postMapper.deletePostById(postId);
+    }
+
+    /**
+     * 删除动态
+     *
+     * @param postId 动态ID
+     * @return 删除的动态对象
+     */
+    @Override
+    public void deletePostById(Integer postId) {
+        postMapper.deletePostById(Long.valueOf(postId));
+    }
+
+    @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. 图片审核（如果有）
+        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.setTags(postRequestDTO.getTags());
+        post.setUpdatedAt(LocalDateTime.now());
+
+        // 更新动态
+        postMapper.updateById(post);
+
+        // 返回动态详情
+        PostEditVO postEditVO = new PostEditVO();
+        BeanUtils.copyProperties(post, postEditVO);
+        return postEditVO;
+    }
+
+    /**
+     * 根据动态ID查询用户ID
+     *
+     * @param postId 动态ID
+     * @return 用户ID
+     */
+    @Override
+    public Long selectUserIdByPostId(Long postId) {
+        return postMapper.selectUserIdByPostId(postId);
+    }
+
 }

src/main/java/com/bao/dating/util/EmailUtil.java

@@ -0,0 +1,178 @@
+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;
+    }
+}
+

src/main/java/com/bao/dating/util/JwtUtil.java

@@ -0,0 +1,204 @@
+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);
+    }
+}
+

src/main/java/com/bao/dating/util/MD5Util.java

@@ -0,0 +1,91 @@
+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();
+    }
+}
+

src/main/resources/application.yml

@@ -7,6 +7,25 @@ spring:
     username: root
     password: JoyeeServe2025
     driver-class-name: com.mysql.cj.jdbc.Driver
+  # 邮箱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:
@@ -20,6 +39,16 @@ mybatis:
 aliyun:
   oss:
     endpoint: oss-cn-beijing.aliyuncs.com
-    access-key-id: LTAI5tKo9TpWH1aW6JxWm1Gp
-    access-key-secret: LHk9DdHECKCwIdaIM9fkGgEuowt18W
-    bucket-name: heimato
+    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: SMS_123456789

src/main/resources/com/bao/dating/mapper/PostFavoriteMapper.xml

@@ -0,0 +1,17 @@
+<?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>
+</mapper>

src/main/resources/com/bao/dating/mapper/PostLikeMapper.xml

@@ -0,0 +1,17 @@
+<?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.PostLikeMapper">
+
+    <select id="findByPostAndUser" resultType="com.bao.dating.pojo.entity.PostLike">
+        select * from dating.post_like where user_id = #{userId} and post_id = #{postId}
+    </select>
+
+    <insert id="insert" useGeneratedKeys="true" keyProperty="likeId">
+        INSERT INTO dating.post_like (post_id, user_id,created_at) VALUES (#{postId}, #{userId},NOW())
+    </insert>
+
+    <delete id="deleteByPostIdAndUserId">
+        delete from dating.post_like where post_id = #{postId} and user_id = #{userId}
+    </delete>
+</mapper>

src/main/resources/com/bao/dating/mapper/PostMapper.xml

@@ -3,7 +3,8 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.bao.dating.mapper.PostMapper">
-    <!--  动态添加  -->
+
+    <!--动态添加-->
     <insert id="insert" useGeneratedKeys="true" keyProperty="postId">
         INSERT INTO post
         (user_id, content,
@@ -27,4 +28,90 @@
          #{isPublic}, 0, 0, #{createdAt}, #{updatedAt})
     </insert>
 
+    <!--动态删除-->
+    <delete id="deletePostById">
+        DELETE FROM post WHERE post_id = #{postId}
+    </delete>
+
+    <!--动态查询-->
+    <resultMap id="PostResultMap" type="com.bao.dating.pojo.entity.Post">
+        <id property="postId" column="post_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="content" column="content"/>
+        <result property="mediaOssKeys" column="media_oss_keys" typeHandler="com.bao.dating.handler.ListToVarcharTypeHandler"/>
+        <result property="tags" column="tags" typeHandler="com.bao.dating.handler.ListToVarcharTypeHandler"/>
+        <result property="location" column="location"/>
+        <result property="isPublic" column="is_public"/>
+        <result property="likeCount" column="like_count"/>
+        <result property="favoriteCount" column="favorite_count"/>
+        <result property="createdAt" column="created_at"/>
+        <result property="updatedAt" column="updated_at"/>
+    </resultMap>
+    <select id="selectById" resultMap="PostResultMap">
+        SELECT 
+          post_id,
+          user_id,
+          content,
+          media_oss_keys,
+          tags,
+          location,
+          is_public,
+          like_count,
+          favorite_count,
+          created_at,
+          updated_at
+        FROM post WHERE post_id = #{postId}
+    </select>
+
+    <!--动态更新-->
+    <update id="updateById">
+        UPDATE post
+        <set>
+            <if test="content != null">
+                content = #{content},
+            </if>
+            <if test="tags != null">
+                tags = #{tags, typeHandler=com.bao.dating.handler.ListToVarcharTypeHandler},
+            </if>
+            <if test="mediaOssKeys != null">
+                media_oss_keys =
+                #{mediaOssKeys, typeHandler=com.bao.dating.handler.ListToVarcharTypeHandler},
+            </if>
+            is_public = #{isPublic},
+            updated_at = #{updatedAt}
+        </set>
+        WHERE post_id = #{postId}
+    </update>
+
+    <!--增加点赞数量-->
+    <update id="increaseLikeCount">
+        update dating.post set like_count = like_count + 1 where post.post_id = #{postId}
+    </update>
+
+    <!--减少点赞数量-->
+    <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>

src/test/java/com/bao/dating/DatingApplicationTests.java

@@ -1,13 +1,57 @@
 package com.bao.dating;
 
+import com.bao.dating.common.aliyun.GreenImageScan;
+import com.bao.dating.common.aliyun.GreenTextScan;
 import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-@SpringBootTest
-class DatingApplicationTests {
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+@SpringBootTest // 添加这个注解以启用Spring上下文
+public class DatingApplicationTests {
+
+    @Autowired
+    private GreenTextScan greenTextScan;
+
+    @Autowired
+    private GreenImageScan greenImageScan;
 
     @Test
-    void contextLoads() {
+    public void testScanText() throws Exception {
+        Map map = greenTextScan.greeTextScan("冰毒");
+        System.out.println(map);
+    }
+    /**
+     * 测试从网络URL上传图片到阿里云OSS并进行内容安全检测
+     */
+    @Test
+    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";
+
+            // 将图片URL添加到列表中进行检测
+            List<String> imageUrls = Arrays.asList(imageUrl);
+
+            // 调用图片检测服务
+            Map<String, String> scanResult = greenImageScan.imageScan(imageUrls);
+
+            if (scanResult != null) {
+                System.out.println("图片检测结果:");
+                System.out.println("建议: " + scanResult.get("suggestion"));
+                System.out.println("标签: " + scanResult.get("label"));
+            } else {
+                System.out.println("图片检测失败");
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
+
+
 }

src/test/java/com/bao/dating/util/EmailAndSmsTest.java

@@ -0,0 +1,75 @@
+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);
+    }
+
+
+}
+