changes

liuhaonan

2022-10-25 dda268997ca8f8a364f7c19b45d7a43a50a98efe

 ximon-admin/src/main/java/com/sandu/ximon/admin/minio/utils/MinIoUtil.java

@@ -1,10 +1,10 @@
package com.sandu.ximon.admin.minio.utils;

import com.alibaba.fastjson.JSONObject;

import com.sandu.ximon.admin.config.VnnoxConstant;
import com.sandu.ximon.admin.minio.config.MinIoPolicy;
import com.sandu.ximon.admin.minio.entity.MinIoConstant;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.LogUtils;
import com.sandu.ximon.admin.utils.SpringContextUtils;
import io.minio.*;
@@ -261,7 +261,18 @@
        minioClient.putObject(bucketName, fileName, is, new PutObjectOptions(is.available(), -1));
        is.close();
        LogUtils.error("上传总时间：" + (System.currentTimeMillis() - start) + "ms");
        return getFileUrl(bucketName, fileName);
        if (SecurityUtils.getClientId() == null) {
            return MinIoConstant.getAbsolutePath(
                    MinIoConstant.ADMIN_BROADCAST_FILE.getBucketName(),
                    fileName
            );
        } else {
            return MinIoConstant.getAbsolutePath(
                    MinIoConstant.ADMIN_BROADCAST_FILE.getBucketName() + SecurityUtils.getUserId(),
                    fileName
            );
        }
//        return getFileUrl(bucketName, fileName);
    }

    /**