瀏覽代碼

修改目录结构

yumeng 5 年之前
父節點
當前提交
11ed9782ea
共有 100 個文件被更改,包括 245 次插入234 次删除
  1. 0 1
      jeecg-boot-module-system/src/main/java/org/jeecg/JeecgApplication.java
  2. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ActorController.java
  3. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AuthController.java
  4. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BindAccountAuthController.java
  5. 5 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BindAccountLoginController.java
  6. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceAdvertiserPostController.java
  7. 6 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ByteDanceTemplateController.java
  8. 6 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CallbackController.java
  9. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CtopOauthTokenController.java
  10. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/FileInfoController.java
  11. 4 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ReportController.java
  12. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/SourceFileController.java
  13. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/UserAllocationController.java
  14. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/job/KuaishouCommentAutoDelete.java
  15. 5 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/CreateInternalServiceImpl.java
  16. 5 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/RefreshTokenServiceImpl.java
  17. 4 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ReportServiceImpl.java
  18. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/fileupload/controller/FileController.java
  19. 5 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/fileupload/service/impl/UploadServiceImpl.java
  20. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouActionBarTextController.java
  21. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCampaignTemplateController.java
  22. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouController.java
  23. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouConversionTypesController.java
  24. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCreateAppTemplateController.java
  25. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouGroupCreateLogController.java
  26. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouImageController.java
  27. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouVideoController.java
  28. 1 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
  29. 5 5
      jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java
  30. 18 0
      module-common/pom.xml
  31. 1 1
      module-common/src/main/java/cn/com/ctop/module/entity/BindAccountAuth.java
  32. 1 1
      module-common/src/main/java/cn/com/ctop/module/entity/BindAccountLogin.java
  33. 1 1
      module-common/src/main/java/cn/com/ctop/module/entity/CtopOauthToken.java
  34. 1 1
      module-common/src/main/java/cn/com/ctop/module/entity/FileInfo.java
  35. 1 1
      module-common/src/main/java/cn/com/ctop/module/entity/SourceFile.java
  36. 1 1
      module-common/src/main/java/cn/com/ctop/module/entity/UserAllocation.java
  37. 2 2
      module-common/src/main/java/cn/com/ctop/module/mapper/BindAccountAuthMapper.java
  38. 2 2
      module-common/src/main/java/cn/com/ctop/module/mapper/BindAccountLoginMapper.java
  39. 2 2
      module-common/src/main/java/cn/com/ctop/module/mapper/CtopOauthTokenMapper.java
  40. 2 2
      module-common/src/main/java/cn/com/ctop/module/mapper/FileInfoMapper.java
  41. 2 2
      module-common/src/main/java/cn/com/ctop/module/mapper/SourceFileMapper.java
  42. 2 2
      module-common/src/main/java/cn/com/ctop/module/mapper/UserAllocationMapper.java
  43. 1 1
      module-common/src/main/java/cn/com/ctop/module/mapper/xml/FileInfoMapper.xml
  44. 1 1
      module-common/src/main/java/cn/com/ctop/module/mapper/xml/BindAccountLoginMapper.xml
  45. 3 3
      module-common/src/main/java/cn/com/ctop/module/mapper/xml/CtopOauthTokenMapper.xml
  46. 1 1
      module-common/src/main/java/cn/com/ctop/module/mapper/xml/BindAccountAuthMapper.xml
  47. 1 1
      module-common/src/main/java/cn/com/ctop/module/mapper/xml/SourceFileMapper.xml
  48. 1 1
      module-common/src/main/java/cn/com/ctop/module/mapper/xml/UserAllocationMapper.xml
  49. 2 2
      module-common/src/main/java/cn/com/ctop/module/service/IBindAccountAuthService.java
  50. 2 2
      module-common/src/main/java/cn/com/ctop/module/service/IBindAccountLoginService.java
  51. 2 2
      module-common/src/main/java/cn/com/ctop/module/service/ICtopOauthTokenService.java
  52. 2 2
      module-common/src/main/java/cn/com/ctop/module/service/IFileInfoService.java
  53. 2 2
      module-common/src/main/java/cn/com/ctop/module/service/ISourceFileService.java
  54. 2 2
      module-common/src/main/java/cn/com/ctop/module/service/IUserAllocationService.java
  55. 8 8
      module-common/src/main/java/cn/com/ctop/module/service/impl/BindAccountAuthServiceImpl.java
  56. 4 4
      module-common/src/main/java/cn/com/ctop/module/service/impl/BindAccountLoginServiceImpl.java
  57. 7 7
      module-common/src/main/java/cn/com/ctop/module/service/impl/CtopOauthTokenServiceImpl.java
  58. 9 9
      module-common/src/main/java/cn/com/ctop/module/service/impl/FileInfoServiceImpl.java
  59. 4 4
      module-common/src/main/java/cn/com/ctop/module/service/impl/SourceFileServiceImpl.java
  60. 4 4
      module-common/src/main/java/cn/com/ctop/module/service/impl/UserAllocationServiceImpl.java
  61. 1 1
      module-common/src/main/java/cn/com/ctop/common/utils/Base64Utils.java
  62. 1 1
      module-common/src/main/java/cn/com/ctop/common/utils/BytedanceInterfaceConstant.java
  63. 1 1
      module-common/src/main/java/cn/com/ctop/common/utils/ChaojiyingUtils.java
  64. 1 1
      module-common/src/main/java/cn/com/ctop/common/utils/Check.java
  65. 1 1
      module-common/src/main/java/cn/com/ctop/common/utils/CsvUtils.java
  66. 1 1
      module-common/src/main/java/cn/com/ctop/common/utils/CtopAdConstant.java
  67. 1 1
      module-common/src/main/java/cn/com/ctop/common/utils/FileEntity.java
  68. 1 1
      module-common/src/main/java/cn/com/ctop/common/utils/FileUploadTool.java
  69. 1 1
      module-common/src/main/java/cn/com/ctop/common/utils/HttpGetWithBodyEntity.java
  70. 1 1
      module-common/src/main/java/cn/com/ctop/common/utils/HttpUtils.java
  71. 1 3
      module-common/src/main/java/cn/com/ctop/common/utils/HttpUtils2.java
  72. 1 4
      module-common/src/main/java/cn/com/ctop/common/utils/ImageUtils.java
  73. 1 1
      module-common/src/main/java/cn/com/ctop/common/utils/JsonUtil.java
  74. 1 1
      module-common/src/main/java/cn/com/ctop/common/utils/KuaishouInterfaceConstant.java
  75. 1 2
      module-common/src/main/java/cn/com/ctop/common/utils/OSSUtils.java
  76. 1 1
      module-common/src/main/java/cn/com/ctop/common/utils/PropertiesUtils.java
  77. 1 1
      module-common/src/main/java/cn/com/ctop/common/utils/ResultMapUtils.java
  78. 1 1
      module-common/src/main/java/cn/com/ctop/common/utils/StatusCode.java
  79. 1 1
      module-common/src/main/java/cn/com/ctop/common/utils/TransfMediaTool.java
  80. 4 4
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouCreateAppTemplateServiceImpl.java
  81. 3 3
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouCreateServiceImpl.java
  82. 4 4
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouImageServiceImpl.java
  83. 4 4
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouUpdateServiceImpl.java
  84. 4 4
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouVideoServiceImpl.java
  85. 4 4
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java
  86. 1 1
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/graphql/service/impl/KuaishouWebInterfaceServiceImpl.java
  87. 1 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/entity/ByteDanceCampaign.java
  88. 1 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/entity/ByteDanceCustomAudience.java
  89. 1 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/entity/ByteDanceImageInfo.java
  90. 1 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/entity/ByteDanceVideoInfo.java
  91. 1 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/IByteDanceAdvertisePlanService.java
  92. 1 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/IByteDanceAdvertiserDataService.java
  93. 1 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/IByteDanceCampaignTemplateService.java
  94. 6 6
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceAdvertisePlanServiceImpl.java
  95. 4 4
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceAdvertiserDataServiceImpl.java
  96. 2 2
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceBudgetTemplateServiceImpl.java
  97. 6 6
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceCampaignTemplateServiceImpl.java
  98. 6 6
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceCreativeServiceImpl.java
  99. 4 4
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/BytedanceAdvertisePlanTemplateServiceImpl.java
  100. 0 0
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/BytedanceDeliveryTargetTemplateServiceImpl.java

