tj

RuoYi-Vue/pom.xml

@@ -40,7 +40,19 @@
     <!-- 依赖声明 -->
     <dependencyManagement>
         <dependencies>
+            <!-- MyBatis-Plus 核心依赖 -->
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-boot-starter</artifactId>
+                <version>3.4.1</version> <!-- 2023年稳定版，兼容Spring Boot 2.7.x -->
+            </dependency>
 
+            <!-- 注解处理器（避免IDE报错） -->
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-annotation</artifactId>
+                <version>3.4.1</version>
+            </dependency>
             <!-- 覆盖SpringFramework的依赖配置-->
             <dependency>
                 <groupId>org.springframework</groupId>

RuoYi-Vue/ruoyi-admin/src/main/resources/application.yml

@@ -89,7 +89,43 @@ spring:
         max-active: 8
         # #连接池最大阻塞等待时间（使用负值表示没有限制）
         max-wait: -1ms
-
+# PHP系统配置
+php:
+  data:
+    url: http://php-system.com/api/data/royalty
+  notify:
+    url: http://php-system.com/api/vote/notify
+  jwt:
+    secret: your_shared_jwt_secret
+# 广告平台配置
+ad:
+  platforms:
+    tencent:
+      url: https://ad.tencent.com/track
+      auth-token: your_tencent_token
+    pangle:
+      url: https://ad.pangle.com/api/v1/event
+      auth-token: your_pangle_token
+# DeepSeek AI配置
+deepseek:
+  api:
+    key: your_deepseek_api_key
+    url: https://api.deepseek.com/v1/story/generate
+    model: novel-pro-1.0
+  prompt:
+    template: |
+      基于以下小说上下文：
+      {上一章内容}
+      用户选择了选项：{选项文本}
+      投票分布：{投票统计}
+      请生成800-1200字的新章节
+# 分账规则配置
+royalty:
+  base-rate: 0.15
+  vip-bonus-rate: 0.05
+handling:
+  fee:
+    rate: 0.05
 # token配置
 token:
   # 令牌自定义标识
@@ -107,7 +143,13 @@ mybatis:
   mapperLocations: classpath*:mapper/**/*Mapper.xml
   # 加载全局的配置文件
   configLocation: classpath:mybatis/mybatis-config.xml
-
+mybatis-plus:
+  global-config:
+    db-config:
+      table-prefix: novel_  # 自动为所有实体类添加表前缀:cite[5]:cite[9]
+      id-type: assign_id  # 雪花算法（避免每个实体类单独配@TableId）:cite[5]:cite[9]
+  configuration:
+    map-underscore-to-camel-case: true
 # PageHelper分页插件
 pagehelper:
   helperDialect: mysql

RuoYi-Vue/ruoyi-novel/pom.xml

@@ -39,39 +39,18 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common</artifactId>
         </dependency>
+        <!-- MyBatis-Plus 核心依赖 -->
         <dependency>
-            <groupId>istrator..m2.repository.com.baomidou</groupId>
-            <artifactId>mybatis-plus-annotation</artifactId>
-            <version>3.5.3.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjweaver</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>istrator..m2.repository.com.baomidou</groupId>
-            <artifactId>mybatis-plus-core</artifactId>
-            <version>3.5.3.1</version>
-        </dependency>
-        <dependency>
-            <groupId>istrator..m2.repository.com.baomidou</groupId>
-            <artifactId>mybatis-plus-annotation</artifactId>
-            <version>3.5.2</version>
-        </dependency>
-        <dependency>
-            <groupId>istrator..m2.repository.com.baomidou</groupId>
-            <artifactId>mybatis-plus-annotation</artifactId>
-            <version>3.5.1</version>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.4.1</version> <!-- 2023年稳定版，兼容Spring Boot 2.7.x -->
         </dependency>
+
+        <!-- 注解处理器（避免IDE报错） -->
         <dependency>
-            <groupId>istrator..m2.repository.com.baomidou</groupId>
+            <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-annotation</artifactId>
-            <version>3.3.1</version>
-        </dependency>
-        <dependency>
-            <groupId>com.tencentcloudapi</groupId>
-            <artifactId>tencentcloud-sdk-java</artifactId>
-            <version>3.1.2</version>
+            <version>3.4.1</version>
         </dependency>
     </dependencies>
 

RuoYi-Vue/ruoyi-novel/src/main/java/com/ruoyi/novel/config/PhpDataSyncTask.java

