syh пре 5 година
родитељ
комит
35cd0e1fb9
97 измењених фајлова са 292 додато и 240 уклоњено
  1. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ActorController.java
  2. 1 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AuthController.java
  3. 2 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BindAccountAuthController.java
  4. 8 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BindAccountLoginController.java
  5. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceAdvertiserPostController.java
  6. 6 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceTemplateController.java
  7. 8 9
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CallbackController.java
  8. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CtopOauthTokenController.java
  9. 2 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/FileInfoController.java
  10. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ReportController.java
  11. 18 19
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/SourceFileController.java
  12. 2 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/UserAllocationController.java
  13. 2 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/KuaishouCommentAutoDelete.java
  14. 5 9
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/CreateInternalServiceImpl.java
  15. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/RefreshTokenServiceImpl.java
  16. 10 9
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ReportServiceImpl.java
  17. 1 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/fileupload/controller/FileController.java
  18. 2 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/fileupload/service/impl/UploadServiceImpl.java
  19. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouController.java
  20. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouConversionTypesController.java
  21. 2 2
      jeecg-boot-module-system/src/main/resources/application-dev.yml
  22. 1 1
      jeecg-boot-module-system/src/main/resources/application-prod.yml
  23. 11 11
      jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java
  24. 2 2
      module-common/pom.xml
  25. 1 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/common/BytedanceInterfaceConstant.java
  26. 1 1
      jeecg-boot-base-common/src/main/java/org/jeecg/common/constant/CtopAdConstant.java
  27. 1 1
      module-kuaishou/src/main/java/constant/KuaishouInterfaceConstant.java
  28. 1 1
      jeecg-boot-base-common/src/main/java/org/jeecg/common/util/ResultMapUtils.java
  29. 1 1
      jeecg-boot-base-common/src/main/java/org/jeecg/common/util/StatusCode.java
  30. 1 1
      module-common/src/main/java/module/entity/BindAccountAuth.java
  31. 1 1
      module-common/src/main/java/module/entity/BindAccountLogin.java
  32. 1 1
      module-common/src/main/java/module/entity/CtopOauthToken.java
  33. 1 1
      module-common/src/main/java/module/entity/FileInfo.java
  34. 1 1
      module-common/src/main/java/module/entity/SourceFile.java
  35. 1 1
      module-common/src/main/java/module/entity/UserAllocation.java
  36. 2 2
      module-common/src/main/java/module/mapper/BindAccountAuthMapper.java
  37. 2 2
      module-common/src/main/java/module/mapper/BindAccountLoginMapper.java
  38. 2 2
      module-common/src/main/java/module/mapper/CtopOauthTokenMapper.java
  39. 2 2
      module-common/src/main/java/module/mapper/FileInfoMapper.java
  40. 2 2
      module-common/src/main/java/module/mapper/SourceFileMapper.java
  41. 2 2
      module-common/src/main/java/module/mapper/UserAllocationMapper.java
  42. 2 2
      module-common/src/main/java/module/mapper/xml/UserAllocationMapper.xml
  43. 2 2
      module-common/src/main/java/module/mapper/xml/BindAccountAuthMapper.xml
  44. 4 4
      module-common/src/main/java/module/mapper/xml/CtopOauthTokenMapper.xml
  45. 2 2
      module-common/src/main/java/module/mapper/xml/FileInfoMapper.xml
  46. 5 0
      module-common/src/main/java/cn/com/ctop/module/mapper/xml/SourceFileMapper.xml
  47. 2 2
      module-common/src/main/java/module/mapper/xml/SourceFileMapper.xml
  48. 2 2
      module-common/src/main/java/module/service/IBindAccountAuthService.java
  49. 2 2
      module-common/src/main/java/module/service/IBindAccountLoginService.java
  50. 2 2
      module-common/src/main/java/module/service/ICtopOauthTokenService.java
  51. 2 2
      module-common/src/main/java/module/service/IFileInfoService.java
  52. 2 2
      module-common/src/main/java/module/service/ISourceFileService.java
  53. 2 2
      module-common/src/main/java/module/service/IUserAllocationService.java
  54. 6 6
      module-common/src/main/java/module/service/impl/BindAccountAuthServiceImpl.java
  55. 4 4
      module-common/src/main/java/module/service/impl/BindAccountLoginServiceImpl.java
  56. 6 8
      module-common/src/main/java/module/service/impl/CtopOauthTokenServiceImpl.java
  57. 9 13
      module-common/src/main/java/module/service/impl/FileInfoServiceImpl.java
  58. 4 4
      module-common/src/main/java/module/service/impl/SourceFileServiceImpl.java
  59. 4 4
      module-common/src/main/java/module/service/impl/UserAllocationServiceImpl.java
  60. 0 5
      module-common/src/main/java/module/mapper/xml/BindAccountLoginMapper.xml
  61. 3 3
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouCreateAppTemplateServiceImpl.java
  62. 2 2
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouCreateServiceImpl.java
  63. 3 3
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouImageServiceImpl.java
  64. 1 1
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouUpdateServiceImpl.java
  65. 3 3
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouVideoServiceImpl.java
  66. 1 1
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java
  67. 2 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/controller/BytedanceAreaInfoController.java
  68. 1 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/entity/ByteDanceCampaign.java
  69. 1 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/entity/ByteDanceCustomAudience.java
  70. 1 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/entity/ByteDanceImageInfo.java
  71. 1 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/entity/ByteDanceVideoInfo.java
  72. 1 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/IByteDanceAdvertisePlanService.java
  73. 1 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/IByteDanceAdvertiserDataService.java
  74. 1 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/IByteDanceCampaignTemplateService.java
  75. 4 4
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceAdvertisePlanServiceImpl.java
  76. 2 2
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceAdvertiserDataServiceImpl.java
  77. 5 3
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceBudgetTemplateServiceImpl.java
  78. 3 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceCampaignServiceImpl.java
  79. 9 5
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceCampaignTemplateServiceImpl.java
  80. 3 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceCreativeMaterialServiceImpl.java
  81. 5 5
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceCreativeServiceImpl.java
  82. 3 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceCreativeTemplateServiceImpl.java
  83. 3 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceCustomAudienceServiceImpl.java
  84. 3 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceImageInfoServiceImpl.java
  85. 3 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceUserOrientationTemplateServiceImpl.java
  86. 3 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceVideoInfoServiceImpl.java
  87. 4 4
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/BytedanceAdvertisePlanTemplateServiceImpl.java
  88. 3 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/BytedanceCampaignDailyReportServiceImpl.java
  89. 3 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/BytedanceCampaignHourlyReportServiceImpl.java
  90. 3 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/BytedanceCreativeDailyReportServiceImpl.java
  91. 3 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/BytedanceCreativeHourlyReportServiceImpl.java
  92. 7 3
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/BytedanceDeliveryTargetTemplateServiceImpl.java
  93. 3 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/BytedanceInterestCategoryServiceImpl.java
  94. 3 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/BytedanceNameModelRuleServiceImpl.java
  95. 3 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/BytedancePlanDailyReportServiceImpl.java
  96. 3 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/BytedancePlanHourlyReportServiceImpl.java
  97. 5 3
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/BytedanceUrlInfoServiceImpl.java

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ActorController.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.ctop.controller;
 
 import cn.com.ctop.common.utils.Check;
