Bladeren bron

file move

wangyunpeng 1 week geleden
bovenliggende
commit
cf1a299a3f
41 gewijzigde bestanden met toevoegingen van 107 en 137 verwijderingen
  1. 3 5
      core/src/main/java/com/tzld/ad/client/marketing/AbstractTencentApiClient.java
  2. 3 4
      core/src/main/java/com/tzld/ad/client/marketing/AdGroupClient.java
  3. 3 6
      core/src/main/java/com/tzld/ad/client/marketing/AdvertiserClient.java
  4. 3 4
      core/src/main/java/com/tzld/ad/client/marketing/AgencyClient.java
  5. 3 7
      core/src/main/java/com/tzld/ad/client/marketing/BatchClient.java
  6. 3 4
      core/src/main/java/com/tzld/ad/client/marketing/ComponentClient.java
  7. 3 4
      core/src/main/java/com/tzld/ad/client/marketing/CreativeClient.java
  8. 3 4
      core/src/main/java/com/tzld/ad/client/marketing/CustomAudienceClient.java
  9. 3 3
      core/src/main/java/com/tzld/ad/client/marketing/DailyReportClient.java
  10. 3 3
      core/src/main/java/com/tzld/ad/client/marketing/FundsClient.java
  11. 3 3
      core/src/main/java/com/tzld/ad/client/marketing/ImageClient.java
  12. 3 3
      core/src/main/java/com/tzld/ad/client/marketing/OAuthClient.java
  13. 3 3
      core/src/main/java/com/tzld/ad/client/marketing/PageClient.java
  14. 3 5
      core/src/main/java/com/tzld/ad/client/marketing/RtaStrategyClient.java
  15. 1 1
      core/src/main/java/com/tzld/ad/client/marketing/TencentMarketingApiConfig.java
  16. 3 9
      core/src/main/java/com/tzld/ad/client/marketing/UserActionClient.java
  17. 3 3
      core/src/main/java/com/tzld/ad/client/marketing/UserActionSetClient.java
  18. 3 7
      core/src/main/java/com/tzld/ad/client/marketing/VideoClient.java
  19. 3 5
      core/src/main/java/com/tzld/ad/client/marketing/WechatClient.java
  20. 1 1
      core/src/main/java/com/tzld/ad/common/exception/CustomException.java
  21. 1 1
      core/src/main/java/com/tzld/ad/common/exception/TencentApiException.java
  22. 1 1
      core/src/main/java/com/tzld/ad/model/marketing/TencentApiResponse.java
  23. 1 1
      core/src/main/java/com/tzld/ad/model/marketing/adgroup/AdGroupDTO.java
  24. 1 1
      core/src/main/java/com/tzld/ad/model/marketing/advertiser/AdvertiserDTO.java
  25. 1 1
      core/src/main/java/com/tzld/ad/model/marketing/audience/AudienceDTO.java
  26. 1 1
      core/src/main/java/com/tzld/ad/model/marketing/batch/BatchDTO.java
  27. 1 1
      core/src/main/java/com/tzld/ad/model/marketing/component/ComponentDTO.java
  28. 1 1
      core/src/main/java/com/tzld/ad/model/marketing/creative/CreativeDTO.java
  29. 1 1
      core/src/main/java/com/tzld/ad/model/marketing/funds/FundsDTO.java
  30. 1 1
      core/src/main/java/com/tzld/ad/model/marketing/image/ImageDTO.java
  31. 1 1
      core/src/main/java/com/tzld/ad/model/marketing/oauth/OAuthDTO.java
  32. 1 1
      core/src/main/java/com/tzld/ad/model/marketing/page/PageDTO.java
  33. 1 1
      core/src/main/java/com/tzld/ad/model/marketing/report/ReportDTO.java
  34. 1 1
      core/src/main/java/com/tzld/ad/model/marketing/rta/RtaDTO.java
  35. 1 1
      core/src/main/java/com/tzld/ad/model/marketing/useraction/UserActionDTO.java
  36. 1 1
      core/src/main/java/com/tzld/ad/model/marketing/video/VideoDTO.java
  37. 1 3
      core/src/main/java/com/tzld/ad/model/marketing/wechat/WechatDTO.java
  38. 13 13
      core/src/main/java/com/tzld/ad/service/adput/impl/AdPutTencentCommonServiceImpl.java
  39. 4 4
      core/src/main/java/com/tzld/ad/service/adput/impl/AdPutTencentUserActionAddServiceImpl.java
  40. 1 1
      core/src/main/java/com/tzld/ad/util/adPut/AdPutTencentUtil.java
  41. 16 16
      server/src/main/java/com/tzld/ad/controller/marketing/TencentMarketingController.java

