From 69c4cbc2949917abb095446c9d0dfeccb66fcae9 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 17 Aug 2023 14:18:50 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/codegenerate/database/DbReadTableUtil.java  | 2 +-
 .../com/jero/codegenerate/database/util/CodeStringUtils.java  | 3 ++-
 .../com/jero/codegenerate/generate/impl/CodeGenerateOne.java  | 2 +-
 .../codegenerate/generate/impl/CodeGenerateOneToMany.java     | 2 +-
 .../java/com/jero/codegenerate/generate/util/FileHelper.java  | 2 +-
 .../com/jero/codegenerate/generate/util/TableConvert.java     | 3 ++-
 .../impl/PhasedImplementationDetailsEOServiceImpl.java        | 4 ++--
 7 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/database/DbReadTableUtil.java b/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/database/DbReadTableUtil.java
index b2e6f28b..5f9d9b00 100644
--- a/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/database/DbReadTableUtil.java
+++ b/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/database/DbReadTableUtil.java
@@ -7,7 +7,7 @@ import com.jero.codegenerate.generate.util.TableConvert;
 import com.jero.codegenerate.properties.CodeConfigProperties;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Component;
 
 import java.sql.*;
diff --git a/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/database/util/CodeStringUtils.java b/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/database/util/CodeStringUtils.java
index 8763e33b..3ce6f16a 100644
--- a/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/database/util/CodeStringUtils.java
+++ b/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/database/util/CodeStringUtils.java
@@ -1,7 +1,8 @@
 package com.jero.codegenerate.database.util;
 
 import java.util.List;
-import org.apache.commons.lang3.StringUtils;
+
+import org.apache.commons.lang.StringUtils;
 
 public class CodeStringUtils {
     private CodeStringUtils() {
diff --git a/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOne.java b/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOne.java
index 74e3fcad..ed1a1f71 100644
--- a/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOne.java
+++ b/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOne.java
@@ -9,7 +9,7 @@ import com.jero.codegenerate.generate.pojo.TableVo;
 import com.jero.codegenerate.generate.util.NonceUtils;
 import com.jero.codegenerate.properties.CodeConfigProperties;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 
 import java.io.IOException;
 import java.sql.SQLException;
diff --git a/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOneToMany.java b/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOneToMany.java
index 359775b9..1fcbda71 100644
--- a/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOneToMany.java
+++ b/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/impl/CodeGenerateOneToMany.java
@@ -10,7 +10,7 @@ import com.jero.codegenerate.generate.pojo.onetomany.SubTableVo;
 import com.jero.codegenerate.generate.util.NonceUtils;
 import com.jero.codegenerate.properties.CodeConfigProperties;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 
 import java.io.IOException;
 import java.sql.SQLException;
diff --git a/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/util/FileHelper.java b/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/util/FileHelper.java
index 543ee5f9..3c983d9e 100644
--- a/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/util/FileHelper.java
+++ b/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/util/FileHelper.java
@@ -8,7 +8,7 @@ import java.util.Comparator;
 import java.util.List;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 
 @Slf4j
 public class FileHelper {
diff --git a/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/util/TableConvert.java b/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/util/TableConvert.java
index d2217fa9..7244420d 100644
--- a/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/util/TableConvert.java
+++ b/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/util/TableConvert.java
@@ -1,6 +1,7 @@
 package com.jero.codegenerate.generate.util;
 
-import org.apache.commons.lang3.StringUtils;
+
+import org.apache.commons.lang.StringUtils;
 
 public class TableConvert {
 
diff --git a/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/PhasedImplementationDetailsEOServiceImpl.java b/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/PhasedImplementationDetailsEOServiceImpl.java
index d4bad589..eb23b980 100644
--- a/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/PhasedImplementationDetailsEOServiceImpl.java
+++ b/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/PhasedImplementationDetailsEOServiceImpl.java
@@ -6,8 +6,8 @@ import com.jero.modules.document.entity.PhasedImplementationDetailsEO;
 import com.jero.modules.document.enums.ImplementationTypeEnum;
 import com.jero.modules.document.mapper.PhasedImplementationDetailsEOMapper;
 import com.jero.modules.document.service.IPhasedImplementationDetailsEOService;
-import me.zhyd.oauth.utils.StringUtils;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
@@ -119,7 +119,7 @@ public class PhasedImplementationDetailsEOServiceImpl extends ServiceImpl<Phased
 					ImplementationTypeEnum[] implementationTypeEnums = ImplementationTypeEnum.values();
 
 					String implementationTypeText = "";
-					if(org.apache.commons.lang3.StringUtils.equals(cut, CutEnum.CN.getValue())){
+					if(StringUtils.equals(cut, CutEnum.CN.getValue())){
 						implementationTypeText = Arrays.stream(implementationTypeEnums).filter(implementationTypeEnum -> {
 							boolean flag = false;
 							for (String type : implementationTypeArr) {