Merge pull request #222 from jumpserver/pr@dev@feat_druid_upgrade

build(druid): upgrade custom dependency

Author: Zxc4wonder

Dockerfile

@@ -1,4 +1,4 @@
-FROM jumpserver/chen-base:20260727_051136 AS stage-build
+FROM jumpserver/chen-base:20260811_065334 AS stage-build
 ENV LANG=en_US.UTF-8
 
 WORKDIR /opt/chen/

backend/framework/pom.xml

@@ -19,9 +19,9 @@
         </dependency>
 
         <dependency>
-            <groupId>com.alibaba</groupId>
+            <groupId>com.jumpserver</groupId>
             <artifactId>druid</artifactId>
-            <version>1.2.18</version>
+            <version>1.2.28-jms-chen.1</version>
         </dependency>
 
         <dependency>

backend/framework/src/main/java/org/jumpserver/chen/framework/utils/PageUtils.java

@@ -15,7 +15,6 @@
 import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitorAdapter;
 import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectQueryBlock;
 import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerSelectQueryBlock;
-import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerTop;
 import com.alibaba.druid.util.JdbcUtils;
 
 import java.util.Iterator;
@@ -264,14 +263,14 @@ private static boolean limitSQLServer(SQLSelect select, DbType dbType, int offse
         if (query instanceof SQLSelectQueryBlock) {
             queryBlock = (SQLServerSelectQueryBlock) query;
             if (offset <= 0) {
-                SQLServerTop top = queryBlock.getTop();
+                SQLTop top = queryBlock.getTop();
                 if (check && top != null && !top.isPercent() && top.getExpr() instanceof SQLNumericLiteralExpr) {
                     int rowCount = ((SQLNumericLiteralExpr) top.getExpr()).getNumber().intValue();
                     if (rowCount <= count) {
                         return false;
                     }
                 }
-                queryBlock.setTop(new SQLServerTop(new SQLNumberExpr(count)));
+                queryBlock.setTop(new SQLTop(new SQLNumberExpr(count)));
                 return true;
             } else {
                 // 创建 SELECT NULL 的子查询
@@ -303,7 +302,7 @@ private static boolean limitSQLServer(SQLSelect select, DbType dbType, int offse
         } else {
             queryBlock = new SQLServerSelectQueryBlock();
             if (offset <= 0) {
-                queryBlock.setTop(new SQLServerTop(new SQLNumberExpr(count)));
+                queryBlock.setTop(new SQLTop(new SQLNumberExpr(count)));
                 select.setQuery(queryBlock);
                 return true;
             } else {

pom.xml

@@ -35,6 +35,20 @@
         <netty.version>4.1.135.Final</netty.version>
     </properties>
 
+    <repositories>
+        <repository>
+            <id>fit2cloud-public</id>
+            <name>FIT2CLOUD Public Repository</name>
+            <url>https://repository.fit2cloud.com/repository/public/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
     <build>
         <plugins>
             <plugin>