From 1b09cf996991839b6bd20c658678d34d2fd7a0c9 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 4 Aug 2018 15:42:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96StringUtils.camelCase?=
 =?UTF-8?q?=E9=A9=BC=E5=B3=B0=E5=91=BD=E5=90=8D=E6=B3=95=E8=BD=AC=E6=8D=A2?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=85=81=E8=AE=B8=E7=AC=AC=E4=BA=8C=E4=B8=AA?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E6=98=AF=E5=A4=A7=E5=86=99=EF=BC=8C=E5=9B=A0?=
 =?UTF-8?q?=E4=B8=BA=E8=BF=99=E6=A0=B7=E4=BC=9A=E9=80=A0=E6=88=90bean?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jeesite/common/lang/StringUtils.java     | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/common/src/main/java/com/jeesite/common/lang/StringUtils.java b/common/src/main/java/com/jeesite/common/lang/StringUtils.java
index e645babb..a0eb094e 100644
--- a/common/src/main/java/com/jeesite/common/lang/StringUtils.java
+++ b/common/src/main/java/com/jeesite/common/lang/StringUtils.java
@@ -250,16 +250,14 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
         if (s == null) {
             return null;
         }
-
         s = s.toLowerCase();
-
         StringBuilder sb = new StringBuilder(s.length());
         boolean upperCase = false;
         for (int i = 0; i < s.length(); i++) {
             char c = s.charAt(i);
 
             if (c == SEPARATOR) {
-                upperCase = true;
+                upperCase = i != 1; // 不允许第二个字符是大写
             } else if (upperCase) {
                 sb.append(Character.toUpperCase(c));
                 upperCase = false;
@@ -267,7 +265,6 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
                 sb.append(c);
             }
         }
-
         return sb.toString();
     }
 
@@ -297,18 +294,14 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
         if (s == null) {
             return null;
         }
-
         StringBuilder sb = new StringBuilder();
         boolean upperCase = false;
         for (int i = 0; i < s.length(); i++) {
             char c = s.charAt(i);
-
             boolean nextUpperCase = true;
-
             if (i < (s.length() - 1)) {
                 nextUpperCase = Character.isUpperCase(s.charAt(i + 1));
             }
-
             if ((i > 0) && Character.isUpperCase(c)) {
                 if (!upperCase || !nextUpperCase) {
                     sb.append(SEPARATOR);
@@ -317,10 +310,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
             } else {
                 upperCase = false;
             }
-
             sb.append(Character.toLowerCase(c));
         }
-
         return sb.toString();
     }