yumeng 2 hete
szülő
commit
50e299fefc

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

@@ -149,8 +149,6 @@ public class TestController {
     @Autowired
     private IKuaishouProgramCreativeService kuaishouProgramCreativeService;
     @Autowired
-    private IRefreshTokenService refreshTokenService;
-    @Autowired
     private IMgsSupplyChainService mgskuaishouSupplyChainService;
     @Autowired
     private IWechatCheckinDataService wechatCheckinDataService;
@@ -178,6 +176,18 @@ public class TestController {
 
     static ExecutorService fxNowService = Executors.newFixedThreadPool(3);
 
+    @Autowired
+    private IRefreshTokenService refreshTokenService;
+    @Autowired
+    private IAdqAdvertiserInfoService adqAdvertiserInfoService;
+    @GetMapping(value = "/testToken")
+    public void testToken() throws Exception {
+
+     //   refreshTokenService.adqRefreshTokenJob();
+        adqAdvertiserInfoService.syncAdvertiserInfo();
+    }
+
+
     @GetMapping(value = "/getData")
     public void getDate() throws Exception {
         log.info("-------------------------获取快分销订单当前月数据开始数据开始--------------------------");

+ 6 - 3
jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -16,6 +16,9 @@ management:
         include: metrics,httptrace
 
 spring:
+  output:
+    ansi:
+      enabled: never
   devtools:
     restart:
       enabled: true
@@ -135,9 +138,9 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://139.186.27.96:3390/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=GMT%2B8
-          username: data
-          password: hcst@2021
+          url: jdbc:mysql://139.186.172.149:3390/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=GMT%2B8
+          username: hcst
+          password: hcst@2025
           driver-class-name: com.mysql.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:

+ 1 - 1
jeecg-boot-module-system/src/main/resources/log4j.properties

@@ -1,4 +1,4 @@
 log4j.rootLogger=INFO,stdout
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS}-[%p] [%t] %-5l - %m%n
+log4j.appender.stdout.layout.ConversionPattern=\u001B[0m%d{HH:mm:ss.SSS} [%t] %-5p %c{1} - %m%n

+ 4 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/CtopOauthTokenMapper.java

@@ -69,4 +69,8 @@ public interface CtopOauthTokenMapper extends BaseMapper<CtopOauthToken> {
     JSONObject queryBytedanceAgentTokenByAccountId(@Param("agentId") Long agentId);
 
     void replace(@Param("data") BytedanceAgentToken data);
+
+    List<JSONObject> getAdqTokenList();
+
+    void updateAdqToken(@Param("adminAdvertiserId") Long adminAdvertiserId, @Param("updateAccessToken") String updateAccessToken, @Param("updateRefreshToken") String updateRefreshToken);
 }

+ 10 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/CtopOauthTokenMapper.xml

@@ -78,6 +78,12 @@
         </set>
         where account_id = #{accountId}
     </update>
+    <update id="updateAdqToken">
+        update `jeecg-boot`.adq_auth_list
+        set access_token  = #{updateAccessToken},
+            refresh_token = #{updateRefreshToken}
+        where admin_advertiser_id = #{adminAdvertiserId}
+    </update>
 
     <select id="selectByAccountId" resultMap="BaseResultMap">
         select
@@ -189,6 +195,10 @@
         FROM ctop_bytedance_agent_token
         WHERE agent_id = #{agentId}
     </select>
+    <select id="getAdqTokenList" resultType="com.alibaba.fastjson.JSONObject">
+        select admin_advertiser_id as 'adminAdvertiserId', client_id as 'clientId', client_secret as 'clientSecret', refresh_token as 'refreshToken'
+        from `jeecg-boot`.adq_auth_list
+    </select>
 
     <insert id="replace">
         replace

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

@@ -54,4 +54,8 @@ public interface ICtopOauthTokenService extends IService<CtopOauthToken> {
     void getLiveKuaiShouAgentRefreshToken(String id, String accessToken, String refreshToken, Long appId, String secret);
 
     void refreshAgentBytedanceToken(JSONObject token);
+
+    List<JSONObject> getAdqTokenList();
+
+    void updateAdqToken(Long adminAdvertiserId, String updateAccessToken, String updateRefreshToken);
 }

+ 2 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/IRefreshTokenService.java

@@ -10,4 +10,6 @@ public interface IRefreshTokenService {
     void getLiveKuaiShouAgentRefresh();
 
     void bytedanceRefreshAgentToken(String accountId);
+
+    void adqRefreshTokenJob();
 }

+ 11 - 5
module-common/src/main/java/cn/com/ctop/common/module/service/impl/CtopOauthTokenServiceImpl.java

@@ -19,11 +19,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @Description: oauth授权码
@@ -421,6 +417,16 @@ public class CtopOauthTokenServiceImpl extends ServiceImpl<CtopOauthTokenMapper,
     }
 
     @Override
+    public List<JSONObject> getAdqTokenList() {
+        return ctopOauthTokenMapper.getAdqTokenList();
+    }
+
+    @Override
+    public void updateAdqToken(Long adminAdvertiserId, String updateAccessToken, String updateRefreshToken) {
+        ctopOauthTokenMapper.updateAdqToken(adminAdvertiserId,updateAccessToken,updateRefreshToken);
+    }
+
+    @Override
     public List<CtopOauthToken> queryKsValidRuleAccountsToken() {
         return ctopOauthTokenMapper.queryKsValidRuleAccountsToken();
     }

+ 38 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/impl/RefreshTokenServiceImpl.java

@@ -9,6 +9,7 @@ import cn.com.ctop.common.module.service.IOauthConfigService;
 import cn.com.ctop.common.module.service.IRefreshTokenService;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
+import cn.com.ctop.common.module.utils.HttpUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.xxl.job.core.context.XxlJobHelper;
@@ -16,6 +17,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
@@ -103,6 +105,42 @@ public class RefreshTokenServiceImpl implements IRefreshTokenService {
     }
 
     @Override
+    public void adqRefreshTokenJob() {
+        List<JSONObject> tokenList = oauthTokenService.getAdqTokenList();
+        if (Check.isNull(tokenList)) {
+            return;
+        }
+        for (JSONObject tokenJson : tokenList) {
+            Long adminAdvertiserId = tokenJson.getLong("adminAdvertiserId");
+            String clientId = tokenJson.getString("clientId");
+            String clientSecret = tokenJson.getString("clientSecret");
+            String refreshToken = tokenJson.getString("refreshToken");
+            Map<String, Object> param = new HashMap<>();
+            param.put("client_id", clientId);
+            param.put("client_secret", clientSecret);
+            param.put("refresh_token", refreshToken);
+            param.put("grant_type", "refresh_token");
+            String s = HttpUtils.httpGet("https://api.e.qq.com/oauth/token", param, new HashMap<>());
+            JSONObject tokenResult = JSONObject.parseObject(s);
+            System.err.println(tokenResult);
+            if (Check.isNull(tokenResult)) {
+                continue;
+            }
+            Integer code = tokenResult.getInteger("code");
+            if (code != 0) {
+                continue;
+            }
+            JSONObject data = tokenResult.getJSONObject("data");
+            if (Check.isNull(data)) {
+                continue;
+            }
+            String updateAccessToken = data.getString("access_token");
+            String updateRefreshToken = data.getString("refresh_token");
+            oauthTokenService.updateAdqToken(adminAdvertiserId, updateAccessToken, updateRefreshToken);
+        }
+    }
+
+    @Override
     public void getKuaiShouAgentRefresh() {
         QueryWrapper<OauthAgentToken> agentTokenQueryWrapper = new QueryWrapper<>();
         agentTokenQueryWrapper.eq("media_id", 2);

+ 1 - 1
module-job-bytedance/src/main/resources/log4j.properties

@@ -1,4 +1,4 @@
 log4j.rootLogger=INFO,stdout
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS}-[%p] [%t] %-5l - %m%n
+log4j.appender.stdout.layout.ConversionPattern=\u001B[0m%d{HH:mm:ss.SSS} [%t] %-5p %c{1} - %m%n

+ 11 - 0
module-job-kuaishou/src/main/java/cn/com/ctop/job/kuaishou/handler/KuaiShouRefreshTokenJob.java

@@ -19,5 +19,16 @@ public class KuaiShouRefreshTokenJob {
     public void execute() throws Exception {
         refreshTokenService.getKuaiShouRefresh();
     }
+
+
+    /**
+     * 快手刷新token
+     * @throws JobExecutionException
+     */
+    @XxlJob("adqRefreshTokenJob")
+    public void adqRefreshTokenJob() throws Exception {
+        refreshTokenService.adqRefreshTokenJob();
+    }
+
 }
 

+ 1 - 1
module-job-kuaishou/src/main/resources/log4j.properties

@@ -1,4 +1,4 @@
 log4j.rootLogger=INFO,stdout
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS}-[%p] [%t] %-5l - %m%n
+log4j.appender.stdout.layout.ConversionPattern=\u001B[0m%d{HH:mm:ss.SSS} [%t] %-5p %c{1} - %m%n