@@ -2,7 +2,7 @@ package com.ruoyi.novel.config;
 
 import com.ruoyi.novel.domain.RoyaltySummary;
 import com.ruoyi.novel.mapper.RoyaltySummaryMapper;
-import lombok.Value;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;

RuoYi-Vue/ruoyi-novel/src/main/java/com/ruoyi/novel/config/ScheduledTasks.java

@@ -3,16 +3,19 @@ package com.ruoyi.novel.config;
 import com.ruoyi.novel.service.IAdService;
 import com.ruoyi.novel.service.IFinanceService;
 import com.ruoyi.novel.service.IVoteService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 
+
 // ScheduledTasks.java
 @Configuration
 @EnableScheduling
 public class ScheduledTasks {
-
+    private static final Logger log = LoggerFactory.getLogger(ScheduledTasks.class);
     @Autowired
     private IAdService adService;
 

RuoYi-Vue/ruoyi-novel/src/main/java/com/ruoyi/novel/controller/ChapterController.java

@@ -1,7 +1,9 @@
 package com.ruoyi.novel.controller;
 
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.novel.domain.ChapterDTO;
 import com.ruoyi.novel.domain.NovelChapter;
+import com.ruoyi.novel.service.ChapterService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -25,4 +27,7 @@ public class ChapterController {
     public AjaxResult saveChapter(@RequestBody ChapterDTO dto) {
         return toAjax(chapterService.saveChapter(dto.getChapter(), dto.getContent()));
     }
+    private AjaxResult toAjax(int result) {
+        return result > 0 ? AjaxResult.success() : AjaxResult.error();
+    }
 }

RuoYi-Vue/ruoyi-novel/src/main/java/com/ruoyi/novel/controller/NovelAdController.java

@@ -1,7 +1,16 @@
 package com.ruoyi.novel.controller;
 //# 广告计数接口
 
+import com.ruoyi.novel.service.AdService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.List;
 
 @RestController
 @RequestMapping("/ad")

RuoYi-Vue/ruoyi-novel/src/main/java/com/ruoyi/novel/domain/AdCountRequest.java

@@ -0,0 +1,22 @@
+package com.ruoyi.novel.domain;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+// AdCountRequest.java
+@Data
+public class AdCountRequest {
+    @NotNull(message = "用户ID不能为空")
+    private Long userId;
+
+    @NotNull(message = "章节ID不能为空")
+    private Long chapterId;
+
+    @NotBlank(message = "广告平台不能为空")
+    private String adPlatform;
+
+    @NotBlank(message = "设备ID不能为空")
+    private String deviceId;
+}

RuoYi-Vue/ruoyi-novel/src/main/java/com/ruoyi/novel/domain/AdLog.java

@@ -1,7 +1,11 @@
 package com.ruoyi.novel.domain;
 
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.util.Date;
 
 // AdLog.java
@@ -28,4 +32,7 @@ public class AdLog {
 
     // 状态字段：0-未同步 1-已同步
     private Integer syncStatus;
+
+    // 确保有默认构造方法
+    public AdLog() {}
 }

RuoYi-Vue/ruoyi-novel/src/main/java/com/ruoyi/novel/domain/AdPlatformConfig.java

@@ -1,5 +1,9 @@
 package com.ruoyi.novel.domain;
 
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
 @Data
 @TableName("novel_ad_config")
 public class AdPlatformConfig {
@@ -10,4 +14,13 @@ public class AdPlatformConfig {
     private String apiUrl;
     private String authToken;
     private String paramsTemplate;
+
+    // 添加带参数的构造方法
+    public AdPlatformConfig(String code, String name, String url, String token, String params) {
+        this.platformCode = code;
+        this.platformName = name;
+        this.apiUrl = url;
+        this.authToken = token;
+        this.paramsTemplate = params;
+    }
 }

RuoYi-Vue/ruoyi-novel/src/main/java/com/ruoyi/novel/domain/ChapterDTO.java

@@ -0,0 +1,15 @@
+package com.ruoyi.novel.domain;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class ChapterDTO {
+    @NotNull(message = "章节不能为空")
+    private NovelChapter chapter;
+
+    @NotBlank(message = "内容不能为空")
+    private String content;
+}

RuoYi-Vue/ruoyi-novel/src/main/java/com/ruoyi/novel/domain/NovelChapter.java

@@ -1,4 +1,9 @@
 package com.ruoyi.novel.domain;
+
+import lombok.Data;
+
+import java.util.Date;
+
 // NovelChapter.java
 @Data
 public class NovelChapter {

RuoYi-Vue/ruoyi-novel/src/main/java/com/ruoyi/novel/domain/NovelContent.java

@@ -1,4 +1,7 @@
 package com.ruoyi.novel.domain;
+
+import lombok.Data;
+
 // NovelContent.java
 @Data
 public class NovelContent {

RuoYi-Vue/ruoyi-novel/src/main/java/com/ruoyi/novel/domain/RoyaltySummary.java

@@ -1,8 +1,11 @@
 package com.ruoyi.novel.domain;
 
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 // RoyaltySummary.java
 // RoyaltySummary.java

RuoYi-Vue/ruoyi-novel/src/main/java/com/ruoyi/novel/domain/StoryOption.java

@@ -1,5 +1,13 @@
 package com.ruoyi.novel.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 // StoryOption.java
 @Data
 @TableName("novel_story_option")

RuoYi-Vue/ruoyi-novel/src/main/java/com/ruoyi/novel/mapper/AdLogMapper.java

@@ -1,9 +1,13 @@
 package com.ruoyi.novel.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.novel.domain.AdLog;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
+
 // AdLogMapper.java
 @Mapper
 public interface AdLogMapper extends BaseMapper<AdLog> {

RuoYi-Vue/ruoyi-novel/src/main/java/com/ruoyi/novel/mapper/RoyaltySummaryMapper.java

@@ -1,10 +1,8 @@
 package com.ruoyi.novel.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.novel.domain.RoyaltySummary;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
+import org.apache.ibatis.annotations.*;
 
 // RoyaltySummaryMapper.java
 @Mapper
@@ -21,4 +19,15 @@ public interface RoyaltySummaryMapper extends BaseMapper<RoyaltySummary> {
             "VALUES (#{authorId}, #{month}, #{totalReads}, NOW()) " +
             "ON DUPLICATE KEY UPDATE total_reads = #{totalReads}, last_sync_time = NOW()")
     int upsertSummary(RoyaltySummary summary);
+
+
+    // 添加 insertOrUpdate 方法
+    @Insert("<script>" +
+            "INSERT INTO novel_royalty_summary (author_id, month, total_reads, last_sync_time) " +
+            "VALUES (#{authorId}, #{month}, #{totalReads}, NOW()) " +
+            "ON DUPLICATE KEY UPDATE " +
+            "total_reads = VALUES(total_reads), " +
+            "last_sync_time = NOW()" +
+            "</script>")
+    int insertOrUpdate(RoyaltySummary summary);
 }

RuoYi-Vue/ruoyi-novel/src/main/java/com/ruoyi/novel/mapper/VoteRecordMapper.java

@@ -1,5 +1,6 @@
 package com.ruoyi.novel.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.novel.domain.VoteRecord;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

RuoYi-Vue/ruoyi-novel/src/main/java/com/ruoyi/novel/service/AdService.java

@@ -0,0 +1,12 @@
+package com.ruoyi.novel.service;
+
+import com.ruoyi.novel.domain.AdLog;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+@Service
+// AdService.java
+public interface AdService {
+    void logAdView(AdCountRequest request);
+    List<AdLog> getAdLogsByUser(Long userId);
+}

RuoYi-Vue/ruoyi-novel/src/main/java/com/ruoyi/novel/service/ChapterService.java

@@ -0,0 +1,13 @@
+package com.ruoyi.novel.service;
+
+import com.ruoyi.novel.domain.NovelChapter;
+
+import java.util.List;
+
+// ChapterService.java
+public interface ChapterService {
+    List<NovelChapter> selectChapterListByNovelId(Long novelId);
+    int saveChapter(NovelChapter chapter, String content);
+    NovelChapter getChapterById(Long chapterId);
+    int deleteChapters(Long[] ids);
+}

RuoYi-Vue/ruoyi-novel/src/main/java/com/ruoyi/novel/service/IAdService.java

@@ -2,9 +2,11 @@ package com.ruoyi.novel.service;
 
 import com.ruoyi.novel.domain.AdLog;
 import com.ruoyi.novel.domain.AdPlatformConfig;
+import org.springframework.stereotype.Service;
 
 import java.util.Map;
 
+@Service
 public interface IAdService {
     void logAdView(AdLog adLog);
     void syncWithAdPlatform(AdLog adLog);

RuoYi-Vue/ruoyi-novel/src/main/java/com/ruoyi/novel/service/impl/AdConfigServiceImpl.java

@@ -0,0 +1,67 @@
+package com.ruoyi.novel.service.impl;
+
+import com.ruoyi.novel.domain.AdPlatformConfig;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PostConstruct;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+// AdConfigServiceImpl.java
+@Service
+public class AdConfigServiceImpl implements AdConfigService {
+
+    @Autowired
+    private AdPlatformConfigMapper configMapper;
+
+    private Map<String, AdPlatformConfig> adConfigCache;
+    private final Object lock = new Object();
+
+    @PostConstruct
+    public void init() {
+        refreshConfigCache();
+    }
+
+    @Override
+    public void refreshConfigCache() {
+        synchronized (lock) {
+            adConfigCache = configMapper.selectList(null).stream()
+                    .collect(Collectors.toMap(AdPlatformConfig::getPlatformCode, Function.identity()));
+
+            // 如果数据库为空，初始化默认配置
+            if (adConfigCache.isEmpty()) {
+                initDefaultConfigs();
+            }
+        }
+    }
+
+    private void initDefaultConfigs() {
+        adConfigCache = new HashMap<>();
+        adConfigCache.put("tencent", new AdPlatformConfig(
+                "tencent", "腾讯广告",
+                "https://ad.tencent.com/track",
+                "default_tencent_token",
+                "{\"user_id\":\"${userId}\",\"content_id\":\"${chapterId}\"}"
+        ));
+        adConfigCache.put("pangle", new AdPlatformConfig(
+                "pangle", "穿山甲",
+                "https://ad.pangle.com/api/v1/event",
+                "default_pangle_token",
+                "{\"user\":\"${userId}\",\"content_id\":\"${chapterId}\"}"
+        ));
+
+        // 保存默认配置到数据库
+        adConfigCache.values().forEach(configMapper::insert);
+    }
+
+    @Override
+    public AdPlatformConfig getConfig(String platformCode) {
+        if (adConfigCache == null) {
+            refreshConfigCache();
+        }
+        return adConfigCache.get(platformCode);
+    }
+}

RuoYi-Vue/ruoyi-novel/src/main/java/com/ruoyi/novel/service/impl/AdLogServiceImpl.java

@@ -0,0 +1,82 @@
+package com.ruoyi.novel.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.novel.domain.AdLog;
+import com.ruoyi.novel.domain.AdPlatformConfig;
+import com.ruoyi.novel.mapper.AdLogMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+// AdLogServiceImpl.java
+@Service
+@Slf4j
+public class AdLogServiceImpl implements AdLogService {
+
+    @Autowired
+    private AdLogMapper adLogMapper;
+
+    @Autowired
+    private AdConfigService adConfigService;
+
+    @Autowired
+    private AdSyncService adSyncService;
+
+    @Override
+    @Transactional
+    public void logAdView(AdLog adLog) {
+        // 1. 保存到数据库
+        adLog.setSyncStatus(0); // 0=未同步
+        adLogMapper.insert(adLog);
+
+        // 2. 异步同步到广告平台
+        syncAdLogAsync(adLog);
+    }
+
+    @Async
+    public void syncAdLogAsync(AdLog adLog) {
+        try {
+            AdPlatformConfig config = adConfigService.getConfig(adLog.getAdPlatform());
+            if (config == null) {
+                throw new ServiceException("广告平台配置不存在: " + adLog.getAdPlatform());
+            }
+
+            // 根据平台选择同步方式
+            switch (adLog.getAdPlatform()) {
+                case "tencent":
+                    adSyncService.syncToTencent(adLog, config);
+                    break;
+                case "pangle":
+                    adSyncService.syncToPangle(adLog, config);
+                    break;
+                default:
+                    throw new ServiceException("不支持的广告平台: " + adLog.getAdPlatform());
+            }
+
+            // 更新同步状态
+            adLog.setSyncStatus(1); // 1=同步成功
+        } catch (Exception e) {
+            log.error("广告同步失败: {}", e.getMessage());
+            adLog.setSyncStatus(2); // 2=同步失败
+        }
+        adLogMapper.updateById(adLog);
+    }
+
+    @Scheduled(fixedRate = 300000) // 每5分钟执行一次
+    public void retryFailedSyncs() {
+        List<AdLog> failedLogs = adLogMapper.selectList(
+                new QueryWrapper<AdLog>().eq("sync_status", 2)
+        );
+
+        failedLogs.forEach(log -> {
+            log.info("重试广告同步: ID={}, 平台={}", log.getId(), log.getAdPlatform());
+            syncAdLogAsync(log);
+        });
+    }
+}

RuoYi-Vue/ruoyi-novel/src/main/java/com/ruoyi/novel/service/impl/AdServiceImpl.java

@@ -1,23 +1,29 @@
 package com.ruoyi.novel.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.novel.config.ScheduledTasks;
+import com.ruoyi.novel.domain.AdCountRequest;
 import com.ruoyi.novel.domain.AdLog;
 import com.ruoyi.novel.domain.AdPlatformConfig;
 import com.ruoyi.novel.mapper.AdLogMapper;
 import com.ruoyi.novel.service.IAdService;
 import com.ruoyi.novel.utils.AdPlatformClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 @Service
 public class AdServiceImpl implements IAdService {
-
+    private static final Logger logger = LoggerFactory.getLogger(AdServiceImpl.class);
     @Autowired
     private AdLogMapper adLogMapper;
 
@@ -32,7 +38,7 @@ public class AdServiceImpl implements IAdService {
         // 防止重复记录
         int count = adLogMapper.countByUserAndChapter(adLog.getUserId(), adLog.getChapterId());
         if (count > 0) {
-            log.warn("Duplicate ad log: user={}, chapter={}", adLog.getUserId(), adLog.getChapterId());
+            logger.warn("Duplicate ad log: user={}, chapter={}", adLog.getUserId(), adLog.getChapterId());
             return;
         }
 
@@ -47,19 +53,26 @@ public class AdServiceImpl implements IAdService {
             adPlatformClient.syncAdPlatform(adLog);
             adLog.setSyncStatus(1); // 同步成功
         } catch (Exception e) {
-            log.error("Ad sync failed: {}", e.getMessage());
+            logger.error("Ad sync failed: {}", e.getMessage());
             adLog.setSyncStatus(2); // 同步失败
         }
         adLogMapper.updateById(adLog);
     }
 
     @Override
-    @Scheduled(fixedRate = 300000) // 每5分钟执行一次
+    @Scheduled(fixedRateString = "${scheduled.ad-retry-interval:300000}") // 默认5分钟重试
     public void retryFailedSyncs() {
-        List<AdLog> failedLogs = adLogMapper.selectUnsyncedLogs();
-        failedLogs.forEach(log -> {
-            log.info("Retrying ad sync for log: {}", log.getId());
-            this.syncWithAdPlatform(log);
+        List<AdLog> failedLogs = adLogMapper.selectList(
+                new QueryWrapper<AdLog>().eq("sync_status", 2) // 2=同步失败状态
+        );
+        failedLogs.forEach(adLog -> {
+            try {
+                syncWithAdPlatform(adLog);  // 调用同步方法
+                adLog.setSyncStatus(1);      // 更新为成功状态
+                adLogMapper.updateById(adLog);
+            } catch (Exception e) {
+                logger.error("广告同步重试失败: ID={}", adLog.getId(), e);
+            }
         });
     }
 
@@ -82,12 +95,24 @@ public class AdServiceImpl implements IAdService {
         }
         return adConfigCache;
     }
-//    @Override
-//    @Transactional
-//    public void logAdView(AdLog adLog) {
-//        adLogMapper.insertAdLog(adLog);
-//    }
+    @Override
+    public void logAdView(AdCountRequest request) {
+        AdLog log = new AdLog();
+        log.setUserId(request.getUserId());
+        log.setChapterId(request.getChapterId());
+        log.setAdPlatform(request.getAdPlatform());
+        log.setDeviceId(request.getDeviceId());
+        log.setViewTime(new Date());
+        log.setSyncStatus(0); // 未同步
 
+        adLogMapper.insert(log);
+    }
+    @Override
+    public List<AdLog> getAdLogsByUser(Long userId) {
+        return adLogMapper.selectList(
+                new QueryWrapper<AdLog>().eq("user_id", userId)
+        );
+    }
     @Override
     public void syncWithAdPlatform(AdLog adLog) {
         // 根据平台选择不同实现
@@ -99,7 +124,7 @@ public class AdServiceImpl implements IAdService {
                 adPlatformClient.syncPangle(adLog);
                 break;
             default:
-                log.warn("Unknown ad platform: {}", adLog.getAdPlatform());
+                logger.warn("Unknown ad platform: {}", adLog.getAdPlatform());
         }
     }
 }

RuoYi-Vue/ruoyi-novel/src/main/java/com/ruoyi/novel/service/impl/AdSyncServiceImpl.java

@@ -0,0 +1,81 @@
+package com.ruoyi.novel.service.impl;
+
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.novel.domain.AdLog;
+import com.ruoyi.novel.domain.AdPlatformConfig;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.*;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.util.UriComponentsBuilder;
+
+// AdSyncServiceImpl.java
+@Service
+@Slf4j
+public class AdSyncServiceImpl implements AdSyncService {
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @Override
+    public void syncToTencent(AdLog adLog, AdPlatformConfig config) {
+        // 1. 构建请求参数
+        String payload = buildTencentPayload(adLog, config);
+
+        // 2. 创建请求头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.setBearerAuth(config.getAuthToken());
+
+        // 3. 发送请求
+        HttpEntity<String> entity = new HttpEntity<>(payload, headers);
+        ResponseEntity<String> response = restTemplate.postForEntity(
+                config.getApiUrl(), entity, String.class);
+
+        // 4. 处理响应
+        if (response.getStatusCode() != HttpStatus.OK) {
+            throw new ServiceException("腾讯广告同步失败: " + response.getBody());
+        }
+        log.info("腾讯广告同步成功: chapter={}, user={}", adLog.getChapterId(), adLog.getUserId());
+    }
+
+    private String buildTencentPayload(AdLog adLog, AdPlatformConfig config) {
+        // 使用模板生成请求体
+        return config.getParamsTemplate()
+                .replace("${userId}", adLog.getUserId().toString())
+                .replace("${chapterId}", adLog.getChapterId().toString())
+                .replace("${timestamp}", String.valueOf(System.currentTimeMillis()));
+    }
+
+    @Override
+    public void syncToPangle(AdLog adLog, AdPlatformConfig config) {
+        // 1. 构建请求URL
+        String url = buildPangleUrl(adLog, config);
+
+        // 2. 创建请求头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setBearerAuth(config.getAuthToken());
+
+        // 3. 发送请求
+        HttpEntity<?> entity = new HttpEntity<>(headers);
+        ResponseEntity<String> response = restTemplate.exchange(
+                url, HttpMethod.GET, entity, String.class);
+
+        // 4. 处理响应
+        if (response.getStatusCode() != HttpStatus.OK) {
+            throw new ServiceException("穿山甲同步失败: " + response.getBody());
+        }
+        log.info("穿山甲同步成功: chapter={}, user={}", adLog.getChapterId(), adLog.getUserId());
+    }
+
+    private String buildPangleUrl(AdLog adLog, AdPlatformConfig config) {
+        // 构建带参数的URL
+        return UriComponentsBuilder.fromHttpUrl(config.getApiUrl())
+                .queryParam("user", adLog.getUserId())
+                .queryParam("content_id", adLog.getChapterId())
+                .queryParam("event", "ad_view")
+                .queryParam("ts", System.currentTimeMillis())
+                .toUriString();
+    }
+}

RuoYi-Vue/ruoyi-novel/src/main/java/com/ruoyi/novel/service/impl/ChapterServiceImpl.java

@@ -3,10 +3,13 @@ package com.ruoyi.novel.service.impl;
 import com.ruoyi.novel.domain.NovelChapter;
 import com.ruoyi.novel.domain.NovelContent;
 import com.ruoyi.novel.mapper.NovelChapterMapper;
+import com.ruoyi.novel.service.ChapterService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 // ChapterServiceImpl.java
 @Service
 public class ChapterServiceImpl implements ChapterService {
@@ -18,12 +21,49 @@ public class ChapterServiceImpl implements ChapterService {
     private NovelContentMapper contentMapper;
 
     @Override
+    public List<NovelChapter> selectChapterListByNovelId(Long novelId) {
+        return chapterMapper.selectList(
+                new QueryWrapper<NovelChapter>()
+                        .eq("novel_id", novelId)
+                        .orderByAsc("chapter_order")
+        );
+    }
+
+    @Override
     @Transactional
     public int saveChapter(NovelChapter chapter, String content) {
-        chapterMapper.insertChapter(chapter);
-        NovelContent novelContent = new NovelContent();
-        novelContent.setChapterId(chapter.getId());
-        novelContent.setContent(content);
-        return contentMapper.insertContent(novelContent);
+        if (chapter.getId() == null) {
+            // 新增章节
+            chapter.setCreateTime(new Date());
+            chapterMapper.insert(chapter);
+
+            NovelContent novelContent = new NovelContent();
+            novelContent.setChapterId(chapter.getId());
+            novelContent.setContent(content);
+            return contentMapper.insert(novelContent);
+        } else {
+            // 更新章节
+            chapter.setUpdateTime(new Date());
+            chapterMapper.updateById(chapter);
+
+            NovelContent novelContent = new NovelContent();
+            novelContent.setChapterId(chapter.getId());
+            novelContent.setContent(content);
+            return contentMapper.updateById(novelContent);
+        }
+    }
+
+    @Override
+    public NovelChapter getChapterById(Long chapterId) {
+        return chapterMapper.selectById(chapterId);
+    }
+
+    @Override
+    @Transactional
+    public int deleteChapters(Long[] ids) {
+        // 删除章节内容
+        contentMapper.deleteBatchIds(Arrays.asList(ids));
+        // 删除章节
+        return chapterMapper.deleteBatchIds(Arrays.asList(ids));
     }
 }

RuoYi-Vue/ruoyi-novel/src/main/java/com/ruoyi/novel/service/impl/FinanceServiceImpl.java

@@ -5,8 +5,11 @@ import com.ruoyi.novel.domain.RoyaltyReport;
 import com.ruoyi.novel.domain.RoyaltySummary;
 import com.ruoyi.novel.mapper.RoyaltySummaryMapper;
 import com.ruoyi.novel.service.IFinanceService;
-import lombok.Value;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
@@ -17,7 +20,7 @@ import java.util.List;
 // FinanceServiceImpl.java
 @Service
 public class FinanceServiceImpl implements IFinanceService {
-
+    private static final Logger logger = LoggerFactory.getLogger(FinanceServiceImpl.class);
     @Autowired
     private RoyaltySummaryMapper royaltySummaryMapper;
     @Value("${royalty.base.rate:0.15}")
@@ -33,6 +36,16 @@ public class FinanceServiceImpl implements IFinanceService {
 
     @Override
     public RoyaltyReport calculateRoyalty(Long authorId, String month) {
+        // 1. 从PHP系统拉取数据（补充缺失的调用）
+//        RoyaltySummary summary = phpApiClient.getAuthorRoyaltySummary(authorId, month);
+//        // 2. 计算分成金额（补充业务逻辑）
+//        BigDecimal royaltyRate = getRoyaltyRate(authorId);
+//        BigDecimal grossAmount = summary.getTotalReads().multiply(royaltyRate);
+//        BigDecimal handlingFee = grossAmount.multiply(handlingFeeRate);
+//        BigDecimal netAmount = grossAmount.subtract(handlingFee);
+//        // 3. 构建报表对象
+//        return new RoyaltyReport(authorId, month, summary.getTotalReads(),
+//                royaltyRate, handlingFeeRate, handlingFee, netAmount);
         // 1. 从PHP主库获取基础数据（假设已通过定时任务同步）
         RoyaltySummary summary = royaltySummaryMapper.selectByAuthorAndMonth(authorId, month);
 
@@ -72,7 +85,7 @@ public class FinanceServiceImpl implements IFinanceService {
     @Override
     @Scheduled(cron = "0 0 2 * * ?") // 每天凌晨2点执行
     public void syncRoyaltyData() {
-        log.info("开始同步分账数据...");
+        logger.info("开始同步分账数据...");
         try {
             // 1. 从PHP主库获取数据
             List<RoyaltySummary> summaries = fetchFromPhpSystem();
@@ -82,9 +95,9 @@ public class FinanceServiceImpl implements IFinanceService {
                 royaltySummaryMapper.upsertSummary(summary);
             });
 
-            log.info("同步完成: {}条记录", summaries.size());
+            logger.info("同步完成: {}条记录", summaries.size());
         } catch (Exception e) {
-            log.error("分账数据同步失败: {}", e.getMessage());
+            logger.error("分账数据同步失败: {}", e.getMessage());
         }
     }
 
@@ -108,4 +121,31 @@ public class FinanceServiceImpl implements IFinanceService {
     public BigDecimal getHandlingFeeRate() {
         return handlingFeeRate;
     }
+
+
+//    @Override
+//    public RoyaltyReport calculateRoyalty(Long authorId, String month) {
+//        // 1. 从PHP系统拉取数据（补充缺失的调用）
+//        RoyaltySummary summary = phpApiClient.getAuthorRoyaltySummary(authorId, month);
+//
+//        // 2. 计算分成金额（补充业务逻辑）
+//        BigDecimal royaltyRate = getRoyaltyRate(authorId);
+//        BigDecimal grossAmount = summary.getTotalReads().multiply(royaltyRate);
+//        BigDecimal handlingFee = grossAmount.multiply(handlingFeeRate);
+//        BigDecimal netAmount = grossAmount.subtract(handlingFee);
+//
+//        // 3. 构建报表对象
+//        return new RoyaltyReport(authorId, month, summary.getTotalReads(),
+//                royaltyRate, handlingFeeRate, handlingFee, netAmount);
+//    }
+//
+//    // 补充缺失的辅助方法
+//    private BigDecimal getRoyaltyRate(Long authorId) {
+//        Author author = authorService.getById(authorId);
+//        BigDecimal rate = baseRoyaltyRate;
+//        if (author.isVip()) {
+//            rate = rate.add(vipBonusRate); // VIP作者加成
+//        }
+//        return rate.min(new BigDecimal("0.35")); // 上限35%:cite[4]
+//    }
 }

RuoYi-Vue/ruoyi-novel/src/main/java/com/ruoyi/novel/utils/JwtUtil.java

@@ -3,12 +3,20 @@ package com.ruoyi.novel.utils;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
+import org.springframework.beans.factory.annotation.Value;
 
+
+import java.nio.charset.StandardCharsets;
 import java.util.Date;
 
 // JwtUtil.java
 public class JwtUtil {
-    private static final String SECRET = "your_jwt_secret_key";
+    private static String SECRET = "your_jwt_secret_key";
+    @Value("${jwt.secret}")
+    public void setSecret(String secret) {
+        SECRET = secret;
+    }
+
     private static final long EXPIRE = 86400; // 24小时
     public static String generateToken(Long userId) {
         Date now = new Date();
@@ -44,4 +52,21 @@ public class JwtUtil {
                 .getBody();
         return Long.parseLong(claims.getSubject());
     }
+
+    // 补充Token解析方法
+    public static Claims parseToken(String token) {
+        return Jwts.parser()
+                .setSigningKey(SECRET.getBytes(StandardCharsets.UTF_8))
+                .parseClaimsJws(token)
+                .getBody();
+    }
+
+    // 补充缺失的Token生成方法
+//    public static String generateToken(Long userId) {
+//        return Jwts.builder()
+//                .setSubject(userId.toString())
+//                .setExpiration(new Date(System.currentTimeMillis() + 86400 * 1000))
+//                .signWith(SignatureAlgorithm.HS512, SECRET)
+//                .compact();
+//    }
 }

RuoYi-Vue/ruoyi-novel/src/main/resources/application.yml

@@ -1,26 +1,26 @@
-# 广告平台配置
-ad:
-  tencent:
-    url: https://ad.tencent.com/track
-  pangle:
-    url: https://ad.pangle.com/api/v1/event
-
-# DeepSeek API配置
-deepseek:
-  api:
-    key: your_deepseek_api_key
-    url: https://api.deepseek.com/v1/story/generate
-
-# PHP系统配置
-php:
-  notify:
-    url: http://php-system.com/api/vote/notify
-  data:
-    url: http://php-system.com/api/data
-
-# 分账规则
-royalty:
-  rate: 0.15   # 15%分成比例
-handling:
-  fee:
-    rate: 0.05  # 5%提现手续费
+## 广告平台配置
+#ad:
+#  tencent:
+#    url: https://ad.tencent.com/track
+#  pangle:
+#    url: https://ad.pangle.com/api/v1/event
+#
+## DeepSeek API配置
+#deepseek:
+#  api:
+#    key: your_deepseek_api_key
+#    url: https://api.deepseek.com/v1/story/generate
+#
+## PHP系统配置
+#php:
+#  notify:
+#    url: http://php-system.com/api/vote/notify
+#  data:
+#    url: http://php-system.com/api/data
+#
+## 分账规则
+#royalty:
+#  rate: 0.15   # 15%分成比例
+#handling:
+#  fee:
+#    rate: 0.05  # 5%提现手续费