fix: 修复EAL4 bug：1.日志相关 2.文件创建工具类修改develop-code-fixdev

1 files changed, 17 insertions, 11 deletions

diff --git a/src/main/java/com/nis/util/MybatisPlusConfig.java b/src/main/java/com/nis/util/MybatisPlusConfig.java
index 5853006..c3b1026 100644
--- a/src/main/java/com/nis/util/MybatisPlusConfig.java
+++ b/src/main/java/com/nis/util/MybatisPlusConfig.java
@@ -1,8 +1,10 @@
 package com.nis.util;
 
+import cn.hutool.core.exceptions.ExceptionUtil;
 import cn.hutool.log.Log;
 import com.baomidou.mybatisplus.core.incrementer.IKeyGenerator;
 import com.baomidou.mybatisplus.core.injector.ISqlInjector;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.injector.LogicSqlInjector;
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import org.apache.ibatis.mapping.DatabaseIdProvider;
@@ -56,19 +58,23 @@ public class MybatisPlusConfig {
 			try {
 				databaseId = databaseIdProvider.getDatabaseId(dataSource);
 			} catch (SQLException e) {
-				logger.debug(LogPrintUtil.print(e));
+				logger.debug(ExceptionUtil.getMessage(e));
 			}
 			
-			switch (databaseId){
-	            case Constant.MYSQL:
-	                return String.format("select seq_nextval('%s')", incrementerName);
-	            case Constant.POSTGRESQL:
-	                return String.format("select seq_nextval('%s')", incrementerName);
-	            case Constant.ORACLE:
-	                return String.format("select %s.nextval from dual", incrementerName);
-	            default:
-	                return String.format("select seq_nextval('%s')", incrementerName);
-	        }
+			if(ObjectUtils.isNotEmpty(databaseId)) {
+				switch (databaseId){
+		            case Constant.MYSQL:
+		                return String.format("select seq_nextval('%s')", incrementerName);
+		            case Constant.POSTGRESQL:
+		                return String.format("select seq_nextval('%s')", incrementerName);
+		            case Constant.ORACLE:
+		                return String.format("select %s.nextval from dual", incrementerName);
+		            default:
+		                return String.format("select seq_nextval('%s')", incrementerName);
+		        }
+			}else {
+				return String.format("select seq_nextval('%s')", incrementerName);
+			}
 		}
     }
 }