update 小改动

admin-ui/src/store/modules/user.js

@@ -9,6 +9,7 @@ const useUserStore = defineStore(
   {
     state: () => ({
       token: getToken(),
+      user: {},
       name: '',
       avatar: '',
       roles: [],
@@ -45,8 +46,9 @@ const useUserStore = defineStore(
             } else {
               this.roles = ['ROLE_DEFAULT']
             }
-            this.name = user.userName
+            this.name = user.userName;
             this.avatar = avatar;
+            this.user = user;
             resolve(res)
           }).catch(error => {
             reject(error)

ruoyi-common/src/main/java/com/ruoyi/common/event/QaEvent.java

@@ -0,0 +1,26 @@
+package com.ruoyi.common.event;
+
+import org.springframework.context.ApplicationEvent;
+
+/**
+ * 需要触发QAnything知识库的增删改查事件
+ */
+public class QaEvent extends ApplicationEvent {
+
+  public static enum Type {
+    ALL, ADD, UPDATE, REMOVE;
+  }
+
+  public QaEvent(Type source) {
+    super(source);
+  }
+
+  public QaEvent() {
+    super(Type.ALL);
+  }
+
+  @Override
+  public Type getSource() {
+    return (Type) super.getSource();
+  }
+}

ruoyi-common/src/main/java/com/ruoyi/common/utils/MongoUtil.java

@@ -61,6 +61,7 @@ public class MongoUtil {
     }
     return c;
   }
+
   public static Criteria or(Criteria... criterias) {
     Criteria c = new Criteria();
     if (ArrayUtil.isNotEmpty(criterias)) {
@@ -73,6 +74,7 @@ public class MongoUtil {
   /**
    * 非空字段完全匹配(is，eq)<br/>
    * 字段名匹配字段值
+   *
    * @param obj
    * @return
    */
@@ -81,7 +83,7 @@ public class MongoUtil {
     if (ObjUtil.isNull(obj)) {
       return c;
     }
-    for(PropDesc pd : BeanUtil.getBeanDesc(obj.getClass()).getProps()) {
+    for (PropDesc pd : BeanUtil.getBeanDesc(obj.getClass()).getProps()) {
       if (pd.getGetter() == null) {
         continue;
       }
@@ -101,34 +103,44 @@ public class MongoUtil {
   }
 
 
-  /** age$gt
+  /**
+   * age$gt
    * 含操作符的字符名
    * 字段命名：字段$操作符
+   *
    * @param obj
    * @return
    */
   public static Criteria criteria(Object obj) {
-    Map<String,Object> map = MapUtil.newHashMap();
-    for(PropDesc pd : BeanUtil.getBeanDesc(obj.getClass()).getProps()){
-      if(pd.getGetter()==null){
+    Map<String, Object> map = MapUtil.newHashMap();
+    for (PropDesc pd : BeanUtil.getBeanDesc(obj.getClass()).getProps()) {
+      if (pd.getGetter() == null) {
         continue;
       }
       Object val = pd.getValue(obj);
-      if(ObjUtil.isNull(val)){
+      if (ObjUtil.isNull(val)) {
         continue;
       }
-      if(pd.getFieldClass()==String.class){
-        String str = (String)val;
-        if(StrUtil.isBlank(str)) {
+      if (pd.getFieldClass() == String.class) {
+        String str = (String) val;
+        if (StrUtil.isBlank(str)) {
           continue;
         }
 
       }
-      map.put(pd.getFieldName(),val);
+      map.put(pd.getFieldName(), val);
     }
     return criteria(map);
   }
 
+  public static Criteria criteria() {
+    return new Criteria();
+  }
+
+  public static Criteria criteria(String key) {
+    return Criteria.where(key);
+  }
+
   /**
    * 根据map的key（rule）生成条件,要求value非空
    * rule：字段$(操作符)
@@ -334,12 +346,12 @@ public class MongoUtil {
     return find(cls, new Query());
   }
 
-  public static boolean findExists(Query query, Class<?> entityClass){
+  public static boolean findExists(Query query, Class<?> entityClass) {
     return template.exists(query, entityClass);
   }
 
 
-  public static boolean findExists(Query query, String collectionName){
+  public static boolean findExists(Query query, String collectionName) {
     return template.exists(query, collectionName);
   }
 
@@ -461,11 +473,11 @@ public class MongoUtil {
       return this;
     }
 
-    public Criteria criteria(){
+    public Criteria criteria() {
       return MongoUtil.criteria(this);
     }
 
-    public Query query(){
+    public Query query() {
       return MongoUtil.query(this);
     }
 

ruoyi-system-cron/src/main/java/com/ruoyi/cron/task/CronTaskLogCleanTask.java

@@ -0,0 +1,37 @@
+package com.ruoyi.cron.task;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.date.LocalDateTimeUtil;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.cron.TaskLog;
+import com.ruoyi.cron.annotation.Cron;
+import com.ruoyi.cron.annotation.CronComponent;
+import com.ruoyi.cron.annotation.CronParam;
+import com.ruoyi.cron.document.CronTaskLog;
+import com.ruoyi.cron.runner.CronBeanPostProcessor;
+import lombok.RequiredArgsConstructor;
+
+import java.time.LocalDate;
+import java.util.Date;
+
+import static com.ruoyi.common.utils.MongoUtil.*;
+
+@CronComponent
+@RequiredArgsConstructor
+public class CronTaskLogCleanTask {
+
+  private final TaskLog log;
+  private final CronBeanPostProcessor cronBeanPostProcessor;
+
+  @Cron("日志清理任务")
+  public void clear(@CronParam("几天前") Integer day, @CronParam("清理的组(null全部)") Integer groupId, @CronParam("清理的任务(null全部)") String taskId) {
+    log.log("开始执行日志清理...");
+    Date date = DateUtils.toDate(LocalDate.now().plusDays(-day));
+    log.log("清理时间(之前)：" + DateUtil.formatDateTime(date));
+    log.log("清理的组编号：" + ((groupId == null) ? "全部" : groupId));
+    log.log("清理的任务：" + ((taskId == null) ? "全部" : cronBeanPostProcessor.getList().stream().filter(a -> a.getId().equals(taskId)).findFirst().get().getName()));
+    long count = doRemove(CronTaskLog.class, conditions().put("startTime$lt", date).query()).getDeletedCount();
+    log.log("日志清理完成，清理数量：" + count);
+  }
+
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssService.java

@@ -38,6 +38,13 @@ import java.util.function.Supplier;
  */
 public interface ISysOssService {
 
+  /**
+   * 服务商
+   */
+  public static enum Service {
+    minio, qiniu, aliyun, qcloud, image, upload;
+  }
+
   String IMAGE_WEBP = "webp";
 
   /**
@@ -45,9 +52,17 @@ public interface ISysOssService {
    */
   String PRE_DEFAULT = "default";
 
+  /**
+   * 设置指定服务商
+   *
+   * @param handle
+   */
+  void setService(Service service, Runnable handle);
+
+  public <T> T setService(Service service, Supplier<T> handle);
 
   /**
-     * 只保存图片，不存放记录
+   * 只保存，不存放记录
    *
    * @param handle 处理执行方法
    */
@@ -55,7 +70,7 @@ public interface ISysOssService {
 
 
   /**
-     * 只保存图片，不存放记录
+   * 只保存，不存放记录
    *
    * @param handle 处理执行方法
    */
@@ -165,7 +180,13 @@ public interface ISysOssService {
 
   void download(Long ossId, HttpServletResponse response) throws IOException;
 
-    void download(String url, String service, HttpServletResponse response) throws IOException;
+  void download(String url, Service service, HttpServletResponse response) throws IOException;
+
+  InputStream download(Long ossId) throws IOException;
+
+  InputStream download(SysOssVo sysOss) throws IOException;
+
+  InputStream download(String url, Service service) throws IOException;
 
   Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
@@ -361,4 +382,15 @@ public interface ISysOssService {
 //    System.out.println(ByteBuffer.wrap(aes.encrypt(buffer.array())).getLong());
 //  }
 
+  SysOssVo url(SysOssVo oss, int second);
+
+  default SysOssVo url(SysOssVo oss) {
+    return url(oss, 120);
+  }
+
+  String url(Service service,String url,int second);
+
+  default String url(Service service,String url) {
+    return url(service,url, 120);
+  }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java

@@ -57,6 +57,27 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
   private final FileService fileService;
   private final SysOssMapper baseMapper;
   private static ThreadLocal<Boolean> IGNORE_THREAD_LOCAL = new ThreadLocal<>();
+  private static ThreadLocal<Service> SERVICE_THREAD_LOCAL = new ThreadLocal<>();
+
+  @Override
+  public void setService(Service service, Runnable handle) {
+    SERVICE_THREAD_LOCAL.set(service);
+    try {
+      handle.run();
+    } finally {
+      SERVICE_THREAD_LOCAL.remove();
+    }
+  }
+
+  @Override
+  public <T> T setService(Service service, Supplier<T> handle) {
+    SERVICE_THREAD_LOCAL.set(service);
+    try {
+      return handle.get();
+    } finally {
+      SERVICE_THREAD_LOCAL.remove();
+    }
+  }
 
   @Override
   public void ignore(Runnable handle) {
@@ -82,7 +103,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
   public TableDataInfo<SysOssVo> queryPageList(SysOssBo bo, PageQuery pageQuery) {
     LambdaQueryWrapper<SysOss> lqw = buildQueryWrapper(bo);
     Page<SysOssVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        List<SysOssVo> filterResult = result.getRecords().stream().map(this::matchingUrl).collect(Collectors.toList());
+    List<SysOssVo> filterResult = result.getRecords().stream().map(this::url).collect(Collectors.toList());
     result.setRecords(filterResult);
     return TableDataInfo.build(result);
   }
@@ -93,7 +114,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
     for (Long id : ossIds) {
       SysOssVo vo = SpringUtils.getBean(ISysOssService.class).getById(id);
       if (ObjectUtil.isNotNull(vo)) {
-                list.add(this.matchingUrl(vo));
+        list.add(this.url(vo));
       }
     }
     return list;
@@ -105,7 +126,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
     for (Long id : StringUtils.splitTo(ossIds, Convert::toLong)) {
       SysOssVo vo = SpringUtils.getBean(ISysOssService.class).getById(id);
       if (ObjectUtil.isNotNull(vo)) {
-                list.add(this.matchingUrl(vo).getUrl());
+        list.add(this.url(vo).getUrl());
       }
     }
     return String.join(StringUtils.SEPARATOR, list);
@@ -159,11 +180,10 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
     }
   }
 
-    @Override
-    public void download(String url, String service, HttpServletResponse response) throws IOException {
+  public void download(String url, Service service, HttpServletResponse response) throws IOException {
     FileUtils.setAttachmentResponseHeader(response, FileNameUtil.getName(url));
     response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE + "; charset=UTF-8");
-        if (UPLOAD.equalsIgnoreCase(service)) {
+    if (UPLOAD.equalsIgnoreCase(service.name())) {
       try (InputStream inputStream = new FileInputStream(fileService.getFile(url))) {
         int available = inputStream.available();
         IoUtil.copy(inputStream, response.getOutputStream());
@@ -172,7 +192,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
         throw new ServiceException(e.getMessage());
       }
     } else {
-            OssClient storage = OssFactory.instance(service);
+      OssClient storage = OssFactory.instance(service.name());
       try (InputStream inputStream = storage.getObjectContent(url)) {
         int available = inputStream.available();
         IoUtil.copy(inputStream, response.getOutputStream());
@@ -183,6 +203,35 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
     }
   }
 
+  @Override
+  public InputStream download(Long ossId) throws IOException {
+    SysOssVo sysOss = SpringUtils.getBean(ISysOssService.class).getById(ossId);
+    return download(sysOss);
+  }
+
+  @Override
+  public InputStream download(SysOssVo sysOss) throws IOException {
+    if (ObjectUtil.isNull(sysOss)) {
+      throw new ServiceException("文件数据不存在!");
+    }
+    if (UPLOAD.equals(sysOss.getService())) {
+      return new FileInputStream(fileService.getFile(sysOss.getUrl()));
+    } else {
+      OssClient storage = OssFactory.instance(sysOss.getService());
+      return storage.getObjectContent(sysOss.getUrl());
+    }
+  }
+
+  @Override
+  public InputStream download(String url, Service service) throws IOException {
+    if (UPLOAD.equalsIgnoreCase(service.name())) {
+      return new FileInputStream(fileService.getFile(url));
+    } else {
+      OssClient storage = OssFactory.instance(service.name());
+      return storage.getObjectContent(url);
+    }
+  }
+
 
   @Override
   public SysOssVo save(InputStream in, String originalFileName, String contentType, String pre, String rule) {
@@ -191,7 +240,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
     oss.setOriginalName(originalFileName);
     oss.setFileSuffix(suffix);
     if (configService.selectOssEnabled()) {
-            OssClient storage = OssFactory.instance();
+      OssClient storage = SERVICE_THREAD_LOCAL.get() == null ? OssFactory.instance() : OssFactory.instance(SERVICE_THREAD_LOCAL.get().name());
       UploadResult uploadResult;
       try {
         String path = "";
@@ -229,7 +278,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
 
     SysOssVo sysOssVo = new SysOssVo();
     BeanCopyUtils.copy(oss, sysOssVo);
-        return this.matchingUrl(sysOssVo);
+    return this.url(sysOssVo);
   }
 
   public SysOssVo uploadImgs(MultipartFile file, String pre) {
@@ -245,7 +294,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
     oss.setOriginalName(originalFileName);
     if (configService.selectOssEnabled()) {
 
-            OssClient storage = OssFactory.instance();
+      OssClient storage = SERVICE_THREAD_LOCAL.get() == null ? OssFactory.instance() : OssFactory.instance(SERVICE_THREAD_LOCAL.get().name());
       UploadResult uploadResult;
 
       try (
@@ -288,7 +337,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
     }
     SysOssVo sysOssVo = new SysOssVo();
     BeanCopyUtils.copy(oss, sysOssVo);
-        return this.matchingUrl(sysOssVo);
+    return this.url(sysOssVo);
   }
 
   @Override
@@ -308,22 +357,32 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
     return baseMapper.deleteBatchIds(ids) > 0;
   }
 
-    /**
-     * 匹配Url
-     *
-     * @param oss OSS对象
-     * @return oss 匹配Url的OSS对象
-     */
-    private SysOssVo matchingUrl(SysOssVo oss) {
+  @Override
+  public SysOssVo url(SysOssVo oss, int second) {
     if (UPLOAD.equals(oss.getService())) {
       return oss;
     } else {
       OssClient storage = OssFactory.instance(oss.getService());
       // 仅修改桶类型为 private 的URL，临时URL时长为120s
       if (AccessPolicyType.PRIVATE == storage.getAccessPolicy()) {
-                oss.setUrl(storage.getPrivateUrl(oss.getFileName(), 120));
+        oss.setUrl(storage.getPrivateUrl(oss.getFileName(), second));
       }
       return oss;
     }
   }
+
+  @Override
+  public String url(Service service, String url, int second) {
+    if (Service.upload.equals(service)) {
+      return url;
+    } else {
+      OssClient storage = OssFactory.instance(service.name());
+      // 仅修改桶类型为 private 的URL，临时URL时长为120s
+      if (AccessPolicyType.PRIVATE == storage.getAccessPolicy()) {
+        return storage.getPrivateUrl(url, second);
+      }
+      return url;
+    }
+  }
+
 }