🐛 修复 social 登录失败的问题

blog-core/pom.xml

@@ -233,19 +233,12 @@
         <dependency>
             <groupId>com.zyd</groupId>
             <artifactId>blog-file</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>okhttp</artifactId>
-                    <groupId>com.squareup.okhttp3</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
-            <artifactId>okhttp</artifactId>
-            <groupId>com.squareup.okhttp3</groupId>
-            <version>4.9.1</version>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-http</artifactId>
+            <version>${hutool.version}</version>
         </dependency>
-
         <dependency>
             <groupId>me.zhyd.braum.spring.boot</groupId>
             <artifactId>braum-spring-boot-starter</artifactId>

blog-web/src/main/java/com/zyd/blog/controller/OAuthController.java

@@ -5,6 +5,8 @@ import com.fujieid.jap.core.JapUserService;
 import com.fujieid.jap.core.config.JapConfig;
 import com.fujieid.jap.core.context.JapAuthentication;
 import com.fujieid.jap.core.result.JapResponse;
+import com.fujieid.jap.http.adapter.jakarta.JakartaRequestAdapter;
+import com.fujieid.jap.http.adapter.jakarta.JakartaResponseAdapter;
 import com.fujieid.jap.social.SocialStrategy;
 import com.zyd.blog.business.entity.SocialConfig;
 import com.zyd.blog.business.entity.User;
@@ -45,7 +47,9 @@ public class OAuthController {
             throw new ZhydException(source + " 平台的配置尚未完成，暂时不支持登录！");
         }
         SocialStrategy socialStrategy = new SocialStrategy(japUserService, new JapConfig());
-        JapResponse japResponse = socialStrategy.authenticate(JapUtil.blogSocialConfig2JapSocialConfig(socialConfig, source), request, response);
+        JapResponse japResponse = socialStrategy.authenticate(JapUtil.blogSocialConfig2JapSocialConfig(socialConfig, source),
+                new JakartaRequestAdapter(request),
+                new JakartaResponseAdapter(response));
         if (!japResponse.isSuccess()) {
             throw new ZhydException(japResponse.getMessage());
         }
@@ -64,7 +68,8 @@ public class OAuthController {
      */
     @RequestMapping("/logout")
     public ModelAndView logout(HttpServletResponse response, HttpServletRequest request) {
-        JapAuthentication.logout(request, response);
+        JapAuthentication.logout(new JakartaRequestAdapter(request),
+                new JakartaResponseAdapter(response));
         SessionUtil.removeUser();
         return ResultUtil.redirect("/");
     }

blog-web/src/main/java/com/zyd/blog/runner/TaskRunner.java → blog-web/src/main/java/com/zyd/blog/runner/AppRunner.java

 package com.zyd.blog.runner;
 
 import cn.hutool.core.thread.ThreadFactoryBuilder;
+import com.xkcoding.http.HttpUtil;
+import com.xkcoding.http.support.hutool.HutoolImpl;
 import com.zyd.blog.core.schedule.ArticleLookTask;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,20 +13,24 @@ import org.springframework.stereotype.Component;
 import java.util.concurrent.*;
 
 /**
- * 执行保存文章浏览记录任务
  *
  * @author kongchong
  * date: 2019-07-10 11:17
  */
 @Slf4j
 @Component
-public class TaskRunner implements ApplicationRunner {
+public class AppRunner implements ApplicationRunner {
 
     @Autowired
     private ArticleLookTask articleLookTask;
 
     @Override
     public void run(ApplicationArguments args) {
+
+        // 重置 simple-http 的使用策略
+        HttpUtil.setHttp(new HutoolImpl());
+
+        // 执行保存文章浏览记录任务
         ThreadFactory articleLookThreadFactory = new ThreadFactoryBuilder().setNamePrefix("BLOG-ARTICLE_LOOK-").build();
 
         ExecutorService singleThreadPool = new ThreadPoolExecutor(1, 1,

pom.xml

@@ -51,7 +51,7 @@
         <spring.web.version>5.1.4.RELEASE</spring.web.version>
         <aliyun.oss.version>2.8.3</aliyun.oss.version>
         <blog-hunter.version>1.0.4</blog-hunter.version>
-        <jap.version>1.0.4</jap.version>
+        <jap.version>1.0.5</jap.version>
     </properties>
 
     <dependencyManagement>