zero 14 timmar sedan
förälder
incheckning
72db1721e4

+ 11 - 6
src/main/java/com/cslg/ppa/service/GetWebArticle/GetIprDailyArticleService.java

@@ -33,6 +33,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -78,9 +79,11 @@ public class GetIprDailyArticleService {
                         .get()
                         .build();
                 String res = Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
-                JSONObject parseObject = JSONObject.parseObject(res);
-                String htmlContent = parseObject.getString("msg");
-                this.addIprDailyArticle(htmlContent, BaseUrl,BaseId,type);
+                if (StringUtils.isNotEmpty(res) && !res.contains("403")) {
+                    JSONObject parseObject = JSONObject.parseObject(res);
+                    String htmlContent = parseObject.getString("msg");
+//                    this.addIprDailyArticle(htmlContent, BaseUrl,BaseId,type);
+                }
             } catch (IOException e) {
                 System.out.println("Get IPRDaily Web Article Error:" + e);
             }
@@ -100,9 +103,11 @@ public class GetIprDailyArticleService {
                     .get()
                     .build();
             String res = Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
-            JSONObject parseObject = JSONObject.parseObject(res);
-            String htmlContent = parseObject.getString("msg");
-            this.addIprDailyArticle(htmlContent, BaseUrl,sourceInfoId,categoryId);
+            if (StringUtils.isNotEmpty(res) && !res.contains("403")) {
+                JSONObject parseObject = JSONObject.parseObject(res);
+                String htmlContent = parseObject.getString("msg");
+                this.addIprDailyArticle(htmlContent, BaseUrl,sourceInfoId,categoryId);
+            }
         } catch (IOException e) {
             System.out.println("Get IPRDaily Web Article Error:" + e);
         }

+ 5 - 0
src/main/java/com/cslg/ppa/service/commom/WeChatLoginCheckService.java

@@ -65,6 +65,11 @@ public class WeChatLoginCheckService {
     }
 
     public String sendQRCodeByEmail() throws Exception {
+        String token = redisUtil.get(RedisConf.WECHAT_TOKEN + RedisConf.SYMBOL_COLON);
+        String cookieStr = redisUtil.get(RedisConf.WECHAT_COOKIE + RedisConf.SYMBOL_COLON);
+        if (!StringUtils.isEmpty(token) && !StringUtils.isEmpty(cookieStr) && WeiXinApi.checkLoginStatus(token, cookieStr)) {
+            return "上次微信登录状态仍正常。";
+        }
         //1.立即返回"任务已接收"给前端
         String uaid = WeiXinApi.initCookieUaid();
         String uuid = WeiXinApi.initCookieUuid();