+ 0 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/JeecgApplication.java

@@ -20,7 +20,6 @@ import java.net.UnknownHostException;
 @SpringBootApplication
 @SpringBootApplication
 @ComponentScan(basePackages = {"cn.com.ctop", "org.jeecg"})
 @ComponentScan(basePackages = {"cn.com.ctop", "org.jeecg"})
 @EnableAutoConfiguration
 @EnableAutoConfiguration
-@ComponentScan
 @Configuration
 @Configuration
 
 
 
 

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

@@ -1,7 +1,7 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
-import cn.com.ctop.common.utils.Check;
-import cn.com.ctop.common.utils.KuaishouInterfaceConstant;
+import cn.com.ctop.common.module.utils.Check;
+import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
 import cn.com.ctop.manage.modules.actor.entity.Actor;
 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.ActorComment;
 import cn.com.ctop.manage.modules.actor.entity.ActorPhoto;
 import cn.com.ctop.manage.modules.actor.entity.ActorPhoto;

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

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

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

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

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

@@ -1,10 +1,10 @@
 package org.jeecg.modules.ctop.controller;
 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 cn.com.ctop.common.module.utils.Check;
+import cn.com.ctop.common.module.entity.BindAccountLogin;
+import cn.com.ctop.common.module.entity.UserAllocation;
+import cn.com.ctop.common.module.mapper.UserAllocationMapper;
+import cn.com.ctop.common.module.service.IBindAccountLoginService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

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

