yumeng преди 5 години
родител
ревизия
a1a1828460
променени са 55 файла, в които са добавени 107 реда и са изтрити 109 реда
  1. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CallbackController.java
  2. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CtopOauthTokenController.java
  3. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ReportController.java
  4. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/CreateInternalServiceImpl.java
  5. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/RefreshTokenServiceImpl.java
  6. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ReportServiceImpl.java
  7. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouController.java
  8. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouConversionTypesController.java
  9. 2 2
      jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java
  10. 2 2
      module-common/pom.xml
  11. 1 1
      module-common/src/main/java/module/entity/BindAccountAuth.java
  12. 1 1
      module-common/src/main/java/module/entity/BindAccountLogin.java
  13. 1 1
      module-common/src/main/java/module/entity/CtopOauthToken.java
  14. 1 1
      module-common/src/main/java/module/entity/FileInfo.java
  15. 1 1
      module-common/src/main/java/module/entity/SourceFile.java
  16. 1 1
      module-common/src/main/java/module/entity/UserAllocation.java
  17. 2 2
      module-common/src/main/java/module/mapper/BindAccountAuthMapper.java
  18. 2 2
      module-common/src/main/java/module/mapper/BindAccountLoginMapper.java
  19. 2 2
      module-common/src/main/java/module/mapper/CtopOauthTokenMapper.java
  20. 2 2
      module-common/src/main/java/module/mapper/FileInfoMapper.java
  21. 2 2
      module-common/src/main/java/module/mapper/SourceFileMapper.java
  22. 2 2
      module-common/src/main/java/module/mapper/UserAllocationMapper.java
  23. 0 0
      module-common/src/main/java/cn/com/ctop/module/mapper/xml/BindAccountAuthMapper.xml
  24. 0 0
      module-common/src/main/java/cn/com/ctop/module/mapper/xml/BindAccountLoginMapper.xml
  25. 0 0
      module-common/src/main/java/cn/com/ctop/module/mapper/xml/CtopOauthTokenMapper.xml
  26. 0 0
      module-common/src/main/java/cn/com/ctop/module/mapper/xml/FileInfoMapper.xml
  27. 0 0
      module-common/src/main/java/cn/com/ctop/module/mapper/xml/SourceFileMapper.xml
  28. 0 0
      module-common/src/main/java/cn/com/ctop/module/mapper/xml/UserAllocationMapper.xml
  29. 2 2
      module-common/src/main/java/module/service/IBindAccountAuthService.java
  30. 2 2
      module-common/src/main/java/module/service/IBindAccountLoginService.java
  31. 2 2
      module-common/src/main/java/module/service/ICtopOauthTokenService.java
  32. 2 2
      module-common/src/main/java/module/service/IFileInfoService.java
  33. 2 2
      module-common/src/main/java/module/service/ISourceFileService.java
  34. 2 2
      module-common/src/main/java/module/service/IUserAllocationService.java
  35. 4 4
      module-common/src/main/java/module/service/impl/BindAccountAuthServiceImpl.java
  36. 4 4
      module-common/src/main/java/module/service/impl/BindAccountLoginServiceImpl.java
  37. 6 8
      module-common/src/main/java/module/service/impl/CtopOauthTokenServiceImpl.java
  38. 8 8
      module-common/src/main/java/module/service/impl/FileInfoServiceImpl.java
  39. 4 4
      module-common/src/main/java/module/service/impl/SourceFileServiceImpl.java
  40. 4 4
      module-common/src/main/java/module/service/impl/UserAllocationServiceImpl.java
  41. 2 2
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouCreateAppTemplateServiceImpl.java
  42. 2 2
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouCreateServiceImpl.java
  43. 2 2
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouImageServiceImpl.java
  44. 2 2
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouVideoServiceImpl.java
  45. 1 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/entity/ByteDanceCampaign.java
  46. 1 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/entity/ByteDanceCustomAudience.java
  47. 1 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/entity/ByteDanceImageInfo.java
  48. 1 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/entity/ByteDanceVideoInfo.java
  49. 1 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/IByteDanceAdvertisePlanService.java
  50. 1 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/IByteDanceAdvertiserDataService.java
  51. 1 1
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/IByteDanceCampaignTemplateService.java
  52. 4 4
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceAdvertisePlanServiceImpl.java
  53. 2 2
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceAdvertiserDataServiceImpl.java
  54. 3 3
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/ByteDanceCreativeServiceImpl.java
  55. 2 2
      module-toutiao/src/main/java/cn/com/ctop/toutiao/service/impl/BytedanceAdvertisePlanTemplateServiceImpl.java

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