+ 3 - 5
core/src/main/java/com/tzld/ad/marketing/client/AbstractTencentApiClient.java → core/src/main/java/com/tzld/ad/client/marketing/AbstractTencentApiClient.java

@@ -1,17 +1,15 @@
-package com.tzld.ad.marketing.client;
+package com.tzld.ad.client.marketing;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.TypeReference;
-import com.tzld.ad.marketing.exception.TencentApiException;
-import com.tzld.ad.marketing.model.TencentApiResponse;
+import com.tzld.ad.common.exception.TencentApiException;
+import com.tzld.ad.model.marketing.TencentApiResponse;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.*;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 

+ 3 - 4
core/src/main/java/com/tzld/ad/marketing/client/AdGroupClient.java → core/src/main/java/com/tzld/ad/client/marketing/AdGroupClient.java

@@ -1,14 +1,13 @@
-package com.tzld.ad.marketing.client;
+package com.tzld.ad.client.marketing;
 
 import com.alibaba.fastjson.JSON;
-import com.tzld.ad.marketing.model.TencentApiResponse;
-import com.tzld.ad.marketing.model.adgroup.AdGroupDTO;
+import com.tzld.ad.model.marketing.TencentApiResponse;
+import com.tzld.ad.model.marketing.adgroup.AdGroupDTO;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**

+ 3 - 6
core/src/main/java/com/tzld/ad/marketing/client/AdvertiserClient.java → core/src/main/java/com/tzld/ad/client/marketing/AdvertiserClient.java

@@ -1,10 +1,8 @@
-package com.tzld.ad.marketing.client;
+package com.tzld.ad.client.marketing;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.tzld.ad.marketing.exception.TencentApiException;
-import com.tzld.ad.marketing.model.TencentApiResponse;
-import com.tzld.ad.marketing.model.advertiser.AdvertiserDTO;
+import com.tzld.ad.model.marketing.TencentApiResponse;
+import com.tzld.ad.model.marketing.advertiser.AdvertiserDTO;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
 import org.springframework.stereotype.Component;
@@ -12,7 +10,6 @@ import org.springframework.stereotype.Component;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * 腾讯广告 广告账号客户端

+ 3 - 4
core/src/main/java/com/tzld/ad/marketing/client/AgencyClient.java → core/src/main/java/com/tzld/ad/client/marketing/AgencyClient.java

@@ -1,8 +1,7 @@
-package com.tzld.ad.marketing.client;
+package com.tzld.ad.client.marketing;
 
-import com.alibaba.fastjson.JSON;
-import com.tzld.ad.marketing.model.TencentApiResponse;
-import com.tzld.ad.marketing.model.advertiser.AdvertiserDTO;
+import com.tzld.ad.model.marketing.TencentApiResponse;
+import com.tzld.ad.model.marketing.advertiser.AdvertiserDTO;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
 import org.springframework.stereotype.Component;

+ 3 - 7
core/src/main/java/com/tzld/ad/marketing/client/BatchClient.java → core/src/main/java/com/tzld/ad/client/marketing/BatchClient.java

@@ -1,15 +1,11 @@
-package com.tzld.ad.marketing.client;
+package com.tzld.ad.client.marketing;
 
-import com.alibaba.fastjson.JSON;
-import com.tzld.ad.marketing.model.TencentApiResponse;
-import com.tzld.ad.marketing.model.batch.BatchDTO;
+import com.tzld.ad.model.marketing.TencentApiResponse;
+import com.tzld.ad.model.marketing.batch.BatchDTO;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
 import org.springframework.stereotype.Component;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * 腾讯广告 批量操作客户端
  * <p>

+ 3 - 4
core/src/main/java/com/tzld/ad/marketing/client/ComponentClient.java → core/src/main/java/com/tzld/ad/client/marketing/ComponentClient.java

@@ -1,14 +1,13 @@
-package com.tzld.ad.marketing.client;
+package com.tzld.ad.client.marketing;
 
 import com.alibaba.fastjson.JSON;
