Bladeren bron

Merge remote-tracking branch 'origin/master'

yumeng 5 jaren geleden
bovenliggende
commit
9ad524cbe4
21 gewijzigde bestanden met toevoegingen van 98 en 45 verwijderingen
  1. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java
  2. 3 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CallbackController.java
  3. 7 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BindAccountAuth.java
  4. 3 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceAdvertiser.java
  5. 4 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceAdvertiserBudget.java
  6. 6 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceBudgetTemplate.java
  7. 3 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCampaign.java
  8. 6 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCampaignTemplate.java
  9. 3 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCreative.java
  10. 6 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCreativeTemplate.java
  11. 6 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceUserOrientationTemplate.java
  12. 7 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceAdvertisePlanTemplate.java
  13. 6 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceDeliveryTargetTemplate.java
  14. 5 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/CTopOauthToken.java
  15. 5 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/UserAllocation.java
  16. 3 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/BindAccountAuthServiceImpl.java
  17. 19 26
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceAdvertiserDataServiceImpl.java
  18. 0 4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/CreateInternalServiceImpl.java
  19. 1 1
      jeecg-boot-module-system/src/main/resources/application.yml
  20. 2 2
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/graphql/service/impl/KuaishouWebInterfaceServiceImpl.java
  21. 1 0
      module-toutiao/src/main/resources/bytedance_config.properties

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java

