oss上传格式

happy-common/happy-common-core/src/main/java/org/jeecg/common/oss/OSSClientUtil.java

@@ -327,38 +327,49 @@ public class OSSClientUtil {
      * @return String
      */
     public String getcontentType(String FilenameExtension) {
-        if (FilenameExtension.equalsIgnoreCase("bmp")) {
+        if (FilenameExtension.equalsIgnoreCase(".bmp")) {
             return "image/bmp";
         }
-        if (FilenameExtension.equalsIgnoreCase("gif")) {
+        if (FilenameExtension.equalsIgnoreCase(".gif")) {
             return "image/gif";
         }
-        if (FilenameExtension.equalsIgnoreCase("jpeg") ||
-                FilenameExtension.equalsIgnoreCase("jpg") ||
-                FilenameExtension.equalsIgnoreCase("png")) {
-            return "image/jpeg";
+        if (FilenameExtension.equalsIgnoreCase(".jpeg") ||
+                FilenameExtension.equalsIgnoreCase(".jpg") ||
+                FilenameExtension.equalsIgnoreCase(".png")) {
+            return "image/jpg";
         }
-        if (FilenameExtension.equalsIgnoreCase("html")) {
+        if (FilenameExtension.equalsIgnoreCase(".html")) {
             return "text/html";
         }
-        if (FilenameExtension.equalsIgnoreCase("txt")) {
+        if (FilenameExtension.equalsIgnoreCase(".txt")) {
             return "text/plain";
         }
-        if (FilenameExtension.equalsIgnoreCase("vsd")) {
+        if (FilenameExtension.equalsIgnoreCase(".vsd")) {
             return "application/vnd.visio";
         }
-        if (FilenameExtension.equalsIgnoreCase("pptx") ||
-                FilenameExtension.equalsIgnoreCase("ppt")) {
+        if (FilenameExtension.equalsIgnoreCase(".pptx") ||
+                FilenameExtension.equalsIgnoreCase(".ppt")) {
             return "application/vnd.ms-powerpoint";
         }
-        if (FilenameExtension.equalsIgnoreCase("docx") ||
-                FilenameExtension.equalsIgnoreCase("doc")) {
+        if (FilenameExtension.equalsIgnoreCase(".docx") ||
+                FilenameExtension.equalsIgnoreCase(".doc")) {
             return "application/msword";
         }
-        if (FilenameExtension.equalsIgnoreCase("xml")) {
+        if (FilenameExtension.equalsIgnoreCase(".xml")) {
             return "text/xml";
         }
-        return "image/jpeg";
+        if (FilenameExtension.equalsIgnoreCase(".pdf")) {
+            return "application/pdf";
+        }
+        if (FilenameExtension.equalsIgnoreCase(".xla") ||
+                FilenameExtension.equalsIgnoreCase(".xlc") ||
+                FilenameExtension.equalsIgnoreCase(".xlm") ||
+                FilenameExtension.equalsIgnoreCase(".xls") ||
+                FilenameExtension.equalsIgnoreCase(".xlt") ||
+                FilenameExtension.equalsIgnoreCase(".xlw")) {
+            return "application/vnd.ms-excel";
+        }
+        return "image/jpg";
     }
 
     /**