-import com.tzld.ad.marketing.model.TencentApiResponse;
-import com.tzld.ad.marketing.model.component.ComponentDTO;
+import com.tzld.ad.model.marketing.TencentApiResponse;
+import com.tzld.ad.model.marketing.component.ComponentDTO;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**

+ 3 - 4
core/src/main/java/com/tzld/ad/marketing/client/CreativeClient.java → core/src/main/java/com/tzld/ad/client/marketing/CreativeClient.java

@@ -1,14 +1,13 @@
-package com.tzld.ad.marketing.client;
+package com.tzld.ad.client.marketing;
 
 import com.alibaba.fastjson.JSON;
-import com.tzld.ad.marketing.model.TencentApiResponse;
-import com.tzld.ad.marketing.model.creative.CreativeDTO;
+import com.tzld.ad.model.marketing.TencentApiResponse;
+import com.tzld.ad.model.marketing.creative.CreativeDTO;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**

+ 3 - 4
core/src/main/java/com/tzld/ad/marketing/client/CustomAudienceClient.java → core/src/main/java/com/tzld/ad/client/marketing/CustomAudienceClient.java

@@ -1,8 +1,7 @@
-package com.tzld.ad.marketing.client;
+package com.tzld.ad.client.marketing;
 
-import com.alibaba.fastjson.JSON;
-import com.tzld.ad.marketing.model.TencentApiResponse;
-import com.tzld.ad.marketing.model.audience.AudienceDTO;
+import com.tzld.ad.model.marketing.TencentApiResponse;
+import com.tzld.ad.model.marketing.audience.AudienceDTO;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
 import org.springframework.stereotype.Component;

+ 3 - 3
core/src/main/java/com/tzld/ad/marketing/client/DailyReportClient.java → core/src/main/java/com/tzld/ad/client/marketing/DailyReportClient.java

@@ -1,8 +1,8 @@
-package com.tzld.ad.marketing.client;
+package com.tzld.ad.client.marketing;
 
 import com.alibaba.fastjson.JSON;
-import com.tzld.ad.marketing.model.TencentApiResponse;
-import com.tzld.ad.marketing.model.report.ReportDTO;
+import com.tzld.ad.model.marketing.TencentApiResponse;
+import com.tzld.ad.model.marketing.report.ReportDTO;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
 import org.springframework.stereotype.Component;

+ 3 - 3
core/src/main/java/com/tzld/ad/marketing/client/FundsClient.java → core/src/main/java/com/tzld/ad/client/marketing/FundsClient.java

@@ -1,7 +1,7 @@
-package com.tzld.ad.marketing.client;
+package com.tzld.ad.client.marketing;
 
-import com.tzld.ad.marketing.model.TencentApiResponse;
-import com.tzld.ad.marketing.model.funds.FundsDTO;
+import com.tzld.ad.model.marketing.TencentApiResponse;
+import com.tzld.ad.model.marketing.funds.FundsDTO;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
 import org.springframework.stereotype.Component;

+ 3 - 3
core/src/main/java/com/tzld/ad/marketing/client/ImageClient.java → core/src/main/java/com/tzld/ad/client/marketing/ImageClient.java

@@ -1,8 +1,8 @@
-package com.tzld.ad.marketing.client;
+package com.tzld.ad.client.marketing;
 
 import com.alibaba.fastjson.JSON;
-import com.tzld.ad.marketing.model.TencentApiResponse;
-import com.tzld.ad.marketing.model.image.ImageDTO;
+import com.tzld.ad.model.marketing.TencentApiResponse;
+import com.tzld.ad.model.marketing.image.ImageDTO;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
 import org.springframework.stereotype.Component;

+ 3 - 3
core/src/main/java/com/tzld/ad/marketing/client/OAuthClient.java → core/src/main/java/com/tzld/ad/client/marketing/OAuthClient.java

@@ -1,9 +1,9 @@
-package com.tzld.ad.marketing.client;
+package com.tzld.ad.client.marketing;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.tzld.ad.marketing.exception.TencentApiException;
-import com.tzld.ad.marketing.model.oauth.OAuthDTO;
+import com.tzld.ad.common.exception.TencentApiException;
+import com.tzld.ad.model.marketing.oauth.OAuthDTO;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
 import org.springframework.stereotype.Component;

+ 3 - 3
core/src/main/java/com/tzld/ad/marketing/client/PageClient.java → core/src/main/java/com/tzld/ad/client/marketing/PageClient.java

