Merge pull request #89 from hocgin/v1.0.29

V1.0.29

Author: hocgin

pom.xml

@@ -16,7 +16,7 @@
   <version>${revision}</version>
 
   <properties>
-    <revision>1.0.28</revision>
+    <revision>1.0.29</revision>
 
     <java.version>1.8</java.version>
     <java.source.version>1.8</java.source.version>

spring-boot-ffmpeg/ffmpeg-spring-boot-autoconfigure/pom.xml

@@ -19,6 +19,11 @@
       <artifactId>spring-boot-starter-log4j2</artifactId>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.bytedeco</groupId>
+      <artifactId>javacv-platform</artifactId>
+      <version>1.5.6</version>
+    </dependency>
     <!-- Basic -->
     <dependency>
       <groupId>${project.groupId}</groupId>

spring-boot-ffmpeg/ffmpeg-spring-boot-autoconfigure/src/main/java/in/hocg/boot/ffmpeg/autoconfiguration/core/Lives.java

@@ -0,0 +1,50 @@
+package in.hocg.boot.ffmpeg.autoconfiguration.core;
+
+import cn.hutool.core.io.FileUtil;
+import in.hocg.boot.ffmpeg.autoconfiguration.utils.ImageUtils;
+import lombok.SneakyThrows;
+import lombok.experimental.UtilityClass;
+import org.bytedeco.ffmpeg.global.avcodec;
+import org.bytedeco.javacv.FFmpegFrameRecorder;
+import org.bytedeco.javacv.Java2DFrameConverter;
+
+import java.awt.image.BufferedImage;
+import java.io.File;
+
+/**
+ * Created by hocgin on 2022/1/9
+ * email: [email protected]
+ * 直播
+ *
+ * @author hocgin
+ */
+@UtilityClass
+public class Lives {
+
+    @SneakyThrows
+    public FFmpegFrameRecorder recorder(String rtmp, Boolean audioRecord) {
+        int frameWidth = 480;
+        int frameHeight = 270;
+
+        FFmpegFrameRecorder recorder = FFmpegFrameRecorder.createDefault(rtmp, frameWidth, frameHeight);
+        recorder.setVideoCodec(avcodec.AV_CODEC_ID_H264);
+        recorder.setFormat("flv");
+        return recorder;
+    }
+
+    @SneakyThrows
+    public static void main(String[] args) {
+        File file = FileUtil.file("/Users/hocgin/Desktop/天气v1/PARTLY_CLOUDY_NIGHT.png");
+        byte[] data = FileUtil.readBytes(file);
+
+        FFmpegFrameRecorder recorder = recorder("rtmp://160107.livepush.myqcloud.com/live/sss?txSecret=c57c77436f7379d112680b6423a4e063&txTime=61DC304A", true);
+        BufferedImage image = ImageUtils.bytesToBufferedImage(data);
+        Java2DFrameConverter converter = new Java2DFrameConverter();
+        recorder.start();
+        while (true) {
+            recorder.record(converter.getFrame(image));
+            Thread.sleep(500);
+        }
+//        recorder.stop();
+    }
+}

spring-boot-ffmpeg/ffmpeg-spring-boot-autoconfigure/src/main/java/in/hocg/boot/ffmpeg/autoconfiguration/core/Main.java

@@ -0,0 +1,13 @@
+package in.hocg.boot.ffmpeg.autoconfiguration.core;
+
+/**
+ * Created by hocgin on 2022/1/9
+ * email: [email protected]
+ *
+ * @author hocgin
+ */
+public class Main {
+    public static void main(String[] args) {
+
+    }
+}

spring-boot-ffmpeg/ffmpeg-spring-boot-autoconfigure/src/main/java/in/hocg/boot/ffmpeg/autoconfiguration/utils/ImageUtils.java

