Browse Source

调整三方授权

yumeng 5 years ago
parent
commit
6b982cf4f4

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

@@ -16,13 +16,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.system.api.ISysBaseApi;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.service.ISysDepartService;
-import org.jeecg.modules.system.service.ISysLogService;
 import org.jeecg.modules.system.service.ISysUserService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -48,10 +46,7 @@ public class CallbackController {
     private static final Logger logger = LoggerFactory.getLogger(CallbackController.class);
     @Autowired
     private ISysUserService sysUserService;
-    @Autowired
-    private ISysBaseApi sysBaseApi;
-    @Autowired
-    private ISysLogService logService;
+
     @Autowired
     private RedisUtil redisUtil;
     @Autowired
@@ -132,6 +127,7 @@ public class CallbackController {
             if (Check.isNull(json)) {
                 throw new Exception("回调信息为空");
             }
+            logger.info("快手授权返回信息:{}", json);
             Integer agentType = json.getInteger("agentType");
             if (StringUtils.isNotBlank(authCode)) {
                 KuaishouResultToken accessToken = kuaishouInterfaceService.getAccessToken(authCode, agentType);

+ 4 - 3
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;
 
-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 cn.com.ctop.common.module.utils.Check;
+import cn.com.ctop.common.module.utils.CtopAdConstant;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.modules.ctop.service.IRefreshTokenService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +22,7 @@ public class RefreshTokenServiceImpl implements IRefreshTokenService {
 
     /**
      * 获取所有token
+     *
      * @return
      */
     @Override
@@ -36,7 +37,7 @@ public class RefreshTokenServiceImpl implements IRefreshTokenService {
                 }
                 //快手
                 if (CtopAdConstant.PLATFORM_TYPE_KUAISHOU.equals(oauthToken.getMediaId().trim())) {
-                    oauthTokenService.getKuaiShouRefreshToken(oauthToken.getAccountId(), oauthToken.getRefreshToken());
+                    oauthTokenService.getKuaiShouRefreshToken(oauthToken.getAccountId(), oauthToken.getRefreshToken(), oauthToken.getAgentType());
                 }
             }
         } else {

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

@@ -2,6 +2,7 @@ package cn.com.ctop.common.module.service;
 
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import com.baomidou.mybatisplus.extension.service.IService;
+import io.swagger.models.auth.In;
 
 import java.util.List;
 import java.util.Map;
@@ -20,7 +21,7 @@ public interface ICtopOauthTokenService extends IService<CtopOauthToken> {
 
     Map<String, Object> getByteDanceAccessToken(String accountId);
 
-    Map<String, Object> getKuaiShouRefreshToken(Long accountId, String refreshToken);
+    Map<String, Object> getKuaiShouRefreshToken(Long accountId, String refreshToken, Integer agentType);
 
     List<CtopOauthToken> getTokenListByType(String platformTypeBytedance);
 

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

@@ -102,13 +102,19 @@ public class CtopOauthTokenServiceImpl extends ServiceImpl<CtopOauthTokenMapper,
      * @return
      */
     @Override
-    public Map<String, Object> getKuaiShouRefreshToken(Long accountId, String refreshToken) {
+    public Map<String, Object> getKuaiShouRefreshToken(Long accountId, String refreshToken, Integer agentType) {
         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>();
-        param.put("app_id", PropertiesUtils.getConfig("kuaishou_appid"));
-        param.put("secret", PropertiesUtils.getConfig("kuaishou_secret"));
+        if (agentType == 1) {
+            param.put("app_id", PropertiesUtils.getConfig("kuaishou_appid"));
+            param.put("secret", PropertiesUtils.getConfig("kuaishou_secret"));
+        } else if (agentType == 0) {
+            param.put("app_id", PropertiesUtils.getConfig("kuaishou_third_appid"));
+            param.put("secret", PropertiesUtils.getConfig("kuaishou_third_secret"));
+        }
+
         param.put("refresh_token", refreshToken);
         try {
             String result = HttpUtils.httpPostRequest(url, param, headers);

+ 2 - 2
module-kuaishou/src/main/resources/kuaishou_config.properties

@@ -3,8 +3,8 @@ kuaishou_auth_url=https://ad.e.kuaishou.com
 kuaishou_appid=27
 kuaishou_third_appid=328
 oauth_type=agent
-kuaishou_secret=1iFTBiMdohkyEQQs
-kuaishou_third_secret=QovprB1tNhXptgDc
+kuaishou_secret=QovprB1tNhXptgDc
+kuaishou_third_secret=1iFTBiMdohkyEQQs
 kuaishou_callback_url=http://adsp.c-top.com.cn:8080/jeecg-boot/kuaishou
 apk_sava_path=/mnt/file/apk
 image_sava_path=/mnt/file/image