From 7f21d4f22ec711d6aa89900b07e0b5ac31dbac42 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期五, 25 八月 2023 17:15:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/utils/image/WaterMarkUtil.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/hiksdk/util/imageUtil/waterMarkUtil.java b/ard-work/src/main/java/com/ruoyi/utils/image/WaterMarkUtil.java
similarity index 98%
rename from ard-work/src/main/java/com/ruoyi/device/hiksdk/util/imageUtil/waterMarkUtil.java
rename to ard-work/src/main/java/com/ruoyi/utils/image/WaterMarkUtil.java
index 919cf10..14a4b1f 100644
--- a/ard-work/src/main/java/com/ruoyi/device/hiksdk/util/imageUtil/waterMarkUtil.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/image/WaterMarkUtil.java
@@ -1,4 +1,4 @@
-package com.ruoyi.device.hiksdk.util.imageUtil;
+package com.ruoyi.utils.image;
import org.bytedeco.ffmpeg.global.avutil;
import org.bytedeco.javacv.FFmpegFrameGrabber;
@@ -11,7 +11,6 @@
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
-import java.util.Random;
import java.awt.*;
import java.awt.image.BufferedImage;
/**
@@ -26,7 +25,7 @@
/**
* 鍥剧墖姘村嵃宸ュ叿绫�
*/
-public class waterMarkUtil {
+public class WaterMarkUtil {
// 姘村嵃閫忔槑搴�
private static final float alpha = 0.3f;
--
Gitblit v1.9.3