重命名为dmp

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/databridge/dto/APIStatus.java → jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/dto/APIStatus.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.adweb.databridge.dto;
+package org.jeecg.modules.adweb.dmp.dto;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/databridge/dto/OpenAPIRequest.java → jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/dto/OpenAPIRequest.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.adweb.databridge.dto;
+package org.jeecg.modules.adweb.dmp.dto;
 
 import lombok.Data;
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/databridge/dto/OpenAPIResponse.java → jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/dto/OpenAPIResponse.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.adweb.databridge.dto;
+package org.jeecg.modules.adweb.dmp.dto;
 
 import lombok.Builder;
 import lombok.Data;

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/databridge/dto/google/ResourceDTO.java → jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/dto/google/ResourceDTO.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.adweb.databridge.dto.google;
+package org.jeecg.modules.adweb.dmp.dto.google;
 
 import com.google.common.base.Splitter;
 import com.google.common.collect.Iterables;

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/databridge/dto/google/analytics/CreatePropertyRequestDTO.java → jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/dto/google/analytics/CreatePropertyRequestDTO.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.adweb.databridge.dto.google.analytics;
+package org.jeecg.modules.adweb.dmp.dto.google.analytics;
 
 import lombok.Data;
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/databridge/dto/google/analytics/GAAccountDTO.java → jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/dto/google/analytics/GAAccountDTO.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.adweb.databridge.dto.google.analytics;
+package org.jeecg.modules.adweb.dmp.dto.google.analytics;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -7,7 +7,7 @@ import lombok.ToString;
 import lombok.experimental.SuperBuilder;
 
 import org.apache.commons.lang3.StringUtils;