+import cn.com.ctop.common.utils.KuaishouInterfaceConstant;
 import cn.com.ctop.manage.modules.actor.entity.Actor;
 import cn.com.ctop.manage.modules.actor.entity.ActorComment;
 import cn.com.ctop.manage.modules.actor.entity.ActorPhoto;
@@ -12,7 +13,6 @@ import cn.com.ctop.manage.modules.actor.service.IActorVideoService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import constant.KuaishouInterfaceConstant;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AuthController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.module.service.IBindAccountAuthService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

+ 2 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BindAccountAuthController.java

@@ -1,6 +1,8 @@
 package org.jeecg.modules.ctop.controller;
 
 import cn.com.ctop.common.utils.Check;
+import cn.com.ctop.module.entity.BindAccountAuth;
+import cn.com.ctop.module.service.IBindAccountAuthService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

+ 8 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BindAccountLoginController.java

@@ -1,6 +1,10 @@
 package org.jeecg.modules.ctop.controller;
 
 import cn.com.ctop.common.utils.Check;
+import cn.com.ctop.module.entity.BindAccountLogin;
+import cn.com.ctop.module.entity.UserAllocation;
+import cn.com.ctop.module.mapper.UserAllocationMapper;
+import cn.com.ctop.module.service.IBindAccountLoginService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -13,6 +17,7 @@ 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.jeecg.modules.ctop.service.ICreateInternalService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -52,6 +57,8 @@ public class BindAccountLoginController {
     private IBindAccountLoginService bindAccountLoginService;
     @Autowired
     private UserAllocationMapper userAllocationMapper;
+    @Autowired
+    private ICreateInternalService createInternalService;
 
     /**
      * TODO  需要爬虫校验用户名密码正确性
@@ -74,7 +81,7 @@ public class BindAccountLoginController {
         String loginType = json.getString("loginType");
         //账号
         String accountName = json.getString("accountName");
-        boolean trueOrFalse = bindAccountLoginService.bindLogin(advertiserId, accountName, password, loginType, userId);
+        boolean trueOrFalse = createInternalService.bindLogin(advertiserId, accountName, password, loginType, userId);
         if (trueOrFalse) {
             String realName = json.getString("realName");
             //部门id

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceAdvertiserPostController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.module.service.IFileInfoService;
 import cn.com.ctop.toutiao.entity.ByteDanceCustomAudience;
 import cn.com.ctop.toutiao.entity.ByteDanceUserOrientationTemplate;
 import cn.com.ctop.toutiao.service.IByteDanceAdvertiserDataService;
@@ -7,7 +8,6 @@ import cn.com.ctop.toutiao.service.IByteDanceCustomAudienceService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import module.service.IFileInfoService;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;

+ 6 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceTemplateController.java

@@ -1,5 +1,11 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.utils.CtopAdConstant;
+import cn.com.ctop.module.entity.BindAccountLogin;
+import cn.com.ctop.module.entity.UserAllocation;
+import cn.com.ctop.module.service.IBindAccountLoginService;
+import cn.com.ctop.module.service.IFileInfoService;
+import cn.com.ctop.module.service.IUserAllocationService;
 import cn.com.ctop.toutiao.entity.*;
 import cn.com.ctop.toutiao.service.*;
 import com.alibaba.fastjson.JSONArray;
@@ -8,14 +14,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
-import module.entity.BindAccountLogin;
-import module.entity.UserAllocation;
-import module.service.IBindAccountLoginService;
-import module.service.IFileInfoService;
-import module.service.IUserAllocationService;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.constant.CtopAdConstant;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.system.service.ISysCategoryService;

+ 8 - 9
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CallbackController.java

@@ -1,19 +1,18 @@
 package org.jeecg.modules.ctop.controller;
 
-import cn.com.ctop.common.utils.Check;
-import cn.com.ctop.common.utils.HttpUtils;
-import cn.com.ctop.common.utils.PropertiesUtils;
+import cn.com.ctop.common.utils.*;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import cn.com.ctop.kuaishou.modules.material.entity.KuaishouAccessToken;
 import cn.com.ctop.kuaishou.modules.material.entity.KuaishouResultToken;
-import cn.com.ctop.toutiao.common.BytedanceInterfaceConstant;
+import cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.module.entity.UserAllocation;
+import cn.com.ctop.module.mapper.CtopOauthTokenMapper;
+import cn.com.ctop.module.mapper.UserAllocationMapper;
+import cn.com.ctop.module.service.IBindAccountAuthService;
+import cn.com.ctop.toutiao.entity.ByteDanceAdvertiser;
+import cn.com.ctop.toutiao.service.IByteDanceAdvertiserDataService;
 import com.alibaba.fastjson.JSONObject;
-import constant.KuaishouInterfaceConstant;
-import module.entity.CtopOauthToken;
-import module.mapper.CtopOauthTokenMapper;
 import org.apache.commons.lang.StringUtils;
-import org.jeecg.modules.ctop.entity.ByteDanceAdvertiser;
-import org.jeecg.modules.ctop.service.IByteDanceAdvertiserDataService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CtopOauthTokenController.java

@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import module.entity.CtopOauthToken;
-import module.service.ICtopOauthTokenService;
+import cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.module.service.ICtopOauthTokenService;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;

+ 2 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/FileInfoController.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.module.entity.FileInfo;
+import cn.com.ctop.module.service.IFileInfoService;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

+ 4 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ReportController.java

@@ -1,12 +1,12 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.common.utils.ResultMapUtils;
+import cn.com.ctop.common.utils.StatusCode;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
+import cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.module.service.ICtopOauthTokenService;
 import com.alibaba.fastjson.JSONObject;
-import module.entity.CtopOauthToken;
-import module.service.ICtopOauthTokenService;
 import org.jeecg.common.util.DateUtils;
-import org.jeecg.common.util.ResultMapUtils;
-import org.jeecg.common.util.StatusCode;
 import org.jeecg.modules.ctop.service.IReportService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

+ 18 - 19
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/SourceFileController.java

@@ -1,38 +1,37 @@
 package org.jeecg.modules.ctop.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.util.oConvertUtils;
-
+import cn.com.ctop.module.entity.SourceFile;
+import cn.com.ctop.module.service.ISourceFileService;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-
+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;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 统一资源库文件信息

+ 2 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/UserAllocationController.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.module.entity.UserAllocation;
+import cn.com.ctop.module.service.IUserAllocationService;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

+ 2 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/KuaishouCommentAutoDelete.java

@@ -1,6 +1,8 @@
 package org.jeecg.modules.ctop.job;
 
 import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouWebInterfaceService;
+import cn.com.ctop.module.entity.BindAccountLogin;
+import cn.com.ctop.module.service.IBindAccountLoginService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;

+ 5 - 9
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/CreateInternalServiceImpl.java

@@ -1,9 +1,12 @@
 package org.jeecg.modules.ctop.service.impl;
 
-import cn.com.ctop.common.utils.Check;
-import cn.com.ctop.common.utils.HttpUtils2;
+import cn.com.ctop.common.utils.*;
 import cn.com.ctop.crawler.modules.core.util.FateadmHttpUtil;
 import cn.com.ctop.crawler.modules.core.util.FateadmUtil;
+import cn.com.ctop.module.entity.BindAccountLogin;
+import cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.module.mapper.BindAccountLoginMapper;
+import cn.com.ctop.module.service.ICtopOauthTokenService;
 import cn.com.ctop.toutiao.entity.ByteDanceUserOrientationTemplate;
 import cn.com.ctop.toutiao.entity.BytedanceUrlInfo;
 import cn.com.ctop.toutiao.mapper.ByteDanceUserOrientationTemplateMapper;
@@ -14,14 +17,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
-import module.entity.BindAccountLogin;
-import module.entity.CtopOauthToken;
-import module.mapper.BindAccountLoginMapper;
-import module.service.ICtopOauthTokenService;
 import org.apache.http.impl.cookie.BasicClientCookie;
-import org.jeecg.common.constant.CtopAdConstant;
-import org.jeecg.common.util.ResultMapUtils;
-import org.jeecg.common.util.StatusCode;
 import org.jeecg.modules.ctop.service.ICreateInternalService;
 import org.openqa.selenium.By;
 import org.openqa.selenium.Cookie;

+ 4 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/RefreshTokenServiceImpl.java

@@ -1,11 +1,11 @@
 package org.jeecg.modules.ctop.service.impl;
 
 import cn.com.ctop.common.utils.Check;
+import cn.com.ctop.common.utils.CtopAdConstant;
+import cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.module.mapper.CtopOauthTokenMapper;
+import cn.com.ctop.module.service.ICtopOauthTokenService;
 import lombok.extern.slf4j.Slf4j;
-import module.entity.CtopOauthToken;
-import module.mapper.CtopOauthTokenMapper;
-import module.service.ICtopOauthTokenService;
-import org.jeecg.common.constant.CtopAdConstant;
 import org.jeecg.modules.ctop.service.IRefreshTokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

+ 10 - 9
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ReportServiceImpl.java

@@ -1,26 +1,27 @@
 package org.jeecg.modules.ctop.service.impl;
 
-import cn.com.ctop.common.utils.CsvUtils;
-import cn.com.ctop.common.utils.HttpUtils;
+import cn.com.ctop.common.utils.*;
+import cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.module.service.ICtopOauthTokenService;
+import cn.com.ctop.toutiao.entity.*;
+import cn.com.ctop.toutiao.service.*;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
-import module.entity.CtopOauthToken;
-import module.service.ICtopOauthTokenService;
 import org.apache.poi.hssf.usermodel.HSSFDataFormat;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.jeecg.common.constant.CtopAdConstant;
-import org.jeecg.common.util.ResultMapUtils;
-import org.jeecg.common.util.StatusCode;
-import org.jeecg.modules.ctop.entity.*;
+import org.jeecg.modules.ctop.entity.CustomerPlanStatisticInfo;
+import org.jeecg.modules.ctop.entity.PlatformCampaignStatisticInfo;
 import org.jeecg.modules.ctop.mapper.CustomerPlanStatisticInfoMapper;
 import org.jeecg.modules.ctop.mapper.PlatformCampaignStatisticInfoMapper;
-import org.jeecg.modules.ctop.service.*;
+import org.jeecg.modules.ctop.service.ICustomerPlanStatisticInfoService;
+import org.jeecg.modules.ctop.service.IPlatformCampaignStatisticInfoService;
+import org.jeecg.modules.ctop.service.IReportService;
 import org.jeecg.modules.ctop.vo.StatisticCampaignVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/fileupload/controller/FileController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.fileupload.controller;
 
+import cn.com.ctop.module.service.IFileInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

+ 2 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/fileupload/service/impl/UploadServiceImpl.java

@@ -3,6 +3,8 @@ package org.jeecg.modules.fileupload.service.impl;
 import cn.com.ctop.common.utils.FileEntity;
 import cn.com.ctop.common.utils.FileUploadTool;
 import cn.com.ctop.common.utils.OSSUtils;
+import cn.com.ctop.module.entity.FileInfo;
+import cn.com.ctop.module.service.IFileInfoService;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.jeecg.modules.fileupload.service.IUploadService;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -5,8 +5,8 @@ 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 module.entity.CtopOauthToken;
-import module.service.ICtopOauthTokenService;
+import cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.module.service.ICtopOauthTokenService;
 import org.jeecg.modules.ctop.service.IRefreshTokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -11,8 +11,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import module.entity.CtopOauthToken;
-import module.service.ICtopOauthTokenService;
+import cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.module.service.ICtopOauthTokenService;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;

+ 2 - 2
jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -119,7 +119,7 @@ spring:
     port: 6379
 #mybatis plus 设置
 mybatis-plus:
-  mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml,classpath*:cn/com/ctop/kuaishou/modules/**/xml/*Mapper.xml,classpath*:cn/com/ctop/crawler/modules/**/xml/*Mapper.xml
+  mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml,classpath*:cn/com/ctop/**/xml/*Mapper.xml
   global-config:
     # 关闭MP3.0自带的banner
     banner: false
@@ -141,4 +141,4 @@ jeecg:
     video-upload: D://upFiles//video//
     image-upload: D://upFiles//image//
     chrome-driver: D://chromedriver.exe
-    csv-upload: D://upFiles//csv//
+    csv-upload: D://upFiles//csv//

+ 1 - 1
jeecg-boot-module-system/src/main/resources/application-prod.yml

@@ -123,7 +123,7 @@ spring:
     port: 6379
 #mybatis plus 设置
 mybatis-plus:
-  mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml,classpath*:cn/com/ctop/kuaishou/modules/**/xml/*Mapper.xml,classpath*:cn/com/ctop/crawler/modules/**/xml/*Mapper.xml
+  mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml,classpath*:cn/com/ctop/**/xml/*Mapper.xml
 
 
   global-config:

+ 11 - 11
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java

@@ -1,20 +1,20 @@
 package org.jeecg;
 
 import cn.com.ctop.common.utils.OSSUtils;
+import cn.com.ctop.common.utils.ResultMapUtils;
+import cn.com.ctop.common.utils.StatusCode;
+import cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.module.service.ICtopOauthTokenService;
+import cn.com.ctop.toutiao.entity.ByteDanceUserOrientationTemplate;
+import cn.com.ctop.toutiao.entity.BytedanceAreaInfo;
+import cn.com.ctop.toutiao.entity.BytedanceInterestCategory;
+import cn.com.ctop.toutiao.mapper.ByteDanceUserOrientationTemplateMapper;
+import cn.com.ctop.toutiao.mapper.BytedanceAreaInfoMapper;
+import cn.com.ctop.toutiao.mapper.BytedanceInterestCategoryMapper;
+import cn.com.ctop.toutiao.service.IByteDanceAdvertiserDataService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import module.entity.CtopOauthToken;
-import module.service.ICtopOauthTokenService;
-import org.jeecg.common.util.ResultMapUtils;
-import org.jeecg.common.util.StatusCode;
 import org.jeecg.common.util.jsonschema.JsonschemaUtil;
-import org.jeecg.modules.ctop.entity.ByteDanceUserOrientationTemplate;
-import org.jeecg.modules.ctop.entity.BytedanceAreaInfo;
-import org.jeecg.modules.ctop.entity.BytedanceInterestCategory;
-import org.jeecg.modules.ctop.mapper.ByteDanceUserOrientationTemplateMapper;
-import org.jeecg.modules.ctop.mapper.BytedanceAreaInfoMapper;
-import org.jeecg.modules.ctop.mapper.BytedanceInterestCategoryMapper;
-import org.jeecg.modules.ctop.service.IByteDanceAdvertiserDataService;
 import org.jeecg.modules.ctop.service.ICreateInternalService;
 import org.jeecg.modules.ctop.service.IReportService;
 import org.jeecg.modules.demo.mock.MockController;

+ 2 - 2
module-common/pom.xml

@@ -23,7 +23,7 @@
     </properties>
 
     <dependencies>
-        <dependency>
+        <!--<dependency>
             <groupId>cn.com.ctop</groupId>
             <artifactId>module-toutiao</artifactId>
             <version>2.0.2</version>
@@ -32,7 +32,7 @@
             <groupId>cn.com.ctop</groupId>
             <artifactId>module-kuaishou</artifactId>
             <version>2.0.2</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

+ 1 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/common/BytedanceInterfaceConstant.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.toutiao.common;
+package cn.com.ctop.common.utils;
 
 public class BytedanceInterfaceConstant {
     public static final String AUTH_PATH = "/audit/oauth.html";

+ 1 - 1
jeecg-boot-base-common/src/main/java/org/jeecg/common/constant/CtopAdConstant.java

@@ -1,4 +1,4 @@
-package org.jeecg.common.constant;
+package cn.com.ctop.common.utils;
 
 /**
  * 广告相关常量数据

+ 1 - 1
module-kuaishou/src/main/java/constant/KuaishouInterfaceConstant.java

@@ -1,4 +1,4 @@
-package constant;
+package cn.com.ctop.common.utils;
 
 /**
  * 2019年9月9日13:21:39

+ 1 - 1
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/ResultMapUtils.java

@@ -1,4 +1,4 @@
-package org.jeecg.common.util;
+package cn.com.ctop.common.utils;
 
 import java.util.Map;
 

+ 1 - 1
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/StatusCode.java

@@ -1,4 +1,4 @@
-package org.jeecg.common.util;
+package cn.com.ctop.common.utils;
 
 public enum StatusCode {
     /**

+ 1 - 1
module-common/src/main/java/module/entity/BindAccountAuth.java

@@ -1,4 +1,4 @@
-package module.entity;
+package cn.com.ctop.module.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 1 - 1
module-common/src/main/java/module/entity/BindAccountLogin.java

@@ -1,4 +1,4 @@
-package module.entity;
+package cn.com.ctop.module.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 1 - 1
module-common/src/main/java/module/entity/CtopOauthToken.java

@@ -1,4 +1,4 @@
-package module.entity;
+package cn.com.ctop.module.entity;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.IdType;

+ 1 - 1
module-common/src/main/java/module/entity/FileInfo.java

@@ -1,4 +1,4 @@
-package module.entity;
+package cn.com.ctop.module.entity;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.IdType;

+ 1 - 1
module-common/src/main/java/module/entity/SourceFile.java

@@ -1,4 +1,4 @@
-package module.entity;
+package cn.com.ctop.module.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 1 - 1
module-common/src/main/java/module/entity/UserAllocation.java

@@ -1,4 +1,4 @@
-package module.entity;
+package cn.com.ctop.module.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 2 - 2
module-common/src/main/java/module/mapper/BindAccountAuthMapper.java

@@ -1,7 +1,7 @@
-package module.mapper;
+package cn.com.ctop.module.mapper;
 
+import cn.com.ctop.module.entity.BindAccountAuth;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import module.entity.BindAccountAuth;
 
 /**
  * @Description: 账号绑定-授权

+ 2 - 2
module-common/src/main/java/module/mapper/BindAccountLoginMapper.java

@@ -1,7 +1,7 @@
-package module.mapper;
+package cn.com.ctop.module.mapper;
 
+import cn.com.ctop.module.entity.BindAccountLogin;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import module.entity.BindAccountLogin;
 
 /**
  * @Description: 账号绑定-登陆

+ 2 - 2
module-common/src/main/java/module/mapper/CtopOauthTokenMapper.java

@@ -1,7 +1,7 @@
-package module.mapper;
+package cn.com.ctop.module.mapper;
 
+import cn.com.ctop.module.entity.CtopOauthToken;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import module.entity.CtopOauthToken;
 
 import java.util.List;
 

+ 2 - 2
module-common/src/main/java/module/mapper/FileInfoMapper.java

@@ -1,7 +1,7 @@
-package module.mapper;
+package cn.com.ctop.module.mapper;
 
+import cn.com.ctop.module.entity.FileInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import module.entity.FileInfo;
 
 /**
  * @Description: 文件信息

+ 2 - 2
module-common/src/main/java/module/mapper/SourceFileMapper.java

@@ -1,7 +1,7 @@
-package module.mapper;
+package cn.com.ctop.module.mapper;
 
+import cn.com.ctop.module.entity.SourceFile;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import module.entity.SourceFile;
 
 /**
  * @Description: 统一资源库文件信息

+ 2 - 2
module-common/src/main/java/module/mapper/UserAllocationMapper.java

@@ -1,7 +1,7 @@
-package module.mapper;
+package cn.com.ctop.module.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import module.entity.UserAllocation;
+import cn.com.ctop.module.entity.UserAllocation;
 
 /**
  * @Description: 用户分配

+ 2 - 2
module-common/src/main/java/module/mapper/xml/UserAllocationMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.ctop.mapper.UserAllocationMapper">
+<mapper namespace="cn.com.ctop.module.mapper.BindAccountAuthMapper">
 
-</mapper>
+</mapper>

+ 2 - 2
module-common/src/main/java/module/mapper/xml/BindAccountAuthMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.ctop.mapper.BindAccountAuthMapper">
+<mapper namespace="cn.com.ctop.module.mapper.BindAccountLoginMapper">
 
-</mapper>
+</mapper>

+ 4 - 4
module-common/src/main/java/module/mapper/xml/CtopOauthTokenMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.ctop.mapper.CtopOauthTokenMapper">
+<mapper namespace="cn.com.ctop.module.mapper.CtopOauthTokenMapper">
 
-    <resultMap id="BaseResultMap" type="org.jeecg.modules.ctop.entity.CtopOauthToken">
+    <resultMap id="BaseResultMap" type="cn.com.ctop.module.entity.CtopOauthToken">
         <result column="id" property="id" jdbcType="BIGINT"/>
         <result column="media_id" property="mediaId" jdbcType="VARCHAR"/>
         <result column="advertiser_id" property="advertiserId" jdbcType="VARCHAR"/>
@@ -26,7 +26,7 @@
     </select>
 
 
-    <update id="updateByPrimaryKeySelective" parameterType="org.jeecg.modules.ctop.entity.CtopOauthToken">
+    <update id="updateByPrimaryKeySelective" parameterType="cn.com.ctop.module.entity.CtopOauthToken">
         update ctop_oauth_token
         <set>
 
@@ -74,4 +74,4 @@
         limit 1
     </select>
 
-</mapper>
+</mapper>

+ 2 - 2
module-common/src/main/java/module/mapper/xml/FileInfoMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.ctop.mapper.FileInfoMapper">
+<mapper namespace="cn.com.ctop.module.mapper.FileInfoMapper">
 
-</mapper>
+</mapper>

+ 5 - 0
module-common/src/main/java/cn/com/ctop/module/mapper/xml/SourceFileMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.com.ctop.module.mapper.SourceFileMapper">
+
+</mapper>

+ 2 - 2
module-common/src/main/java/module/mapper/xml/SourceFileMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.ctop.mapper.SourceFileMapper">
+<mapper namespace="cn.com.ctop.module.mapper.UserAllocationMapper">
 
-</mapper>
+</mapper>

+ 2 - 2
module-common/src/main/java/module/service/IBindAccountAuthService.java

@@ -1,7 +1,7 @@
-package module.service;
+package cn.com.ctop.module.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import module.entity.BindAccountAuth;
+import cn.com.ctop.module.entity.BindAccountAuth;
 
 import java.io.UnsupportedEncodingException;
 

+ 2 - 2
module-common/src/main/java/module/service/IBindAccountLoginService.java

@@ -1,7 +1,7 @@
-package module.service;
+package cn.com.ctop.module.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import module.entity.BindAccountLogin;
+import cn.com.ctop.module.entity.BindAccountLogin;
 
 /**
  * @Description: 账号绑定-登陆

+ 2 - 2
module-common/src/main/java/module/service/ICtopOauthTokenService.java

@@ -1,7 +1,7 @@
-package module.service;
+package cn.com.ctop.module.service;
 
+import cn.com.ctop.module.entity.CtopOauthToken;
 import com.baomidou.mybatisplus.extension.service.IService;
-import module.entity.CtopOauthToken;
 
 import java.util.Map;
 

+ 2 - 2
module-common/src/main/java/module/service/IFileInfoService.java

@@ -1,8 +1,8 @@
-package module.service;
+package cn.com.ctop.module.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
-import module.entity.FileInfo;
+import cn.com.ctop.module.entity.FileInfo;
 
 import java.util.List;
 import java.util.Map;

+ 2 - 2
module-common/src/main/java/module/service/ISourceFileService.java

@@ -1,7 +1,7 @@
-package module.service;
+package cn.com.ctop.module.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import module.entity.SourceFile;
+import cn.com.ctop.module.entity.SourceFile;
 
 /**
  * @Description: 统一资源库文件信息

+ 2 - 2
module-common/src/main/java/module/service/IUserAllocationService.java

@@ -1,7 +1,7 @@
-package module.service;
+package cn.com.ctop.module.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import module.entity.UserAllocation;
+import cn.com.ctop.module.entity.UserAllocation;
 
 /**
  * @Description: 用户分配

+ 6 - 6
module-common/src/main/java/module/service/impl/BindAccountAuthServiceImpl.java

@@ -1,13 +1,13 @@
-package module.service.impl;
+package cn.com.ctop.module.service.impl;
 
+import cn.com.ctop.common.utils.BytedanceInterfaceConstant;
+import cn.com.ctop.common.utils.KuaishouInterfaceConstant;
 import cn.com.ctop.common.utils.PropertiesUtils;
-import cn.com.ctop.toutiao.common.BytedanceInterfaceConstant;
+import cn.com.ctop.module.entity.BindAccountAuth;
+import cn.com.ctop.module.mapper.BindAccountAuthMapper;
+import cn.com.ctop.module.service.IBindAccountAuthService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import constant.KuaishouInterfaceConstant;
 import lombok.extern.slf4j.Slf4j;
-import module.entity.BindAccountAuth;
-import module.mapper.BindAccountAuthMapper;
-import module.service.IBindAccountAuthService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

+ 4 - 4
module-common/src/main/java/module/service/impl/BindAccountLoginServiceImpl.java

@@ -1,10 +1,10 @@
-package module.service.impl;
+package cn.com.ctop.module.service.impl;
 
+import cn.com.ctop.module.entity.BindAccountLogin;
+import cn.com.ctop.module.mapper.BindAccountLoginMapper;
+import cn.com.ctop.module.service.IBindAccountLoginService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
-import module.entity.BindAccountLogin;
-import module.mapper.BindAccountLoginMapper;
-import module.service.IBindAccountLoginService;
 import org.springframework.stereotype.Service;
 
 /**

+ 6 - 8
module-common/src/main/java/module/service/impl/CtopOauthTokenServiceImpl.java

@@ -1,17 +1,15 @@
-package module.service.impl;
+package cn.com.ctop.module.service.impl;
 
 import cn.com.ctop.common.utils.Check;
 import cn.com.ctop.common.utils.HttpUtils;
 import cn.com.ctop.common.utils.PropertiesUtils;
-import cn.com.ctop.toutiao.common.BytedanceInterfaceConstant;
+import cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.module.mapper.CtopOauthTokenMapper;
+import cn.com.ctop.module.service.ICtopOauthTokenService;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import constant.KuaishouInterfaceConstant;
 import lombok.extern.slf4j.Slf4j;
-import module.entity.CtopOauthToken;
-import module.mapper.CtopOauthTokenMapper;
-import module.service.ICtopOauthTokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -55,7 +53,7 @@ public class CtopOauthTokenServiceImpl extends ServiceImpl<CtopOauthTokenMapper,
             resultMap.put("code", -1);
             return resultMap;
         }
-        String url = PropertiesUtils.getValue("bytedance_config", "bytedance_api_url") + BytedanceInterfaceConstant.REFRESH_TOKEN;
+        String url = PropertiesUtils.getValue("bytedance_config", "bytedance_api_url") + "/oauth2/refresh_token";
         Map<String, Object> param = new HashMap<String, Object>();
         param.put("app_id", PropertiesUtils.getValue("bytedance_config", "bytedance_appid"));
         param.put("secret", PropertiesUtils.getValue("bytedance_config", "bytedance_secret"));
@@ -89,7 +87,7 @@ public class CtopOauthTokenServiceImpl extends ServiceImpl<CtopOauthTokenMapper,
      */
     @Override
     public Map<String, Object> getKuaiShouRefreshToken(Long accountId, String refreshToken) {
-        String url = PropertiesUtils.getConfig("kuaishou_api_url") + KuaishouInterfaceConstant.REFRESH_TOKEN;
+        String url = PropertiesUtils.getConfig("kuaishou_api_url") + "/rest/openapi/oauth2/authorize/refresh_token";
         Map<String, String> headers = new HashMap<String, String>();
         headers.put("Content-Type", " application/json");
         Map<String, Object> param = new HashMap<String, Object>();

+ 9 - 13
module-common/src/main/java/module/service/impl/FileInfoServiceImpl.java

@@ -1,20 +1,18 @@
-package module.service.impl;
+package cn.com.ctop.module.service.impl;
 
-import cn.com.ctop.common.utils.HttpUtils;
-import cn.com.ctop.common.utils.PropertiesUtils;
-import cn.com.ctop.toutiao.common.BytedanceInterfaceConstant;
+import cn.com.ctop.common.utils.*;
+import cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.module.entity.FileInfo;
+import cn.com.ctop.module.entity.SourceFile;
+import cn.com.ctop.module.mapper.FileInfoMapper;
+import cn.com.ctop.module.service.ICtopOauthTokenService;
+import cn.com.ctop.module.service.IFileInfoService;
+import cn.com.ctop.module.service.ISourceFileService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
-import module.entity.CtopOauthToken;
-import module.entity.FileInfo;
-import module.entity.SourceFile;
-import module.mapper.FileInfoMapper;
-import module.service.ICtopOauthTokenService;
-import module.service.IFileInfoService;
-import module.service.ISourceFileService;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.ClientProtocolException;
@@ -24,8 +22,6 @@ import org.apache.http.entity.mime.MultipartEntityBuilder;
 import org.apache.http.entity.mime.content.FileBody;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
-import org.jeecg.common.util.ResultMapUtils;
-import org.jeecg.common.util.StatusCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;

+ 4 - 4
module-common/src/main/java/module/service/impl/SourceFileServiceImpl.java

@@ -1,9 +1,9 @@
-package module.service.impl;
+package cn.com.ctop.module.service.impl;
 
+import cn.com.ctop.module.entity.SourceFile;
+import cn.com.ctop.module.mapper.SourceFileMapper;
+import cn.com.ctop.module.service.ISourceFileService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import module.entity.SourceFile;
-import module.mapper.SourceFileMapper;
-import module.service.ISourceFileService;
 import org.springframework.stereotype.Service;
 
 /**

+ 4 - 4
module-common/src/main/java/module/service/impl/UserAllocationServiceImpl.java

@@ -1,9 +1,9 @@
-package module.service.impl;
+package cn.com.ctop.module.service.impl;
 
+import cn.com.ctop.module.entity.UserAllocation;
+import cn.com.ctop.module.mapper.UserAllocationMapper;
+import cn.com.ctop.module.service.IUserAllocationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import module.entity.UserAllocation;
-import module.mapper.UserAllocationMapper;
-import module.service.IUserAllocationService;
 import org.springframework.stereotype.Service;
 
 /**

+ 0 - 5
module-common/src/main/java/module/mapper/xml/BindAccountLoginMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.ctop.mapper.BindAccountLoginMapper">
-
-</mapper>

+ 3 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouCreateAppTemplateServiceImpl.java

@@ -1,16 +1,16 @@
 package cn.com.ctop.kuaishou.modules.batch.service.impl;
 
 import cn.com.ctop.common.utils.Check;
+import cn.com.ctop.common.utils.KuaishouInterfaceConstant;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCreateAppTemplate;
 import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouCreateAppTemplateMapper;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCreateAppTemplateService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
+import cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.module.service.ICtopOauthTokenService;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import constant.KuaishouInterfaceConstant;
-import module.entity.CtopOauthToken;
-import module.service.ICtopOauthTokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

+ 2 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouCreateServiceImpl.java

@@ -17,8 +17,8 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
-import module.entity.CtopOauthToken;
-import module.service.ICtopOauthTokenService;
+import cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.module.service.ICtopOauthTokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

+ 3 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouImageServiceImpl.java

@@ -1,18 +1,18 @@
 package cn.com.ctop.kuaishou.modules.batch.service.impl;
 
 import cn.com.ctop.common.utils.Check;
+import cn.com.ctop.common.utils.KuaishouInterfaceConstant;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImage;
 import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouImageMapper;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouImageService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
+import cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.module.service.ICtopOauthTokenService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import constant.KuaishouInterfaceConstant;
 import lombok.extern.slf4j.Slf4j;
-import module.entity.CtopOauthToken;
-import module.service.ICtopOauthTokenService;
 import org.jeecg.common.util.encryption.AesEncryptUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

+ 1 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouUpdateServiceImpl.java

@@ -2,6 +2,7 @@ package cn.com.ctop.kuaishou.modules.batch.service.impl;
 
 import cn.com.ctop.common.utils.Check;
 import cn.com.ctop.common.utils.HttpUtils;
+import cn.com.ctop.common.utils.KuaishouInterfaceConstant;
 import cn.com.ctop.common.utils.PropertiesUtils;
 import cn.com.ctop.kuaishou.modules.batch.entity.*;
 import cn.com.ctop.kuaishou.modules.batch.mapper.*;
@@ -9,7 +10,6 @@ import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouUpdateService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import constant.KuaishouInterfaceConstant;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

+ 3 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouVideoServiceImpl.java

@@ -1,18 +1,18 @@
 package cn.com.ctop.kuaishou.modules.batch.service.impl;
 
 import cn.com.ctop.common.utils.Check;
+import cn.com.ctop.common.utils.KuaishouInterfaceConstant;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouVideo;
 import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouVideoMapper;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouVideoService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
+import cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.module.service.ICtopOauthTokenService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import constant.KuaishouInterfaceConstant;
 import lombok.extern.slf4j.Slf4j;
-import module.entity.CtopOauthToken;
-import module.service.ICtopOauthTokenService;
 import org.jeecg.common.util.encryption.AesEncryptUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

+ 1 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java

@@ -2,6 +2,7 @@ package cn.com.ctop.kuaishou.modules.batch.service.impl;
 
 import cn.com.ctop.common.utils.Check;
 import cn.com.ctop.common.utils.HttpUtils;
+import cn.com.ctop.common.utils.KuaishouInterfaceConstant;
 import cn.com.ctop.common.utils.PropertiesUtils;
 import cn.com.ctop.kuaishou.modules.batch.entity.*;
 import cn.com.ctop.kuaishou.modules.batch.mapper.*;
@@ -22,7 +23,6 @@ import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.type.TypeFactory;
-import constant.KuaishouInterfaceConstant;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.ParseException;
 import org.jeecg.common.util.DateUtils;

+ 2 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/controller/BytedanceAreaInfoController.java

@@ -1,5 +1,7 @@
 package cn.com.ctop.toutiao.controller;
 
+import cn.com.ctop.toutiao.entity.BytedanceAreaInfo;
+import cn.com.ctop.toutiao.service.IBytedanceAreaInfoService;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

+ 1 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/entity/ByteDanceCampaign.java

@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import module.entity.CtopOauthToken;
+import cn.com.ctop.module.entity.CtopOauthToken;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 import java.math.BigDecimal;

+ 1 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/entity/ByteDanceCustomAudience.java

@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import module.entity.CtopOauthToken;
+import cn.com.ctop.module.entity.CtopOauthToken;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 import java.util.Date;

+ 1 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/entity/ByteDanceImageInfo.java

@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import module.entity.CtopOauthToken;
+import cn.com.ctop.module.entity.CtopOauthToken;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 import java.util.Date;

+ 1 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/entity/ByteDanceVideoInfo.java

@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import module.entity.CtopOauthToken;
+import cn.com.ctop.module.entity.CtopOauthToken;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 import java.util.Date;

+ 1 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/service/IByteDanceAdvertisePlanService.java

@@ -2,7 +2,7 @@ package cn.com.ctop.toutiao.service;
 
 import cn.com.ctop.toutiao.entity.ByteDanceAdvertisePlan;
 import com.baomidou.mybatisplus.extension.service.IService;
-import module.entity.CtopOauthToken;
+import cn.com.ctop.module.entity.CtopOauthToken;
 
 import java.util.Map;
 

+ 1 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/service/IByteDanceAdvertiserDataService.java

@@ -2,7 +2,7 @@ package cn.com.ctop.toutiao.service;
 
 import cn.com.ctop.toutiao.entity.ByteDanceUserOrientationTemplate;
 import com.alibaba.fastjson.JSONObject;
-import module.entity.CtopOauthToken;
+import cn.com.ctop.module.entity.CtopOauthToken;
 
 import java.util.Map;
 

+ 1 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/service/IByteDanceCampaignTemplateService.java

@@ -3,7 +3,7 @@ package cn.com.ctop.toutiao.service;
 import cn.com.ctop.toutiao.entity.ByteDanceCampaignTemplate;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import module.entity.CtopOauthToken;
+import cn.com.ctop.module.entity.CtopOauthToken;
 import org.jeecg.common.api.vo.Result;
 
 import javax.servlet.http.HttpServletRequest;

+ 4 - 4
module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceAdvertisePlanServiceImpl.java

@@ -12,10 +12,10 @@ import cn.com.ctop.toutiao.service.IByteDanceAdvertisePlanService;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
-import module.entity.BindAccountLogin;
-import module.entity.CtopOauthToken;
-import module.mapper.BindAccountLoginMapper;
-import module.service.ICtopOauthTokenService;
+import cn.com.ctop.module.entity.BindAccountLogin;
+import cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.module.mapper.BindAccountLoginMapper;
+import cn.com.ctop.module.service.ICtopOauthTokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

+ 2 - 2
module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceAdvertiserDataServiceImpl.java

@@ -9,8 +9,8 @@ import cn.com.ctop.toutiao.service.IByteDanceAdvertiserDataService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
-import module.entity.CtopOauthToken;
-import module.service.ICtopOauthTokenService;
+import cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.module.service.ICtopOauthTokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

+ 5 - 3
module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceBudgetTemplateServiceImpl.java

@@ -1,5 +1,10 @@
 package cn.com.ctop.toutiao.service.impl;
 
+import cn.com.ctop.common.utils.ResultMapUtils;
+import cn.com.ctop.common.utils.StatusCode;
+import cn.com.ctop.toutiao.entity.ByteDanceBudgetTemplate;
+import cn.com.ctop.toutiao.mapper.ByteDanceBudgetTemplateMapper;
+import cn.com.ctop.toutiao.service.IByteDanceBudgetTemplateService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,9 +13,6 @@ import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.common.util.ResultMapUtils;
-import org.jeecg.common.util.StatusCode;
-import org.jeecg.modules.ctop.service.IByteDanceBudgetTemplateService;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;

+ 3 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceCampaignServiceImpl.java

@@ -1,7 +1,9 @@
 package cn.com.ctop.toutiao.service.impl;
 
+import cn.com.ctop.toutiao.entity.ByteDanceCampaign;
+import cn.com.ctop.toutiao.mapper.ByteDanceCampaignMapper;
+import cn.com.ctop.toutiao.service.IByteDanceCampaignService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.ctop.service.IByteDanceCampaignService;
 import org.springframework.stereotype.Service;
 
 /**

+ 9 - 5
module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceCampaignTemplateServiceImpl.java

@@ -2,6 +2,15 @@ package cn.com.ctop.toutiao.service.impl;
 
 import cn.com.ctop.common.utils.HttpUtils;
 import cn.com.ctop.common.utils.PropertiesUtils;
+import cn.com.ctop.common.utils.ResultMapUtils;
+import cn.com.ctop.common.utils.StatusCode;
+import cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.module.service.ICtopOauthTokenService;
+import cn.com.ctop.toutiao.entity.ByteDanceCampaign;
+import cn.com.ctop.toutiao.entity.ByteDanceCampaignTemplate;
+import cn.com.ctop.toutiao.mapper.ByteDanceCampaignMapper;
+import cn.com.ctop.toutiao.mapper.ByteDanceCampaignTemplateMapper;
+import cn.com.ctop.toutiao.service.IByteDanceCampaignTemplateService;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -12,11 +21,6 @@ import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.common.util.ResultMapUtils;
-import org.jeecg.common.util.StatusCode;
-import org.jeecg.modules.ctop.entity.CtopOauthToken;
-import org.jeecg.modules.ctop.service.IByteDanceCampaignTemplateService;
-import org.jeecg.modules.ctop.service.ICtopOauthTokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

+ 3 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceCreativeMaterialServiceImpl.java

@@ -1,7 +1,9 @@
 package cn.com.ctop.toutiao.service.impl;
 
+import cn.com.ctop.toutiao.entity.ByteDanceCreativeMaterial;
+import cn.com.ctop.toutiao.mapper.ByteDanceCreativeMaterialMapper;
+import cn.com.ctop.toutiao.service.IByteDanceCreativeMaterialService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.ctop.service.IByteDanceCreativeMaterialService;
 import org.springframework.stereotype.Service;
 
 /**

+ 5 - 5
module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceCreativeServiceImpl.java

@@ -1,6 +1,11 @@
 package cn.com.ctop.toutiao.service.impl;
 
 import cn.com.ctop.common.utils.PropertiesUtils;
+import cn.com.ctop.common.utils.ResultMapUtils;
+import cn.com.ctop.common.utils.StatusCode;
+import cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.module.service.ICtopOauthTokenService;
+import cn.com.ctop.module.service.IFileInfoService;
 import cn.com.ctop.toutiao.entity.ByteDanceCreative;
 import cn.com.ctop.toutiao.mapper.ByteDanceCreativeMapper;
 import cn.com.ctop.toutiao.service.IByteDanceAdvertiserDataService;
@@ -11,9 +16,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
-import module.entity.CtopOauthToken;
-import module.service.ICtopOauthTokenService;
-import module.service.IFileInfoService;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
@@ -21,8 +23,6 @@ import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
-import org.jeecg.common.util.ResultMapUtils;
-import org.jeecg.common.util.StatusCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

+ 3 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceCreativeTemplateServiceImpl.java

@@ -1,7 +1,9 @@
 package cn.com.ctop.toutiao.service.impl;
 
+import cn.com.ctop.toutiao.entity.ByteDanceCreativeTemplate;
+import cn.com.ctop.toutiao.mapper.ByteDanceCreativeTemplateMapper;
+import cn.com.ctop.toutiao.service.IByteDanceCreativeTemplateService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.ctop.service.IByteDanceCreativeTemplateService;
 import org.springframework.stereotype.Service;
 
 /**

+ 3 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceCustomAudienceServiceImpl.java

@@ -1,7 +1,9 @@
 package cn.com.ctop.toutiao.service.impl;
 
+import cn.com.ctop.toutiao.entity.ByteDanceCustomAudience;
+import cn.com.ctop.toutiao.mapper.ByteDanceCustomAudienceMapper;
+import cn.com.ctop.toutiao.service.IByteDanceCustomAudienceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.ctop.service.IByteDanceCustomAudienceService;
 import org.springframework.stereotype.Service;
 
 /**

+ 3 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceImageInfoServiceImpl.java

@@ -1,7 +1,9 @@
 package cn.com.ctop.toutiao.service.impl;
 
+import cn.com.ctop.toutiao.entity.ByteDanceImageInfo;
+import cn.com.ctop.toutiao.mapper.ByteDanceImageInfoMapper;
+import cn.com.ctop.toutiao.service.IByteDanceImageInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.ctop.service.IByteDanceImageInfoService;
 import org.springframework.stereotype.Service;
 
 /**

+ 3 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceUserOrientationTemplateServiceImpl.java

@@ -1,5 +1,8 @@
 package cn.com.ctop.toutiao.service.impl;
 
+import cn.com.ctop.toutiao.entity.ByteDanceUserOrientationTemplate;
+import cn.com.ctop.toutiao.mapper.ByteDanceUserOrientationTemplateMapper;
+import cn.com.ctop.toutiao.service.IByteDanceUserOrientationTemplateService;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -9,7 +12,6 @@ import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.modules.ctop.service.IByteDanceUserOrientationTemplateService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

+ 3 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceVideoInfoServiceImpl.java

@@ -1,7 +1,9 @@
 package cn.com.ctop.toutiao.service.impl;
 
+import cn.com.ctop.toutiao.entity.ByteDanceVideoInfo;
+import cn.com.ctop.toutiao.mapper.ByteDanceVideoInfoMapper;
+import cn.com.ctop.toutiao.service.IByteDanceVideoInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.ctop.service.IByteDanceVideoInfoService;
 import org.springframework.stereotype.Service;
 
 /**

+ 4 - 4
module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/BytedanceAdvertisePlanTemplateServiceImpl.java

@@ -1,5 +1,9 @@
 package cn.com.ctop.toutiao.service.impl;
 
+import cn.com.ctop.common.utils.ResultMapUtils;
+import cn.com.ctop.common.utils.StatusCode;
+import cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.module.service.ICtopOauthTokenService;
 import cn.com.ctop.toutiao.entity.*;
 import cn.com.ctop.toutiao.mapper.*;
 import cn.com.ctop.toutiao.service.IByteDanceAdvertisePlanService;
@@ -7,10 +11,6 @@ import cn.com.ctop.toutiao.service.IByteDanceAdvertiserDataService;
 import cn.com.ctop.toutiao.service.IBytedanceAdvertisePlanTemplateService;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import module.entity.CtopOauthToken;
-import module.service.ICtopOauthTokenService;
-import org.jeecg.common.util.ResultMapUtils;
-import org.jeecg.common.util.StatusCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

+ 3 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/BytedanceCampaignDailyReportServiceImpl.java

@@ -1,7 +1,9 @@
 package cn.com.ctop.toutiao.service.impl;
 
+import cn.com.ctop.toutiao.entity.BytedanceCampaignDailyReport;
+import cn.com.ctop.toutiao.mapper.BytedanceCampaignDailyReportMapper;
+import cn.com.ctop.toutiao.service.IBytedanceCampaignDailyReportService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.ctop.service.IBytedanceCampaignDailyReportService;
 import org.springframework.stereotype.Service;
 
 /**

+ 3 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/BytedanceCampaignHourlyReportServiceImpl.java

@@ -1,7 +1,9 @@
 package cn.com.ctop.toutiao.service.impl;
 
+import cn.com.ctop.toutiao.entity.BytedanceCampaignHourlyReport;
+import cn.com.ctop.toutiao.mapper.BytedanceCampaignHourlyReportMapper;
+import cn.com.ctop.toutiao.service.IBytedanceCampaignHourlyReportService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.ctop.service.IBytedanceCampaignHourlyReportService;
 import org.springframework.stereotype.Service;
 
 /**

+ 3 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/BytedanceCreativeDailyReportServiceImpl.java

@@ -1,7 +1,9 @@
 package cn.com.ctop.toutiao.service.impl;
 
+import cn.com.ctop.toutiao.entity.BytedanceCreativeDailyReport;
+import cn.com.ctop.toutiao.mapper.BytedanceCreativeDailyReportMapper;
+import cn.com.ctop.toutiao.service.IBytedanceCreativeDailyReportService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.ctop.service.IBytedanceCreativeDailyReportService;
 import org.springframework.stereotype.Service;
 
 /**

+ 3 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/BytedanceCreativeHourlyReportServiceImpl.java

@@ -1,7 +1,9 @@
 package cn.com.ctop.toutiao.service.impl;
 
+import cn.com.ctop.toutiao.entity.BytedanceCreativeHourlyReport;
+import cn.com.ctop.toutiao.mapper.BytedanceCreativeHourlyReportMapper;
+import cn.com.ctop.toutiao.service.IBytedanceCreativeHourlyReportService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.ctop.service.IBytedanceCreativeHourlyReportService;
 import org.springframework.stereotype.Service;
 
 /**

+ 7 - 3
module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/BytedanceDeliveryTargetTemplateServiceImpl.java

@@ -1,5 +1,12 @@
 package cn.com.ctop.toutiao.service.impl;
 
+import cn.com.ctop.common.utils.ResultMapUtils;
+import cn.com.ctop.common.utils.StatusCode;
+import cn.com.ctop.toutiao.entity.BytedanceDeliveryTargetTemplate;
+import cn.com.ctop.toutiao.entity.BytedanceUrlInfo;
+import cn.com.ctop.toutiao.mapper.BytedanceDeliveryTargetTemplateMapper;
+import cn.com.ctop.toutiao.mapper.BytedanceUrlInfoMapper;
+import cn.com.ctop.toutiao.service.IBytedanceDeliveryTargetTemplateService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,9 +15,6 @@ import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.common.util.ResultMapUtils;
-import org.jeecg.common.util.StatusCode;
-import org.jeecg.modules.ctop.service.IBytedanceDeliveryTargetTemplateService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

+ 3 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/BytedanceInterestCategoryServiceImpl.java

@@ -1,7 +1,9 @@
 package cn.com.ctop.toutiao.service.impl;
 
+import cn.com.ctop.toutiao.entity.BytedanceInterestCategory;
+import cn.com.ctop.toutiao.mapper.BytedanceInterestCategoryMapper;
+import cn.com.ctop.toutiao.service.IBytedanceInterestCategoryService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.ctop.service.IBytedanceInterestCategoryService;
 import org.springframework.stereotype.Service;
 
 /**

+ 3 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/BytedanceNameModelRuleServiceImpl.java

@@ -1,7 +1,9 @@
 package cn.com.ctop.toutiao.service.impl;
 
+import cn.com.ctop.toutiao.entity.BytedanceNameModelRule;
+import cn.com.ctop.toutiao.mapper.BytedanceNameModelRuleMapper;
+import cn.com.ctop.toutiao.service.IBytedanceNameModelRuleService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.ctop.service.IBytedanceNameModelRuleService;
 import org.springframework.stereotype.Service;
 
 /**

+ 3 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/BytedancePlanDailyReportServiceImpl.java

@@ -1,7 +1,9 @@
 package cn.com.ctop.toutiao.service.impl;
 
+import cn.com.ctop.toutiao.entity.BytedancePlanDailyReport;
+import cn.com.ctop.toutiao.mapper.BytedancePlanDailyReportMapper;
+import cn.com.ctop.toutiao.service.IBytedancePlanDailyReportService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.ctop.service.IBytedancePlanDailyReportService;
 import org.springframework.stereotype.Service;
 
 /**

+ 3 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/BytedancePlanHourlyReportServiceImpl.java

@@ -1,7 +1,9 @@
 package cn.com.ctop.toutiao.service.impl;
 
+import cn.com.ctop.toutiao.entity.BytedancePlanHourlyReport;
+import cn.com.ctop.toutiao.mapper.BytedancePlanHourlyReportMapper;
+import cn.com.ctop.toutiao.service.IBytedancePlanHourlyReportService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.ctop.service.IBytedancePlanHourlyReportService;
 import org.springframework.stereotype.Service;
 
 /**

+ 5 - 3
module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/BytedanceUrlInfoServiceImpl.java

@@ -1,12 +1,14 @@
 package cn.com.ctop.toutiao.service.impl;
 
+import cn.com.ctop.common.utils.ResultMapUtils;
+import cn.com.ctop.common.utils.StatusCode;
+import cn.com.ctop.toutiao.entity.BytedanceUrlInfo;
+import cn.com.ctop.toutiao.mapper.BytedanceUrlInfoMapper;
+import cn.com.ctop.toutiao.service.IBytedanceUrlInfoService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.common.util.ResultMapUtils;
-import org.jeecg.common.util.StatusCode;
-import org.jeecg.modules.ctop.service.IBytedanceUrlInfoService;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;