Merge branch 'master' into cpq-dev

jeecg-boot-base-core/pom.xml

@@ -304,7 +304,7 @@
 		<!-- chatgpt -->
 		<dependency>
 			<groupId>org.jeecgframework.boot</groupId>
-			<artifactId>jeecg-boot-starter3-chatgpt</artifactId>
+			<artifactId>jeecg-boot-starter-chatgpt</artifactId>
 		</dependency>
 
 		<!--thumbnailator图片处理-->

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/service/google/GAReportService.java

@@ -10,6 +10,7 @@ import jakarta.annotation.PostConstruct;
 import lombok.extern.slf4j.Slf4j;
 
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ThreadUtils;
 import org.apache.commons.lang3.reflect.TypeUtils;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.FastJsonUtil;
@@ -35,6 +36,7 @@ import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
+import java.time.Duration;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -107,7 +109,11 @@ public class GAReportService {
                 this.syncGASourceMediumReport(googleGTM);
                 this.syncGAPagePathReport(googleGTM);
                 this.syncGADeviceReport(googleGTM);
-            } catch (RuntimeException e) {
+
+                // Google Analytics API限流 - 10 queries per second (QPS) per IP address
+                // https://developers.google.com/analytics/devguides/config/userdeletion/v3/limits-quotas
+                ThreadUtils.sleep(Duration.ofSeconds(1));
+            } catch (InterruptedException | RuntimeException e) {
                 log.warn("同步GA报表异常, siteCode = {], error = {}", googleGTM.getSiteCode(), e);
             }
         }
@@ -178,7 +184,11 @@ public class GAReportService {
                 this.getRemoveQueryWrapper(
                         GADailyReport.class, googleGTM.getSiteCode(), startDate, endDate));
 
