报表修改获取token的方式

ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/RefreshTokenJob.java

@@ -59,6 +59,18 @@ public class RefreshTokenJob {
         return generateToken(value,ticket);
     }
 
+    public void waitForToken(CjtAccountEnum cjtAccountEnum){
+        try {
+            String refreshCacheKey = buildCacheUniqueKey(RedisConstants.CJT_TICKET_REFRESH_CACHE_KEY, cjtAccountEnum.getAppKey());
+            Long expireTime = redisCache.getExpireTime(refreshCacheKey);
+            if (expireTime != null && expireTime > 0){
+                Thread.sleep(expireTime);
+            }
+        }catch (Exception e){
+            log.info("",e);
+        }
+    }
+
     /**
      * 获取ticket,失效前重置
      */

ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SyncAccountsJobAbstract.java

@@ -193,7 +193,7 @@ public abstract class SyncAccountsJobAbstract {
                 redisCache.deleteObject(asynchronous);
             } else {
                 String errorInfo = buildRobotErrorCountMessage2(e, queryFromTime, queryToTime);
-                if (!StringUtils.isEmpty(errorInfo) && !errorInfo.contains("openToken已失效") && !errorInfo.contains("会话过期请重新登录")) {
+                if (!StringUtils.isEmpty(errorInfo)) {
                     larkRobotHelper.sendMessageByBot(ROBOT_GROUP, errorInfo);
                 }
 //                CJTRetryRequest request = new CJTRetryRequest(now, 1, cjt);
@@ -590,7 +590,7 @@ public abstract class SyncAccountsJobAbstract {
         String openToken = (String) redisCache.getCacheObject(tokenCacheKey);
         if (StringUtils.isEmpty(openToken)) {
             CjtAccountEnum cjtAccountEnum = cjtAccount(context.getCjt());
-            waitForToken(cjtAccountEnum);
+            refreshTokenJob.waitForToken(cjtAccountEnum);
             return refreshTokenJob.getToken(cjtAccountEnum);
         } else {
             context.setOpenToken(openToken);
@@ -598,17 +598,7 @@ public abstract class SyncAccountsJobAbstract {
         }
     }
 
-    private void waitForToken(CjtAccountEnum cjtAccountEnum){
+
-        try {
-            String refreshCacheKey = buildCacheUniqueKey(RedisConstants.CJT_TICKET_REFRESH_CACHE_KEY, cjtAccountEnum.getAppKey());
-            Long expireTime = redisCache.getExpireTime(refreshCacheKey);
-            if (expireTime != null && expireTime > 0){
-                Thread.sleep(expireTime);
-            }
-        }catch (Exception e){
-            log.info("",e);
-        }
-    }
 
     /**
      * 生成调用接口的token信息

ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CJT/SyncReportJob.java

@@ -54,6 +54,8 @@ public class SyncReportJob {
     private LarkTableHelper larkTableHelper;
     @Autowired
     private LarkRobotHelper larkRobotHelper;
+    @Autowired
+    private RefreshTokenJob refreshTokenJob;
     @Value("${lark.robot.group}")
     private String ROBOT_GROUP;
     @Value("${sync.flag}")
@@ -94,7 +96,7 @@ public class SyncReportJob {
             //初始化飞书信息及相关配置
             initLarkInfo(context);
             //重置ticket
-            resetTicket(context);
+//            resetTicket(context);
 //            preSync(context);
             cleanTableDate(context);
             //执行分页同步
@@ -382,31 +384,44 @@ public class SyncReportJob {
         context.setTicket(ticket);
     }
 
-    /**
-     * 生成调用接口的token信息
-     */
     private String generateToken(CJTJobContext context) {
         String tokenCacheKey = buildCacheUniqueKey(RedisConstants.CJT_TOKEN_CACHE_KEY, context.getAppKey());
         String openToken = (String) redisCache.getCacheObject(tokenCacheKey);
-        if (StringUtils.isBlank(openToken)) {
+        if (org.springframework.util.StringUtils.isEmpty(openToken)) {
-            CJTRequest cjtRequest = new CJTRequest(REQUEST_GENERATE_TOKEN_PATH
+            CjtAccountEnum cjtAccountEnum = cjtAccount(context.getCjt());
-                    , context.getAppKey()
+            refreshTokenJob.waitForToken(cjtAccountEnum);
-                    , context.getAppSecret()
+            return refreshTokenJob.getToken(cjtAccountEnum);
-                    , context.getTicket()
-                    , context.getCertificate());
-            cjtRequest.buildGenerateBody();
-            JSONObject body = JSONObject.parseObject(post(cjtRequest));
-            JSONObject value = body.getJSONObject("value");
-            String token = value.getString("accessToken");
-            context.setOpenToken(token);
-            redisCache.setCacheObject(tokenCacheKey, token, 5, TimeUnit.MINUTES);
-            return token;
         } else {
             context.setOpenToken(openToken);
             return openToken;
         }
     }
 
+    /**
+     * 生成调用接口的token信息
+     */
+//    private String generateToken(CJTJobContext context) {
+//        String tokenCacheKey = buildCacheUniqueKey(RedisConstants.CJT_TOKEN_CACHE_KEY, context.getAppKey());
+//        String openToken = (String) redisCache.getCacheObject(tokenCacheKey);
+//        if (StringUtils.isBlank(openToken)) {
+//            CJTRequest cjtRequest = new CJTRequest(REQUEST_GENERATE_TOKEN_PATH
+//                    , context.getAppKey()
+//                    , context.getAppSecret()
+//                    , context.getTicket()
+//                    , context.getCertificate());
+//            cjtRequest.buildGenerateBody();
+//            JSONObject body = JSONObject.parseObject(post(cjtRequest));
+//            JSONObject value = body.getJSONObject("value");
+//            String token = value.getString("accessToken");
+//            context.setOpenToken(token);
+//            redisCache.setCacheObject(tokenCacheKey, token, 5, TimeUnit.MINUTES);
+//            return token;
+//        } else {
+//            context.setOpenToken(openToken);
+//            return openToken;
+//        }
+//    }
+
     /**
      * 生成调用接口的token信息
      */