Bläddra i källkod

Merge remote-tracking branch 'origin/test-split' into test-split

syh 5 år sedan
förälder
incheckning
ec404d5ee5
31 ändrade filer med 36 tillägg och 39 borttagningar
  1. 1 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouActionBarTextController.java
  2. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouAdvertiserBaseInfoController.java
  3. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouAppCreateController.java
  4. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouAppInfoController.java
  5. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouAppListController.java
  6. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCampaignController.java
  7. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCampaignCreateController.java
  8. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCampaignDayBudgetController.java
  9. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCampaignStatusController.java
  10. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCampaignTemplateController.java
  11. 4 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouController.java
  12. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouConversionInfosController.java
  13. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouConversionTypesController.java
  14. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCreateAppTemplateController.java
  15. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCreateController.java
  16. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCreativeController.java
  17. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCreativeCreateController.java
  18. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouGroupBidController.java
  19. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouGroupController.java
  20. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouGroupCreateLogController.java
  21. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouGroupCreateTargetController.java
  22. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouGroupDayBudgetController.java
  23. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouImageController.java
  24. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouImageGetController.java
  25. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouImageUploandController.java
  26. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouRegionListChildrenController.java
  27. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouRegionListParentController.java
  28. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouScheduleController.java
  29. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouVideoController.java
  30. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouVideoGetController.java
  31. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouVideoUploadController.java

+ 1 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouActionBarTextController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.controller;
+package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouActionBarText;
@@ -16,7 +16,6 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
-
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouAdvertiserBaseInfoController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.controller;
+package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouAdvertiserBaseInfo;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouAdvertiserBaseInfoService;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouAppCreateController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.controller;
+package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouAppCreate;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouAppCreateService;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouAppInfoController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.controller;
+package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouAppInfo;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouAppInfoService;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouAppListController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.controller;
+package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouAppList;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouAppListService;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCampaignController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.controller;
+package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaign;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCampaignService;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCampaignCreateController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.controller;
+package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaignCreate;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCampaignCreateService;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCampaignDayBudgetController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.controller;
+package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaignDayBudget;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCampaignDayBudgetService;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCampaignStatusController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.controller;
+package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaignStatus;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCampaignStatusService;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCampaignTemplateController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.controller;
+package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaignTemplate;

+ 4 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouController.java

@@ -1,13 +1,12 @@
-package org.jeecg.modules.kuaishou.controller;
+package cn.com.ctop.kuaishou.modules.batch.controller;
 
+import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import cn.com.ctop.kuaishou.modules.material.entity.KuaishouResult;
 import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyCampaign;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import cn.com.ctop.common.module.entity.CtopOauthToken;
-import cn.com.ctop.common.module.service.ICtopOauthTokenService;
-import org.jeecg.modules.ctop.service.IRefreshTokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -188,8 +187,7 @@ public class KuaiShouController {
         kuaishouInterfaceService.appUpdate(advertiserId, accessToken, requestJson, multipartFile, request);
     }
 
-    @Autowired
-    private IRefreshTokenService refreshTokenService;
+
     @Autowired
     private ICtopOauthTokenService tokenService;
 

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouConversionInfosController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.controller;
+package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouConversionInfos;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouConversionInfosService;

+ 3 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouConversionTypesController.java

@@ -1,5 +1,7 @@
-package org.jeecg.modules.kuaishou.controller;
+package cn.com.ctop.kuaishou.modules.batch.controller;
 
+import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouConversionTypes;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouConversionTypesService;
@@ -11,8 +13,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import cn.com.ctop.common.module.entity.CtopOauthToken;
-import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCreateAppTemplateController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.controller;
+package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCreateAppTemplate;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCreateController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.controller;
+package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroupCreateLog;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCreateService;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCreativeController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.controller;
+package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCreative;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCreativeService;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCreativeCreateController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.controller;
+package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCreativeCreate;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCreativeCreateService;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouGroupBidController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.controller;
+package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroupBid;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouGroupBidService;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouGroupController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.controller;
+package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroup;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouGroupService;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouGroupCreateLogController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.controller;
+package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroupCreateLog;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouGroupCreateTargetController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.controller;
+package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroupCreateTarget;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouGroupCreateTargetService;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouGroupDayBudgetController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.controller;
+package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroupDayBudget;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouGroupDayBudgetService;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouImageController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.controller;
+package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImage;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouImageGetController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.controller;
+package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImageGet;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouImageGetService;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouImageUploandController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.controller;
+package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImageUploand;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouImageUploandService;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouRegionListChildrenController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.controller;
+package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouRegionListChildren;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouRegionListChildrenService;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouRegionListParentController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.controller;
+package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouRegionListParent;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouRegionListParentService;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouScheduleController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.controller;
+package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouSchedule;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouScheduleService;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouVideoController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.controller;
+package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouVideo;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouVideoGetController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.controller;
+package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouVideoGet;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouVideoGetService;

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouVideoUploadController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.kuaishou.controller;
+package cn.com.ctop.kuaishou.modules.batch.controller;
 
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouVideoUpload;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouVideoUploadService;