common-frame/hcframe
17
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

fix: 修复异常问题

Browse Source
This commit is contained in:
lhc
2025-11-14 15:43:07 +08:00
parent 5714438fbf
commit 28038c0713
5 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hcframe-parent/hcframe-base/pom.xml
View File

@@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>hcframe-base</artifactId>
<version>1.2.4-SNAPSHOT</version>
<version>1.2.5-SNAPSHOT</version>
<properties>
<maven.compiler.source>8</maven.compiler.source>

4
hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/module/Condition.java
View File

@@ -480,7 +480,7 @@ public class Condition implements Serializable {
public ConditionBuilder lte(String key, Object value) {
String sqlKey = "item_" + IdUtil.fastUUID();
this.paramMap.put(sqlKey, formatValue(key, value));
this.conditionSql += " " + key + " " + LTE + " #{" + value.toString() + "} ";
this.conditionSql += " " + key + " " + LTE + " #{" + sqlKey + "} ";
return this;
}
@@ -497,7 +497,7 @@ public class Condition implements Serializable {
public ConditionBuilder gte(String key, Object value) {
String sqlKey = "item_" + IdUtil.fastUUID();
this.paramMap.put(sqlKey, formatValue(key, value));
this.conditionSql += " " + key + " " + GTE + " #{" + value.toString() + "} ";
this.conditionSql += " " + key + " " + GTE + " #{" + sqlKey + "} ";
return this;
}

3
hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/config/DataSourceConfiguration.java
View File

@@ -9,6 +9,7 @@ import org.mybatis.spring.SqlSessionTemplate;
import org.mybatis.spring.annotation.MapperScan;
import org.mybatis.spring.boot.autoconfigure.MybatisProperties;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
@@ -92,7 +93,7 @@ public class DataSourceConfiguration {
return new DataSourceTransactionManager(dynamicDataSource());
}
@Bean
public SqlSessionTemplate sqlSessionTemplate(SqlSessionFactory sqlSessionFactory) {
public SqlSessionTemplate sqlSessionTemplate(@Qualifier("sqlSessionFactoryBean222")SqlSessionFactory sqlSessionFactory) {
return new SqlSessionTemplate(sqlSessionFactory);
}

2
hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/datasource/dynamic/MyDynamicDataSource.java
View File

@@ -1,10 +1,10 @@
package com.taixingyiji.base.module.datasource.dynamic;
import com.alibaba.druid.util.StringUtils;
import com.taixingyiji.base.module.datasource.utils.DataUnit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
import org.springframework.util.StringUtils;
/**
* @author lhc

28
hcframe-parent/pom.xml
View File

@@ -230,25 +230,25 @@
</profile>
</profiles>
<distributionManagement>
<!-- <repository>-->
<!-- <id>releases</id>-->
<!-- <name>Releases</name>-->
<!-- <url>http://192.168.0.123:8081/repository/maven-releases/</url>-->
<!-- </repository>-->
<!-- <snapshotRepository>-->
<!-- <id>snapshots</id>-->
<!-- <name>Snapshot</name>-->
<!-- <url>http://192.168.0.123:8081/repository/maven-snapshots/</url>-->
<!-- </snapshotRepository>-->
<repository>
<id>releases-hc</id>
<id>releases</id>
<name>Releases</name>
<url>https://qs.taixingyiji.com:8082/repository/maven-releases/</url>
<url>http://192.168.0.123:8081/repository/maven-releases/</url>
</repository>
<snapshotRepository>
<id>snapshots-hc</id>
<id>snapshots</id>
<name>Snapshot</name>
<url>https://qs.taixingyiji.com:8082/repository/maven-snapshots/</url>
<url>http://192.168.0.123:8081/repository/maven-snapshots/</url>
</snapshotRepository>
<!-- <repository>-->
<!-- <id>releases-hc</id>-->
<!-- <name>Releases</name>-->
<!-- <url>https://qs.taixingyiji.com:8082/repository/maven-releases/</url>-->
<!-- </repository>-->
<!-- <snapshotRepository>-->
<!-- <id>snapshots-hc</id>-->
<!-- <name>Snapshot</name>-->
<!-- <url>https://qs.taixingyiji.com:8082/repository/maven-snapshots/</url>-->
<!-- </snapshotRepository>-->
</distributionManagement>
</project>