@@ -1,8 +1,8 @@
-package com.tzld.ad.marketing.client;
+package com.tzld.ad.client.marketing;
 
 import com.alibaba.fastjson.JSON;
-import com.tzld.ad.marketing.model.TencentApiResponse;
-import com.tzld.ad.marketing.model.page.PageDTO;
+import com.tzld.ad.model.marketing.TencentApiResponse;
+import com.tzld.ad.model.marketing.page.PageDTO;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
 import org.springframework.stereotype.Component;

+ 3 - 5
core/src/main/java/com/tzld/ad/marketing/client/RtaStrategyClient.java → core/src/main/java/com/tzld/ad/client/marketing/RtaStrategyClient.java

@@ -1,9 +1,9 @@
-package com.tzld.ad.marketing.client;
+package com.tzld.ad.client.marketing;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.tzld.ad.marketing.model.TencentApiResponse;
-import com.tzld.ad.marketing.model.rta.RtaDTO;
+import com.tzld.ad.model.marketing.TencentApiResponse;
+import com.tzld.ad.model.marketing.rta.RtaDTO;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
 import org.springframework.beans.factory.annotation.Value;
@@ -11,8 +11,6 @@ import org.springframework.stereotype.Component;
 
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * 腾讯广告 RTA 策略管理客户端

+ 1 - 1
core/src/main/java/com/tzld/ad/marketing/client/TencentMarketingApiConfig.java → core/src/main/java/com/tzld/ad/client/marketing/TencentMarketingApiConfig.java

@@ -1,4 +1,4 @@
-package com.tzld.ad.marketing.client;
+package com.tzld.ad.client.marketing;
 
 import lombok.Data;
 import okhttp3.ConnectionPool;

+ 3 - 9
core/src/main/java/com/tzld/ad/marketing/client/UserActionClient.java → core/src/main/java/com/tzld/ad/client/marketing/UserActionClient.java

@@ -1,17 +1,11 @@
-package com.tzld.ad.marketing.client;
+package com.tzld.ad.client.marketing;
 
-import com.alibaba.fastjson.JSON;
-import com.tzld.ad.marketing.model.TencentApiResponse;
-import com.tzld.ad.marketing.model.useraction.UserActionDTO;
+import com.tzld.ad.model.marketing.TencentApiResponse;
+import com.tzld.ad.model.marketing.useraction.UserActionDTO;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
 import org.springframework.stereotype.Component;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * 腾讯广告 用户行为数据客户端
  * <p>

+ 3 - 3
core/src/main/java/com/tzld/ad/marketing/client/UserActionSetClient.java → core/src/main/java/com/tzld/ad/client/marketing/UserActionSetClient.java

@@ -1,8 +1,8 @@
-package com.tzld.ad.marketing.client;
+package com.tzld.ad.client.marketing;
 
 import com.alibaba.fastjson.JSON;
-import com.tzld.ad.marketing.model.TencentApiResponse;
-import com.tzld.ad.marketing.model.useraction.UserActionDTO;
+import com.tzld.ad.model.marketing.TencentApiResponse;
+import com.tzld.ad.model.marketing.useraction.UserActionDTO;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
 import org.springframework.stereotype.Component;

+ 3 - 7
core/src/main/java/com/tzld/ad/marketing/client/VideoClient.java → core/src/main/java/com/tzld/ad/client/marketing/VideoClient.java

@@ -1,17 +1,13 @@
-package com.tzld.ad.marketing.client;
+package com.tzld.ad.client.marketing;
 
 import com.alibaba.fastjson.JSON;
-import com.tzld.ad.marketing.model.TencentApiResponse;
-import com.tzld.ad.marketing.model.video.VideoDTO;
+import com.tzld.ad.model.marketing.TencentApiResponse;
+import com.tzld.ad.model.marketing.video.VideoDTO;
 import lombok.extern.slf4j.Slf4j;
-import okhttp3.MediaType;
-import okhttp3.MultipartBody;
 import okhttp3.OkHttpClient;
-import okhttp3.RequestBody;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**

+ 3 - 5
core/src/main/java/com/tzld/ad/marketing/client/WechatClient.java → core/src/main/java/com/tzld/ad/client/marketing/WechatClient.java

@@ -1,14 +1,12 @@
-package com.tzld.ad.marketing.client;
+package com.tzld.ad.client.marketing;
 
