Browse Source

骄阳调整

yumeng 5 years ago
parent
commit
7edaf1f48e

+ 0 - 12
module-common/src/main/java/cn/com/ctop/common/module/service/impl/BindAccountAuthServiceImpl.java

@@ -68,16 +68,6 @@ public class BindAccountAuthServiceImpl extends ServiceImpl<BindAccountAuthMappe
                     .append("&state=" + URLEncoder.encode(URLEncoder.encode(state)))
                     .append("&state=" + URLEncoder.encode(URLEncoder.encode(state)))
                     .append("&scope=%5B%22report_service%22%2C%22ad_query%22%2C%22account_service%22%2C%22ad_manage%22%5D")
                     .append("&scope=%5B%22report_service%22%2C%22ad_query%22%2C%22account_service%22%2C%22ad_manage%22%5D")
                     .append("&redirect_uri=" + URLEncoder.encode(PropertiesUtils.getValue("kuaishou_config", "kuaishou_callback_url"), "UTF-8"));
                     .append("&redirect_uri=" + URLEncoder.encode(PropertiesUtils.getValue("kuaishou_config", "kuaishou_callback_url"), "UTF-8"));
-        } else if (agentType == 0) {
-
-            // &scope=%5B%22ad_query%22%2C%22ad_manage%22%5D&
-            // &scope=%5B%22report_service%22%2C%22ad_query%22%2C%22account_service%22%2C%22ad_manage%22%5D
-            sb.append(PropertiesUtils.getValue("kuaishou_config", "kuaishou_auth_url"))
-                    .append(KuaishouInterfaceConstant.AUTH_PATH)
-                    .append ("?app_id=" + PropertiesUtils.getValue("kuaishou_config", "kuaishou_third_appid"))
-                    .append("&state=" + URLEncoder.encode(URLEncoder.encode(state)))
-                    .append("&scope=%5B%22report_service%22%2C%22ad_query%22%2C%22account_service%22%2C%22ad_manage%22%5D")
-                    .append("&redirect_uri=" + URLEncoder.encode(PropertiesUtils.getValue("kuaishou_config", "kuaishou_callback_url"), "UTF-8"));
         }
         }
 
 
         return sb.toString();
         return sb.toString();
@@ -86,8 +76,6 @@ public class BindAccountAuthServiceImpl extends ServiceImpl<BindAccountAuthMappe
     @Override
     @Override
     public String getByteDanceCodeUrl(String state) throws UnsupportedEncodingException {
     public String getByteDanceCodeUrl(String state) throws UnsupportedEncodingException {
         StringBuffer sb = new StringBuffer();
         StringBuffer sb = new StringBuffer();
-
-
         sb.append(PropertiesUtils.getValue("bytedance_config", "bytedance_auth_url"))
         sb.append(PropertiesUtils.getValue("bytedance_config", "bytedance_auth_url"))
                 .append(BytedanceInterfaceConstant.AUTH_PATH)
                 .append(BytedanceInterfaceConstant.AUTH_PATH)
                 .append("?app_id=" + PropertiesUtils.getValue("bytedance_config", "bytedance_appid"))
                 .append("?app_id=" + PropertiesUtils.getValue("bytedance_config", "bytedance_appid"))

+ 0 - 4
module-common/src/main/java/cn/com/ctop/common/module/service/impl/CtopOauthTokenServiceImpl.java

@@ -64,7 +64,6 @@ public class CtopOauthTokenServiceImpl extends ServiceImpl<CtopOauthTokenMapper,
         param.put("grant_type", "refresh_token");
         param.put("grant_type", "refresh_token");
         param.put("refresh_token", token.getRefreshToken());
         param.put("refresh_token", token.getRefreshToken());
         String result = HttpUtils.httpPostRequest(url, param, new HashMap<>());
         String result = HttpUtils.httpPostRequest(url, param, new HashMap<>());
-        System.err.println(JSONObject.parseObject(result));
         XxlJobLogger.log("头条刷新token;accountId:{},返回信息:{}", token.getAccountId(), result);
         XxlJobLogger.log("头条刷新token;accountId:{},返回信息:{}", token.getAccountId(), result);
         if (null == result || result.trim().equals("") || result.equalsIgnoreCase("null")) {
         if (null == result || result.trim().equals("") || result.equalsIgnoreCase("null")) {
             XxlJobLogger.log("头条刷新token失败;accountId:{},返回信息:{}", token.getAccountId(), result);
             XxlJobLogger.log("头条刷新token失败;accountId:{},返回信息:{}", token.getAccountId(), result);
@@ -121,9 +120,6 @@ public class CtopOauthTokenServiceImpl extends ServiceImpl<CtopOauthTokenMapper,
         if (agentType == 1) {
         if (agentType == 1) {
             param.put("app_id", PropertiesUtils.getConfig("kuaishou_appid"));
             param.put("app_id", PropertiesUtils.getConfig("kuaishou_appid"));
             param.put("secret", PropertiesUtils.getConfig("kuaishou_secret"));
             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);
         param.put("refresh_token", refreshToken);

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

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