update

xlorne · xlorne · commit 1eae83bb546e · 2025-12-12T09:01:31.000+08:00
diff --git a/example/example-app/example-app-cmd-domain/pom.xml b/example/example-app/example-app-cmd-domain/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-app</artifactId>
-        <version>3.4.25</version>
+        <version>3.4.26</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/example/example-app/example-app-cmd-meta/pom.xml b/example/example-app/example-app-cmd-meta/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-app</artifactId>
-        <version>3.4.25</version>
+        <version>3.4.26</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/example/example-app/example-app-query/pom.xml b/example/example-app/example-app-query/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-app</artifactId>
-        <version>3.4.25</version>
+        <version>3.4.26</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/example/example-app/pom.xml b/example/example-app/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-example</artifactId>
-        <version>3.4.25</version>
+        <version>3.4.26</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/example/example-domain/example-domain-leave/pom.xml b/example/example-domain/example-domain-leave/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-domain</artifactId>
-        <version>3.4.25</version>
+        <version>3.4.26</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/example/example-domain/example-domain-user/pom.xml b/example/example-domain/example-domain-user/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-domain</artifactId>
-        <version>3.4.25</version>
+        <version>3.4.26</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/example/example-domain/pom.xml b/example/example-domain/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-example</artifactId>
-       <version>3.4.25</version>
+       <version>3.4.26</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/example/example-infra/example-infra-flow/pom.xml b/example/example-infra/example-infra-flow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-infra</artifactId>
-       <version>3.4.25</version>
+       <version>3.4.26</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/example/example-infra/example-infra-jpa/pom.xml b/example/example-infra/example-infra-jpa/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-infra</artifactId>
-        <version>3.4.25</version>
+        <version>3.4.26</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/example/example-infra/example-infra-security/pom.xml b/example/example-infra/example-infra-security/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>example-infra</artifactId>
-        <version>3.4.25</version>
+        <version>3.4.26</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/example/example-infra/pom.xml b/example/example-infra/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-example</artifactId>
-        <version>3.4.25</version>
+        <version>3.4.26</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/example/example-interface/pom.xml b/example/example-interface/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-example</artifactId>
-        <version>3.4.25</version>
+        <version>3.4.26</version>
     </parent>
 
     <artifactId>example-interface</artifactId>
diff --git a/example/example-server/pom.xml b/example/example-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-       <version>3.4.25</version>
+       <version>3.4.26</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/example/pom.xml b/example/pom.xml
@@ -19,7 +19,7 @@
     </parent>
 
     <artifactId>springboot-example</artifactId>
-    <version>3.4.25</version>
+    <version>3.4.26</version>
 
     <name>springboot-example</name>
     <description>springboot-example project for Spring Boot</description>
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>3.4.25</version>
+    <version>3.4.26</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>
diff --git a/springboot-starter-data-authorization/pom.xml b/springboot-starter-data-authorization/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-       <version>3.4.25</version>
+       <version>3.4.26</version>
     </parent>
 
     <name>springboot-starter-data-authorization</name>
diff --git a/springboot-starter-data-fast/pom.xml b/springboot-starter-data-fast/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-       <version>3.4.25</version>
+       <version>3.4.26</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/JPAQueryConfiguration.java b/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/JPAQueryConfiguration.java
diff --git a/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/JpaQuery.java b/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/JpaQuery.java
@@ -13,7 +13,7 @@
 import java.util.List;
 
 @AllArgsConstructor
