Selaa lähdekoodia

激光本地版

dsx 2 vuotta sitten
vanhempi
commit
7e337b8b58

+ 1 - 18
4dkankan-common-utils/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.fdkankan</groupId>
         <artifactId>4dkankan-utils</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>JG-3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -27,23 +27,6 @@
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.bytedeco</groupId>
-            <artifactId>javacv</artifactId>
-            <version>1.4.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.bytedeco</groupId>
-            <artifactId>javacpp</artifactId>
-            <version>1.4.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.bytedeco</groupId>
-            <artifactId>javacv-platform</artifactId>
-            <version>1.4.3</version>
-        </dependency>
 
         <dependency>
             <groupId>joinery</groupId>

+ 0 - 70
4dkankan-common-utils/src/main/java/com/fdkankan/common/util/FileUtils.java

@@ -9,11 +9,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import it.sauronsoftware.jave.*;
 import org.apache.commons.lang3.ObjectUtils;
-import org.bytedeco.javacpp.opencv_core;
-import org.bytedeco.javacv.FFmpegFrameGrabber;
-import org.bytedeco.javacv.Frame;
-import org.bytedeco.javacv.Java2DFrameConverter;
-import org.bytedeco.javacv.OpenCVFrameConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sun.misc.BASE64Decoder;
@@ -454,71 +449,6 @@ public class FileUtils {
         }
     }
 