@@ -72,7 +72,7 @@ public class ShiroConfig {
 		filterChainDefinitionMap.put("/swagger**/**", "anon");
 		filterChainDefinitionMap.put("/webjars/**", "anon");
 		filterChainDefinitionMap.put("/v2/**", "anon");
-		filterChainDefinitionMap.put("/kuaishou/**", "anon");
+        filterChainDefinitionMap.put("/kuaishou", "anon");
 		filterChainDefinitionMap.put("/ctop/bindAccount/**", "anon");
 		filterChainDefinitionMap.put("/**/*.mp4", "anon");
         filterChainDefinitionMap.put("/bytedance", "anon");
@@ -89,7 +89,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/auth/**", "anon");
 		filterChainDefinitionMap.put("/ctop/syncdata/**", "anon");
 		//头条接口
-		filterChainDefinitionMap.put("/kuaishou", "anon");
+        filterChainDefinitionMap.put("/bytedance", "anon");
 		filterChainDefinitionMap.put("/toutiao/dictitem/list", "anon");
 		filterChainDefinitionMap.put("/toutiao/advertiser/**", "anon");
         filterChainDefinitionMap.put("/toutiao/industry/list", "anon");

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

@@ -147,7 +147,7 @@ public class CallbackController {
         param.put("secret", PropertiesUtils.getValue("bytedance_config", "bytedance_secret"));
         param.put("grant_type", "auth_code");
         param.put("auth_code", authCode);
-
+        logger.info("state:{}", state);
         Map<String, Object> returnMap = new HashMap<>();
         try {
             JSONObject json = JSONObject.parseObject(state);
@@ -162,7 +162,7 @@ public class CallbackController {
                 logger.info("获取token失败,state:{},message:{}", state, message);
                 throw new Exception("token返回码异常");
             }
-            String advertiser_id = json.getString("advertiserId");
+            String advertiser_id = json.getString("advertiserId");//广告主id
             String mediaId = json.getString("mediaId"); // 媒体类型: 1 头条 2 快手
             String realName = json.getString("realName");
             String departmentId = json.getString("departmentId"); //部门id
@@ -171,12 +171,11 @@ public class CallbackController {
             String userId = json.getString("userId"); //创建人
 
             JSONObject data = resultObject.getJSONObject("data");
-            CTopOauthToken token = new CTopOauthToken(data.getString("advertiser_id"), data);
+            CTopOauthToken token = new CTopOauthToken(advertiser_id, data);
             Map<String, Object> deleteMap = new HashMap<>();
             deleteMap.put("advertiser_id", advertiser_id);
             deleteMap.put("account_id", token.getAccountId());
             cTopOauthTokenMapper.deleteByMap(deleteMap); //删除 广告主id下的相关授权信息
-            token.setAdvertiserId(advertiser_id);
             cTopOauthTokenMapper.insert(token);
             //获取广告主信息
             Map<String, Object> advertiserDataMap = advertiserDataService.getAdvertiserInfo(token.getAccountId() + "");

+ 7 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BindAccountAuth.java

@@ -67,4 +67,11 @@ public class BindAccountAuth {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "修改时间")
     private Date updateTime;
+
+
+    public BindAccountAuth() {
+        Date now = new Date();
+        this.createTime = now;
+        this.updateTime = now;
+    }
 }

+ 3 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceAdvertiser.java

@@ -239,5 +239,8 @@ public class ByteDanceAdvertiser {
 	}
 
     public ByteDanceAdvertiser() {
+		Date now = new Date();
+		this.createTime = now;
+		this.updateTime = now;
 	}
 }

+ 4 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceAdvertiserBudget.java

@@ -12,6 +12,7 @@ import lombok.experimental.Accessors;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * @Description: 今日头条广告主预算信息
@@ -47,6 +48,9 @@ public class ByteDanceAdvertiserBudget {
 	private java.util.Date updateTime;
 
     public ByteDanceAdvertiserBudget() {
+		Date now = new Date();
+		this.createTime = now;
+		this.updateTime = now;
     }
 
     public ByteDanceAdvertiserBudget(JSONObject dataObject, String accountId) {

+ 6 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceBudgetTemplate.java

@@ -139,4 +139,10 @@ public class ByteDanceBudgetTemplate {
 
     private String createBy;
     private String updateBy;
+
+    public ByteDanceBudgetTemplate() {
+        Date now = new Date();
+        this.createTime = now;
+        this.updateTime = now;
+    }
 }

+ 3 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCampaign.java

@@ -94,6 +94,9 @@ public class ByteDanceCampaign {
 	private Date updateTime;
 
     public ByteDanceCampaign() {
+		Date now = new Date();
+		this.createTime = now;
+		this.updateTime = now;
     }
 
     public ByteDanceCampaign(Long id, String advertiserId, Long toutiaoId, String name, BigDecimal budget, String budgetMode, String landingType, String modifyTime, String status, String optStatus, String campaignCreateTime, String campaignModifyTime, Date createTime, Date updateTime) {

+ 6 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCampaignTemplate.java

@@ -84,4 +84,10 @@ public class ByteDanceCampaignTemplate {
      */
     @ApiModelProperty(value = "updateTime")
     private Date updateTime;
+
+    public ByteDanceCampaignTemplate() {
+        Date now = new Date();
+        this.createTime = now;
+        this.updateTime = now;
+    }
 }

+ 3 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCreative.java

@@ -161,5 +161,8 @@ public class ByteDanceCreative {
 	}
 
     public ByteDanceCreative() {
+		Date now = new Date();
+		this.createTime = now;
+		this.updateTime = now;
 	}
 }

+ 6 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceCreativeTemplate.java

@@ -141,4 +141,10 @@ public class ByteDanceCreativeTemplate {
      */
     @ApiModelProperty(value = "updateTime")
     private Date updateTime;
+
+    public ByteDanceCreativeTemplate() {
+        Date now = new Date();
+        this.createTime = now;
+        this.updateTime = now;
+    }
 }

+ 6 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ByteDanceUserOrientationTemplate.java

@@ -244,4 +244,10 @@ public class ByteDanceUserOrientationTemplate {
      */
     @ApiModelProperty(value = "updateTime")
     private Date updateTime;
+
+    public ByteDanceUserOrientationTemplate() {
+        Date now = new Date();
+        this.createTime = now;
+        this.updateTime = now;
+    }
 }

+ 7 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceAdvertisePlanTemplate.java

@@ -93,4 +93,11 @@ public class BytedanceAdvertisePlanTemplate {
      */
     @ApiModelProperty(value = "updateTime")
     private Date updateTime;
+
+
+    public BytedanceAdvertisePlanTemplate() {
+        Date now = new Date();
+        this.createTime = now;
+        this.updateTime = now;
+    }
 }