-import com.alibaba.fastjson.JSON;
-import com.tzld.ad.marketing.model.TencentApiResponse;
-import com.tzld.ad.marketing.model.wechat.WechatDTO;
+import com.tzld.ad.model.marketing.TencentApiResponse;
+import com.tzld.ad.model.marketing.wechat.WechatDTO;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**

+ 1 - 1
core/src/main/java/com/tzld/ad/common/CustomException.java → core/src/main/java/com/tzld/ad/common/exception/CustomException.java

@@ -1,4 +1,4 @@
-package com.tzld.ad.common;
+package com.tzld.ad.common.exception;
 
 
 import com.tzld.ad.enums.ExceptionCodeEnum;

+ 1 - 1
core/src/main/java/com/tzld/ad/marketing/exception/TencentApiException.java → core/src/main/java/com/tzld/ad/common/exception/TencentApiException.java

@@ -1,4 +1,4 @@
-package com.tzld.ad.marketing.exception;
+package com.tzld.ad.common.exception;
 
 import lombok.Getter;
 

+ 1 - 1
core/src/main/java/com/tzld/ad/marketing/model/TencentApiResponse.java → core/src/main/java/com/tzld/ad/model/marketing/TencentApiResponse.java

@@ -1,4 +1,4 @@
-package com.tzld.ad.marketing.model;
+package com.tzld.ad.model.marketing;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
core/src/main/java/com/tzld/ad/marketing/model/adgroup/AdGroupDTO.java → core/src/main/java/com/tzld/ad/model/marketing/adgroup/AdGroupDTO.java

@@ -1,4 +1,4 @@
-package com.tzld.ad.marketing.model.adgroup;
+package com.tzld.ad.model.marketing.adgroup;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
core/src/main/java/com/tzld/ad/marketing/model/advertiser/AdvertiserDTO.java → core/src/main/java/com/tzld/ad/model/marketing/advertiser/AdvertiserDTO.java

@@ -1,4 +1,4 @@
-package com.tzld.ad.marketing.model.advertiser;
+package com.tzld.ad.model.marketing.advertiser;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
core/src/main/java/com/tzld/ad/marketing/model/audience/AudienceDTO.java → core/src/main/java/com/tzld/ad/model/marketing/audience/AudienceDTO.java

@@ -1,4 +1,4 @@
-package com.tzld.ad.marketing.model.audience;
+package com.tzld.ad.model.marketing.audience;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
core/src/main/java/com/tzld/ad/marketing/model/batch/BatchDTO.java → core/src/main/java/com/tzld/ad/model/marketing/batch/BatchDTO.java

@@ -1,4 +1,4 @@
-package com.tzld.ad.marketing.model.batch;
+package com.tzld.ad.model.marketing.batch;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
core/src/main/java/com/tzld/ad/marketing/model/component/ComponentDTO.java → core/src/main/java/com/tzld/ad/model/marketing/component/ComponentDTO.java

@@ -1,4 +1,4 @@
-package com.tzld.ad.marketing.model.component;
+package com.tzld.ad.model.marketing.component;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
core/src/main/java/com/tzld/ad/marketing/model/creative/CreativeDTO.java → core/src/main/java/com/tzld/ad/model/marketing/creative/CreativeDTO.java

@@ -1,4 +1,4 @@
-package com.tzld.ad.marketing.model.creative;
+package com.tzld.ad.model.marketing.creative;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
core/src/main/java/com/tzld/ad/marketing/model/funds/FundsDTO.java → core/src/main/java/com/tzld/ad/model/marketing/funds/FundsDTO.java

@@ -1,4 +1,4 @@
-package com.tzld.ad.marketing.model.funds;
+package com.tzld.ad.model.marketing.funds;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
core/src/main/java/com/tzld/ad/marketing/model/image/ImageDTO.java → core/src/main/java/com/tzld/ad/model/marketing/image/ImageDTO.java

@@ -1,4 +1,4 @@
-package com.tzld.ad.marketing.model.image;
+package com.tzld.ad.model.marketing.image;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
core/src/main/java/com/tzld/ad/marketing/model/oauth/OAuthDTO.java → core/src/main/java/com/tzld/ad/model/marketing/oauth/OAuthDTO.java

@@ -1,4 +1,4 @@
-package com.tzld.ad.marketing.model.oauth;
+package com.tzld.ad.model.marketing.oauth;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
core/src/main/java/com/tzld/ad/marketing/model/page/PageDTO.java → core/src/main/java/com/tzld/ad/model/marketing/page/PageDTO.java