-
-    /**
-     * 获取指定视频的帧并保存为图片至指定目录
-     * @param filePath 视频存放的地址
-     * @param targerFilePath 截图存放的地址
-     * @param targetFileName 截图保存的文件名称
-     * @return
-     * @throws Exception
-     */
-    public static boolean executeCodecs(String filePath, String targerFilePath, String targetFileName){
-        try{
-            FFmpegFrameGrabber ff = FFmpegFrameGrabber.createDefault(filePath);
-            ff.start();
-            String rotate =ff.getVideoMetadata("rotate");
-            Frame f;
-            int i = 0;
-            while (i <1) {
-                f =ff.grabImage();
-                opencv_core.IplImage src = null;
-                if(null !=rotate &&rotate.length() > 1) {
-                    OpenCVFrameConverter.ToIplImage converter =new OpenCVFrameConverter.ToIplImage();
-                    src =converter.convert(f);
-                    f =converter.convert(rotate(src, Integer.valueOf(rotate)));
-                }
-                doExecuteFrame(f,targerFilePath,targetFileName);
-                i++;
-            }
-            ff.stop();
-            return true;
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-        return false;
-    }
-
-    /*
-     * 旋转角度的
-     */
-    public static opencv_core.IplImage rotate(opencv_core.IplImage src, int angle) {
-        opencv_core.IplImage img = opencv_core.IplImage.create(src.height(), src.width(), src.depth(), src.nChannels());
-        opencv_core.cvTranspose(src, img);
-        opencv_core.cvFlip(img, img, angle);
-        return img;
-    }
-
-
-    public static void doExecuteFrame(Frame f, String targerFilePath, String targetFileName) {
-
-        if (null ==f ||null ==f.image) {
-            return;
-        }
-        Java2DFrameConverter converter =new Java2DFrameConverter();
-        String imageMat ="jpg";
-        String FileName =targerFilePath + File.separator +targetFileName +"." +imageMat;
-        BufferedImage bi =converter.getBufferedImage(f);
-        System.out.println("width:" + bi.getWidth());//打印宽、高
-        System.out.println("height:" + bi.getHeight());
-        File output =new File(FileName);
-        try {
-            ImageIO.write(bi,imageMat,output);
-        }catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
     /**
      * 获取音频时长
      * @throws IOException

+ 3 - 3
4dkankan-common-web/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>4dkankan-utils</artifactId>
     <groupId>com.fdkankan</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>JG-3.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>com.fdkankan</groupId>
       <artifactId>4dkankan-common-utils</artifactId>
-      <version>3.0.0-SNAPSHOT</version>
+      <version>JG-3.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>com.fdkankan</groupId>
       <artifactId>4dkankan-utils-redis</artifactId>
-      <version>3.0.0-SNAPSHOT</version>
+      <version>JG-3.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>

+ 1 - 1
4dkankan-utils-app-push/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>4dkankan-utils</artifactId>
         <groupId>com.fdkankan</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>JG-3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 2 - 2
4dkankan-utils-db/pom.xml

@@ -6,12 +6,12 @@
     <parent>
         <groupId>com.fdkankan</groupId>
         <artifactId>4dkankan-utils</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>JG-3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>4dkankan-utils-db</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>JG-3.0.0-SNAPSHOT</version>
     <dependencies>
 
         <dependency>

+ 2 - 2
4dkankan-utils-dingtalk/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>4dkankan-utils</artifactId>
         <groupId>com.fdkankan</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>JG-3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-common-utils</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>JG-3.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

+ 1 - 1
4dkankan-utils-email/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>4dkankan-utils</artifactId>
         <groupId>com.fdkankan</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>JG-3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
4dkankan-utils-es/pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>com.fdkankan</groupId>
   <artifactId>4dkankan-utils-es</artifactId>
-  <version>3.0.0-SNAPSHOT</version>
+  <version>JG-3.0.0-SNAPSHOT</version>
 
   <name>4dkankan-utils-es</name>
   <!-- FIXME change it to the project's website -->

+ 2 - 2
4dkankan-utils-fyun-https/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>4dkankan-utils</artifactId>
         <groupId>com.fdkankan</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>JG-3.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>4dkankan-utils-fyun-https</artifactId>
     <properties>
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-utils-fyun-parent</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>JG-3.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

+ 2 - 2
4dkankan-utils-fyun-local/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>4dkankan-utils</artifactId>
         <groupId>com.fdkankan</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>JG-3.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>4dkankan-utils-fyun-local</artifactId>
     <properties>
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-utils-fyun-parent</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>JG-3.0.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

+ 2 - 2
4dkankan-utils-fyun-oss/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>4dkankan-utils</artifactId>
         <groupId>com.fdkankan</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>JG-3.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>4dkankan-utils-fyun-oss</artifactId>
     <properties>
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-utils-fyun-parent</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>JG-3.0.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

+ 2 - 2
4dkankan-utils-fyun-parent/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>4dkankan-utils</artifactId>
         <groupId>com.fdkankan</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>JG-3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-common-utils</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>JG-3.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>

+ 2 - 2
4dkankan-utils-fyun-s3/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>4dkankan-utils</artifactId>
         <groupId>com.fdkankan</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>JG-3.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>4dkankan-utils-fyun-s3</artifactId>
     <properties>
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-utils-fyun-parent</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>JG-3.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.amazonaws</groupId>

+ 2 - 2
4dkankan-utils-fyun/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>4dkankan-utils</artifactId>
         <groupId>com.fdkankan</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>JG-3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-common-utils</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>JG-3.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>

+ 1 - 1
4dkankan-utils-image/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>4dkankan-utils</artifactId>
         <groupId>com.fdkankan</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>JG-3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 2 - 2
4dkankan-utils-model/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>4dkankan-utils</artifactId>
         <groupId>com.fdkankan</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>JG-3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-common-utils</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>JG-3.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>

+ 1 - 1
4dkankan-utils-mongodb/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>4dkankan-utils</artifactId>
         <groupId>com.fdkankan</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>JG-3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
4dkankan-utils-mq/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.fdkankan</groupId>
         <artifactId>4dkankan-utils</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>JG-3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
4dkankan-utils-pay/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>4dkankan-utils</artifactId>
     <groupId>com.fdkankan</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>JG-3.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
4dkankan-utils-rabbitmq/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>4dkankan-utils</artifactId>
     <groupId>com.fdkankan</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>JG-3.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
4dkankan-utils-redis/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.fdkankan</groupId>
         <artifactId>4dkankan-utils</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>JG-3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 2 - 2
4dkankan-utils-rubber-sheeting/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>4dkankan-utils</artifactId>
         <groupId>com.fdkankan</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>JG-3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-common-utils</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>JG-3.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>

+ 1 - 1
4dkankan-utils-sensitive-word/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>4dkankan-utils</artifactId>
         <groupId>com.fdkankan</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>JG-3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
4dkankan-utils-sms/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>4dkankan-utils</artifactId>
         <groupId>com.fdkankan</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>JG-3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 2 - 2
4dkankan-utils-wechat/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>4dkankan-utils</artifactId>
         <groupId>com.fdkankan</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>JG-3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-common-utils</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>JG-3.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

+ 1 - 1
pom.xml

@@ -30,7 +30,7 @@
 
     <groupId>com.fdkankan</groupId>
     <artifactId>4dkankan-utils</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>JG-3.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>