+ 6 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceDeliveryTargetTemplate.java

@@ -137,4 +137,10 @@ public class BytedanceDeliveryTargetTemplate {
 
     @TableField(exist = false)
     private Long urlId;
+
+    public BytedanceDeliveryTargetTemplate() {
+        Date now = new Date();
+        this.createTime = now;
+        this.updateTime = now;
+    }
 }

+ 5 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/CTopOauthToken.java

@@ -98,9 +98,9 @@ public class CTopOauthToken {
     @ApiModelProperty(value = "修改时间")
     private Date updateTime;
 
-    public CTopOauthToken(String accountId, JSONObject data) {
-        this.advertiserId = accountId;
-        this.mediaId = "toutiao";
+    public CTopOauthToken(String userId, JSONObject data) {
+        this.advertiserId = userId;
+        this.mediaId = "1";
         this.accountId = data.getLong("advertiser_id");
         ;
         String accessToken = data.getString("access_token");
@@ -112,6 +112,8 @@ public class CTopOauthToken {
         Date now = new Date();
         this.accessTokenExpiresIn = DateUtils.addSecond(now, expiresIn);
         this.refreshTokenExpiresIn = DateUtils.addSecond(now, refreshTokenExpiresIn);
+        this.createTime = now;
+        this.updateTime = now;
     }
 
     public CTopOauthToken() {

+ 5 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/UserAllocation.java

@@ -127,4 +127,9 @@ public class UserAllocation {
     @Excel(name = "平台类型 1 头条 2快手", width = 15)
     @ApiModelProperty(value = "平台类型 1 头条 2快手")
     private String mediaId;
+
+    public UserAllocation() {
+        this.createTime = new Date();
+        this.updateTime = new Date();
+    }
 }

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

@@ -62,19 +62,19 @@ public class BindAccountAuthServiceImpl extends ServiceImpl<BindAccountAuthMappe
         sb.append(PropertiesUtils.getValue("kuaishou_config", "kuaishou_auth_url"))
                 .append(KuaishouInterfaceConstant.AUTH_PATH)
                 .append("?app_id=" + PropertiesUtils.getValue("kuaishou_config", "kuaishou_appid"))
-                .append("&state=" + URLEncoder.encode(URLEncoder.encode(state)))
+                .append("&state=" + URLEncoder.encode(state))
                 .append("&scope=%5B%22report_service%22%2C%22ad_query%22%2C%22ad_manage%22%5D")
                 .append("&redirect_uri=" + URLEncoder.encode(PropertiesUtils.getValue("kuaishou_config", "kuaishou_callback_url"), "UTF-8"));
         return sb.toString();
     }
 
-
+    @Override
     public String getByteDanceCodeUrl(String state) throws UnsupportedEncodingException {
         StringBuffer sb = new StringBuffer();
         sb.append(PropertiesUtils.getValue("bytedance_config", "bytedance_auth_url"))
                 .append(BytedanceInterfaceConstant.AUTH_PATH)
                 .append("?app_id=" + PropertiesUtils.getValue("bytedance_config", "bytedance_appid"))
-                .append("&state=" + URLEncoder.encode(URLEncoder.encode(state)))
+                .append("&state=" + URLEncoder.encode(state))
                 .append("&redirect_uri=" + URLEncoder.encode(PropertiesUtils.getValue("bytedance_config", "bytedance_callback_url"), "UTF-8"));
         return sb.toString();
     }

+ 19 - 26
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ByteDanceAdvertiserDataServiceImpl.java

@@ -35,20 +35,13 @@ import java.util.TreeMap;
 @Service
 public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserDataService {
     private static final Logger logger = LoggerFactory.getLogger(ByteDanceAdvertiserDataServiceImpl.class);
-    @Autowired
-    private CTopOauthTokenMapper cTopOauthTokenMapper;
-
-    private CTopOauthToken getOAuthTokenByAccountId(String accountId) {
-        QueryWrapper<CTopOauthToken> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("advertiser_id", accountId).orderByDesc("create_time");
-        CTopOauthToken cTopOauthToken = cTopOauthTokenMapper.selectOne(queryWrapper);
-        return cTopOauthToken;
-    }
 
+    @Autowired
+    private ICTopOauthTokenService tokenService;
     @Override
     public Map<String, Object> getAdvertiserInfo(String accountId) {
         Map<String, Object> resultMap = new HashMap<>();
-        CTopOauthToken cTopOauthToken = getOAuthTokenByAccountId(accountId);
+        CTopOauthToken cTopOauthToken = tokenService.getOAuthTokenByAccountId(accountId);
         //2: 根据token以及用户id获取用户信息数据
         String url = PropertiesUtils.getValue("bytedance_config", "bytedance_api_url") + PropertiesUtils.getValue("bytedance_config", "bytedance_v2_advertiser_info");
         Map<String, String> headers = new HashMap<>();
@@ -62,13 +55,15 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
 
         if (null == code || !code.equals(0)) {
             logger.info("获取广告主信息接口异常==》accountId:{},message:{}", accountId, jsonObject.getString("message"));
+            resultMap.put("success", false);
             resultMap.put("code", -1);
             resultMap.put("message", "获取广告主信息接口异常");
             return resultMap;
         }
         JSONArray data = jsonObject.getJSONArray("data");
         if (null == data || data.size() <= 0) {
-            resultMap.put("code", 0);
+            resultMap.put("success", false);
+            resultMap.put("code", -1);
             resultMap.put("message", "广告主信息不存在");
             return resultMap;
         }
@@ -80,13 +75,14 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
             advertiserMapper.insert(advertiser);
             resultMap.put("data", advertiser);
         }
+        resultMap.put("success", true);
         resultMap.put("code", 0);
         resultMap.put("message", "获取广告主信息成功");
         return resultMap;
     }
 
     private void getAdvertiserPlanByPageNumber(String accountId, Integer pageNumber, String ids) {
-        CTopOauthToken cTopOauthToken = getOAuthTokenByAccountId(accountId);
+        CTopOauthToken cTopOauthToken = tokenService.getOAuthTokenByAccountId(accountId);
         //2: 根据token以及用户id获取用户信息数据
         String url = PropertiesUtils.getValue("bytedance_config", "bytedance_api_url") + PropertiesUtils.getValue("bytedance_config", "bytedance_v2_ad_get");
         Map<String, String> headers = new HashMap<>();
@@ -155,7 +151,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
     @Override
     public Map<String, Object> getAdvertiserBudget(String accountId) {
         Map<String, Object> resultMap = new HashMap<>();
-        CTopOauthToken cTopOauthToken = getOAuthTokenByAccountId(accountId);
+        CTopOauthToken cTopOauthToken = tokenService.getOAuthTokenByAccountId(accountId);
         //2: 根据token以及用户id获取用户信息数据
         String url = PropertiesUtils.getValue("bytedance_config", "bytedance_api_url") + PropertiesUtils.getValue("bytedance_config", "bytedance_v2_campaign_get");
         Map<String, String> headers = new HashMap<>();
@@ -205,7 +201,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
     @Override
     public Map<String, Object> getAdvertiserCreativeMaterial(String accountId, String creativeIds) {
         Map<String, Object> resultMap = new HashMap<>();
-        CTopOauthToken cTopOauthToken = getOAuthTokenByAccountId(accountId);
+        CTopOauthToken cTopOauthToken = tokenService.getOAuthTokenByAccountId(accountId);
         //2: 根据token以及用户id获取用户信息数据
         String url = PropertiesUtils.getValue("bytedance_config", "bytedance_api_url") + PropertiesUtils.getValue("bytedance_config", "bytedance_v2_creative_material_get");
         Map<String, String> headers = new HashMap<>();
@@ -254,7 +250,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
                 ids.add(Long.parseLong(getIds[i]));
             }
         }
-        CTopOauthToken cTopOauthToken = getOAuthTokenByAccountId(accountId);
+        CTopOauthToken cTopOauthToken = tokenService.getOAuthTokenByAccountId(accountId);
         //2: 根据token以及用户id获取用户信息数据
         String url = PropertiesUtils.getValue("bytedance_config", "bytedance_api_url") + PropertiesUtils.getValue("bytedance_config", "bytedance_v2_campaign_update_status");
         Map<String, String> headers = new HashMap<>();
@@ -301,7 +297,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
     @Override
     public Map<String, Object> advertiserCampaignUpdate(String accountId, Long campaignId, String budgetMode, Integer budget, String campaignName) {
         Map<String, Object> resultMap = new HashMap<>();
-        CTopOauthToken cTopOauthToken = getOAuthTokenByAccountId(accountId);
+        CTopOauthToken cTopOauthToken = tokenService.getOAuthTokenByAccountId(accountId);
         ByteDanceCampaign campaign = campaignMapper.selectById(campaignId);
         //2: 根据token以及用户id获取用户信息数据
         String url = PropertiesUtils.getValue("bytedance_config", "bytedance_api_url") + PropertiesUtils.getValue("bytedance_config", "bytedance_v2_campaign_update");
@@ -367,7 +363,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
                 ids.add(Long.parseLong(getIds[i]));
             }
         }
-        CTopOauthToken cTopOauthToken = getOAuthTokenByAccountId(accountId);
+        CTopOauthToken cTopOauthToken = tokenService.getOAuthTokenByAccountId(accountId);
         //2: 根据token以及用户id获取用户信息数据
         String url = PropertiesUtils.getValue("bytedance_config", "bytedance_api_url") + PropertiesUtils.getValue("bytedance_config", "bytedance_v2_ad_update_status");
         Map<String, String> headers = new HashMap<>();
@@ -422,7 +418,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
                 data.add(object);
             }
         }
-        CTopOauthToken cTopOauthToken = getOAuthTokenByAccountId(accountId);
+        CTopOauthToken cTopOauthToken = tokenService.getOAuthTokenByAccountId(accountId);
         //2: 根据token以及用户id获取用户信息数据
         String url = PropertiesUtils.getValue("bytedance_config", "bytedance_api_url") + PropertiesUtils.getValue("bytedance_config", "bytedance_v2_ad_update_bid");
         Map<String, String> headers = new HashMap<>();
@@ -476,7 +472,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
                 data.add(object);
             }
         }
