|
@@ -149,7 +149,9 @@ object UrlUtil {
|
|
|
|
|
|
|
|
/* 获取合法的文件后缀 */
|
|
/* 获取合法的文件后缀 */
|
|
|
fun getSuffix(str: String, default: String? = null): String {
|
|
fun getSuffix(str: String, default: String? = null): String {
|
|
|
- val suffix = CustomUrl(str).getUrl().substringAfterLast(".")
|
|
|
|
|
|
|
+ val suffix = CustomUrl(str).getUrl()
|
|
|
|
|
+ .substringAfterLast(".", "")
|
|
|
|
|
+ .substringBefore("?")
|
|
|
//检查截取的后缀字符是否合法 [a-zA-Z0-9]
|
|
//检查截取的后缀字符是否合法 [a-zA-Z0-9]
|
|
|
val fileSuffixRegex = Regex("^[a-z\\d]+$", RegexOption.IGNORE_CASE)
|
|
val fileSuffixRegex = Regex("^[a-z\\d]+$", RegexOption.IGNORE_CASE)
|
|
|
return if (suffix.length > 5 || !suffix.matches(fileSuffixRegex)) {
|
|
return if (suffix.length > 5 || !suffix.matches(fileSuffixRegex)) {
|
kunfei