GTM

conf/nginx/google-proxy.conf

@@ -0,0 +1,17 @@
+server {
+    listen 80;
+    server_name google-proxy.adwebcloud.com;
+
+    location / {
+        proxy_pass https://www.google.com/;
+        proxy_ssl_server_name on;
+        proxy_set_header Host www.google.com;
+        proxy_set_header X-Forwarded-For $remote_addr;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_http_version 1.1;
+
+        chunked_transfer_encoding off;
+        proxy_buffering off;
+        proxy_cache off;
+    }
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/controller/GTMController.java

@@ -8,6 +8,7 @@ import lombok.extern.slf4j.Slf4j;
 
 import org.apache.commons.lang3.tuple.Pair;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.modules.adweb.dmp.dto.google.analytics.GAAccountDTO;
 import org.jeecg.modules.adweb.dmp.entity.GoogleGTM;
 import org.jeecg.modules.adweb.dmp.service.IGoogleGTMService;
@@ -37,30 +38,28 @@ public class GTMController {
     @Autowired private IGoogleGTMService googleGTMService;
     @Autowired private GTMAdminService gtmAdminService;
 
+    /** 获取站点绑定的GTM snippets */
     @RequestMapping(value = "/get", method = RequestMethod.GET)
     @ResponseBody
-    public Result<AdwebSite> getGTMSnippets(String siteCode) {
+    public Result<Pair<String, String>> getGTMSnippets(String siteCode) {
         GoogleGTM googleGTM =
                 googleGTMService.getOne(
                         new LambdaQueryWrapper<GoogleGTM>().eq(GoogleGTM::getSiteCode, siteCode));
         if (Objects.isNull(googleGTM)) {
             log.info("站点 {} 对应的GoogleGTM不存在", siteCode);
-            return null;
+            return Result.error(CommonConstant.SC_INTERNAL_NOT_FOUND_404, "GoogleGTM不存在");
         }
 
-        AdwebSite adwebSite = new AdwebSite();
-        Pair<String, String> snippets = gtmAdminService.getSnippets(googleGTM.getGtmTagId());
-        adwebSite.setGtmHead(snippets.getKey());
-        adwebSite.setGtmBody(snippets.getValue());
-
-        return Result.ok(adwebSite);
+        return Result.ok(gtmAdminService.getSnippets(googleGTM.getGtmTagId()));
     }
 
-    @RequestMapping(value = "/create", method = RequestMethod.GET)
+    /** 为站点添加GTM snippets */
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
-    public Result<AdwebSite> createGTMSnippets(String siteCode, String gaAccountId) {
+    public Result<Pair<String, String>> addGTMSnippets(String siteCode, String gaAccountId) {
         AdwebSite adwebSite = adwebSiteService.getSiteByCode(siteCode);
 
+        // 如果GoogleGTM表中已存在，不再创建，返回现有记录
         GoogleGTM googleGTM =
                 gtmAdminService.createContainer(
                         adwebSite.getCode(),
@@ -68,13 +67,10 @@ public class GTMController {
                         adwebSite.getName(),
                         gaAccountId);
 
-        Pair<String, String> snippets = gtmAdminService.getSnippets(googleGTM.getGtmTagId());
-        adwebSite.setGtmHead(snippets.getKey());
-        adwebSite.setGtmBody(snippets.getValue());
-
-        return Result.ok(adwebSite);
+        return Result.ok(gtmAdminService.getSnippets(googleGTM.getGtmTagId()));
     }
 
+    /** 获取所有可用的GA帐号 */
     @RequestMapping(value = "/listGAAccounts", method = RequestMethod.GET)
     @ResponseBody
     public Result<List<Pair<String, String>>> listGAAccounts() {

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

@@ -177,8 +177,8 @@ public class GTMAdminService {
                                 TypeUtils.parameterize(
                                         OpenAPIResponse.class,
                                         TypeUtils.parameterize(List.class, GAAccountDTO.class))));
-
         log.info("获取GA accounts: {}", FastJsonUtil.toJSONString(listGAAccountsResponse.getData()));
+
         return listGAAccountsResponse.getData().stream()
                 .filter(gaAccount -> gaAccountIds.contains(gaAccount.getId()))
                 .toList();