|
@@ -1,14 +1,15 @@
|
|
package org.jeecg.modules.ctop.controller;
|
|
package org.jeecg.modules.ctop.controller;
|
|
|
|
|
|
-import cn.com.ctop.common.module.utils.*;
|
|
|
|
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
|
|
|
|
-import cn.com.ctop.kuaishou.modules.material.entity.KuaishouAccessToken;
|
|
|
|
-import cn.com.ctop.kuaishou.modules.material.entity.KuaishouResultToken;
|
|
|
|
import cn.com.ctop.common.module.entity.CtopOauthToken;
|
|
import cn.com.ctop.common.module.entity.CtopOauthToken;
|
|
import cn.com.ctop.common.module.entity.UserAllocation;
|
|
import cn.com.ctop.common.module.entity.UserAllocation;
|
|
import cn.com.ctop.common.module.mapper.CtopOauthTokenMapper;
|
|
import cn.com.ctop.common.module.mapper.CtopOauthTokenMapper;
|
|
import cn.com.ctop.common.module.mapper.UserAllocationMapper;
|
|
import cn.com.ctop.common.module.mapper.UserAllocationMapper;
|
|
import cn.com.ctop.common.module.service.IBindAccountAuthService;
|
|
import cn.com.ctop.common.module.service.IBindAccountAuthService;
|
|
|
|
+import cn.com.ctop.common.module.service.ICtopOauthTokenService;
|
|
|
|
+import cn.com.ctop.common.module.utils.*;
|
|
|
|
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
|
|
|
|
+import cn.com.ctop.kuaishou.modules.material.entity.KuaishouAccessToken;
|
|
|
|
+import cn.com.ctop.kuaishou.modules.material.entity.KuaishouResultToken;
|
|
import cn.com.ctop.toutiao.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;
|
|
@@ -43,6 +44,9 @@ public class CallbackController {
|
|
@Autowired
|
|
@Autowired
|
|
private UserAllocationMapper allocationMapper;
|
|
private UserAllocationMapper allocationMapper;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private ICtopOauthTokenService ctopOauthTokenService;
|
|
|
|
+
|
|
|
|
|
|
/**
|
|
/**
|
|
* TODO 授权绑定成功/失败 需要跳转特定页面
|
|
* TODO 授权绑定成功/失败 需要跳转特定页面
|
|
@@ -106,10 +110,7 @@ public class CallbackController {
|
|
logger.info("同步分配用户表完成,task_id:{},accountId:{}", state, accountId);
|
|
logger.info("同步分配用户表完成,task_id:{},accountId:{}", state, accountId);
|
|
}
|
|
}
|
|
CtopOauthToken topOauthToken = new CtopOauthToken();
|
|
CtopOauthToken topOauthToken = new CtopOauthToken();
|
|
- Map<String, Object> deleteMap = new HashMap<>();
|
|
|
|
- deleteMap.put("advertiser_id", advertiserId);
|
|
|
|
- deleteMap.put("account_id", accountId);
|
|
|
|
- cTopOauthTokenMapper.deleteByMap(deleteMap); //删除 广告主id下的相关授权信息
|
|
|
|
|
|
+ topOauthToken.setId(accountId + "");
|
|
topOauthToken.setAccountId(accountId);
|
|
topOauthToken.setAccountId(accountId);
|
|
topOauthToken.setMediaId("2");
|
|
topOauthToken.setMediaId("2");
|
|
topOauthToken.setAdvertiserId(advertiserId);
|
|
topOauthToken.setAdvertiserId(advertiserId);
|
|
@@ -123,7 +124,7 @@ public class CallbackController {
|
|
Date refreshTokenExpireInDate = new Date(now + refreshTokenExpireIn);
|
|
Date refreshTokenExpireInDate = new Date(now + refreshTokenExpireIn);
|
|
topOauthToken.setRefreshTokenExpiresIn(refreshTokenExpireInDate);
|
|
topOauthToken.setRefreshTokenExpiresIn(refreshTokenExpireInDate);
|
|
topOauthToken.setUpdateTime(new Date());
|
|
topOauthToken.setUpdateTime(new Date());
|
|
- cTopOauthTokenMapper.insert(topOauthToken);
|
|
|
|
|
|
+ ctopOauthTokenService.saveOrUpdate(topOauthToken);
|
|
bindAccountAuthService.addBindAccount(accountId, KuaishouInterfaceConstant.LOGIN_TYPE_KUAISHOU, advertiserId); //账号绑定
|
|
bindAccountAuthService.addBindAccount(accountId, KuaishouInterfaceConstant.LOGIN_TYPE_KUAISHOU, advertiserId); //账号绑定
|
|
Thread t = new Thread() {
|
|
Thread t = new Thread() {
|
|
@Override
|
|
@Override
|
|
@@ -192,11 +193,7 @@ public class CallbackController {
|
|
|
|
|
|
JSONObject data = resultObject.getJSONObject("data");
|
|
JSONObject data = resultObject.getJSONObject("data");
|
|
CtopOauthToken token = new CtopOauthToken(advertiserId, data);
|
|
CtopOauthToken token = new CtopOauthToken(advertiserId, data);
|
|
- Map<String, Object> deleteMap = new HashMap<>();
|
|
|
|
- deleteMap.put("advertiser_id", advertiserId);
|
|
|
|
- deleteMap.put("account_id", token.getAccountId());
|
|
|
|
- cTopOauthTokenMapper.deleteByMap(deleteMap); //删除 广告主id下的相关授权信息
|
|
|
|
- cTopOauthTokenMapper.insert(token);
|
|
|
|
|
|
+ ctopOauthTokenService.saveOrUpdate(token);
|
|
//获取广告主信息
|
|
//获取广告主信息
|
|
Map<String, Object> advertiserDataMap = advertiserDataService.getAdvertiserInfo(token.getAccountId() + "");
|
|
Map<String, Object> advertiserDataMap = advertiserDataService.getAdvertiserInfo(token.getAccountId() + "");
|
|
Boolean getSuccess = (Boolean) advertiserDataMap.get("success");
|
|
Boolean getSuccess = (Boolean) advertiserDataMap.get("success");
|