@@ -9,8 +9,8 @@ import cn.com.ctop.kuaishou.modules.material.entity.KuaishouResultToken;
 import cn.com.ctop.toutiao.common.BytedanceInterfaceConstant;
 import com.alibaba.fastjson.JSONObject;
 import constant.KuaishouInterfaceConstant;
-import module.entity.CtopOauthToken;
-import module.mapper.CtopOauthTokenMapper;
+import cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.module.mapper.CtopOauthTokenMapper;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.modules.ctop.entity.ByteDanceAdvertiser;
 import org.jeecg.modules.ctop.service.IByteDanceAdvertiserDataService;

+ 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 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ReportController.java

@@ -2,8 +2,8 @@ package org.jeecg.modules.ctop.controller;
 
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 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.common.util.DateUtils;
 import org.jeecg.common.util.ResultMapUtils;
 import org.jeecg.common.util.StatusCode;

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

@@ -8,8 +8,8 @@ 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.CtopOauthToken;
-import module.service.ICtopOauthTokenService;
+import cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.module.service.ICtopOauthTokenService;
 import org.apache.http.impl.cookie.BasicClientCookie;
 import org.jeecg.common.util.ResultMapUtils;
 import org.jeecg.common.util.StatusCode;

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

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

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

@@ -6,8 +6,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.apache.poi.hssf.usermodel.HSSFDataFormat;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;

+ 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/test/java/org/jeecg/SampleTest.java

@@ -3,8 +3,8 @@ package org.jeecg;
 import cn.com.ctop.common.utils.OSSUtils;
 import com.alibaba.fastjson.JSONArray;
 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.common.util.ResultMapUtils;
 import org.jeecg.common.util.StatusCode;
 import org.jeecg.common.util.jsonschema.JsonschemaUtil;

+ 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-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: 用户分配

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


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


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


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


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


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


+ 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: 用户分配

+ 4 - 4
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.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.toutiao.common.BytedanceInterfaceConstant;
 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,11 +1,11 @@
-package module.service.impl;
+package cn.com.ctop.module.service.impl;
 
 import cn.com.ctop.common.utils.Check;
+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.jeecg.common.constant.CtopAdConstant;
 import org.jeecg.modules.ctop.service.ICreateInternalService;
 import org.springframework.beans.factory.annotation.Autowired;

+ 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>();

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

@@ -1,20 +1,20 @@
-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.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.toutiao.common.BytedanceInterfaceConstant;
 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;

+ 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;
 
 /**

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

@@ -9,8 +9,8 @@ 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 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;
 

+ 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;
 

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

@@ -11,8 +11,8 @@ 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 cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.module.service.ICtopOauthTokenService;
 import org.jeecg.common.util.encryption.AesEncryptUtil;
 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/KuaiShouVideoServiceImpl.java

@@ -11,8 +11,8 @@ 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 cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.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-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;
 

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

@@ -11,9 +11,9 @@ 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 cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.module.service.ICtopOauthTokenService;
+import cn.com.ctop.module.service.IFileInfoService;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;

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

@@ -7,8 +7,8 @@ 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 cn.com.ctop.module.entity.CtopOauthToken;
+import cn.com.ctop.module.service.ICtopOauthTokenService;
 import org.jeecg.common.util.ResultMapUtils;
 import org.jeecg.common.util.StatusCode;
 import org.springframework.beans.factory.annotation.Autowired;