Merge branch 'xxljob' of wangfan/adweb3-server into master

jeecg-module-system/jeecg-system-biz/pom.xml

@@ -49,6 +49,14 @@
 			<groupId>org.jeecgframework.jimureport</groupId>
 			<artifactId>jimureport-nosql-starter</artifactId>
 		</dependency>-->
+
+        <!--xxl-job定时任务-->
+        <dependency>
+            <groupId>com.xuxueli</groupId>
+            <artifactId>xxl-job-core</artifactId>
+            <version>${xxl-job-core.version}</version>
+        </dependency>
+
 	</dependencies>
 	
 </project>

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

@@ -33,6 +33,7 @@ import org.jeecg.modules.adweb.dmp.entity.GoogleGTM;
 import org.jeecg.modules.adweb.dmp.service.IGACountryReportService;
 import org.jeecg.modules.adweb.dmp.service.IGAPagePathReportService;
 import org.jeecg.modules.adweb.dmp.service.IGASourceMediumReportService;
+import org.jeecg.modules.adweb.dmp.service.IGoogleGTMService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.ParameterizedTypeReference;
@@ -40,7 +41,6 @@ import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -70,6 +70,8 @@ public class GAReportService {
     @Value("${data-bridge.api.token}")
     private String dataBridgeApiToken;
 
+    @Autowired private IGoogleGTMService googleGTMService;
+
     @Autowired private IGACountryReportService gaCountryReportService;
     @Autowired private IGASourceMediumReportService gaSourceMediumReportService;
     @Autowired private IGAPagePathReportService gaPagePathReportService;
@@ -85,8 +87,8 @@ public class GAReportService {
 
     /** 拉取并同步Google Analytics报表 */
     public void syncGAReport() {
-        // TODO: 获取可查的GoogleGTM对象
-        List<GoogleGTM> googleGTMS = Collections.emptyList();
+        // TODO: 判断网站状态
+        List<GoogleGTM> googleGTMS = googleGTMService.list();
 
         for (GoogleGTM googleGTM : googleGTMS) {
             // 每个帐号同步更新三张报表

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/xxl/GAReportJob.java

@@ -0,0 +1,28 @@
+package org.jeecg.modules.xxl;
+
+import com.xxl.job.core.handler.annotation.XxlJob;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.adweb.dmp.service.google.GAReportService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * GA报表数据同步任务，{@link GAReportService}
+ *
+ * @author wfansh
+ */
+@Slf4j
+@Component
+public class GAReportJob {
+
+    @Autowired private GAReportService gaReportService;
+
+    @XxlJob("syncGAReportHandler")
+    public void syncGAReportHandler() {
+        log.info("同步GA报表数据...");
+        gaReportService.syncGAReport();
+        log.info("同步GA报表数据结束");
+    }
+}

jeecg-module-system/jeecg-system-start/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>jeecg-system-start</artifactId>
-    
+
     <dependencies>
         <!-- SYSTEM 系统管理模块 -->
         <dependency>
@@ -24,7 +24,7 @@
             <artifactId>jeecg-module-demo</artifactId>
             <version>${jeecgboot.version}</version>
         </dependency>
-        
+
         <!-- flyway 数据库自动升级 
         <dependency>
             <groupId>org.flywaydb</groupId>
@@ -42,6 +42,12 @@
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
+
+        <!--xxl-job定时任务-->
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>jeecg-boot-starter3-job</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -68,7 +68,7 @@ spring:
     job-store-type: jdbc
     initialize-schema: embedded
     #定时任务启动开关，true-开  false-关
-    auto-startup: true
+    auto-startup: false
     #延迟1秒启动定时任务
     startup-delay: 1s
     #启动时更新己存在的Job
@@ -253,15 +253,18 @@ jeecg:
       dataSourceSafe: false
       # 低代码开发模式（dev:开发模式，prod:发布模式—关闭在线报表设计功能，分配角色admin、lowdeveloper可以放开限制）
       lowCodeMode: dev
-  #xxl-job配置
+  #xxl-job配置 - jeecg-boot-starter3-job
   xxljob:
-    enabled: false
-    adminAddresses: http://127.0.0.1:9080/xxl-job-admin
+    enabled: true
+    adminAddresses: http://localhost:8090/xxl-job-admin/
     appname: ${spring.application.name}
-    accessToken: ''
-    address: 127.0.0.1:30007
-    ip: 127.0.0.1
-    port: 30007
+    accessToken: 4j9Z@FapJQKLuQtG
+    ## 执行器注册地址 [选填]：优先使用该配置作为注册地址，为空时使用内嵌服务 ”IP:PORT“ 作为注册地址
+    address:
+    ## 执行器IP [选填]：默认为空表示自动获取IP，多网卡时可手动设置指定IP
+    ip:
+    ## 执行器端口号 [选填]：小于等于0则自动获取；默认端口为9999
+    port: 24080
     logPath: logs/jeecg/job/jobhandler/
     logRetentionDays: 30
   #分布式锁配置

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

@@ -68,7 +68,7 @@ spring:
     job-store-type: jdbc
     initialize-schema: embedded
     #定时任务开关，true-开  false-关
-    auto-startup: true
+    auto-startup: false
     #延迟1秒启动定时任务
     startup-delay: 1s
     #启动时更新己存在的Job
@@ -254,15 +254,18 @@ jeecg:
       dataSourceSafe: true
       # 低代码开发模式（dev:开发模式，prod:发布模式—关闭在线报表设计功能，分配角色admin、lowdeveloper可以放开限制）
       lowCodeMode: prod
-  #xxl-job配置
+  #xxl-job配置 - jeecg-boot-starter3-job
   xxljob:
-    enabled: false
-    adminAddresses: http://127.0.0.1:9080/xxl-job-admin
+    enabled: true
+    adminAddresses: http://xxl-job.v3.adwebcloud.com/xxl-job-admin/
     appname: ${spring.application.name}
-    accessToken: ''
-    address: 127.0.0.1:30007
-    ip: 127.0.0.1
-    port: 30007
+    accessToken: 4j9Z@FapJQKLuQtG
+    ## 执行器注册地址 [选填]：优先使用该配置作为注册地址，为空时使用内嵌服务 ”IP:PORT“ 作为注册地址
+    address:
+    ## 执行器IP [选填]：默认为空表示自动获取IP，多网卡时可手动设置指定IP
+    ip:
+    ## 执行器端口号 [选填]：小于等于0则自动获取；默认端口为9999
+    port: 24080
     logPath: logs/jeecg/job/jobhandler/
     logRetentionDays: 30
   #分布式锁配置

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

@@ -68,7 +68,7 @@ spring:
     job-store-type: jdbc
     initialize-schema: embedded
     #定时任务启动开关，true-开  false-关
-    auto-startup: true
+    auto-startup: false
     #延迟1秒启动定时任务
     startup-delay: 1s
     #启动时更新己存在的Job
@@ -253,18 +253,20 @@ jeecg:
       dataSourceSafe: true
       # 低代码开发模式（dev:开发模式，prod:发布模式—关闭在线报表设计功能，分配角色admin、lowdeveloper可以放开限制）
       lowCodeMode: prod
-  #xxl-job配置
+  #xxl-job配置 - jeecg-boot-starter3-job
   xxljob:
-    enabled: false
-    adminAddresses: http://127.0.0.1:9080/xxl-job-admin
+    enabled: true
+    adminAddresses: http://localhost:8090/xxl-job-admin/
     appname: ${spring.application.name}
-    accessToken: ''
-    address: 127.0.0.1:30007
-    ip: 127.0.0.1
-    port: 30007
+    accessToken: 4j9Z@FapJQKLuQtG
+    ## 执行器注册地址 [选填]：优先使用该配置作为注册地址，为空时使用内嵌服务 ”IP:PORT“ 作为注册地址
+    address:
+    ## 执行器IP [选填]：默认为空表示自动获取IP，多网卡时可手动设置指定IP
+    ip:
+    ## 执行器端口号 [选填]：小于等于0则自动获取；默认端口为9999
+    port: 24080
     logPath: logs/jeecg/job/jobhandler/
-    logRetentionDays: 30
-  #分布式锁配置
+    logRetentionDays: 30  #分布式锁配置
   redisson:
     address: 127.0.0.1:6379
     password:

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

@@ -1,5 +1,5 @@
 spring:
   application:
-    name: jeecg-system
+    name: adweb3
   profiles:
     active: '@profile.name@'