增加在线用户开启登录地点获取 minio事件类型修改

‘liusuyi’

2023-08-07 479a23949c28ae93a15e3f2f5aba655662f6c0c8

增加在线用户开启登录地点获取
minio事件类型修改

 ard-work/src/main/java/com/ruoyi/storage/minio/service/impl/StorageMinioEventServiceImpl.java

@@ -106,31 +106,37 @@
    @Async
    @Override
    public void parseStorageMinioEvent(String message) {
        JsonsRootBean jsonsRootBean = JSONObject.parseObject(message, JsonsRootBean.class);
        if (jsonsRootBean != null) {
            Records records = jsonsRootBean.getRecords().get(0);
            StorageMinioEvent storageMinioEvent = new StorageMinioEvent();
            storageMinioEvent.setEventTime(records.getEventTime());
            storageMinioEvent.setEventType(records.getEventName());
            storageMinioEvent.setBucketName(records.getS3().getBucket().getName());
            String encode = null;
            try {
                encode = URLDecoder.decode(records.getS3().getMObject().getKey(), "UTF-8");
            } catch (UnsupportedEncodingException e) {
                e.printStackTrace();
            }
            storageMinioEvent.setObjectName(encode);
            storageMinioEvent.setObjectSize(records.getS3().getMObject().getSize());
            storageMinioEvent.setObjectType(records.getS3().getMObject().getContentType());
            storageMinioEvent.setHost(records.getSource().getHost());
            storageMinioEvent.setEndpoint(records.getResponseElements().getXMinioOriginEndpoint());
            storageMinioEvent.setUserName(records.getRequestParameters().getPrincipalid());
        try {
            JsonsRootBean jsonsRootBean = JSONObject.parseObject(message, JsonsRootBean.class);
            if (jsonsRootBean != null) {
                Records records = jsonsRootBean.getRecords().get(0);
                StorageMinioEvent storageMinioEvent = new StorageMinioEvent();
                storageMinioEvent.setEventTime(records.getEventTime());
                String eventType = records.getEventName().substring(0, records.getEventName().indexOf(":", records.getEventName().indexOf(":") + 1));//不包含本身位置
                storageMinioEvent.setEventType(eventType);
                storageMinioEvent.setBucketName(records.getS3().getBucket().getName());
                String encode = null;
                try {
                    encode = URLDecoder.decode(records.getS3().getMObject().getKey(), "UTF-8");
                } catch (UnsupportedEncodingException e) {
                    e.printStackTrace();
                }
                storageMinioEvent.setObjectName(encode);
                storageMinioEvent.setObjectSize(records.getS3().getMObject().getSize());
                storageMinioEvent.setObjectType(records.getS3().getMObject().getContentType());
                storageMinioEvent.setHost(records.getSource().getHost());
                storageMinioEvent.setEndpoint(records.getResponseElements().getXMinioOriginEndpoint());
                storageMinioEvent.setUserName(records.getRequestParameters().getPrincipalid());

            int i = insertStorageMinioEvent(storageMinioEvent);
            if(i>0)
            {
                log.debug("minio操作日志入库成功!【"+storageMinioEvent.getEventType()+"】");
                int i = insertStorageMinioEvent(storageMinioEvent);
                if (i > 0) {
                    log.debug("minio操作日志入库成功!【" + storageMinioEvent.getEventType() + "】");
                }
            }
        }
        catch (Exception ex)
        {
            log.error("minio事件格式化异常:"+ex.getMessage());
        }
    }
}

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java

@@ -1,9 +1,7 @@
package com.ruoyi.web.controller.monitor;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.*;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -75,6 +73,9 @@
        }
        Collections.reverse(userOnlineList);
        userOnlineList.removeAll(Collections.singleton(null));
        //在线用户按登录时间逆序排序
        Comparator<SysUserOnline> comparator = Comparator.comparingLong(sysUserOnline -> sysUserOnline.getLoginTime()); // 使用Collections.sort方法进行排序 Collections.sort(personList, comparator);
        Collections.sort(userOnlineList, comparator.reversed());
        return getDataTable(userOnlineList);
    }