上传图片

pom.xml

@@ -1000,8 +1000,6 @@
         </dependency>
 
 
-
-
     </dependencies>
 
 </project>

src/main/java/com/izouma/awesomeadmin/service/OSSFileService.java

@@ -53,6 +53,13 @@ public class OSSFileService {
             object = client.getObject(bucketname, path);
         } catch (Exception r) {
             logger.error("OSS上传异常:", r);
+        } finally {
+
+            try {
+                fin.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
         }
         // 如果不设置content-length, 默认为chunked编码。
         if (object != null) {

src/main/java/com/izouma/awesomeadmin/util/ImagesUtil.java

@@ -1,11 +1,6 @@
 package com.izouma.awesomeadmin.util;
 
-import java.awt.*;
-import java.awt.color.ColorSpace;
-import java.awt.image.*;
-import java.io.*;
-import java.util.Iterator;
-
+import org.apache.commons.io.FileUtils;
 import sun.misc.BASE64Decoder;
 
 import javax.imageio.IIOException;
@@ -13,6 +8,11 @@ import javax.imageio.ImageIO;
 import javax.imageio.ImageReader;
 import javax.imageio.stream.ImageInputStream;
 import javax.imageio.stream.ImageOutputStream;
+import java.awt.*;
+import java.awt.color.ColorSpace;
+import java.awt.image.*;
+import java.io.*;
+import java.util.Iterator;
 
 
 public class ImagesUtil {
@@ -64,14 +64,15 @@ public class ImagesUtil {
      *                  当scale>=1,缩略图height=comBase,width按原图宽高比例;若scale<1,缩略图width=comBase,height按原图宽高比例
      * @throws Exception
      */
-    public static InputStream changeMinPhoto(InputStream fin, String imageType, double comBase,
-                                             double scale) {
+    public static InputStream changeMinPhotoOld(InputStream fin, String imageType, double comBase,
+                                                double scale) {
         try {
             // get image format in a file
             //File file = new File("newimage.jpg");
 
             // create an image input stream from the specified file
-            ImageInputStream iis = ImageIO.createImageInputStream(fin);
+            ByteArrayOutputStream baos = cloneInputStream(fin);
+            ImageInputStream iis = ImageIO.createImageInputStream(new ByteArrayInputStream(baos.toByteArray()));
 
             Iterator<ImageReader> readers = ImageIO.getImageReaders(iis);
             if (readers == null || !readers.hasNext()) {
@@ -88,8 +89,30 @@ public class ImagesUtil {
                     image = reader.read(0); //RGB
                 } catch (IIOException e) {
                     // 读取Raster (没有颜色的转换).
-                    Raster raster = reader.readRaster(0, null);//CMYK
-                    image = createJPEG4(raster);
+//                    Raster raster = reader.readRaster(0, null);//CMYK
+//                    image = createJPEG4(raster);
+
+                    try {
+
+                        String tmpImagename = "CMYK_" + MbappUtil.create_nonce_str() + "." + format;
+                        File src = new File("/tmp/" + tmpImagename);
+                        FileUtils.copyInputStreamToFile(new ByteArrayInputStream(baos.toByteArray()), src);
+                        String[] cmd = {"sh", "-c", "convert -colorspace RGB -resize '4000000@>' -quality 60 /tmp/" + tmpImagename + " /tmp/RGB" + tmpImagename};
+                        //System.out.println("1xxxx:" + new Date());
+                        Process p = Runtime.getRuntime().exec(cmd);
+                        //System.out.println("2xxxx:" + new Date());
+                        p.waitFor();
+                        //System.out.println("3xxxx:" + new Date());
+                        image = ImageIO.read(new FileInputStream(new File("/tmp/RGB" + tmpImagename)));
+                        //System.out.println("4xxxx:" + new Date());
+                        if (!"".equals(tmpImagename)) {//清楚临时文件
+                            deleteFile("/tmp/" + tmpImagename);
+                            deleteFile("/tmp/RGB" + tmpImagename);
+                        }
+
+                    } catch (Exception ee) {
+                        ee.printStackTrace();
+                    }
                 }
             }
 
@@ -129,6 +152,7 @@ public class ImagesUtil {
             ImageOutputStream imageOutput = ImageIO.createImageOutputStream(byteArrayOutputStream);
             ImageIO.write(tag, imageType, imageOutput);
             InputStream inputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
+            iis.close();
             return inputStream;
         } catch (Exception e) {
             e.printStackTrace();
@@ -136,6 +160,51 @@ public class ImagesUtil {
         return null;
     }
 
+    public static InputStream changeMinPhoto(InputStream fin, String imageType) {
+        try {
+            ByteArrayOutputStream baos = cloneInputStream(fin);
+
+
+            String tmpImagename = "CMYK_" + MbappUtil.create_nonce_str() + "." + imageType;
+            File src = new File("/tmp/" + tmpImagename);
+            FileUtils.copyInputStreamToFile(new ByteArrayInputStream(baos.toByteArray()), src);
+            String[] cmd = {"sh", "-c", "convert -resize '4000000@>' -quality 60 /tmp/" + tmpImagename + " /tmp/RGB" + tmpImagename};
+            //System.out.println("1xxxx:" + new Date());
+            Process p = Runtime.getRuntime().exec(cmd);
+            //System.out.println("2xxxx:" + new Date());
+            p.waitFor();
+            //System.out.println("3xxxx:" + new Date());
+            InputStream inputStream = new FileInputStream(new File("/tmp/RGB" + tmpImagename));
+            //System.out.println("4xxxx:" + new Date());
+            if (!"".equals(tmpImagename)) {//清楚临时文件
+                deleteFile("/tmp/" + tmpImagename);
+                deleteFile("/tmp/RGB" + tmpImagename);
+            }
+
+            return inputStream;
+        } catch (Exception ee) {
+            ee.printStackTrace();
+        }
+        return null;
+    }
+
+
+    private static ByteArrayOutputStream cloneInputStream(InputStream input) {
+        try {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            byte[] buffer = new byte[1024];
+            int len;
+            while ((len = input.read(buffer)) > -1) {
+                baos.write(buffer, 0, len);
+            }
+            baos.flush();
+            return baos;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
     private static BufferedImage createJPEG4(Raster raster) {
         int w = raster.getWidth();
         int h = raster.getHeight();
@@ -169,4 +238,21 @@ public class ImagesUtil {
         ColorModel cm = new ComponentColorModel(cs, false, true, Transparency.OPAQUE, DataBuffer.TYPE_BYTE);
         return new BufferedImage(cm, (WritableRaster) raster, true, null);
     }
+
+    public static boolean deleteFile(String fileName) {
+        File file = new File(fileName);
+        // 如果文件路径所对应的文件存在，并且是一个文件，则直接删除
+        if (file.exists() && file.isFile()) {
+            if (file.delete()) {
+                System.out.println("删除单个文件" + fileName + "成功！");
+                return true;
+            } else {
+                System.out.println("删除单个文件" + fileName + "失败！");
+                return false;
+            }
+        } else {
+            System.out.println("删除单个文件失败：" + fileName + "不存在！");
+            return false;
+        }
+    }
 }

src/main/java/com/izouma/awesomeadmin/web/OrderImageController.java

@@ -323,15 +323,17 @@ public class OrderImageController {
                             //System.out.println("5xxxx:" + new Date());
                             String min = OSSFileService.upload(ImagesUtil.changeMinPhoto(
                                     in,
-                                    fileType,
-                                    2000, 1), minPath);
+                                    fileType), minPath);
 
                             imageUploadLog.setUrl(min);
 
+
                             if (!"".equals(srcName)) {//清楚临时文件
                                 deleteFile("/tmp/" + srcName);
                                 deleteFile("/tmp/" + srcName + ".jpg");
                             }
+
+                            in.close();
                         }
 
                         imageUploadLogService.createImageUploadLog(imageUploadLog);
@@ -496,6 +498,7 @@ public class OrderImageController {
 
     /**
      * 统计存储空间
+     *
      * @param record
      * @return
      */

src/main/vue/src/components/ImgItem.vue

@@ -3,7 +3,7 @@
         <template v-if="img[label]">
             <div class="img" v-if='!(imgStyle=="storeUpload"&&img.statusFlag==2)'>
                 <!-- <div class="image" v-if="img" @click="choose" :style="imageStyle" ref="img"></div> -->
-                <img :src="img[label]+'?x-oss-process=image/resize,l_120'" @click="choose" alt="">
+                <img :src="img[label]+'?x-oss-process=image/resize,m_lfit,h_120,w_120'" @click="choose" alt="">
             </div>
             <div class="remark" v-if='!(imgStyle=="storeUpload"&&img.statusFlag==2)'>{{img.imageName}}
                 <span v-if="label=='originalImage'">{{img.remark}}</span>

src/main/webapp/WEB-INF/html/admin.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.5c411643b8e24842ecf841445c555b30.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.e34aa2ef73d4584c9fe1.js></script><script type=text/javascript src=/static/js/vendor.d09a4f8d3e413458d931.js></script><script type=text/javascript src=/static/js/admin.d912c8d8d31065fb5c10.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.0367d2dd301093c6fc4e8a183d5ecceb.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.a7b9effba3d63045addd.js></script><script type=text/javascript src=/static/js/vendor.d09a4f8d3e413458d931.js></script><script type=text/javascript src=/static/js/admin.b164010b89eb024ea60b.js></script></body></html>

src/main/webapp/WEB-INF/html/index.html

@@ -5,7 +5,7 @@
             position: absolute;
             top: 0;
             left: 0;
-        }</style><link href=/static/css/index.17dab5fb2dbb43c4cb8366809eb9a04c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.e34aa2ef73d4584c9fe1.js></script><script type=text/javascript src=/static/js/vendor.d09a4f8d3e413458d931.js></script><script type=text/javascript src=/static/js/index.c57dd527b9ac018d6d7a.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
+        }</style><link href=/static/css/index.09bb22a861f3d39410e4ffc07a094cce.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.a7b9effba3d63045addd.js></script><script type=text/javascript src=/static/js/vendor.d09a4f8d3e413458d931.js></script><script type=text/javascript src=/static/js/index.25d1c24672627f881121.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
     var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1; //判断是否IE<11浏览器
     var isEdge = userAgent.indexOf("Edge") > -1 && !isIE; //判断是否IE的Edge浏览器
     var isIE11 = userAgent.indexOf('Trident') > -1 && userAgent.indexOf("rv:11.0") > -1;

src/main/webapp/WEB-INF/html/loginAdmin.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.93a3f42423a08260c7ba54563141eab6.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.e34aa2ef73d4584c9fe1.js></script><script type=text/javascript src=/static/js/vendor.d09a4f8d3e413458d931.js></script><script type=text/javascript src=/static/js/loginAdmin.258e0caecb7468f979cb.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.93a3f42423a08260c7ba54563141eab6.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.a7b9effba3d63045addd.js></script><script type=text/javascript src=/static/js/vendor.d09a4f8d3e413458d931.js></script><script type=text/javascript src=/static/js/loginAdmin.258e0caecb7468f979cb.js></script></body></html>

src/main/webapp/static/js/110.07023dfe1d5c87cc5fc2.js

@@ -1 +0,0 @@
-webpackJsonp([110],{"76TP":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0});var s={name:"home",data:function(){return{joinInfo:{},bannerList:[]}},mounted:function(){var t=this;this.$http.get({url:"/joinUs/getOne",data:{id:1}}).then(function(n){n.success&&(t.joinInfo=n.data)}).catch(function(t){console.log(t)}),this.$http.get({url:"/bannerInfo/all",data:{location:14}}).then(function(n){n.success&&(t.bannerList=n.data)}).catch(function(t){console.log(t)})},computed:{},methods:{goNext:function(){window.open(this.joinInfo.zhaopin)}}},i={render:function(){var t=this,n=t.$createElement,s=t._self._c||n;return s("div",{staticClass:"conatiner"},[s("el-carousel",{staticClass:"swiper banner",class:[1==t.bannerList.length?"noButton":""],attrs:{height:"220px",interval:4e3}},[t._l(t.bannerList,function(n){return[s("el-carousel-item",{style:{backgroundImage:"url("+n.imageUrl+")"}},[n.url?s("a",{attrs:{href:n.url}}):t._e()])]})],2),t._v(" "),s("div",{staticClass:"content"},[t._m(0),t._v(" "),s("div",{staticClass:"content-content"},[s("div",{staticClass:"content-text"},[s("div",{domProps:{innerHTML:t._s(t.joinInfo.manifesto)}}),t._v("\n                邮箱："+t._s(t.joinInfo.email)+"\n                "),s("br"),t._v(" 联系方式："+t._s(t.joinInfo.telephone)+"\n            ")]),t._v(" "),s("div",{staticClass:"line"}),t._v(" "),s("div",{staticClass:"content-img"},[s("img",{attrs:{src:e("Ns+n"),alt:""}}),t._v(" "),s("div",{staticClass:"button",on:{click:t.goNext}},[t._v("诚聘英才")])])])])],1)},staticRenderFns:[function(){var t=this.$createElement,n=this._self._c||t;return n("div",{staticClass:"name"},[n("div",{staticClass:"kuai"}),this._v(" "),n("span",[this._v("加入我们")])])}]};var a=e("VU/8")(s,i,!1,function(t){e("JPpr")},"data-v-60bc1eee",null);n.default=a.exports},JPpr:function(t,n){},"Ns+n":function(t,n,e){t.exports=e.p+"static/img/join.999e208.png"}});

src/main/webapp/static/js/140.b606f4181cbc41c7038c.js

@@ -1 +0,0 @@
-webpackJsonp([140],{V8wA:function(t,e){},izdZ:function(t,e,r){"use strict";Object.defineProperty(e,"__esModule",{value:!0});r("NYxO");var i={created:function(){this.getIframeSrc()},data:function(){return{iframeSrc:"/404"}},computed:{height:function(){return window.innerHeight-104+"px"}},methods:{getIframeSrc:function(){this.iframeSrc=this.$route.query.code}},watch:{$route:function(){this.getIframeSrc()}}},n={render:function(){var t=this.$createElement;return(this._self._c||t)("iframe",{staticClass:"iframe",attrs:{src:this.iframeSrc,height:this.height,width:"100%"}})},staticRenderFns:[]};var c=r("VU/8")(i,n,!1,function(t){r("V8wA")},"data-v-6d20da16",null);e.default=c.exports}});

src/main/webapp/static/js/171.72b4466cd3afd79b76a6.js

@@ -1 +0,0 @@
-webpackJsonp([171],{"7pWu":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0});var a={name:"home",data:function(){return{aboutInfo:{},bannerList:[]}},mounted:function(){var t=this;this.$http.get({url:"/aboutUs/getOne",data:{id:1}}).then(function(n){n.success&&(t.aboutInfo=n.data)}).catch(function(t){console.log(t)}),this.$http.get({url:"/bannerInfo/all",data:{location:16}}).then(function(n){n.success&&(t.bannerList=n.data)}).catch(function(t){console.log(t)})},computed:{},methods:{scrollMenu:function(){}}},s={render:function(){var t=this,n=t.$createElement,e=t._self._c||n;return e("div",{staticClass:"conatiner"},[e("el-carousel",{staticClass:"swiper banner",class:[1==t.bannerList.length?"noButton":""],attrs:{height:"220px",interval:4e3}},[t._l(t.bannerList,function(n){return[e("el-carousel-item",{style:{backgroundImage:"url("+n.imageUrl+")"}},[n.url?e("a",{attrs:{href:n.url}}):t._e()])]})],2),t._v(" "),e("div",{staticClass:"content"},[t._m(0),t._v(" "),e("div",{staticClass:"content-content"},[e("div",{staticClass:"content-img",style:{backgroundImage:"url("+t.aboutInfo.image+")"}}),t._v(" "),e("div",{staticClass:"content-text"},[e("div",{staticClass:"title"},[t._v(t._s(t.aboutInfo.title))]),t._v(" "),e("div",{staticClass:"content-all",domProps:{innerHTML:t._s(t.aboutInfo.description)}})])])])],1)},staticRenderFns:[function(){var t=this.$createElement,n=this._self._c||t;return n("div",{staticClass:"name"},[n("div",{staticClass:"kuai"}),this._v(" "),n("span",[this._v("关于我们")])])}]};var i=e("VU/8")(a,s,!1,function(t){e("SH8R")},"data-v-115aa2ee",null);n.default=i.exports},SH8R:function(t,n){}});