From e24abffba5b66ea0c184b914884ed72bac8b60ff Mon Sep 17 00:00:00 2001
From: noear <noear@live.cn>
Date: Mon, 13 Nov 2023 14:21:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?solon=20=E5=8D=87=E4=B8=BA=202.5.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mybatisflex/solon/integration/XPluginImpl.java | 6 ++----
 pom.xml                                                     | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/mybatis-flex-solon-plugin/src/main/java/com/mybatisflex/solon/integration/XPluginImpl.java b/mybatis-flex-solon-plugin/src/main/java/com/mybatisflex/solon/integration/XPluginImpl.java
index 5e386fe3..984d9202 100644
--- a/mybatis-flex-solon-plugin/src/main/java/com/mybatisflex/solon/integration/XPluginImpl.java
+++ b/mybatis-flex-solon-plugin/src/main/java/com/mybatisflex/solon/integration/XPluginImpl.java
@@ -17,7 +17,7 @@
 package com.mybatisflex.solon.integration;
 
 import org.apache.ibatis.solon.integration.MybatisAdapterManager;
-import org.noear.solon.core.AopContext;
+import org.noear.solon.core.AppContext;
 import org.noear.solon.core.Plugin;
 
 /**
@@ -27,11 +27,9 @@ import org.noear.solon.core.Plugin;
  * @since 2.2
  */
 public class XPluginImpl implements Plugin {
-
     @Override
-    public void start(AopContext context) {
+    public void start(AppContext context) throws Throwable {
         // 此插件的 solon.plugin.priority 会大于 mybatis-solon-plugin 的值
         MybatisAdapterManager.setAdapterFactory(new MybatisAdapterFactoryFlex());
     }
-
 }
diff --git a/pom.xml b/pom.xml
index a5b6e539..26b80c77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
 
         <spring.version>5.3.27</spring.version>
         <spring-boot.version>2.7.11</spring-boot.version>
-        <solon.version>2.3.1</solon.version>
+        <solon.version>2.5.3</solon.version>
 
         <junit.version>4.13.2</junit.version>
         <maven-flatten.version>1.5.0</maven-flatten.version>

From 867d91c1d807e3aed1188abf9e98053c0af0c223 Mon Sep 17 00:00:00 2001
From: noear <noear@live.cn>
Date: Mon, 13 Nov 2023 14:46:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=20solon=20=E9=80=82?=
 =?UTF-8?q?=E9=85=8D=EF=BC=8C=E5=85=BC=E5=AE=B9=E6=97=A7=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E4=B8=8E=E6=9C=AA=E6=9D=A5=E6=96=B0=E7=89=88=E6=9C=AC=E7=9A=84?=
 =?UTF-8?q?=E5=87=86=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mybatisflex/solon/integration/XPluginImpl.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/mybatis-flex-solon-plugin/src/main/java/com/mybatisflex/solon/integration/XPluginImpl.java b/mybatis-flex-solon-plugin/src/main/java/com/mybatisflex/solon/integration/XPluginImpl.java
index 984d9202..502a0cf8 100644
--- a/mybatis-flex-solon-plugin/src/main/java/com/mybatisflex/solon/integration/XPluginImpl.java
+++ b/mybatis-flex-solon-plugin/src/main/java/com/mybatisflex/solon/integration/XPluginImpl.java
@@ -17,6 +17,7 @@
 package com.mybatisflex.solon.integration;
 
 import org.apache.ibatis.solon.integration.MybatisAdapterManager;
+import org.noear.solon.core.AopContext;
 import org.noear.solon.core.AppContext;
 import org.noear.solon.core.Plugin;
 
@@ -27,6 +28,15 @@ import org.noear.solon.core.Plugin;
  * @since 2.2
  */
 public class XPluginImpl implements Plugin {
+
+    //兼容 2.5 以下版本
+    @Override
+    public void start(AopContext context) throws Throwable {
+        // 此插件的 solon.plugin.priority 会大于 mybatis-solon-plugin 的值
+        MybatisAdapterManager.setAdapterFactory(new MybatisAdapterFactoryFlex());
+    }
+
+    //兼容 2.5 以上版本
     @Override
     public void start(AppContext context) throws Throwable {
         // 此插件的 solon.plugin.priority 会大于 mybatis-solon-plugin 的值