@@ -1,4 +1,4 @@
-package com.tzld.ad.marketing.model.page;
+package com.tzld.ad.model.marketing.page;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
core/src/main/java/com/tzld/ad/marketing/model/report/ReportDTO.java → core/src/main/java/com/tzld/ad/model/marketing/report/ReportDTO.java

@@ -1,4 +1,4 @@
-package com.tzld.ad.marketing.model.report;
+package com.tzld.ad.model.marketing.report;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
core/src/main/java/com/tzld/ad/marketing/model/rta/RtaDTO.java → core/src/main/java/com/tzld/ad/model/marketing/rta/RtaDTO.java

@@ -1,4 +1,4 @@
-package com.tzld.ad.marketing.model.rta;
+package com.tzld.ad.model.marketing.rta;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
core/src/main/java/com/tzld/ad/marketing/model/useraction/UserActionDTO.java → core/src/main/java/com/tzld/ad/model/marketing/useraction/UserActionDTO.java

@@ -1,4 +1,4 @@
-package com.tzld.ad.marketing.model.useraction;
+package com.tzld.ad.model.marketing.useraction;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
core/src/main/java/com/tzld/ad/marketing/model/video/VideoDTO.java → core/src/main/java/com/tzld/ad/model/marketing/video/VideoDTO.java

@@ -1,4 +1,4 @@
-package com.tzld.ad.marketing.model.video;
+package com.tzld.ad.model.marketing.video;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 3
core/src/main/java/com/tzld/ad/marketing/model/wechat/WechatDTO.java → core/src/main/java/com/tzld/ad/model/marketing/wechat/WechatDTO.java

@@ -1,12 +1,10 @@
-package com.tzld.ad.marketing.model.wechat;
+package com.tzld.ad.model.marketing.wechat;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.List;
-
 /**
  * 公众号模块相关 DTO
  */

+ 13 - 13
core/src/main/java/com/tzld/ad/service/adput/impl/AdPutTencentCommonServiceImpl.java

@@ -17,23 +17,23 @@ import com.tencent.ads.ApiContextConfig;
 import com.tencent.ads.TencentAds;
 import com.tencent.ads.model.AuthorizerStruct;
 import com.tencent.ads.model.OauthTokenResponseData;
-import com.tzld.ad.common.CustomException;
+import com.tzld.ad.client.marketing.*;
+import com.tzld.ad.common.exception.CustomException;
 import com.tzld.ad.dao.mapper.adPut.*;
 import com.tzld.ad.dao.mapper.adPut.ext.AdPutTencentExtMapper;
 import com.tzld.ad.enums.EnumRedisPrefix;
 import com.tzld.ad.enums.adPut.*;
-import com.tzld.ad.marketing.client.*;
-import com.tzld.ad.marketing.model.TencentApiResponse;
-import com.tzld.ad.marketing.model.adgroup.AdGroupDTO;
-import com.tzld.ad.marketing.model.audience.AudienceDTO;
-import com.tzld.ad.marketing.model.component.ComponentDTO;
-import com.tzld.ad.marketing.model.creative.CreativeDTO;
-import com.tzld.ad.marketing.model.funds.FundsDTO;
-import com.tzld.ad.marketing.model.image.ImageDTO;
-import com.tzld.ad.marketing.model.oauth.OAuthDTO;
-import com.tzld.ad.marketing.model.report.ReportDTO;
-import com.tzld.ad.marketing.model.useraction.UserActionDTO;
-import com.tzld.ad.marketing.model.video.VideoDTO;
+import com.tzld.ad.model.marketing.TencentApiResponse;
+import com.tzld.ad.model.marketing.adgroup.AdGroupDTO;
+import com.tzld.ad.model.marketing.audience.AudienceDTO;
+import com.tzld.ad.model.marketing.component.ComponentDTO;
+import com.tzld.ad.model.marketing.creative.CreativeDTO;
+import com.tzld.ad.model.marketing.funds.FundsDTO;
+import com.tzld.ad.model.marketing.image.ImageDTO;
+import com.tzld.ad.model.marketing.oauth.OAuthDTO;
+import com.tzld.ad.model.marketing.report.ReportDTO;
+import com.tzld.ad.model.marketing.useraction.UserActionDTO;
+import com.tzld.ad.model.marketing.video.VideoDTO;
 import com.tzld.ad.model.adPut.*;
 import com.tzld.ad.model.adplatformDto.AdPutFissionBehaviorParam;
 import com.tzld.ad.model.po.adput.*;

