From 52008e2d6b50ba19e1e88ba10ec2883da4d80eb2 Mon Sep 17 00:00:00 2001 From: zhongxuchen Date: Wed, 31 Jul 2024 21:39:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E5=8E=86=E5=8F=B2=E4=B8=BB?= =?UTF-8?q?=E9=94=AE=E5=8C=85=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- trunk/sqltoy-orm-core/pom.xml | 2 +- .../main/java/org/sagacity/sqltoy/config/EntityManager.java | 4 +++- .../java/org/sagacity/sqltoy/dialect/utils/DialectUtils.java | 2 +- trunk/sqltoy-orm-solon-plugin/pom.xml | 2 +- trunk/sqltoy-orm-spring-starter/pom.xml | 2 +- trunk/sqltoy-orm-spring/pom.xml | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/trunk/sqltoy-orm-core/pom.xml b/trunk/sqltoy-orm-core/pom.xml index 9b807a571..b560aac17 100644 --- a/trunk/sqltoy-orm-core/pom.xml +++ b/trunk/sqltoy-orm-core/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.sagframe - 5.6.15 + 5.6.16 sagacity-sqltoy sqltoy core code sagacity-sqltoy diff --git a/trunk/sqltoy-orm-core/src/main/java/org/sagacity/sqltoy/config/EntityManager.java b/trunk/sqltoy-orm-core/src/main/java/org/sagacity/sqltoy/config/EntityManager.java index aaa397dff..a58556db0 100644 --- a/trunk/sqltoy-orm-core/src/main/java/org/sagacity/sqltoy/config/EntityManager.java +++ b/trunk/sqltoy-orm-core/src/main/java/org/sagacity/sqltoy/config/EntityManager.java @@ -117,6 +117,7 @@ public class EntityManager { private static final String IdGeneratorPackage = "org.sagacity.sqltoy.plugins.id.impl."; // 历史id主键策略的包路径，5.x版本开始剔除了兼容处理，2024-7-16日增加了兼容处理 private static final String IdGeneratorOldPackage = "org.sagacity.sqltoy.plugin.id."; + private static final String IdGeneratorOldPackage_v1 = "org.sagacity.sqltoy.plugins.id."; /** * 扫描的包(意义不大,sqltoy已经改为在使用时自动加载) @@ -783,7 +784,8 @@ private void processIdGenerator(SqlToyContext sqlToyContext, EntityMeta entityMe String generator = IdGenerators.get(idGenerator.toLowerCase()); generator = (generator != null) ? IdGeneratorPackage.concat(generator) : idGenerator; // 针对历史id策略包路径提供兼容处理:update 2024-07-16 - if (generator.startsWith(IdGeneratorOldPackage)) { + if (generator.startsWith(IdGeneratorOldPackage) + || (generator.startsWith(IdGeneratorOldPackage_v1) && !generator.startsWith(IdGeneratorPackage))) { generator = IdGeneratorPackage.concat(generator.substring(generator.lastIndexOf(".") + 1)); } // 自定义(不依赖spring模式),用法在quickvo中配置例如:com.xxxx..CustomIdGenerator diff --git a/trunk/sqltoy-orm-core/src/main/java/org/sagacity/sqltoy/dialect/utils/DialectUtils.java b/trunk/sqltoy-orm-core/src/main/java/org/sagacity/sqltoy/dialect/utils/DialectUtils.java index 7d5719ca4..648557fae 100644 --- a/trunk/sqltoy-orm-core/src/main/java/org/sagacity/sqltoy/dialect/utils/DialectUtils.java +++ b/trunk/sqltoy-orm-core/src/main/java/org/sagacity/sqltoy/dialect/utils/DialectUtils.java @@ -1083,7 +1083,7 @@ public static Serializable load(final SqlToyContext sqlToyContext, SqlToyConfig Serializable result = null; // 加载主表 if (!onlySubTables) { - SqlConfigParseUtils.processSql(sql, entityMeta.getIdArray(), pkValues, null); + sqlToyResult = SqlConfigParseUtils.processSql(sql, entityMeta.getIdArray(), pkValues, null); // 加密字段解密 DecryptHandler decryptHandler = null; if (entityMeta.getSecureColumns() != null) { diff --git a/trunk/sqltoy-orm-solon-plugin/pom.xml b/trunk/sqltoy-orm-solon-plugin/pom.xml index c96a45f38..284609b12 100644 --- a/trunk/sqltoy-orm-solon-plugin/pom.xml +++ b/trunk/sqltoy-orm-solon-plugin/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.sagframe - 5.6.15 + 5.6.16 sagacity-sqltoy-solon-plugin sagacity-sqltoy-solon-plugin diff --git a/trunk/sqltoy-orm-spring-starter/pom.xml b/trunk/sqltoy-orm-spring-starter/pom.xml index 6c4786edd..665abba37 100644 --- a/trunk/sqltoy-orm-spring-starter/pom.xml +++ b/trunk/sqltoy-orm-spring-starter/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.sagframe - 5.6.15 + 5.6.16 sagacity-sqltoy-spring-starter sagacity-sqltoy-spring-starter sqltoy springboot starter diff --git a/trunk/sqltoy-orm-spring/pom.xml b/trunk/sqltoy-orm-spring/pom.xml index 69ea67500..7ba4bd997 100644 --- a/trunk/sqltoy-orm-spring/pom.xml +++ b/trunk/sqltoy-orm-spring/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.sagframe - 5.6.15 + 5.6.16 sagacity-sqltoy-spring sagacity-sqltoy-spring sagacity-sqltoy-spring