-        gaDailyReportService.saveBatch(dailyReport, dailyReport.size());
+        if (CollectionUtils.isNotEmpty(dailyReport)) {
+            gaDailyReportService.saveBatch(dailyReport, dailyReport.size());
+        } else {
+            log.info("syncGADailyReport()数据为空, siteCode = {}", googleGTM.getSiteCode());
+        }
     }
 
     /**
@@ -228,7 +238,11 @@ public class GAReportService {
                 this.getRemoveQueryWrapper(
                         GACountryReport.class, googleGTM.getSiteCode(), startDate, endDate));
 
-        gaCountryReportService.saveBatch(countryReport, countryReport.size());
+        if (CollectionUtils.isNotEmpty(countryReport)) {
+            gaCountryReportService.saveBatch(countryReport, countryReport.size());
+        } else {
+            log.info("syncGACountryReport()数据为空, siteCode = {}", googleGTM.getSiteCode());
+        }
     }
 
     /**
@@ -298,7 +312,11 @@ public class GAReportService {
                 this.getRemoveQueryWrapper(
                         GASourceMediumReport.class, googleGTM.getSiteCode(), startDate, endDate));
 
-        gaSourceMediumReportService.saveBatch(sourceMediumReport, sourceMediumReport.size());
+        if (CollectionUtils.isNotEmpty(sourceMediumReport)) {
+            gaSourceMediumReportService.saveBatch(sourceMediumReport, sourceMediumReport.size());
+        } else {
+            log.info("syncGASourceMediumReport()数据为空, siteCode = {}", googleGTM.getSiteCode());
+        }
     }
 
     /**
@@ -358,7 +376,11 @@ public class GAReportService {
                 this.getRemoveQueryWrapper(
                         GAPagePathReport.class, googleGTM.getSiteCode(), startDate, endDate));
 
-        gaPagePathReportService.saveBatch(pagePathReport, pagePathReport.size());
+        if (CollectionUtils.isNotEmpty(pagePathReport)) {
+            gaPagePathReportService.saveBatch(pagePathReport, pagePathReport.size());
+        } else {
+            log.info("syncGAPagePathReport()数据为空, siteCode = {}", googleGTM.getSiteCode());
+        }
     }
 
     /**
@@ -427,7 +449,11 @@ public class GAReportService {
                 this.getRemoveQueryWrapper(
                         GADeviceReport.class, googleGTM.getSiteCode(), startDate, endDate));
 
-        gaDeviceReportService.saveBatch(deviceReport, deviceReport.size());
+        if (CollectionUtils.isNotEmpty(deviceReport)) {
+            gaDeviceReportService.saveBatch(deviceReport, deviceReport.size());
+        } else {
+            log.info("syncGADeviceReport()数据为空, siteCode = {}", googleGTM.getSiteCode());
+        }
     }
 
     /**

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/service/google/GTMAdminService.java

@@ -75,7 +75,7 @@ public class GTMAdminService {
 
     @PostConstruct
     private void init() throws IOException {
-        this.restTemplate = RestTemplateUtil.getRestTemplate(60, 60, dataBridgeApiToken);
+        this.restTemplate = RestTemplateUtil.getRestTemplate(60, 120, dataBridgeApiToken);
 
         headSnippetTemplate =
                 Resources.toString(

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/gpt/service/impl/ChatServiceImpl.java

@@ -1,19 +1,22 @@
 package org.jeecg.modules.adweb.gpt.service.impl;
 
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.unfbx.chatgpt.OpenAiStreamClient;
+import com.unfbx.chatgpt.entity.chat.BaseChatCompletion;
 import com.unfbx.chatgpt.entity.chat.ChatCompletion;
 import com.unfbx.chatgpt.entity.chat.Message;
 import com.unfbx.chatgpt.exception.BaseException;
 
+import jakarta.annotation.PostConstruct;
+
 import lombok.extern.slf4j.Slf4j;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.api.vo.Result;
+import org.jeecg.chatgpt.prop.AiChatProperties;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.common.util.UUIDGenerator;
 import org.jeecg.modules.adweb.common.util.AdwebRedisUtil;
 import org.jeecg.modules.adweb.gpt.cache.SseEmitterCache;
@@ -49,14 +52,28 @@ public class ChatServiceImpl implements ChatService {
 
     @Autowired private OpenAiStreamClient openAiStreamClient;
 
+    @Autowired private AiChatProperties aiChatProperties;
+
     @Autowired private IChatHistoryService chatHistoryService;
 
-    /** 防止client不能成功注入 */
-    private OpenAiStreamClient ensureClient() {
-        if (Objects.isNull(this.openAiStreamClient)) {
-            this.openAiStreamClient = SpringContextUtils.getBean(OpenAiStreamClient.class);
-        }
-        return this.openAiStreamClient;
+    // 是否使用DeepSeek模型
+    private boolean isDeepSeek = false;
+
+    //    /** 防止client不能成功注入 */
+    //    private OpenAiStreamClient ensureClient() {
+    //        if (Objects.isNull(this.openAiStreamClient)) {
+    //            this.openAiStreamClient = SpringContextUtils.getBean(OpenAiStreamClient.class);
+    //            this.aiChatProperties = SpringContextUtils.getBean(AiChatProperties.class);
+    //        }
+    //        return this.openAiStreamClient;
+    //    }
+
+    @PostConstruct
+    private void init() {
+        this.isDeepSeek =
+                Arrays.stream(BaseChatCompletion.Model.values())
+                        .map(BaseChatCompletion.Model::getName)
+                        .noneMatch(aiChatProperties.getModel()::equals);
     }
 
     @Override
@@ -145,10 +162,14 @@ public class ChatServiceImpl implements ChatService {
                 new OpenAISSEEventSourceListener(topicId, sseEmitter);
         ChatCompletion completion =
                 ChatCompletion.builder()
-                        .messages(topicContext)
-                        .model(ChatCompletion.Model.GPT_3_5_TURBO.getName())
+                        // 对DeepSeek模型不发送上下文
+                        .messages(
+                                this.isDeepSeek
+                                        ? Collections.singletonList(Iterables.getLast(topicContext))
+                                        : topicContext)
+                        .model(aiChatProperties.getModel())
                         .build();
-        ensureClient().streamChatCompletion(completion, openAIEventSourceListener);
+        openAiStreamClient.streamChatCompletion(completion, openAIEventSourceListener);
 
         // 3. 将当前话题的context保存到Redis
         adwebRedisUtil.del(contextKey);
@@ -161,7 +182,7 @@ public class ChatServiceImpl implements ChatService {
                 // 话题context TTL设置为3小时
                 3 * 60 * 60);
 
-        Result.ok(completion.tokens());
+        // Result.ok(completion.tokens());
     }
 
     @Override

jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -297,13 +297,15 @@ jeecg:
     enabled: true
   # ai-chat
   ai-chat:
-    # 是否开启；必须。
+    # 是否开启 - 必须
     enabled: true
-    # openAi接口秘钥，填写自己的apiKey；必须。
+    # openAi / deepSeek 接口秘钥
     apiKey: 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
-    # openAi域名，有代理就填代理的域名。默认：openAI官方apiHost
+    # openAi / deepSeek 语言模型
+    model: gpt-3.5-turbo
+    # openAi / deepSeek域名，有代理就填代理的域名
     apiHost: http://openai-proxy.adwebcloud.com
-    # 超时时间单位:s。默认 60s
+    # 超时时间单位:s - 默认 60s
     timeout: 60
 
     # 本地代理地址

jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml

@@ -298,13 +298,15 @@ jeecg:
     enabled: true
   # ai-chat
   ai-chat:
-    # 是否开启；必须。
+    # 是否开启 - 必须
     enabled: true
-    # openAi接口秘钥，填写自己的apiKey；必须。
+    # openAi / deepSeek 接口秘钥
     apiKey: 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
-    # openAi域名，有代理就填代理的域名。默认：openAI官方apiHost
+    # openAi / deepSeek 语言模型
+    model: gpt-3.5-turbo
+    # openAi / deepSeek域名，有代理就填代理的域名
     apiHost: http://openai-proxy.adwebcloud.com
-    # 超时时间单位:s。默认 60s
+    # 超时时间单位:s - 默认 60s
     timeout: 60
 
     # 本地代理地址

jeecg-module-system/jeecg-system-start/src/main/resources/application-test.yml

@@ -296,13 +296,15 @@ jeecg:
     enabled: true
   # ai-chat
   ai-chat:
-    # 是否开启；必须。
+    # 是否开启 - 必须
     enabled: true
-    # openAi接口秘钥，填写自己的apiKey；必须。
-    apiKey: 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
-    # openAi域名，有代理就填代理的域名。默认：openAI官方apiHost
-    apiHost: http://openai-proxy.adwebcloud.com
-    # 超时时间单位:s。默认 60s
+    # openAi / deepSeek 接口秘钥
+    apiKey: sk-e2e55cc205ee4ca1bdd25533d74fc646
+    # openAi / deepSeek 语言模型
+    model: deepseek-chat
+    # openAi / deepSeek域名，有代理就填代理的域名
+    apiHost: https://api.deepseek.com
+    # 超时时间单位:s - 默认 60s
     timeout: 60
 
     # 本地代理地址

pom.xml

@@ -426,8 +426,8 @@
 			<!-- chatgpt -->
 			<dependency>
 				<groupId>org.jeecgframework.boot</groupId>
-				<artifactId>jeecg-boot-starter3-chatgpt</artifactId>
-                <version>${jeecgboot.version}</version>
+				<artifactId>jeecg-boot-starter-chatgpt</artifactId>
+                <version>3.7.3</version>
 			</dependency>
 
 			<!--flyway 支持 mysql5.7+、MariaDB10.3.16-->