tj

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

@@ -58,4 +58,7 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
+                        multi-statement-allow: true
+            remove-abandoned: true
+            remove-abandoned-timeout: 300  # 5分钟无操作视为泄露
+            log-abandoned: true

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

@@ -110,6 +110,12 @@ ad:
     pangle:
       url: https://ad.pangle.com/api/v1/event
       auth-token: your_pangle_token
+  tencent:
+    url: https://your-tencent-ad-url.com/api  # 替换为实际的腾讯广告URL
+    key: your_tencent_key                     # 替换为实际的腾讯广告密钥
+  pangle:
+    url: https://your-pangle-ad-url.com/api   # 替换为实际的Pangle广告URL
+    key: your_pangle_key                      # 替换为实际的Pangle广告密钥
 # DeepSeek AI配置
 deepseek:
   api:
@@ -177,3 +183,6 @@ xss:
   excludes: /system/notice
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*
+# application.yml（或 application-dev.yml）
+scheduled:
+  ad-retry-interval: 30000  # 单位：毫秒，示例值30秒，按需调整

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

@@ -2,10 +2,11 @@ package com.ruoyi.novel.config;
 
 import com.ruoyi.novel.service.IAdService;
 import com.ruoyi.novel.service.IFinanceService;
-import com.ruoyi.novel.service.IVoteService;
+import com.ruoyi.novel.service.VoteService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -17,10 +18,11 @@ import org.springframework.scheduling.annotation.Scheduled;
 public class ScheduledTasks {
     private static final Logger log = LoggerFactory.getLogger(ScheduledTasks.class);
     @Autowired
+    @Qualifier("adServiceImpl")  // 明确指定实现
     private IAdService adService;
 
     @Autowired
-    private IVoteService voteService;
+    private VoteService voteService;
 
     @Autowired
     private IFinanceService financeService;

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

@@ -3,8 +3,9 @@ package com.ruoyi.novel.controller;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.novel.domain.AdCountRequest;
-import com.ruoyi.novel.service.AdService;
+import com.ruoyi.novel.service.IAdService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -18,12 +19,12 @@ import java.util.List;
 @RequestMapping("/ad")
 public class NovelAdController {
 
-    private final AdService adService;
+    private final IAdService iAdService;
     private final RedisTemplate<String, String> redisTemplate;
-
+    // 明确指定实现
     @Autowired
-    public NovelAdController(AdService adService, RedisTemplate<String, String> redisTemplate) {
-        this.adService = adService;
+    public NovelAdController(@Qualifier("adServiceImpl") IAdService iAdService, RedisTemplate<String, String> redisTemplate) {
+        this.iAdService = iAdService;
         this.redisTemplate = redisTemplate;
     }
 
@@ -49,7 +50,7 @@ public class NovelAdController {
         }
 
         // 记录广告
-        adService.logAdView(
+        iAdService.logAdView(
                 userId,
                 request.getChapterId(),
                 request.getAdType(),
@@ -61,9 +62,9 @@ public class NovelAdController {
 
         return ResponseEntity.ok("Ad counted");
     }
-    @PostMapping("/count")
+    @PostMapping("/log")
     public AjaxResult logAdView(@RequestBody AdCountRequest request) {
-        adService.logAdView(request);
+        iAdService.logAdView(request);
         return AjaxResult.success("广告计数成功");
     }
     private String resolveUserId(AdCountRequest request, String phpSessionId) {

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

@@ -33,8 +33,7 @@ public class NovelController {
         List<Novel> list = novelService.selectNovelList(novel);
         return getDataTable(list);
     }
-
-    @PostMapping
+    @PostMapping("/add")
     public AjaxResult add(@RequestBody Novel novel) {
         return toAjax(novelService.insertNovel(novel));
     }
@@ -69,7 +68,8 @@ public class NovelController {
         return AjaxResult.success(novels);
     }
 
-    @PostMapping
+
+    @PostMapping("/create")
     public AjaxResult addNovel(@RequestBody Novel novel) {
         novelMapper.insert(novel);
         searchService.indexNovel(novel); // 创建索引

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

@@ -3,7 +3,8 @@ package com.ruoyi.novel.controller;
 import com.google.common.util.concurrent.RateLimiter;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.novel.domain.VoteRequest;
-import com.ruoyi.novel.service.IVoteService;
+//import com.ruoyi.novel.service.IVoteService;
+import com.ruoyi.novel.service.VoteService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -19,7 +20,7 @@ import java.util.concurrent.ConcurrentHashMap;
 public class NovelVoteController {
 
     @Autowired
-    private IVoteService voteService;
+    private VoteService voteService;
 
     // 使用Guava RateLimiter限制投票频率
     private static final ConcurrentHashMap<Long, RateLimiter> userRateLimiters = new ConcurrentHashMap<>();

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

@@ -1,15 +0,0 @@
-package com.ruoyi.novel.service;
-
-import com.ruoyi.novel.domain.AdCountRequest;
-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);
-
-    void logAdView(String userId, Long chapterId, String adType, String source);
-}

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

@@ -19,4 +19,9 @@ public interface IAdService {
     void syncWithAdPlatform(AdLog adLog);
     void retryFailedSyncs();
     Map<String, AdPlatformConfig> loadAdConfigs();
+
+//    void logAdView(AdCountRequest request);
+//    List<AdLog> getAdLogsByUser(Long userId);
+
+    void logAdView(String userId, Long chapterId, String adType, String source);
 }

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

@@ -1,16 +1,16 @@
-package com.ruoyi.novel.service;
-
-import com.ruoyi.novel.domain.VoteRecord;
-import com.ruoyi.novel.domain.VoteRequest;
-
-// IVoteService.java
-public interface IVoteService {
-    String processVote(VoteRequest request);
-    void generateStoryContent(VoteRecord record);
-    void notifyPhpSystem(VoteRecord record);
-    void retryFailedNotifications();
-
-    void notifyPhpSystem(VoteRequest request, String generatedContent);
-
-    String generateStoryContent(Long storyId, Long optionId);
-}
+//package com.ruoyi.novel.service;
+//
+//import com.ruoyi.novel.domain.VoteRecord;
+//import com.ruoyi.novel.domain.VoteRequest;
+//
+//// IVoteService.java
+//public interface IVoteService {
+//    String processVote(VoteRequest request);
+//    void generateStoryContent(VoteRecord record);
+//    void notifyPhpSystem(VoteRecord record);
+//    void retryFailedNotifications();
+//
+//    void notifyPhpSystem(VoteRequest request, String generatedContent);
+//
+//    String generateStoryContent(Long storyId, Long optionId);
+//}

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

@@ -93,6 +93,12 @@ public class AdServiceImpl implements IAdService {
         }
         return adConfigCache;
     }
+
+    @Override
+    public void logAdView(String userId, Long chapterId, String adType, String source) {
+
+    }
+
     @Override
     public void logAdView(AdCountRequest request) {
         AdLog log = new AdLog();

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

@@ -12,6 +12,7 @@ import com.ruoyi.novel.service.IFinanceService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.*;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -33,8 +34,8 @@ public class FinanceServiceImpl implements IFinanceService {
 
     @Value("${handling.fee.rate:0.05}")
     private BigDecimal handlingFeeRate;
-    @Value("${royalty.rate}")
-    private BigDecimal royaltyRate;
+//    @Value("${royalty.rate}")
+//    private BigDecimal royaltyRate;
     // 添加配置项注入
     @Value("${php.data.url}")
     private String phpDataUrl;
@@ -43,6 +44,7 @@ public class FinanceServiceImpl implements IFinanceService {
     private AdLogMapper adLogMapper; // 确保已注入
 
     @Autowired
+    @Qualifier("adServiceImpl")  // 明确指定实现
     private IAdService adService; // 确保已注入
 
     //@Value("${handling.fee.rate}")

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

@@ -35,7 +35,7 @@ public class NovelSearchServiceImpl implements NovelSearchService {
 
     private static final String INDEX_NAME = "novels";
 
-    @PostConstruct
+//    @PostConstruct
     public void createIndexIfNotExists() {
         IndexOperations indexOps = elasticTemplate.indexOps(IndexCoordinates.of(INDEX_NAME));
         if (!indexOps.exists()) {

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

@@ -15,6 +15,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.*;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
+
+import javax.annotation.PostConstruct;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -29,11 +31,17 @@ public class AdPlatformClient {
 
     @Autowired
     private RestTemplate restTemplate;
-    @Value("${ad.tencent.url}")
+    // 设置默认值为空字符串
+    @Value("${ad.tencent.url:}")
     private String tencentUrl;
 
-    @Value("${ad.pangle.url}")
+    @Value("${ad.pangle.url:}")
     private String pangleUrl;
+    @PostConstruct
+    public void init() {
+        logger.info("腾讯广告URL: {}", tencentUrl);
+        logger.info("Pangle广告URL: {}", pangleUrl);
+    }
     public void syncAdPlatform(AdLog adLog) {
         Map<String, AdPlatformConfig> configs = iAdService.loadAdConfigs();
         AdPlatformConfig config = configs.get(adLog.getAdPlatform());

RuoYi-Vue/ruoyi-system/src/main/resources/mapper/novel/AdLogMapper.xml

@@ -1,4 +1,7 @@
-<!-- AdLogMapper.xml -->
+<?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.ruoyi.novel.mapper.AdLogMapper">
 
     <resultMap id="AdLogResult" type="AdLog">
@@ -24,4 +27,8 @@
             #{id}
         </foreach>
     </update>
+    <select id="selectList" resultMap="AdLogResult">
+        SELECT * FROM novel_ad_log
+        <!-- 按需添加WHERE条件 -->
+    </select>
 </mapper>

RuoYi-Vue/ruoyi-system/src/main/resources/mapper/novel/AdPlatformConfigMapper.xml

@@ -0,0 +1,29 @@
+<?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.ruoyi.novel.mapper.AdPlatformConfigMapper">
+
+    <resultMap type="AdPlatformConfig" id="AdPlatformConfigResult">
+        <!-- 定义字段映射 -->
+    </resultMap>
+
+    <select id="selectList" resultMap="AdPlatformConfigResult">
+        SELECT * FROM novel_ad_config
+    </select>
+    <!-- 添加 insert 语句 -->
+    <insert id="insert" parameterType="com.ruoyi.novel.domain.AdPlatformConfig">
+        INSERT INTO novel_ad_config (
+            platform_code,
+            platform_name,
+            api_url,
+            auth_token,
+            params_template
+        ) VALUES (
+            #{platformCode},
+            #{platformName},
+            #{apiUrl},
+            #{authToken},
+            #{paramsTemplate}
+        )
+    </insert>
+</mapper>

RuoYi-Vue/ruoyi-system/src/main/resources/mapper/novel/NovelMapper.xml

@@ -0,0 +1,30 @@
+<?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.ruoyi.novel.mapper.NovelMapper">
+
+    <!-- 基础字段映射 -->
+    <resultMap type="Novel" id="NovelResult">
+        <id     property="id"      column="id"      />
+        <result property="title"        column="title"         />
+        <result property="author"       column="author"        />
+        <result property="categoryId"   column="category_id"   />
+        <result property="coverImg"   column="cover_img"   />
+        <result property="description"  column="description"   />
+        <result property="status"       column="status"        />
+        <result property="wordCount"    column="word_count"    />
+        <result property="readCount"    column="word_count"    />
+        <result property="createTime"   column="create_time"   />
+        <result property="updateTime"   column="update_time"   />
+    </resultMap>
+
+    <!-- 基础字段列表 -->
+    <sql id="selectNovelVo">
+        select
+            id, title, author, category_id, cover_img, description,
+            status, word_count, readCount,create_time, update_time
+        from novel
+    </sql>
+    <select id="selectList" resultMap="NovelResult">
+        SELECT * FROM novel
+    </select>
+</mapper>

RuoYi-Vue/ruoyi-system/src/main/resources/mapper/novel/RoyaltySummaryMapper.xml

@@ -1,4 +1,7 @@
-<!-- RoyaltySummaryMapper.xml -->
+<?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.ruoyi.novel.mapper.RoyaltySummaryMapper">
 
     <resultMap id="RoyaltySummaryResult" type="RoyaltySummary">

RuoYi-Vue/ruoyi-system/src/main/resources/mapper/novel/VoteRecordMapper.xml

@@ -1,4 +1,7 @@
-<!-- VoteRecordMapper.xml -->
+<?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.ruoyi.novel.mapper.VoteRecordMapper">
 
     <resultMap id="VoteRecordResult" type="VoteRecord">
@@ -18,9 +21,9 @@
         WHERE id = #{optionId}
     </update>
 
-    <update id="updateNotifyStatus">
-        UPDATE novel_vote_log
-        SET notify_status = #{status}
-        WHERE id = #{id}
-    </update>
+<!--    <update id="updateNotifyStatus">-->
+<!--        UPDATE novel_vote_log-->
+<!--        SET notify_status = #{status}-->
+<!--        WHERE id = #{id}-->
+<!--    </update>-->
 </mapper>