-        CTopOauthToken cTopOauthToken = getOAuthTokenByAccountId(accountId);
+        CTopOauthToken cTopOauthToken = tokenService.getOAuthTokenByAccountId(accountId);
         //2: 根据token以及用户id获取用户信息数据
         String url = PropertiesUtils.getValue("bytedance_config", "bytedance_api_url") + PropertiesUtils.getValue("bytedance_config", "bytedance_v2_ad_update_budget");
         Map<String, String> headers = new HashMap<>();
@@ -522,7 +518,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
                 ids.add(Long.parseLong(getCreativeIds[i]));
             }
         }
-        CTopOauthToken cTopOauthToken = getOAuthTokenByAccountId(accountId);
+        CTopOauthToken cTopOauthToken = tokenService.getOAuthTokenByAccountId(accountId);
         //2: 根据token以及用户id获取用户信息数据
         String url = PropertiesUtils.getValue("bytedance_config", "bytedance_api_url") + PropertiesUtils.getValue("bytedance_config", "bytedance_v2_creative_update_status");
         Map<String, String> headers = new HashMap<>();
@@ -568,7 +564,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
     @Override
     public Map<String, Object> advertiserCustomAudienceSelect(String accountId) {
         Map<String, Object> resultMap = new HashMap<>();
-        CTopOauthToken token = getOAuthTokenByAccountId(accountId);
+        CTopOauthToken token = tokenService.getOAuthTokenByAccountId(accountId);
 
         String url = PropertiesUtils.getValue("bytedance_config", "bytedance_api_url") + PropertiesUtils.getValue("bytedance_config", "bytedance_v2_dmp_custom_audience_select");
         Map<String, String> headers = new HashMap<>();
@@ -620,13 +616,10 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
     private ByteDanceCustomAudienceMapper audienceMapper;
 
     @Autowired
-    private ICTopOauthTokenService tokenService;
-
-    @Autowired
     private ByteDanceCreativeMaterialMapper creativeMaterialMapper;
 
     private void getAdvertiserCreativeByPageNumber(String accountId, Integer pageNumber, String ids) {
-        CTopOauthToken cTopOauthToken = getOAuthTokenByAccountId(accountId);
+        CTopOauthToken cTopOauthToken = tokenService.getOAuthTokenByAccountId(accountId);
         //2: 根据token以及用户id获取用户信息数据
         String url = PropertiesUtils.getValue("bytedance_config", "bytedance_api_url") + PropertiesUtils.getValue("bytedance_config", "bytedance_v2_creative_get");
         Map<String, String> headers = new HashMap<>();
@@ -676,7 +669,7 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
     private ByteDanceAdvertiserBudgetMapper advertiserBudgetMapper;
 
     private void getAdvertiserCampaignByPageNumber(String accountId, Integer pageNumber, String ids) {
-        CTopOauthToken cTopOauthToken = getOAuthTokenByAccountId(accountId);
+        CTopOauthToken cTopOauthToken = tokenService.getOAuthTokenByAccountId(accountId);
         //2: 根据token以及用户id获取用户信息数据
         String url = PropertiesUtils.getValue("bytedance_config", "bytedance_api_url") + PropertiesUtils.getValue("bytedance_config", "bytedance_v2_campaign_get");
         Map<String, String> headers = new HashMap<>();

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

@@ -146,10 +146,6 @@ public class CreateInternalServiceImpl implements ICreateInternalService {
                     ck.setPath(cookie.getPath());
                     HttpUtils.cookieStore.addCookie(ck);
                 }
-//                String siteStr = HttpUtils.httpGetRequest("https://ad.oceanengine.com/overture/api/adv_site/get_site_list/?_="+String.valueOf(new Date().getTime()));
-//                String convStr = HttpUtils.httpGetRequest("https://ad.oceanengine.com/overture/api/get_tetris_action/?external_url=&type=external&pricing=9&landing_type=3&_="+String.valueOf(new Date().getTime()));
-//                JsonNode siteNode = mapper.readTree(siteStr);
-//                JsonNode convNode = mapper.readTree(convStr);
 
                 Map<String, Object> param4 = new HashMap<String, Object>();
                 param4.put("location_type", 4);

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

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
+    active: prod
 swagger:
   production: false
   basic:

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

@@ -187,8 +187,8 @@ public class KuaishouWebInterfaceServiceImpl implements IKuaishouWebInterfaceSer
     }
 
     public void adkuaishouWebLogin(String phone, String password) {
-        System.getProperties().setProperty("webdriver.chrome.driver", "D:/chromedriver.exe");
-//        System.getProperties().setProperty("webdriver.chrome.driver", "/usr/bin/chromedriver");
+//        System.getProperties().setProperty("webdriver.chrome.driver", "D:/chromedriver.exe");
+        System.getProperties().setProperty("webdriver.chrome.driver", "/usr/bin/chromedriver");
         ChromeOptions chromeOptions = new ChromeOptions();
         WebDriver webDriver = new ChromeDriver(chromeOptions);
         try {

+ 1 - 0
module-toutiao/src/main/resources/bytedance_config.properties

@@ -7,6 +7,7 @@ bytedance_auth_url=https://ad.toutiao.com/openapi
 #sandbox
 #bytedance_api_url=https://test-ad.toutiao.com/open_api
 #bytedance_auth_url=https://test-ad.toutiao.com/open_api
+#bytedance_callback_url=http://callback.c-top.com.cn/bytedance
 bytedance_callback_url=http://adsp.c-top.com.cn:8080/jeecg-boot/bytedance
 bytedance_v2_advertiser_info=/2/advertiser/info
 bytedance_v2_ad_get=/2/ad/get