Merge branch 'master' into cpq-dev

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/api/controller/OpenAPIController.java

@@ -0,0 +1,25 @@
+package org.jeecg.modules.adweb.api.controller;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.adweb.api.vo.APIRequestVO;
+import org.jeecg.modules.adweb.api.vo.ProductInfoVO;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Collections;
+import java.util.List;
+
+@RestController
+@RequestMapping("/open-api")
+@Slf4j
+public class OpenAPIController {
+
+    private static final String STATIC_BEARER_TOKEN = "Bearer uxl9Wpzh65vXNUyDvynJDjBo";
+
+    @PostMapping("/product/list")
+    @ResponseBody
+    public List<ProductInfoVO> listProducts(@RequestParam APIRequestVO apiReques) {
+
+        return Collections.EMPTY_LIST;
+    }
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/api/vo/APIRequestVO.java

@@ -0,0 +1,21 @@
+package org.jeecg.modules.adweb.api.vo;
+
+import lombok.Data;
+
+/**
+ * @author wfansh
+ */
+@Data
+public class APIRequestVO {
+    /** 站点ID */
+    private String id;
+
+    /** 站点域名 */
+    private String domain;
+
+    /** 页面数量 */
+    private Integer pageNo;
+
+    /** 页面大小 */
+    private Integer pageSize;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/api/vo/ProductInfoVO.java

@@ -0,0 +1,24 @@
+package org.jeecg.modules.adweb.api.vo;
+
+import lombok.Data;
+
+/**
+ * @author wfansh
+ */
+@Data
+public class ProductInfoVO {
+
+    private Integer productId;
+
+    private String productName;
+
+    private String productNameZh;
+
+    private String productImage;
+
+    private String productGalleryImage;
+
+    private String categoryName;
+
+    private String authorName;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/marketing/googleads/controller/GoogleAdsController.java

@@ -52,7 +52,9 @@ public class GoogleAdsController {
     @PostMapping("/account/add")
     @ResponseBody
     public Result<String> addAdsAccount(
-            @RequestParam String siteCode, @RequestParam String customerId) {
+            @RequestParam String siteCode,
+            @RequestParam String customerId,
+            @RequestParam(required = false) String refreshToken) {
         GoogleAds googleAds =
                 googleAdsService.getOne(
                         new LambdaQueryWrapper<GoogleAds>().eq(GoogleAds::getSiteCode, siteCode),
@@ -61,6 +63,7 @@ public class GoogleAdsController {
 
         googleAds.setSiteCode(siteCode);
         googleAds.setCustomerId(customerId);
+        googleAds.setRefreshToken(refreshToken);
         googleAdsService.saveOrUpdate(googleAds);
 
         return Result.ok("添加成功");

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/marketing/googleads/entity/GoogleAds.java

@@ -51,6 +51,11 @@ public class GoogleAds implements Serializable {
     @Schema(description = "Google Ads帐号ID")
     private String customerId;
 
+    /** refreshToken */
+    @Excel(name = "选填，Google Ads API refresh token", width = 15)
+    @Schema(description = "选填，Google Ads API refresh token")
+    private String refreshToken;
+
     /** ctime */
     @Excel(name = "ctime", width = 20, format = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")