From 2a1cca09aef442d5e7b7b7a2ac8dacb7c6690655 Mon Sep 17 00:00:00 2001 From: HuangHai <10402852@qq.com> Date: Wed, 30 Apr 2025 09:04:57 +0800 Subject: [PATCH] 'commit' --- .../com/dsideal/dsBase/BaseApplication.java | 5 ++--- .../com/dsideal/dsBase/Util/CommonUtil.java | 20 ------------------- .../java/com/dsideal/gw/GwApplication.java | 2 +- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/dsBase/src/main/java/com/dsideal/dsBase/BaseApplication.java b/dsBase/src/main/java/com/dsideal/dsBase/BaseApplication.java index ee16a300..4da0766c 100644 --- a/dsBase/src/main/java/com/dsideal/dsBase/BaseApplication.java +++ b/dsBase/src/main/java/com/dsideal/dsBase/BaseApplication.java @@ -32,6 +32,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; +import java.nio.charset.StandardCharsets; import java.util.Objects; public class BaseApplication extends JFinalConfig { @@ -184,9 +185,7 @@ public class BaseApplication extends JFinalConfig { @Override public void onStart() { //打印 启动Logo - String path = BaseApplication.class.getClassLoader().getResource("logo.txt").getPath(); - File file = new File(path); - System.out.println(FileUtil.readUtf8String(file)); + System.out.println(FileUtil.readUtf8String("logo.txt")); //初始化人员主键序列 PkUtil.InitPersonNumPk(); diff --git a/dsBase/src/main/java/com/dsideal/dsBase/Util/CommonUtil.java b/dsBase/src/main/java/com/dsideal/dsBase/Util/CommonUtil.java index 3d4a2a36..886f85e3 100644 --- a/dsBase/src/main/java/com/dsideal/dsBase/Util/CommonUtil.java +++ b/dsBase/src/main/java/com/dsideal/dsBase/Util/CommonUtil.java @@ -11,7 +11,6 @@ import com.jfinal.kit.PropKit; import com.jfinal.kit.StrKit; import com.jfinal.plugin.activerecord.Page; import com.jfinal.plugin.activerecord.Record; -import com.jfinal.plugin.hikaricp.HikariCpPlugin; import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.digest.DigestUtils; import org.slf4j.Logger; @@ -20,11 +19,8 @@ import org.slf4j.LoggerFactory; import java.io.*; import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; -import java.security.SecureRandom; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -33,22 +29,6 @@ import java.util.regex.Pattern; public class CommonUtil { private static final Logger log = LoggerFactory.getLogger(CommonUtil.class); - /** - * 功能:将jsonObject转换为Record - * - * @param jsonObject - * @return - */ - public static Record convertJsonObjectToRecord(JSONObject jsonObject) { - Record record = new Record(); - for (Map.Entry entry : jsonObject.entrySet()) { - String key = entry.getKey(); // 获取键 - Object value = entry.getValue(); // 获取值 - record.set(key, value); - } - return record; - } - /** * 功能:获取操作系统类型 * 作者:黄海 diff --git a/dsGw/src/main/java/com/dsideal/gw/GwApplication.java b/dsGw/src/main/java/com/dsideal/gw/GwApplication.java index 2890b63b..51ad852c 100644 --- a/dsGw/src/main/java/com/dsideal/gw/GwApplication.java +++ b/dsGw/src/main/java/com/dsideal/gw/GwApplication.java @@ -123,6 +123,6 @@ public class GwApplication extends JFinalConfig { @Override public void onStart() { //打印 启动Logo - System.out.println(FileUtil.readString("logo.txt", StandardCharsets.UTF_8)); + System.out.println(FileUtil.readUtf8String("logo.txt")); } }