+ 4 - 4
core/src/main/java/com/tzld/ad/service/adput/impl/AdPutTencentUserActionAddServiceImpl.java

@@ -3,10 +3,10 @@ package com.tzld.ad.service.adput.impl;
 import com.alibaba.fastjson.JSON;
 import com.tzld.ad.dao.mapper.adPut.AdPutOfficialOpenIdCardIdMappingMapper;
 import com.tzld.ad.dao.mapper.adPut.AdPutOfficialOpenIdClickIdMappingMapper;
-import com.tzld.ad.marketing.client.UserActionClient;
-import com.tzld.ad.marketing.client.UserActionSetClient;
-import com.tzld.ad.marketing.model.TencentApiResponse;
-import com.tzld.ad.marketing.model.useraction.UserActionDTO;
+import com.tzld.ad.client.marketing.UserActionClient;
+import com.tzld.ad.client.marketing.UserActionSetClient;
+import com.tzld.ad.model.marketing.TencentApiResponse;
+import com.tzld.ad.model.marketing.useraction.UserActionDTO;
 import com.tzld.ad.model.adPut.AdPutTencentUserAction;
 import com.tzld.ad.model.adPut.AdPutTencentUserActionReq;
 import com.tzld.ad.model.adPut.AdPutTencentUserActionSet;

+ 1 - 1
core/src/main/java/com/tzld/ad/util/adPut/AdPutTencentUtil.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.tencent.ads.model.OauthTokenResponseData;
-import com.tzld.ad.common.CustomException;
+import com.tzld.ad.common.exception.CustomException;
 import com.tzld.ad.enums.ExceptionCodeEnum;
 import com.tzld.ad.model.adPut.*;
 import org.apache.commons.lang3.StringUtils;

+ 16 - 16
server/src/main/java/com/tzld/ad/controller/marketing/TencentMarketingController.java

@@ -1,23 +1,23 @@
 package com.tzld.ad.controller.marketing;
 
 import com.tzld.ad.annotation.JwtIgnore;
+import com.tzld.ad.client.marketing.*;
 import com.tzld.ad.common.base.CommonResponse;
-import com.tzld.ad.marketing.client.*;
-import com.tzld.ad.marketing.model.TencentApiResponse;
-import com.tzld.ad.marketing.model.adgroup.AdGroupDTO;
-import com.tzld.ad.marketing.model.advertiser.AdvertiserDTO;
-import com.tzld.ad.marketing.model.audience.AudienceDTO;
-import com.tzld.ad.marketing.model.batch.BatchDTO;
-import com.tzld.ad.marketing.model.component.ComponentDTO;
-import com.tzld.ad.marketing.model.creative.CreativeDTO;
-import com.tzld.ad.marketing.model.funds.FundsDTO;
-import com.tzld.ad.marketing.model.image.ImageDTO;
-import com.tzld.ad.marketing.model.oauth.OAuthDTO;
-import com.tzld.ad.marketing.model.page.PageDTO;
-import com.tzld.ad.marketing.model.report.ReportDTO;
-import com.tzld.ad.marketing.model.useraction.UserActionDTO;
-import com.tzld.ad.marketing.model.video.VideoDTO;
-import com.tzld.ad.marketing.model.wechat.WechatDTO;
+import com.tzld.ad.model.marketing.TencentApiResponse;
+import com.tzld.ad.model.marketing.adgroup.AdGroupDTO;
+import com.tzld.ad.model.marketing.advertiser.AdvertiserDTO;
+import com.tzld.ad.model.marketing.audience.AudienceDTO;
+import com.tzld.ad.model.marketing.batch.BatchDTO;
+import com.tzld.ad.model.marketing.component.ComponentDTO;
+import com.tzld.ad.model.marketing.creative.CreativeDTO;
+import com.tzld.ad.model.marketing.funds.FundsDTO;
+import com.tzld.ad.model.marketing.image.ImageDTO;
+import com.tzld.ad.model.marketing.oauth.OAuthDTO;
+import com.tzld.ad.model.marketing.page.PageDTO;
+import com.tzld.ad.model.marketing.report.ReportDTO;
+import com.tzld.ad.model.marketing.useraction.UserActionDTO;
+import com.tzld.ad.model.marketing.video.VideoDTO;
+import com.tzld.ad.model.marketing.wechat.WechatDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;