Browse Source

字符未使用下划线不进行驼峰式处理

RuoYi 4 years ago
parent
commit
49e20200f1

BIN
doc/若依环境使用手册.docx


+ 1 - 1
ruoyi-admin/src/main/resources/templates/system/user/profile/profile.html

@@ -16,7 +16,7 @@
                 </div>
                 <div class="ibox-content">
                     <div class="text-center">
-                        <p class="user-info-head" onclick="javascript:avatar()"><img class="img-circle img-lg" th:src="(${user.avatar} == '') ? @{/img/profile.jpg} : @{${user.avatar}}"></p>
+                        <p class="user-info-head" onclick="avatar()"><img class="img-circle img-lg" th:src="(${user.avatar} == '') ? @{/img/profile.jpg} : @{${user.avatar}}"></p>
                         <p><a href="javascript:avatar()">修改头像</a></p>
                     </div>
                     <ul class="list-group list-group-striped">

+ 7 - 3
ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java

@@ -301,7 +301,6 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
             }
             sb.append(Character.toLowerCase(c));
         }
-
         return sb.toString();
     }
 
@@ -364,7 +363,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
     }
 
     /**
-     * 驼峰式命名法 例如:user_name->userName
+     * 驼峰式命名法
+     * 例如:user_name->userName
      */
     public static String toCamelCase(String s)
     {
@@ -372,6 +372,10 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
         {
             return null;
         }
+        if (s.indexOf(SEPARATOR) == -1)
+        {
+            return s;
+        }
         s = s.toLowerCase();
         StringBuilder sb = new StringBuilder(s.length());
         boolean upperCase = false;
@@ -401,4 +405,4 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
     {
         return (T) obj;
     }
-}
+}