|
@@ -140,15 +140,8 @@ public class CallbackController {
|
|
|
if (Check.isNull(accountId)) {
|
|
|
return "授权绑定失败!";
|
|
|
}
|
|
|
- QueryWrapper<UserAllocation> userAllocationQueryWrapper = new QueryWrapper<>();
|
|
|
- userAllocationQueryWrapper.eq("account_id", accountId);
|
|
|
- userAllocationQueryWrapper.eq("media_id", 2);
|
|
|
- userAllocationQueryWrapper.orderByDesc("create_time");
|
|
|
- userAllocationQueryWrapper.last("limit 1");
|
|
|
- UserAllocation checkUserAllocation = allocationMapper.selectOne(userAllocationQueryWrapper);
|
|
|
- if (!Check.isNull(checkUserAllocation)) {
|
|
|
- return "授权失败,该账号已被:" + checkUserAllocation.getAuthName() + "绑定!";
|
|
|
- }
|
|
|
+
|
|
|
+
|
|
|
String advertiserId = json.getString("advertiserId");
|
|
|
//指定分配人姓名
|
|
|
String userName = json.getString("userName");
|
|
@@ -159,6 +152,34 @@ public class CallbackController {
|
|
|
//创建人
|
|
|
String userId = json.getString("userId");
|
|
|
Long projectId = json.getLong("projectId");
|
|
|
+
|
|
|
+ CtopOauthToken topOauthToken = new CtopOauthToken();
|
|
|
+ topOauthToken.setId(accountId + "");
|
|
|
+ topOauthToken.setAccountId(accountId);
|
|
|
+ topOauthToken.setMediaId("2");
|
|
|
+ topOauthToken.setAdvertiserId(advertiserId);
|
|
|
+ topOauthToken.setAccessToken(token.getAccessToken());
|
|
|
+ long accessTokenExpireIn = token.getAccessTokenExpiresIn() * 1000L;
|
|
|
+ long now = System.currentTimeMillis();
|
|
|
+ Date accessTokenExpireInDate = new Date(now + accessTokenExpireIn);
|
|
|
+ topOauthToken.setAccessTokenExpiresIn(accessTokenExpireInDate);
|
|
|
+ topOauthToken.setRefreshToken(token.getRefreshToken());
|
|
|
+ long refreshTokenExpireIn = token.getRefreshTokenExpiresIn() * 1000L;
|
|
|
+ Date refreshTokenExpireInDate = new Date(now + refreshTokenExpireIn);
|
|
|
+ topOauthToken.setRefreshTokenExpiresIn(refreshTokenExpireInDate);
|
|
|
+ topOauthToken.setUpdateTime(new Date());
|
|
|
+ ctopOauthTokenService.saveOrUpdate(topOauthToken);
|
|
|
+
|
|
|
+
|
|
|
+ QueryWrapper<UserAllocation> userAllocationQueryWrapper = new QueryWrapper<>();
|
|
|
+ userAllocationQueryWrapper.eq("account_id", accountId);
|
|
|
+ userAllocationQueryWrapper.eq("media_id", 2);
|
|
|
+ userAllocationQueryWrapper.orderByDesc("create_time");
|
|
|
+ userAllocationQueryWrapper.last("limit 1");
|
|
|
+ UserAllocation checkUserAllocation = allocationMapper.selectOne(userAllocationQueryWrapper);
|
|
|
+ if (!Check.isNull(checkUserAllocation)) {
|
|
|
+ return "授权失败,该账号已被:" + checkUserAllocation.getUserName() + " 绑定!";
|
|
|
+ }
|
|
|
String projectName = json.getString("projectName");
|
|
|
UserAllocation userAllocation = new UserAllocation();
|
|
|
userAllocation.setUserName(userName);
|
|
@@ -185,22 +206,7 @@ public class CallbackController {
|
|
|
if (i > 0) {
|
|
|
logger.info("同步分配用户表完成,task_id:{},accountId:{}", state, accountId);
|
|
|
}
|
|
|
- CtopOauthToken topOauthToken = new CtopOauthToken();
|
|
|
- topOauthToken.setId(accountId + "");
|
|
|
- topOauthToken.setAccountId(accountId);
|
|
|
- topOauthToken.setMediaId("2");
|
|
|
- topOauthToken.setAdvertiserId(advertiserId);
|
|
|
- topOauthToken.setAccessToken(token.getAccessToken());
|
|
|
- long accessTokenExpireIn = token.getAccessTokenExpiresIn() * 1000L;
|
|
|
- long now = System.currentTimeMillis();
|
|
|
- Date accessTokenExpireInDate = new Date(now + accessTokenExpireIn);
|
|
|
- topOauthToken.setAccessTokenExpiresIn(accessTokenExpireInDate);
|
|
|
- topOauthToken.setRefreshToken(token.getRefreshToken());
|
|
|
- long refreshTokenExpireIn = token.getRefreshTokenExpiresIn() * 1000L;
|
|
|
- Date refreshTokenExpireInDate = new Date(now + refreshTokenExpireIn);
|
|
|
- topOauthToken.setRefreshTokenExpiresIn(refreshTokenExpireInDate);
|
|
|
- topOauthToken.setUpdateTime(new Date());
|
|
|
- ctopOauthTokenService.saveOrUpdate(topOauthToken);
|
|
|
+
|
|
|
//账号绑定
|
|
|
bindAccountAuthService.addBindAccount(accountId, KuaishouInterfaceConstant.LOGIN_TYPE_KUAISHOU, advertiserId);
|
|
|
Thread t = new Thread() {
|