-import org.jeecg.modules.adweb.databridge.dto.google.ResourceDTO;
+import org.jeecg.modules.adweb.dmp.dto.google.ResourceDTO;
 
 /**
  * @author wfansh

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/databridge/dto/google/analytics/GADataStreamDTO.java → jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/dto/google/analytics/GADataStreamDTO.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.adweb.databridge.dto.google.analytics;
+package org.jeecg.modules.adweb.dmp.dto.google.analytics;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -6,7 +6,7 @@ import lombok.NoArgsConstructor;
 import lombok.ToString;
 import lombok.experimental.SuperBuilder;
 
-import org.jeecg.modules.adweb.databridge.dto.google.ResourceDTO;
+import org.jeecg.modules.adweb.dmp.dto.google.ResourceDTO;
 
 /**
  * @author wfansh

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/databridge/dto/google/analytics/GAPropertyDTO.java → jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/dto/google/analytics/GAPropertyDTO.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.adweb.databridge.dto.google.analytics;
+package org.jeecg.modules.adweb.dmp.dto.google.analytics;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -7,7 +7,7 @@ import lombok.ToString;
 import lombok.experimental.SuperBuilder;
 
 import org.apache.commons.lang3.StringUtils;
-import org.jeecg.modules.adweb.databridge.dto.google.ResourceDTO;
+import org.jeecg.modules.adweb.dmp.dto.google.ResourceDTO;
 
 import java.util.List;
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/databridge/dto/google/gtm/CreateContainerRequestDTO.java → jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/dto/google/gtm/CreateContainerRequestDTO.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.adweb.databridge.dto.google.gtm;
+package org.jeecg.modules.adweb.dmp.dto.google.gtm;
 
 import lombok.Data;
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/databridge/dto/google/gtm/GTMAccountDTO.java → jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/dto/google/gtm/GTMAccountDTO.java

@@ -1,10 +1,10 @@
-package org.jeecg.modules.adweb.databridge.dto.google.gtm;
+package org.jeecg.modules.adweb.dmp.dto.google.gtm;
 
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
 import org.apache.commons.lang3.StringUtils;
-import org.jeecg.modules.adweb.databridge.dto.google.ResourceDTO;
+import org.jeecg.modules.adweb.dmp.dto.google.ResourceDTO;
 
 /**
  * @author wfansh

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/databridge/dto/google/gtm/GTMContainerDTO.java → jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/dto/google/gtm/GTMContainerDTO.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.adweb.databridge.dto.google.gtm;
+package org.jeecg.modules.adweb.dmp.dto.google.gtm;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -7,7 +7,7 @@ import lombok.ToString;
 import lombok.experimental.SuperBuilder;
 
 import org.apache.commons.lang3.StringUtils;
-import org.jeecg.modules.adweb.databridge.dto.google.ResourceDTO;
+import org.jeecg.modules.adweb.dmp.dto.google.ResourceDTO;
 
 import java.util.List;
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/databridge/dto/google/gtm/GTMTriggerDTO.java → jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/dto/google/gtm/GTMTriggerDTO.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.adweb.databridge.dto.google.gtm;
+package org.jeecg.modules.adweb.dmp.dto.google.gtm;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -6,7 +6,7 @@ import lombok.NoArgsConstructor;
 import lombok.ToString;
 import lombok.experimental.SuperBuilder;
 
-import org.jeecg.modules.adweb.databridge.dto.google.ResourceDTO;
+import org.jeecg.modules.adweb.dmp.dto.google.ResourceDTO;
 
 /**
  * @author wfansh

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/databridge/dto/google/gtm/GTMVersionDTO.java → jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/dto/google/gtm/GTMVersionDTO.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.adweb.databridge.dto.google.gtm;
+package org.jeecg.modules.adweb.dmp.dto.google.gtm;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -6,7 +6,7 @@ import lombok.NoArgsConstructor;
 import lombok.ToString;
 import lombok.experimental.SuperBuilder;
 
-import org.jeecg.modules.adweb.databridge.dto.google.ResourceDTO;
+import org.jeecg.modules.adweb.dmp.dto.google.ResourceDTO;
 
 /**
  * @author wfansh

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/databridge/dto/google/gtm/GTMWorkspaceDTO.java → jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/dto/google/gtm/GTMWorkspaceDTO.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.adweb.databridge.dto.google.gtm;
+package org.jeecg.modules.adweb.dmp.dto.google.gtm;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -6,7 +6,7 @@ import lombok.NoArgsConstructor;
 import lombok.ToString;
 import lombok.experimental.SuperBuilder;
 
-import org.jeecg.modules.adweb.databridge.dto.google.ResourceDTO;
+import org.jeecg.modules.adweb.dmp.dto.google.ResourceDTO;
 
 /**
  * @author wfansh

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

@@ -0,0 +1,35 @@
+package org.jeecg.modules.adweb.dmp.service.google;
+
+import jakarta.annotation.PostConstruct;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.adweb.common.util.RestTemplateUtil;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * Google Analytics数据同步 - http://data-bridge.v3.adwebcloud.com:9002/swagger-ui/index.html
+ *
+ * @author wfansh
+ */
+@Slf4j
+@Service
+public class GAReportService {
+
+    @Value("${data-bridge.api.host}")
+    private String dataBridgeApiHost;
+
+    @Value("${data-bridge.api.token}")
+    private String dataBridgeApiToken;
+
+    private RestTemplate restTemplate;
+
+    @PostConstruct
+    private void init() {
+        this.restTemplate = RestTemplateUtil.getRestTemplate(30, 30, dataBridgeApiToken);
+    }
+
+
+}

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

@@ -339,7 +339,6 @@ security:
 ### 自定义
 ### GA,GTM,Ads等数据交换中心
 data-bridge:
-  open:
-    api:
-      host: http://data-bridge.v3.adwebcloud.com:9002
-      token: lgoXX9APqgPLGMPECiNoxaPx
+  api:
+    host: http://data-bridge.v3.adwebcloud.com:9002
+    token: lgoXX9APqgPLGMPECiNoxaPx

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

@@ -327,7 +327,6 @@ security:
 ### 自定义
 ### GA,GTM,Ads等数据交换中心
 data-bridge:
-  open:
-    api:
-      host: http://data-bridge.v3.adwebcloud.com:9002
-      token: lgoXX9APqgPLGMPECiNoxaPx
+  api:
+    host: http://data-bridge.v3.adwebcloud.com:9002
+    token: lgoXX9APqgPLGMPECiNoxaPx

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

@@ -325,7 +325,6 @@ security:
 ### 自定义
 ### GA,GTM,Ads等数据交换中心
 data-bridge:
-  open:
-    api:
-      host: http://data-bridge.v3.adwebcloud.com:9002
-      token: lgoXX9APqgPLGMPECiNoxaPx
+  api:
+    host: http://data-bridge.v3.adwebcloud.com:9002
+    token: lgoXX9APqgPLGMPECiNoxaPx