-public class JPAQuery {
+public class JpaQuery {
 
     private final EntityManager entityManager;
 
diff --git a/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/JpaQueryConfiguration.java b/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/JpaQueryConfiguration.java
@@ -0,0 +1,21 @@
+package com.codingapi.springboot.fast.jpa;
+
+import jakarta.persistence.EntityManager;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+
+@Configuration
+public class JpaQueryConfiguration {
+
+    @Bean
+    public JpaQuery dynamicQuery(EntityManager entityManager){
+        return new JpaQuery(entityManager);
+    }
+
+    @Bean
+    public JpaQueryContextRegister jpaQueryContextRegister(JpaQuery jpaQuery){
+        return new JpaQueryContextRegister(jpaQuery);
+    }
+
+}
diff --git a/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/JpaQueryContext.java b/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/JpaQueryContext.java
@@ -13,10 +13,10 @@ private JpaQueryContext() {
     }
 
     @Getter
-    private JPAQuery JPAQuery;
+    private JpaQuery jpaQuery;
 
-    void setJPAQuery(JPAQuery JPAQuery) {
-        this.JPAQuery = JPAQuery;
+    void setJpaQuery(JpaQuery jpaQuery) {
+        this.jpaQuery = jpaQuery;
     }
 
 
diff --git a/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/JpaQueryContextRegister.java b/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/JpaQueryContextRegister.java
@@ -4,13 +4,13 @@
 import org.springframework.beans.factory.InitializingBean;
 
 @AllArgsConstructor
-public class JPAQueryContextRegister implements InitializingBean {
+public class JpaQueryContextRegister implements InitializingBean {
 
-    private JPAQuery JPAQuery;
+    private JpaQuery jpaQuery;
 
     @Override
     public void afterPropertiesSet() throws Exception {
-        JpaQueryContext.getInstance().setJPAQuery(JPAQuery);
+        JpaQueryContext.getInstance().setJpaQuery(jpaQuery);
     }
 
 }
diff --git a/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/repository/DynamicRepository.java b/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/repository/DynamicRepository.java
@@ -14,39 +14,39 @@
 public interface DynamicRepository<T, ID> extends BaseRepository<T, ID> {
 
     default <V> List<V> dynamicListQuery(SQLBuilder<V> builder) {
-        return JpaQueryContext.getInstance().getJPAQuery().listQuery(builder);
+        return JpaQueryContext.getInstance().getJpaQuery().listQuery(builder);
     }
 
     default List<T> dynamicListQuery(String sql, Object... params) {
-        return JpaQueryContext.getInstance().getJPAQuery().listQuery(getEntityClass(), sql, params);
+        return JpaQueryContext.getInstance().getJpaQuery().listQuery(getEntityClass(), sql, params);
     }
 
     default <V> List<V> dynamicListQuery(Class<V> clazz, String sql, Object... params) {
-        return JpaQueryContext.getInstance().getJPAQuery().listQuery(clazz, sql, params);
+        return JpaQueryContext.getInstance().getJpaQuery().listQuery(clazz, sql, params);
     }
 
     default <V> Page<V> dynamicPageQuery(SQLBuilder<V> builder, PageRequest request) {
-        return JpaQueryContext.getInstance().getJPAQuery().pageQuery(builder, request);
+        return JpaQueryContext.getInstance().getJpaQuery().pageQuery(builder, request);
     }
 
     default Page<T> dynamicPageQuery(String sql, String countSql, PageRequest request, Object... params) {
-        return JpaQueryContext.getInstance().getJPAQuery().pageQuery(getEntityClass(), sql, countSql, request, params);
+        return JpaQueryContext.getInstance().getJpaQuery().pageQuery(getEntityClass(), sql, countSql, request, params);
     }
 
     default Page<T> dynamicPageQuery(String sql, PageRequest request, Object... params) {
-        return JpaQueryContext.getInstance().getJPAQuery().pageQuery(getEntityClass(), sql, request, params);
+        return JpaQueryContext.getInstance().getJpaQuery().pageQuery(getEntityClass(), sql, request, params);
     }
 
     default <V> Page<V> dynamicPageQuery(Class<V> clazz, String sql, String countSql, PageRequest request, Object... params) {
-        return JpaQueryContext.getInstance().getJPAQuery().pageQuery(clazz, sql, countSql, request, params);
+        return JpaQueryContext.getInstance().getJpaQuery().pageQuery(clazz, sql, countSql, request, params);
     }
 
     default Page<MapViewResult> dynamicMapPageQuery(QueryColumns columns, String sql, String countSql, PageRequest request, Object... params) {
-        return JpaQueryContext.getInstance().getJPAQuery().pageMapQuery(columns, sql, countSql, request, params);
+        return JpaQueryContext.getInstance().getJpaQuery().pageMapQuery(columns, sql, countSql, request, params);
     }
 
     default List<MapViewResult> dynamicMapListQuery(QueryColumns columns, String sql, Object... params) {
-        return JpaQueryContext.getInstance().getJPAQuery().listMapQuery(columns, sql, params);
+        return JpaQueryContext.getInstance().getJpaQuery().listMapQuery(columns, sql, params);
     }
 
 }
diff --git a/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/script/ScriptRuntime.java b/springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/script/ScriptRuntime.java
@@ -2,7 +2,7 @@
 
 import com.codingapi.springboot.fast.jdbc.JdbcQuery;
 import com.codingapi.springboot.fast.jdbc.JdbcQueryContext;
-import com.codingapi.springboot.fast.jpa.JPAQuery;
+import com.codingapi.springboot.fast.jpa.JpaQuery;
 import com.codingapi.springboot.fast.jpa.JpaQueryContext;
 import groovy.lang.Binding;
 import groovy.lang.GroovyShell;
@@ -18,7 +18,7 @@ static Object running(String script) {
         ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.currentRequestAttributes();
         ScriptRequest request = new ScriptRequest(attributes.getRequest());
         JdbcQuery jdbcQuery = JdbcQueryContext.getInstance().getJdbcQuery();
-        JPAQuery jpaQuery = JpaQueryContext.getInstance().getJPAQuery();
+        JpaQuery jpaQuery = JpaQueryContext.getInstance().getJpaQuery();
 
         binding.setVariable("$request", request);
         binding.setVariable("$jpa", jpaQuery);
diff --git a/springboot-starter-data-fast/src/main/resources/META-INF/spring.factories b/springboot-starter-data-fast/src/main/resources/META-INF/spring.factories
@@ -1,4 +1,4 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 com.codingapi.springboot.fast.DataFastConfiguration,\
-com.codingapi.springboot.fast.jpa.JPAQueryConfiguration,\
+com.codingapi.springboot.fast.jpa.JpaQueryConfiguration,\
 com.codingapi.springboot.fast.jdbc.JdbcQueryConfiguration
diff --git a/springboot-starter-data-fast/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/springboot-starter-data-fast/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,3 +1,3 @@
 com.codingapi.springboot.fast.DataFastConfiguration
-com.codingapi.springboot.fast.jpa.JPAQueryConfiguration
+com.codingapi.springboot.fast.jpa.JpaQueryConfiguration
 com.codingapi.springboot.fast.jdbc.JdbcQueryConfiguration
diff --git a/springboot-starter-data-fast/src/test/java/com/codingapi/springboot/fast/generator/DynamicTableGeneratorQueryTest.java b/springboot-starter-data-fast/src/test/java/com/codingapi/springboot/fast/generator/DynamicTableGeneratorQueryTest.java
@@ -2,7 +2,7 @@
 
 import com.codingapi.springboot.fast.jdbc.JdbcQuery;
 import com.codingapi.springboot.fast.jdbc.JdbcQueryContext;
-import com.codingapi.springboot.fast.jpa.JPAQuery;
+import com.codingapi.springboot.fast.jpa.JpaQuery;
 import com.codingapi.springboot.fast.jpa.JpaQueryContext;
 import com.codingapi.springboot.fast.metadata.TableEntityMetadata;
 import jakarta.persistence.EntityManagerFactory;
@@ -53,7 +53,7 @@ void generateThenUpdateQuery() throws ClassNotFoundException {
         dynamicTableGenerator.generateMigratorTableDDL(entityClass, true);
 
         // 通过DynamicTableGenerator 动态创建的entity无法通过jpa的 EntityManager进行数据查询处理, 因为Entity不在JPA扫描支持的范围内。
-        JPAQuery jpaQuery = JpaQueryContext.getInstance().getJPAQuery();
+        JpaQuery jpaQuery = JpaQueryContext.getInstance().getJpaQuery();
         assertThrows(Exception.class,()->{
             jpaQuery.listQuery(entityClass,"select t from com.codingapi.springboot.fast.entity.Test");
         });
diff --git a/springboot-starter-flow/pom.xml b/springboot-starter-flow/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-       <version>3.4.25</version>
+       <version>3.4.26</version>
     </parent>
 
     <name>springboot-starter-flow</name>
diff --git a/springboot-starter-security/pom.xml b/springboot-starter-security/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-       <version>3.4.25</version>
+       <version>3.4.26</version>
     </parent>
 
     <artifactId>springboot-starter-security</artifactId>
diff --git a/springboot-starter/pom.xml b/springboot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-       <version>3.4.25</version>
+       <version>3.4.26</version>
     </parent>
     <artifactId>springboot-starter</artifactId>
 
