🔖 发布 2.3.0

blog-admin/pom.xml

@@ -12,7 +12,7 @@
     <parent>
         <groupId>com.zyd</groupId>
         <artifactId>blog</artifactId>
-        <version>${oneblog.version}</version>
+        <version>2.3.0</version>
     </parent>
 
     <dependencies>

blog-core/pom.xml

@@ -12,7 +12,7 @@
     <parent>
         <groupId>com.zyd</groupId>
         <artifactId>blog</artifactId>
-        <version>${oneblog.version}</version>
+        <version>2.3.0</version>
     </parent>
 
     <dependencies>

blog-core/src/main/resources/config/application-center.yml

@@ -86,5 +86,5 @@ pagehelper:
   params: count=countSql
 
 app:
-  version: v2.2.9
+  version: v2.3.0
   enableRedisCache: ${ONEBLOG_ENABLE_REDIS_CACHE:false}

blog-file/pom.xml

@@ -12,7 +12,7 @@
     <parent>
         <groupId>com.zyd</groupId>
         <artifactId>blog</artifactId>
-        <version>${oneblog.version}</version>
+        <version>2.3.0</version>
     </parent>
 
     <properties>

blog-web/pom.xml

@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>com.zyd</groupId>
 		<artifactId>blog</artifactId>
-		<version>${oneblog.version}</version>
+		<version>2.3.0</version>
 	</parent>
 
 	<dependencies>

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

@@ -5,8 +5,6 @@ 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;
@@ -47,9 +45,7 @@ public class OAuthController {
             throw new ZhydException(source + " 平台的配置尚未完成，暂时不支持登录！");
         }
         SocialStrategy socialStrategy = new SocialStrategy(japUserService, new JapConfig());
-        JapResponse japResponse = socialStrategy.authenticate(JapUtil.blogSocialConfig2JapSocialConfig(socialConfig, source),
-                new JakartaRequestAdapter(request),
-                new JakartaResponseAdapter(response));
+        JapResponse japResponse = socialStrategy.authenticate(JapUtil.blogSocialConfig2JapSocialConfig(socialConfig, source), request, response);
         if (!japResponse.isSuccess()) {
             throw new ZhydException(japResponse.getMessage());
         }
@@ -68,8 +64,7 @@ public class OAuthController {
      */
     @RequestMapping("/logout")
     public ModelAndView logout(HttpServletResponse response, HttpServletRequest request) {
-        JapAuthentication.logout(new JakartaRequestAdapter(request),
-                new JakartaResponseAdapter(response));
+        JapAuthentication.logout(request, response);
         SessionUtil.removeUser();
         return ResultUtil.redirect("/");
     }

docs/bin/repVersion.sh

@@ -21,7 +21,6 @@ fi
 # 替换README.md等文件中的版本
 sed -i "s/${old_version}/${new_version}/g" $pwd/blog-core/src/main/resources/config/application-center.yml
 sed -i "s/${old_version}/${new_version}/g" $pwd/README.md
-sed -i "s/${old_version}/${new_version}/g" $pwd/README.en-US.md
 
 # 替换pom.xml中的版本
 sed -i "s/${old_version}/${new_version}/g" $pwd/pom.xml

docs/bin/updVersion.sh

@@ -9,4 +9,4 @@ fi
 mvn versions:set -DnewVersion=$1
 
 # 替换其它地方的版本
-source $(pwd)/bin/repVersion.sh "$1"
+source $(pwd)/docs/bin/repVersion.sh "$1"

docs/bin/version.txt

-2.2.9
+2.3.0

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.zyd</groupId>
     <artifactId>blog</artifactId>
-    <version>${oneblog.version}</version>
+    <version>2.3.0</version>
     <packaging>pom</packaging>
     <modules>
         <module>blog-core</module>
@@ -25,7 +25,6 @@
     </parent>
 
     <properties>
-        <oneblog.version>2.2.9</oneblog.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
@@ -51,7 +50,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.5</jap.version>
+        <jap.version>1.0.4</jap.version>
     </properties>
 
     <dependencyManagement>
@@ -59,22 +58,22 @@
             <dependency>
                 <groupId>com.zyd</groupId>
                 <artifactId>blog-core</artifactId>
-                <version>${oneblog.version}</version>
+                <version>2.3.0</version>
             </dependency>
             <dependency>
                 <groupId>com.zyd</groupId>
                 <artifactId>blog-admin</artifactId>
-                <version>${oneblog.version}</version>
+                <version>2.3.0</version>
             </dependency>
             <dependency>
                 <groupId>com.zyd</groupId>
                 <artifactId>blog-web</artifactId>
-                <version>${oneblog.version}</version>
+                <version>2.3.0</version>
             </dependency>
             <dependency>
                 <groupId>com.zyd</groupId>
                 <artifactId>blog-file</artifactId>
-                <version>${oneblog.version}</version>
+                <version>2.3.0</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

update.md

@@ -3,6 +3,10 @@
 
 ----
 
+### 2021-10-27
+
+- 修复第三方登录失败的问题
+
 ### 2021-10-23
 
 1. 优化页面样式。