Merge pull request #15 from yyyCode/dev

feat(audit): integrate audit logging, fix bean naming and charset encoding

Author: yyyCode

OpenBlog-business/src/main/java/com/yqz/openblog/article/service/ArticleService.java

@@ -1,5 +1,6 @@
 package com.yqz.openblog.article.service;
 
+import com.yqz.openblog.audit.annotation.AuditLog;
 import com.yqz.openblog.article.dto.ArticleCreateRequest;
 import com.yqz.openblog.article.dto.ArticleDetailResponse;
 import com.yqz.openblog.article.dto.ArticleListItemResponse;
@@ -447,6 +448,7 @@ public void hide(Long authorId, Long articleId) {
         removeFromEs(articleId);
     }
 
+    @AuditLog(action = "ARTICLE_DELETE", entityType = "Article", entityId = "#articleId")
     @Transactional
     public void deletePermanently(Long authorId, Long articleId) {
         Article a = articleMapper.selectById(articleId);

OpenBlog-business/src/main/resources/application.yaml

@@ -58,6 +58,11 @@ dubbo:
   consumer:
     check: false
 
+audit:
+  enabled: true
+  async: true
+  channel: local
+
 openblog:
   seo:
     site-url: "https://www.wecode.xin"

OpenBlog-email/src/main/java/com/yqz/openblog/email/controller/EmailAdminController.java

@@ -1,6 +1,8 @@
 package com.yqz.openblog.email.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yqz.openblog.email.api.EmailSendRequest;
+import com.yqz.openblog.email.api.EmailSendResult;
 import com.yqz.openblog.email.dto.EmailRecordResponse;
 import com.yqz.openblog.email.service.EmailService;
 import org.springframework.web.bind.annotation.*;
@@ -18,6 +20,18 @@ public EmailAdminController(EmailService emailService) {
         this.emailService = emailService;
     }
 
+    /**
+     * 快速测试发送邮件：POST /api/v1/email/test?recipient=xxx&subject=xxx&body=xxx
+     */
+    @PostMapping("/test")
+    public EmailSendResult testSend(
+            @RequestParam String recipient,
+            @RequestParam String subject,
+            @RequestParam String body) {
+        EmailSendRequest req = new EmailSendRequest(recipient, subject, body);
+        return emailService.send(req);
+    }
+
     @GetMapping("/records")
     public Map<String, Object> listRecords(
             @RequestParam(defaultValue = "0") int page,

OpenBlog-email/src/main/resources/application.yaml

@@ -5,9 +5,9 @@ spring:
   application:
     name: openblog-email
   datasource:
-    url: jdbc:mysql://10.21.76.221:3306/openblog?useUnicode=true&characterEncoding=utf8mb4&serverTimezone=Asia/Shanghai
-    username: ${DB_USERNAME:root}
-    password: ${DB_PASSWORD:}
+    url: jdbc:mysql://10.21.76.221:3306/openblog?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+    username: root
+    password: 12345678aa
     driver-class-name: com.mysql.cj.jdbc.Driver
 
 mybatis-plus:
@@ -38,9 +38,9 @@ dubbo:
 openblog:
   email:
     aliyun:
-      enabled: ${EMAIL_ENABLED:false}
+      enabled: true
       access-key-id: ${ALIYUN_AK:}
       access-key-secret: ${ALIYUN_SK:}
       region-id: cn-hangzhou
-      from-address: ${EMAIL_FROM:}
+      from-address: ${ALIYUN_FROM:}
       from-alias: OpenBlog

OpenBlog-framework-audit/src/main/java/com/yqz/openblog/audit/config/AuditAutoConfiguration.java

@@ -16,6 +16,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.task.SimpleAsyncTaskExecutor;
 import org.springframework.core.task.TaskExecutor;
@@ -27,8 +28,8 @@
 @ConditionalOnProperty(prefix = "audit", name = "enabled", havingValue = "true", matchIfMissing = true)
 public class AuditAutoConfiguration {
 
-    @Bean
-    @ConditionalOnMissingBean
+    @Bean("auditTaskExecutor")
+    @ConditionalOnMissingBean(name = "auditTaskExecutor")
     public TaskExecutor auditTaskExecutor() {
         return new SimpleAsyncTaskExecutor("audit-");
     }
@@ -56,7 +57,7 @@ public AuditSnapshotProvider auditSnapshotProvider() {
     @ConditionalOnMissingBean
     public AuditChannel auditChannel(
             AuditProperties props,
-            TaskExecutor auditTaskExecutor,
+            @Qualifier("auditTaskExecutor") TaskExecutor auditTaskExecutor,
             List<AuditRecordHandler> handlers
     ) {
         // 先落一个通用默认：local。Kafka 通道会在后续配置类里按条件覆盖。