升级版本号，默认不打印SQL日志

jeecgboot · Oct 30, 2024 · 3d9dcdd · 3d9dcdd
1 parent 54785f5
commit 3d9dcdd
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
 MiniDao 
 =======
-当前最新版本： 1.10.3 （发布日期：2024-10-23）
+当前最新版本： 1.10.4 （发布日期：2024-10-30）
 
 [![AUR](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://github.com/zhangdaiscott/jeecg-boot/blob/master/LICENSE)
 [![](https://img.shields.io/badge/Author-北京国炬软件-orange.svg)](http://jeecg.com/aboutusIndex)
 [![](https://img.shields.io/badge/Blog-官方博客-blue.svg)](https://jeecg.blog.csdn.net)
-[![](https://img.shields.io/badge/version-1.10.3-brightgreen.svg)](https://github.com/zhangdaiscott/jeecg-boot)
+[![](https://img.shields.io/badge/version-1.10.4-brightgreen.svg)](https://github.com/zhangdaiscott/jeecg-boot)
 [![GitHub stars](https://img.shields.io/github/stars/zhangdaiscott/jeecg-boot.svg?style=social&label=Stars)](https://github.com/zhangdaiscott/jeecg-boot)
 [![GitHub forks](https://img.shields.io/github/forks/zhangdaiscott/jeecg-boot.svg?style=social&label=Fork)](https://github.com/zhangdaiscott/jeecg-boot)
 
@@ -44,7 +44,7 @@ MiniDao 是一款轻量级JAVA持久层框架，基于 SpringJdbc + freemarker
 <dependency>
   <groupId>org.jeecgframework</groupId>
   <artifactId>minidao-pe</artifactId>
-  <version>1.10.3</version>
+  <version>1.10.4</version>
 </dependency>
 ```
 

diff --git a/minidao-pe-example/pom.xml b/minidao-pe-example/pom.xml
@@ -3,17 +3,17 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jeecgframework</groupId>
 	<artifactId>minidao-pe-example</artifactId>
-	<version>1.10.3</version>
+	<version>1.10.4</version>
 	<packaging>jar</packaging>
 	<url>http://www.jeecg.com</url>
 	<parent>
 		<groupId>org.jeecgframework</groupId>
 		<artifactId>minidao-parent</artifactId>
-		<version>1.10.3</version>
+		<version>1.10.4</version>
 	</parent>
 
 	<properties>
-		<minidao.version>1.10.3</minidao.version>
+		<minidao.version>1.10.4</minidao.version>
 		<junit.version>4.13.1</junit.version>
 		<springframework.version>5.3.31</springframework.version>
 		<!-- 数据库驱动 -->

diff --git a/minidao-pe/pom.xml b/minidao-pe/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>org.jeecgframework</groupId>
 	<artifactId>minidao-pe</artifactId>
-	<version>1.10.3</version>
+	<version>1.10.4</version>
 	<packaging>jar</packaging>
 
 	<name>minidao-pe</name>

diff --git a/minidao-pe/src/main/java/org/jeecgframework/minidao/aop/MiniDaoHandler.java b/minidao-pe/src/main/java/org/jeecgframework/minidao/aop/MiniDaoHandler.java
@@ -416,18 +416,24 @@ private Object getReturnMinidaoResult(MiniDaoPage pageSetting, Method method, St
 					if (returnType.isAssignableFrom(MiniDaoPage.class)) {
 						if (paramMap != null) {
 							String countsql = MiniDaoUtil.getCountSql(executeSql);
-							logger.info("page smart countsql===> "+countsql);
+							if (showSql) {
+								logger.info("page smart countsql===> "+countsql);
+							}
 							pageSetting.setTotal(namedParameterJdbcTemplate.queryForObject(countsql, paramMap, Integer.class));
 						} else {
 							String countsql = MiniDaoUtil.getCountSql(executeSql);
-							logger.info("page countsql===> "+countsql);
+							if (showSql) {
+								logger.info("page countsql===> "+countsql);
+							}
 							pageSetting.setTotal(jdbcTemplate.queryForObject(countsql, Integer.class));
 						}
 					}
 					//判断方言，获取分页sql
 					if (pageAutoDialect.getDelegate()!=null) {
 						 executeSql = pageAutoDialect.getDelegate().getPageSql(executeSql,pageSetting);
-						 logger.info("page executeSql===> "+executeSql);
+						if (showSql) {
+							logger.info("page executeSql===> "+executeSql);
+						}
 					}
 					//executeSql = MiniDaoUtil.createPageSql(dbType, executeSql, page, rows);
 				}

diff --git a/minidao-pe/src/main/java/org/jeecgframework/minidao/util/MiniDaoUtil.java b/minidao-pe/src/main/java/org/jeecgframework/minidao/util/MiniDaoUtil.java
@@ -184,7 +184,7 @@ public static String getDbType(DataSource dataSource){
 		String dbUrl = getUrl(dataSource);
 		String dbType = getDbType(dbUrl);
         long endTime=System.currentTimeMillis();
-        logger.info("获取DB类型："+ dbType+ "，耗时："+ (endTime-startTime) +"ms");
+        logger.debug("获取DB类型："+ dbType+ "，耗时："+ (endTime-startTime) +"ms");
 		return dbType;
 	}
 
@@ -290,7 +290,7 @@ public static boolean isJSqlParserAvailable() {
 	private static boolean checkJSqlParserAvailability() {
 		try {
 			Class.forName("net.sf.jsqlparser.statement.select.SelectBody");
-			logger.info("【Sql Parser】 The environment supports jsqlparser engine");
+			logger.debug("【Sql Parser】 The environment supports jsqlparser engine");
 			return true;
 		} catch (ClassNotFoundException e) {
 			logger.warn("【Sql Parser】 The environment does not support jsqlparser engine");

diff --git a/minidao-spring-boot-starter/pom.xml b/minidao-spring-boot-starter/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jeecgframework</groupId>
 	<artifactId>minidao-spring-boot-starter</artifactId>
-	<version>1.10.3</version>
+	<version>1.10.4</version>
 	<packaging>jar</packaging>
 
 	<parent>
@@ -33,7 +33,7 @@
 
 	<properties>
 		<!-- minidao -->
-		<minidao.version>1.10.3</minidao.version>
+		<minidao.version>1.10.4</minidao.version>
 		<druid.version>1.2.22</druid.version>
 		<mysql-connector-java.version>8.0.27</mysql-connector-java.version>
 	</properties>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jeecgframework</groupId>
 	<artifactId>minidao-parent</artifactId>
-	<version>1.10.3</version>
+	<version>1.10.4</version>
 	<packaging>pom</packaging>
 
 	<!-- 项目属性 -->