@@ -1,6 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
-import cn.com.ctop.module.service.IFileInfoService;
+import cn.com.ctop.common.module.service.IFileInfoService;
 import cn.com.ctop.toutiao.entity.ByteDanceCustomAudience;
 import cn.com.ctop.toutiao.entity.ByteDanceCustomAudience;
 import cn.com.ctop.toutiao.entity.ByteDanceUserOrientationTemplate;
 import cn.com.ctop.toutiao.entity.ByteDanceUserOrientationTemplate;
 import cn.com.ctop.toutiao.service.IByteDanceAdvertiserDataService;
 import cn.com.ctop.toutiao.service.IByteDanceAdvertiserDataService;

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

@@ -1,11 +1,11 @@
 package org.jeecg.modules.ctop.controller;
 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.common.module.utils.CtopAdConstant;
+import cn.com.ctop.common.module.entity.BindAccountLogin;
+import cn.com.ctop.common.module.entity.UserAllocation;
+import cn.com.ctop.common.module.service.IBindAccountLoginService;
+import cn.com.ctop.common.module.service.IFileInfoService;
+import cn.com.ctop.common.module.service.IUserAllocationService;
 import cn.com.ctop.toutiao.entity.*;
 import cn.com.ctop.toutiao.entity.*;
 import cn.com.ctop.toutiao.service.*;
 import cn.com.ctop.toutiao.service.*;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONArray;

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

@@ -1,14 +1,14 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
-import cn.com.ctop.common.utils.*;
+import cn.com.ctop.common.module.utils.*;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 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.KuaishouAccessToken;
 import cn.com.ctop.kuaishou.modules.material.entity.KuaishouResultToken;
 import cn.com.ctop.kuaishou.modules.material.entity.KuaishouResultToken;
-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.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.entity.UserAllocation;
+import cn.com.ctop.common.module.mapper.CtopOauthTokenMapper;
+import cn.com.ctop.common.module.mapper.UserAllocationMapper;
+import cn.com.ctop.common.module.service.IBindAccountAuthService;
 import cn.com.ctop.toutiao.entity.ByteDanceAdvertiser;
 import cn.com.ctop.toutiao.entity.ByteDanceAdvertiser;
 import cn.com.ctop.toutiao.service.IByteDanceAdvertiserDataService;
 import cn.com.ctop.toutiao.service.IByteDanceAdvertiserDataService;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;

+ 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.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
-import cn.com.ctop.module.entity.CtopOauthToken;
-import cn.com.ctop.module.service.ICtopOauthTokenService;
+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.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;

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

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

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

@@ -1,10 +1,10 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
-import cn.com.ctop.common.utils.ResultMapUtils;
-import cn.com.ctop.common.utils.StatusCode;
+import cn.com.ctop.common.module.utils.ResultMapUtils;
+import cn.com.ctop.common.module.utils.StatusCode;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
-import cn.com.ctop.module.entity.CtopOauthToken;
-import cn.com.ctop.module.service.ICtopOauthTokenService;
+import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.ctop.service.IReportService;
 import org.jeecg.modules.ctop.service.IReportService;

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

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

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

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

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

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

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

@@ -1,12 +1,12 @@
 package org.jeecg.modules.ctop.service.impl;
 package org.jeecg.modules.ctop.service.impl;
 
 
-import cn.com.ctop.common.utils.*;
+import cn.com.ctop.common.module.entity.BindAccountLogin;
+import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.mapper.BindAccountLoginMapper;
+import cn.com.ctop.common.module.service.ICtopOauthTokenService;
+import cn.com.ctop.common.module.utils.*;
 import cn.com.ctop.crawler.modules.core.util.FateadmHttpUtil;
 import cn.com.ctop.crawler.modules.core.util.FateadmHttpUtil;
 import cn.com.ctop.crawler.modules.core.util.FateadmUtil;
 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.ByteDanceUserOrientationTemplate;
 import cn.com.ctop.toutiao.entity.BytedanceUrlInfo;
 import cn.com.ctop.toutiao.entity.BytedanceUrlInfo;
 import cn.com.ctop.toutiao.mapper.ByteDanceUserOrientationTemplateMapper;
 import cn.com.ctop.toutiao.mapper.ByteDanceUserOrientationTemplateMapper;

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

@@ -1,10 +1,10 @@
 package org.jeecg.modules.ctop.service.impl;
 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 cn.com.ctop.common.module.utils.Check;
+import cn.com.ctop.common.module.utils.CtopAdConstant;
+import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.mapper.CtopOauthTokenMapper;
+import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.modules.ctop.service.IRefreshTokenService;
 import org.jeecg.modules.ctop.service.IRefreshTokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,8 +1,9 @@
 package org.jeecg.modules.ctop.service.impl;
 package org.jeecg.modules.ctop.service.impl;
 
 
-import cn.com.ctop.common.utils.*;
-import cn.com.ctop.module.entity.CtopOauthToken;
-import cn.com.ctop.module.service.ICtopOauthTokenService;
+import cn.com.ctop.common.module.utils.*;
+
+import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.toutiao.entity.*;
 import cn.com.ctop.toutiao.entity.*;
 import cn.com.ctop.toutiao.service.*;
 import cn.com.ctop.toutiao.service.*;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONArray;

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

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

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

@@ -1,10 +1,10 @@
 package org.jeecg.modules.fileupload.service.impl;
 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 cn.com.ctop.common.module.utils.FileEntity;