@@ -0,0 +1,73 @@
+package in.hocg.boot.ffmpeg.autoconfiguration.utils;
+
+import lombok.experimental.UtilityClass;
+import org.bytedeco.javacv.Frame;
+import org.bytedeco.javacv.Java2DFrameConverter;
+import org.bytedeco.javacv.OpenCVFrameConverter;
+import org.bytedeco.opencv.opencv_core.IplImage;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+/**
+ * Created by hocgin on 2022/1/9
+ * email: [email protected]
+ *
+ * @author hocgin
+ */
+@UtilityClass
+public class ImageUtils {
+
+    /**
+     * 图片转数组
+     *
+     * @param image
+     * @param format
+     * @return
+     */
+    public byte[] bufferedImageToBytes(BufferedImage image, String format) {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        try {
+            ImageIO.write(image, format, out);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return out.toByteArray();
+    }
+
+
+    /**
+     * 数组转图片
+     *
+     * @param bytes
+     * @return
+     */
+    public BufferedImage bytesToBufferedImage(byte[] bytes) {
+        try {
+            return ImageIO.read(new ByteArrayInputStream(bytes));
+        } catch (IOException e) {
+            return null;
+        }
+    }
+
+    public static BufferedImage iplImageToBufferedImage(IplImage src) {
+        OpenCVFrameConverter.ToIplImage grabberConverter = new OpenCVFrameConverter.ToIplImage();
+        Java2DFrameConverter converter = new Java2DFrameConverter();
+        Frame frame = grabberConverter.convert(src);
+        return converter.getBufferedImage(frame, 1);
+    }
+
+    public static IplImage bufferedImageToIplImage(BufferedImage src) {
+        OpenCVFrameConverter.ToIplImage grabberConverter = new OpenCVFrameConverter.ToIplImage();
+        Java2DFrameConverter jconverter = new Java2DFrameConverter();
+        return grabberConverter.convert(jconverter.convert(src));
+    }
+
+    public static Frame bufferedImageToFrame(BufferedImage src) {
+        return new Java2DFrameConverter().convert(src);
+    }
+
+}

spring-boot-logging/logging-spring-boot-autoconfigure/src/main/java/in/hocg/boot/logging/autoconfiguration/core/LoggerAspect.java

@@ -1,6 +1,7 @@
 package in.hocg.boot.logging.autoconfiguration.core;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.google.common.base.Stopwatch;
 import in.hocg.boot.logging.autoconfiguration.utils.LoggingUtils;
 import in.hocg.boot.utils.StringPoolUtils;
@@ -113,6 +114,7 @@ protected void handleLog(Optional<HttpServletRequest> requestOpt, ProceedingJoin
             ApiOperation apiOperation = method.getAnnotation(ApiOperation.class);
             enterRemark = apiOperation.value();
         }
+        enterRemark = StrUtil.emptyToDefault(enterRemark, "未填写");
 
         LoggerEvent logger = new LoggerEvent().setMapping(mapping)
             .setCurrentUser(this.getCurrentUser().orElse(username))

spring-boot-logging/logging-spring-boot-autoconfigure/src/main/java/in/hocg/boot/logging/autoconfiguration/core/UseLogger.java

@@ -20,5 +20,5 @@
      *
      * @return
      */
-    String value() default "未填写";
+    String value() default "";
 }

spring-boot-mybatis-plus/mybatis-plus-spring-boot-autoconfigure/src/main/java/in/hocg/boot/mybatis/plus/autoconfiguration/core/struct/basic/AbstractService.java

@@ -66,6 +66,16 @@ boolean has(SFunction<T, ?> field, Object fieldVal,
      */
     <R> R as(T entity, Class<R> clazz);
 
+    /**
+     * 实体转换
+     *
+     * @param entity  实体
+     * @param convert 转换函数
+     * @param <R>     实体
+     * @return 转换目标实体
+     */
+    <R> R as(T entity, SFunction<T, R> convert);
+
     /**
      * 实体转换
      *

spring-boot-mybatis-plus/mybatis-plus-spring-boot-autoconfigure/src/main/java/in/hocg/boot/mybatis/plus/autoconfiguration/core/struct/basic/AbstractServiceImpl.java

@@ -71,6 +71,11 @@ public <R> R as(T entity, Class<R> clazz) {
         return as(entity, clazz, useConvert.value());
     }
 
+    @Override
+    public <R> R as(T entity, SFunction<T, R> convert) {
+        return convert.apply(entity);
+    }
+
     @Override
     public <R> R as(T entity, Class<R> clazz, Class<?> beanClass) {
         if (clazz.isInstance(entity)) {
@@ -83,6 +88,6 @@ public <R> R as(T entity, Class<R> clazz, Class<?> beanClass) {
         }
         Method method = methods.get(0);
         Object bean = SpringUtil.getBean(beanClass);
-        return ReflectUtil.invoke(bean, method, entity);
+        return as(entity, (T t) -> ReflectUtil.invoke(bean, method, t));
     }
 }