From 1f9b36eee6c7945d281c34e51a8e70501cf938c2 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期六, 04 二月 2023 22:30:27 +0800
Subject: [PATCH] 连接池Druid支持新的配置connectTimeout和socketTimeout

---
 src/main/java/com/ruoyi/common/core/text/Convert.java |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/ruoyi/common/core/text/Convert.java b/src/main/java/com/ruoyi/common/core/text/Convert.java
index 515cf0b..50d2be0 100644
--- a/src/main/java/com/ruoyi/common/core/text/Convert.java
+++ b/src/main/java/com/ruoyi/common/core/text/Convert.java
@@ -562,17 +562,12 @@
         switch (valueStr)
         {
             case "true":
-                return true;
-            case "false":
-                return false;
             case "yes":
-                return true;
             case "ok":
-                return true;
-            case "no":
-                return false;
             case "1":
                 return true;
+            case "false":
+            case "no":
             case "0":
                 return false;
             default:
@@ -718,7 +713,7 @@
         }
         if (value instanceof Double)
         {
-            return new BigDecimal((Double) value);
+            return BigDecimal.valueOf((Double) value);
         }
         if (value instanceof Integer)
         {
@@ -899,7 +894,7 @@
      */
     public static String toSBC(String input, Set<Character> notConvertSet)
     {
-        char c[] = input.toCharArray();
+        char[] c = input.toCharArray();
         for (int i = 0; i < c.length; i++)
         {
             if (null != notConvertSet && notConvertSet.contains(c[i]))
@@ -941,7 +936,7 @@
      */
     public static String toDBC(String text, Set<Character> notConvertSet)
     {
-        char c[] = text.toCharArray();
+        char[] c = text.toCharArray();
         for (int i = 0; i < c.length; i++)
         {
             if (null != notConvertSet && notConvertSet.contains(c[i]))

--
Gitblit v1.9.3