+import cn.com.ctop.common.module.utils.FileUploadTool;
+import cn.com.ctop.common.module.utils.OSSUtils;
+import cn.com.ctop.common.module.entity.FileInfo;
+import cn.com.ctop.common.module.service.IFileInfoService;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.jeecg.modules.fileupload.service.IUploadService;
 import org.jeecg.modules.fileupload.service.IUploadService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,6 +1,6 @@
 package org.jeecg.modules.kuaishou.controller;
 package org.jeecg.modules.kuaishou.controller;
 
 
-import cn.com.ctop.common.utils.Check;
+import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouActionBarText;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouActionBarText;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaignCreate;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaignCreate;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouActionBarTextService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouActionBarTextService;

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

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

+ 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 cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyCampaign;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
-import cn.com.ctop.module.entity.CtopOauthToken;
-import cn.com.ctop.module.service.ICtopOauthTokenService;
+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.jeecg.modules.ctop.service.IRefreshTokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

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

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

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

@@ -1,6 +1,6 @@
 package org.jeecg.modules.kuaishou.controller;
 package org.jeecg.modules.kuaishou.controller;
 
 
-import cn.com.ctop.common.utils.Check;
+import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCreateAppTemplate;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCreateAppTemplate;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCreateAppTemplateService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCreateAppTemplateService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;

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

@@ -1,6 +1,6 @@
 package org.jeecg.modules.kuaishou.controller;
 package org.jeecg.modules.kuaishou.controller;
 
 
-import cn.com.ctop.common.utils.Check;
+import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroupCreateLog;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouGroupCreateLog;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouGroupCreateLogService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouGroupCreateLogService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;

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

@@ -1,6 +1,6 @@
 package org.jeecg.modules.kuaishou.controller;
 package org.jeecg.modules.kuaishou.controller;
 
 
-import cn.com.ctop.common.utils.Check;
+import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImage;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImage;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouImageService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouImageService;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;

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

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

+ 1 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java

@@ -6,11 +6,10 @@ import java.util.List;
 import java.util.UUID;
 import java.util.UUID;
 
 
 
 
-import cn.com.ctop.common.utils.Check;
+import cn.com.ctop.common.module.utils.Check;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.util.YouBianCodeUtil;
 import org.jeecg.common.util.YouBianCodeUtil;
-import org.jeecg.modules.ctop.entity.AuthTask;
 import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.mapper.SysDepartMapper;
 import org.jeecg.modules.system.mapper.SysDepartMapper;
 import org.jeecg.modules.system.model.SysDepartTreeModel;
 import org.jeecg.modules.system.model.SysDepartTreeModel;

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

@@ -1,10 +1,10 @@
 package org.jeecg;
 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.common.module.utils.OSSUtils;
+import cn.com.ctop.common.module.utils.ResultMapUtils;
+import cn.com.ctop.common.module.utils.StatusCode;
+import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.toutiao.entity.ByteDanceUserOrientationTemplate;
 import cn.com.ctop.toutiao.entity.ByteDanceUserOrientationTemplate;
 import cn.com.ctop.toutiao.entity.BytedanceAreaInfo;
 import cn.com.ctop.toutiao.entity.BytedanceAreaInfo;
 import cn.com.ctop.toutiao.entity.BytedanceInterestCategory;
 import cn.com.ctop.toutiao.entity.BytedanceInterestCategory;

+ 18 - 0
module-common/pom.xml

@@ -66,5 +66,23 @@
             <artifactId>javacsv</artifactId>
             <artifactId>javacsv</artifactId>
             <version>2.0</version>
             <version>2.0</version>
         </dependency>
         </dependency>
+
     </dependencies>
     </dependencies>
