‘liusuyi’
2023-08-24 6f34a6a7e99d4015cd5e8bc3669eea9107ac5837
src/main/java/com/ard/utils/hiksdk/service/impl/HikClientUtil.java
@@ -3,12 +3,12 @@
import com.ard.alarm.camera.domain.ArdCameras;
import com.ard.alarm.camera.domain.CameraCmd;
import com.ard.alarm.external.domain.ArdEquipExternal;
import com.ard.config.MinioClientSingleton;
import com.ard.utils.minio.MinioUtils;
import com.ard.utils.other.ByteUtils;
import com.ard.utils.hiksdk.common.GlobalVariable;
import com.ard.utils.hiksdk.domain.DeviceInfo;
import com.ard.utils.hiksdk.util.hikSdkUtil.HCNetSDK;
import com.ard.utils.hiksdk.util.minio.MinioUtils;
import com.ard.utils.spring.SpringUtils;
import com.sun.jna.Native;
import com.sun.jna.Platform;
import com.sun.jna.Pointer;
@@ -434,12 +434,11 @@
            InputStream input = new ByteArrayInputStream(array);
            String url = "";
            try {
                boolean b = MinioUtils.uploadObject(cmd.getBucketName(), cmd.getObjectName(), input, ContentType);
                MinioUtils minioUtil = SpringUtils.getBean(MinioUtils.class);
                boolean b = minioUtil.uploadObject(cmd.getBucketName(), cmd.getObjectName(), input,input.available(), ContentType);
                if (b) {
                    // url = MinioUtils.getBucketObjectUrl(cmd.getBucketName(), cmd.getObjectName());
                    // url = url.indexOf('?') != -1 ? url.substring(0, url.indexOf('?')) : url;
                    url = MinioClientSingleton.domainUrl + "/" + cmd.getBucketName() + "/" + cmd.getObjectName();
                    log.debug("上传文件成功!" + url);
                    url = minioUtil.getBucketObjectUrl(cmd.getBucketName(), cmd.getObjectName());
                   // log.debug("上传文件成功!" + url);
                }
            } catch (Exception ex) {
                log.error("上传文件异常:" + ex.getMessage());