Merge remote-tracking branch 'origin/master' into master

blade-common/pom.xml

@@ -61,6 +61,12 @@
             <version>30.1.1-jre</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.sejda.imageio</groupId>
+            <artifactId>webp-imageio</artifactId>
+            <version>0.1.6</version>
+        </dependency>
+
     </dependencies>
 
     <build>

blade-common/src/main/java/org/springblade/common/utils/CommonUtil.java

@@ -37,6 +37,7 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
 import com.drew.metadata.MetadataException;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 通用工具类
@@ -626,4 +627,21 @@ public class CommonUtil {
         return url;
     }
 
+    /**
+     *  webp文件转字节数组
+     * @param
+     * @return
+     */
+    public static byte[] webpToPngBytes(InputStream inputStream) {
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        try {
+            BufferedImage webpImage = ImageIO.read(inputStream);
+            ImageIO.write(webpImage,"png",bos);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return bos.toByteArray();
+    }
+
+
 }