+    <build>
+        <resources>
+            <!-- 解决MyBatis配置文件引入问题 -->
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.properties</include>
+                    <include>**/*.xml</include>
+                </includes>
+                <!-- 是否替换资源中的属性-->
+                <filtering>false</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+    </build>
 </project>
 </project>

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
-package cn.com.ctop.module.mapper;
+package cn.com.ctop.common.module.mapper;
 
 
-import cn.com.ctop.module.entity.BindAccountAuth;
+import cn.com.ctop.common.module.entity.BindAccountAuth;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 
 /**
 /**

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

@@ -1,6 +1,6 @@
-package cn.com.ctop.module.mapper;
+package cn.com.ctop.common.module.mapper;
 
 
-import cn.com.ctop.module.entity.BindAccountLogin;
+import cn.com.ctop.common.module.entity.BindAccountLogin;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 
 /**
 /**

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

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

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

@@ -1,6 +1,6 @@
-package cn.com.ctop.module.mapper;
+package cn.com.ctop.common.module.mapper;
 
 
-import cn.com.ctop.module.entity.FileInfo;
+import cn.com.ctop.common.module.entity.FileInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 
 /**
 /**

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

@@ -1,6 +1,6 @@
-package cn.com.ctop.module.mapper;
+package cn.com.ctop.common.module.mapper;
 
 
-import cn.com.ctop.module.entity.SourceFile;
+import cn.com.ctop.common.module.entity.SourceFile;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 
 /**
 /**

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

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

+ 1 - 1
module-common/src/main/java/cn/com/ctop/module/mapper/xml/FileInfoMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-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">
 <!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.FileInfoMapper">
+<mapper namespace="cn.com.ctop.common.module.mapper.BindAccountAuthMapper">
 
 
 </mapper>
 </mapper>

+ 1 - 1
module-common/src/main/java/cn/com/ctop/module/mapper/xml/BindAccountLoginMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-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">
 <!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.BindAccountLoginMapper">
+<mapper namespace="cn.com.ctop.common.module.mapper.BindAccountLoginMapper">
 
 
 </mapper>
 </mapper>

+ 3 - 3
module-common/src/main/java/cn/com/ctop/module/mapper/xml/CtopOauthTokenMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-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">
 <!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.CtopOauthTokenMapper">
+<mapper namespace="cn.com.ctop.common.module.mapper.CtopOauthTokenMapper">
 
 
-    <resultMap id="BaseResultMap" type="cn.com.ctop.module.entity.CtopOauthToken">
+    <resultMap id="BaseResultMap" type="cn.com.ctop.common.module.entity.CtopOauthToken">
         <result column="id" property="id" jdbcType="BIGINT"/>
         <result column="id" property="id" jdbcType="BIGINT"/>
         <result column="media_id" property="mediaId" jdbcType="VARCHAR"/>
         <result column="media_id" property="mediaId" jdbcType="VARCHAR"/>
         <result column="advertiser_id" property="advertiserId" jdbcType="VARCHAR"/>
         <result column="advertiser_id" property="advertiserId" jdbcType="VARCHAR"/>
@@ -26,7 +26,7 @@
     </select>
     </select>
 
 
 
 
-    <update id="updateByPrimaryKeySelective" parameterType="cn.com.ctop.module.entity.CtopOauthToken">
+    <update id="updateByPrimaryKeySelective" parameterType="cn.com.ctop.common.module.entity.CtopOauthToken">
         update ctop_oauth_token
         update ctop_oauth_token
         <set>
         <set>
 
 

+ 1 - 1
module-common/src/main/java/cn/com/ctop/module/mapper/xml/BindAccountAuthMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-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">
 <!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.BindAccountAuthMapper">
+<mapper namespace="cn.com.ctop.common.module.mapper.FileInfoMapper">
 
 
 </mapper>
 </mapper>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-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">
 <!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 namespace="cn.com.ctop.common.module.mapper.SourceFileMapper">
 
 
 </mapper>
 </mapper>

+ 1 - 1
module-common/src/main/java/cn/com/ctop/module/mapper/xml/UserAllocationMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-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">
 <!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.UserAllocationMapper">
+<mapper namespace="cn.com.ctop.common.module.mapper.UserAllocationMapper">
 
 
 </mapper>
 </mapper>

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

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

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

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

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

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

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

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

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

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

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

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

+ 8 - 8
module-common/src/main/java/cn/com/ctop/module/service/impl/BindAccountAuthServiceImpl.java

@@ -1,11 +1,11 @@
-package cn.com.ctop.module.service.impl;
+package cn.com.ctop.common.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.module.entity.BindAccountAuth;
-import cn.com.ctop.module.mapper.BindAccountAuthMapper;
-import cn.com.ctop.module.service.IBindAccountAuthService;
+import cn.com.ctop.common.module.utils.BytedanceInterfaceConstant;
+import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
+import cn.com.ctop.common.module.utils.PropertiesUtils;
+import cn.com.ctop.common.module.entity.BindAccountAuth;
+import cn.com.ctop.common.module.mapper.BindAccountAuthMapper;
+import cn.com.ctop.common.module.service.IBindAccountAuthService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,10 +26,10 @@ import java.util.Map;
 @Slf4j
 @Slf4j
 @Service
 @Service
 public class BindAccountAuthServiceImpl extends ServiceImpl<BindAccountAuthMapper, BindAccountAuth> implements IBindAccountAuthService {
 public class BindAccountAuthServiceImpl extends ServiceImpl<BindAccountAuthMapper, BindAccountAuth> implements IBindAccountAuthService {
+
     @Autowired
     @Autowired
     private BindAccountAuthMapper bindAccountAuthMapper;
     private BindAccountAuthMapper bindAccountAuthMapper;
 
 
-
     /**
     /**
      * 授权 绑定账号信息
      * 授权 绑定账号信息
      *
      *

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

@@ -1,8 +1,8 @@
-package cn.com.ctop.module.service.impl;
+package cn.com.ctop.common.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 cn.com.ctop.common.module.entity.BindAccountLogin;
+import cn.com.ctop.common.module.mapper.BindAccountLoginMapper;
+import cn.com.ctop.common.module.service.IBindAccountLoginService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;

+ 7 - 7
module-common/src/main/java/cn/com/ctop/module/service/impl/CtopOauthTokenServiceImpl.java

@@ -1,11 +1,11 @@
-package cn.com.ctop.module.service.impl;
+package cn.com.ctop.common.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.module.entity.CtopOauthToken;
-import cn.com.ctop.module.mapper.CtopOauthTokenMapper;
-import cn.com.ctop.module.service.ICtopOauthTokenService;
+import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.mapper.CtopOauthTokenMapper;
+import cn.com.ctop.common.module.service.ICtopOauthTokenService;
+import cn.com.ctop.common.module.utils.Check;
+import cn.com.ctop.common.module.utils.HttpUtils;
+import cn.com.ctop.common.module.utils.PropertiesUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

+ 9 - 9
module-common/src/main/java/cn/com/ctop/module/service/impl/FileInfoServiceImpl.java

@@ -1,13 +1,13 @@
-package cn.com.ctop.module.service.impl;
+package cn.com.ctop.common.module.service.impl;
 
 
-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 cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.entity.FileInfo;
+import cn.com.ctop.common.module.entity.SourceFile;
+import cn.com.ctop.common.module.mapper.FileInfoMapper;
+import cn.com.ctop.common.module.service.ICtopOauthTokenService;
+import cn.com.ctop.common.module.service.IFileInfoService;
+import cn.com.ctop.common.module.service.ISourceFileService;
+import cn.com.ctop.common.module.utils.*;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

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

@@ -1,8 +1,8 @@
-package cn.com.ctop.module.service.impl;
+package cn.com.ctop.common.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 cn.com.ctop.common.module.entity.SourceFile;
+import cn.com.ctop.common.module.mapper.SourceFileMapper;
+import cn.com.ctop.common.module.service.ISourceFileService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 

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

@@ -1,8 +1,8 @@
-package cn.com.ctop.module.service.impl;
+package cn.com.ctop.common.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 cn.com.ctop.common.module.entity.UserAllocation;
+import cn.com.ctop.common.module.mapper.UserAllocationMapper;
+import cn.com.ctop.common.module.service.IUserAllocationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/utils/Base64Utils.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.common.utils;
+package cn.com.ctop.common.module.utils;
 
 
 import java.io.FileInputStream;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.IOException;

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

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

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/utils/ChaojiyingUtils.java

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

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/utils/Check.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.common.utils;
+package cn.com.ctop.common.module.utils;
 
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 
 

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/utils/CsvUtils.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.common.utils;
+package cn.com.ctop.common.module.utils;
 
 
 import com.csvreader.CsvReader;
 import com.csvreader.CsvReader;
 import com.csvreader.CsvWriter;
 import com.csvreader.CsvWriter;

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/utils/CtopAdConstant.java

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

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/utils/FileEntity.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.common.utils;
+package cn.com.ctop.common.module.utils;
 
 
 import java.sql.Timestamp;
 import java.sql.Timestamp;
 
 

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/utils/FileUploadTool.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.common.utils;
+package cn.com.ctop.common.module.utils;
 
 
 
 
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartFile;

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/utils/HttpGetWithBodyEntity.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.common.utils;
+package cn.com.ctop.common.module.utils;
 
 
 import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
 import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
 
 

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/utils/HttpUtils.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.common.utils;
+package cn.com.ctop.common.module.utils;
 
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
 import com.google.gson.Gson;

+ 1 - 3
module-common/src/main/java/cn/com/ctop/common/utils/HttpUtils2.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.common.utils;
+package cn.com.ctop.common.module.utils;
 
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
 import com.google.gson.Gson;
@@ -29,8 +29,6 @@ import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.ssl.SSLContextBuilder;
 import org.apache.http.ssl.SSLContextBuilder;
 import org.apache.http.util.EntityUtils;
 import org.apache.http.util.EntityUtils;
 import org.eclipse.jetty.util.UrlEncoded;
 import org.eclipse.jetty.util.UrlEncoded;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLContext;
 import java.io.BufferedReader;
 import java.io.BufferedReader;

+ 1 - 4
module-common/src/main/java/cn/com/ctop/common/utils/ImageUtils.java

@@ -1,12 +1,9 @@
-package cn.com.ctop.common.utils;
+package cn.com.ctop.common.module.utils;
 
 
-import javax.imageio.IIOException;
 import javax.imageio.ImageIO;
 import javax.imageio.ImageIO;
 import javax.swing.*;
 import javax.swing.*;
 import java.awt.*;
 import java.awt.*;
 import java.awt.font.FontRenderContext;
 import java.awt.font.FontRenderContext;
-import java.awt.font.GlyphVector;
-import java.awt.font.TextLayout;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.AffineTransform;
 import java.awt.image.BufferedImage;
 import java.awt.image.BufferedImage;
 import java.io.*;
 import java.io.*;

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/utils/JsonUtil.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.common.utils;
+package cn.com.ctop.common.module.utils;
 
 
 
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.JsonProcessingException;

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/utils/KuaishouInterfaceConstant.java

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

+ 1 - 2
module-common/src/main/java/cn/com/ctop/common/utils/OSSUtils.java

@@ -1,7 +1,6 @@
-package cn.com.ctop.common.utils;
+package cn.com.ctop.common.module.utils;
 
 
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSS;
-import com.aliyun.oss.OSSClient;
 import com.aliyun.oss.OSSClientBuilder;
 import com.aliyun.oss.OSSClientBuilder;
 import com.aliyun.oss.model.Bucket;
 import com.aliyun.oss.model.Bucket;
 import com.aliyun.oss.model.OSSObject;
 import com.aliyun.oss.model.OSSObject;

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/utils/PropertiesUtils.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.common.utils;
+package cn.com.ctop.common.module.utils;
 
 
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/utils/ResultMapUtils.java

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

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/utils/StatusCode.java

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

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/utils/TransfMediaTool.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.common.utils;
+package cn.com.ctop.common.module.utils;
 
 
 import java.io.BufferedReader;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.IOException;

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

@@ -1,13 +1,13 @@
 package cn.com.ctop.kuaishou.modules.batch.service.impl;
 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.common.module.utils.Check;
+import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCreateAppTemplate;
 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.mapper.KuaiShouCreateAppTemplateMapper;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCreateAppTemplateService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouCreateAppTemplateService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
-import cn.com.ctop.module.entity.CtopOauthToken;
-import cn.com.ctop.module.service.ICtopOauthTokenService;
+import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

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

@@ -1,6 +1,6 @@
 package cn.com.ctop.kuaishou.modules.batch.service.impl;
 package cn.com.ctop.kuaishou.modules.batch.service.impl;
 
 
-import cn.com.ctop.common.utils.Check;
+import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaignCreate;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaignCreate;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaignTemplate;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCampaignTemplate;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCreateAppTemplate;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouCreateAppTemplate;
@@ -17,8 +17,8 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
-import cn.com.ctop.module.entity.CtopOauthToken;
-import cn.com.ctop.module.service.ICtopOauthTokenService;
+import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 

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

@@ -1,13 +1,13 @@
 package cn.com.ctop.kuaishou.modules.batch.service.impl;
 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.common.module.utils.Check;
+import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImage;
 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.mapper.KuaiShouImageMapper;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouImageService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouImageService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
-import cn.com.ctop.module.entity.CtopOauthToken;
-import cn.com.ctop.module.service.ICtopOauthTokenService;
+import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

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

@@ -1,9 +1,9 @@
 package cn.com.ctop.kuaishou.modules.batch.service.impl;
 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.common.module.utils.Check;
+import cn.com.ctop.common.module.utils.HttpUtils;
+import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
+import cn.com.ctop.common.module.utils.PropertiesUtils;
 import cn.com.ctop.kuaishou.modules.batch.entity.*;
 import cn.com.ctop.kuaishou.modules.batch.entity.*;
 import cn.com.ctop.kuaishou.modules.batch.mapper.*;
 import cn.com.ctop.kuaishou.modules.batch.mapper.*;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouUpdateService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouUpdateService;

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

@@ -1,13 +1,13 @@
 package cn.com.ctop.kuaishou.modules.batch.service.impl;
 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.common.module.utils.Check;
+import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouVideo;
 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.mapper.KuaiShouVideoMapper;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouVideoService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouVideoService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
-import cn.com.ctop.module.entity.CtopOauthToken;
-import cn.com.ctop.module.service.ICtopOauthTokenService;
+import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

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

@@ -1,9 +1,9 @@
 package cn.com.ctop.kuaishou.modules.batch.service.impl;
 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.common.module.utils.Check;
+import cn.com.ctop.common.module.utils.HttpUtils;
+import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
+import cn.com.ctop.common.module.utils.PropertiesUtils;
 import cn.com.ctop.kuaishou.modules.batch.entity.*;
 import cn.com.ctop.kuaishou.modules.batch.entity.*;
 import cn.com.ctop.kuaishou.modules.batch.mapper.*;
 import cn.com.ctop.kuaishou.modules.batch.mapper.*;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;

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

@@ -1,6 +1,6 @@
 package cn.com.ctop.kuaishou.modules.graphql.service.impl;
 package cn.com.ctop.kuaishou.modules.graphql.service.impl;
 
 
-import cn.com.ctop.common.utils.HttpUtils2;
+import cn.com.ctop.common.module.utils.HttpUtils2;
 import cn.com.ctop.kuaishou.modules.graphql.entity.*;
 import cn.com.ctop.kuaishou.modules.graphql.entity.*;
 import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouUserService;
 import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouUserService;
 import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouVideoService;
 import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouVideoService;

+ 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.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;
-import cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.entity.CtopOauthToken;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 
 import java.math.BigDecimal;
 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.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;
-import cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.entity.CtopOauthToken;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 
 import java.util.Date;
 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.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;
-import cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.entity.CtopOauthToken;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 
 import java.util.Date;
 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.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;
-import cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.entity.CtopOauthToken;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 
 import java.util.Date;
 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 cn.com.ctop.toutiao.entity.ByteDanceAdvertisePlan;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.entity.CtopOauthToken;
 
 
 import java.util.Map;
 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 cn.com.ctop.toutiao.entity.ByteDanceUserOrientationTemplate;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
-import cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.entity.CtopOauthToken;
 
 
 import java.util.Map;
 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 cn.com.ctop.toutiao.entity.ByteDanceCampaignTemplate;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.entity.CtopOauthToken;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;

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

@@ -1,7 +1,7 @@
 package cn.com.ctop.toutiao.service.impl;
 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.module.utils.HttpUtils;
+import cn.com.ctop.common.module.utils.PropertiesUtils;
 import cn.com.ctop.toutiao.entity.ByteDanceAdvertisePlan;
 import cn.com.ctop.toutiao.entity.ByteDanceAdvertisePlan;
 import cn.com.ctop.toutiao.entity.BytedanceDeliveryTargetTemplate;
 import cn.com.ctop.toutiao.entity.BytedanceDeliveryTargetTemplate;
 import cn.com.ctop.toutiao.entity.BytedanceUrlInfo;
 import cn.com.ctop.toutiao.entity.BytedanceUrlInfo;
@@ -12,10 +12,10 @@ import cn.com.ctop.toutiao.service.IByteDanceAdvertisePlanService;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
-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.common.module.entity.BindAccountLogin;
+import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.mapper.BindAccountLoginMapper;
+import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 

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

@@ -1,7 +1,7 @@
 package cn.com.ctop.toutiao.service.impl;
 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.module.utils.HttpUtils;
+import cn.com.ctop.common.module.utils.PropertiesUtils;
 import cn.com.ctop.toutiao.entity.*;
 import cn.com.ctop.toutiao.entity.*;
 import cn.com.ctop.toutiao.mapper.*;
 import cn.com.ctop.toutiao.mapper.*;
 import cn.com.ctop.toutiao.service.IByteDanceAdvertisePlanService;
 import cn.com.ctop.toutiao.service.IByteDanceAdvertisePlanService;
@@ -9,8 +9,8 @@ import cn.com.ctop.toutiao.service.IByteDanceAdvertiserDataService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
-import cn.com.ctop.module.entity.CtopOauthToken;
-import cn.com.ctop.module.service.ICtopOauthTokenService;
+import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 

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

@@ -1,7 +1,7 @@
 package cn.com.ctop.toutiao.service.impl;
 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.common.module.utils.ResultMapUtils;
+import cn.com.ctop.common.module.utils.StatusCode;
 import cn.com.ctop.toutiao.entity.ByteDanceBudgetTemplate;
 import cn.com.ctop.toutiao.entity.ByteDanceBudgetTemplate;
 import cn.com.ctop.toutiao.mapper.ByteDanceBudgetTemplateMapper;
 import cn.com.ctop.toutiao.mapper.ByteDanceBudgetTemplateMapper;
 import cn.com.ctop.toutiao.service.IByteDanceBudgetTemplateService;
 import cn.com.ctop.toutiao.service.IByteDanceBudgetTemplateService;

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

@@ -1,11 +1,11 @@
 package cn.com.ctop.toutiao.service.impl;
 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.common.module.utils.HttpUtils;
+import cn.com.ctop.common.module.utils.PropertiesUtils;
+import cn.com.ctop.common.module.utils.ResultMapUtils;
+import cn.com.ctop.common.module.utils.StatusCode;
+import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.toutiao.entity.ByteDanceCampaign;
 import cn.com.ctop.toutiao.entity.ByteDanceCampaign;
 import cn.com.ctop.toutiao.entity.ByteDanceCampaignTemplate;
 import cn.com.ctop.toutiao.entity.ByteDanceCampaignTemplate;
 import cn.com.ctop.toutiao.mapper.ByteDanceCampaignMapper;
 import cn.com.ctop.toutiao.mapper.ByteDanceCampaignMapper;

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

@@ -1,11 +1,11 @@
 package cn.com.ctop.toutiao.service.impl;
 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.common.module.utils.PropertiesUtils;
+import cn.com.ctop.common.module.utils.ResultMapUtils;
+import cn.com.ctop.common.module.utils.StatusCode;
+import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.service.ICtopOauthTokenService;
+import cn.com.ctop.common.module.service.IFileInfoService;
 import cn.com.ctop.toutiao.entity.ByteDanceCreative;
 import cn.com.ctop.toutiao.entity.ByteDanceCreative;
 import cn.com.ctop.toutiao.mapper.ByteDanceCreativeMapper;
 import cn.com.ctop.toutiao.mapper.ByteDanceCreativeMapper;
 import cn.com.ctop.toutiao.service.IByteDanceAdvertiserDataService;
 import cn.com.ctop.toutiao.service.IByteDanceAdvertiserDataService;

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

@@ -1,9 +1,9 @@
 package cn.com.ctop.toutiao.service.impl;
 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.common.module.utils.ResultMapUtils;
+import cn.com.ctop.common.module.utils.StatusCode;
+import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.toutiao.entity.*;
 import cn.com.ctop.toutiao.entity.*;
 import cn.com.ctop.toutiao.mapper.*;
 import cn.com.ctop.toutiao.mapper.*;
 import cn.com.ctop.toutiao.service.IByteDanceAdvertisePlanService;
 import cn.com.ctop.toutiao.service.IByteDanceAdvertisePlanService;

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


部分文件因文件數量過多而無法顯示