修改失效函数

eco-common/common-excel/src/main/java/org/eco/common/excel/core/DefaultExcelResult.java

@@ -9,7 +9,6 @@ import java.util.List;
 /**
  * 默认excel返回对象
  *
- * @author Yjoioooo
  * @author wgk
  */
 @Setter

eco-common/common-excel/src/main/java/org/eco/common/excel/core/DropDownOptions.java

@@ -17,7 +17,7 @@ import java.util.stream.Collectors;
  * <h1>Excel下拉可选项</h1>
  * 注意：为确保下拉框解析正确，传值务必使用createOptionValue()做为值的拼接
  *
- * @author Emil.Zhang
+ * @author gaokunwang
  */
 @Data
 @AllArgsConstructor

eco-common/common-excel/src/main/java/org/eco/common/excel/core/ExcelDownHandler.java

@@ -86,9 +86,7 @@ public class ExcelDownHandler implements SheetWriteHandler {
      * 开始创建下拉数据
      * 1.通过解析传入的@ExcelProperty同级是否标注有@DropDown选项
      * 如果有且设置了value值，则将其直接置为下拉可选项
-     *
      * 2.或者在调用ExcelUtil时指定了可选项，将依据传入的可选项做下拉
-     *
      * 3.二者并存，注意调用方式
      */
     @Override

eco-common/common-redis/src/main/java/org/eco/common/redis/handler/KeyPrefixHandler.java

@@ -6,8 +6,8 @@ import org.redisson.api.NameMapper;
 /**
  * redis缓存key前缀处理
  *
- * @author ye
- * @date 2023/7/14 17:44
+ * @author wgk
+ * @date 2023/9/14
  */
 public class KeyPrefixHandler implements NameMapper {
 

eco-common/common-redis/src/main/java/org/eco/common/redis/manager/FlexSpringCacheManager.java

@@ -35,11 +35,10 @@ import java.util.concurrent.ConcurrentMap;
 /**
  * A {@link org.springframework.cache.CacheManager} implementation
  * backed by Redisson instance.
- *
  * 修改 RedissonSpringCacheManager 源码
  * 重写 cacheName 处理方法 支持多参数
  *
- * @author Nikita Koksharov
+ * @author wgk
  */
 @SuppressWarnings("unchecked")
 public class FlexSpringCacheManager implements CacheManager {

eco-common/common-tenant/src/main/java/org/eco/common/tenant/helper/TenantHelper.java

@@ -71,7 +71,6 @@ public class TenantHelper {
 
     /**
      * 获取动态租户(一直有效 需要手动清理)
-     *
      * 如果为非web环境 那么只在当前线程内生效
      */
     public static Long getDynamic() {
@@ -94,7 +93,6 @@ public class TenantHelper {
 
     /**
      * 设置动态租户(一直有效 需要手动清理)
-     *
      * 如果为非web环境 那么只在当前线程内生效
      */
     public static void setDynamic(Long tenantId) {

eco-common/common-websocket/src/main/java/org/eco/common/websocket/dto/WebSocketMessageDto.java

@@ -9,7 +9,7 @@ import java.util.List;
 /**
  * 消息的dto
  *
- * @author zendwang
+ * @author wgk
  */
 @Data
 public class WebSocketMessageDto implements Serializable {

eco-common/common-websocket/src/main/java/org/eco/common/websocket/listener/WebSocketTopicListener.java

@@ -11,7 +11,7 @@ import org.springframework.core.Ordered;
 /**
  * WebSocket 主题订阅监听器
  *
- * @author zendwang
+ * @author wgk
  */
 @Slf4j
 public class WebSocketTopicListener implements ApplicationRunner, Ordered {

eco-modules/system/src/main/java/org/eco/system/service/ISysDictTypeService.java

@@ -70,16 +70,6 @@ public interface ISysDictTypeService extends IBaseService<SysDictType> {
      */
     boolean deleteDictTypeByIds(Long[] dictIds);
 
-    /**
-     * 加载字典缓存数据
-     */
-    //void loadingDictCache();
-
-    /**
-     * 清空字典缓存数据
-     */
-    //void clearDictCache();
-
     /**
      * 重置字典缓存数据
      */

eco-modules/system/src/main/java/org/eco/system/service/impl/SysDictTypeServiceImpl.java

@@ -1,15 +1,13 @@
 package org.eco.system.service.impl;
 
-import cn.dev33.satoken.context.SaHolder;
 import cn.hutool.core.util.ObjectUtil;
-import org.eco.common.core.exception.BusinessException;
-import org.eco.system.domain.SysDictType;
-import org.eco.system.domain.bo.SysDictTypeBo;
-import org.eco.system.domain.vo.SysDictTypeVo;
-import org.eco.common.core.constant.CacheConstants;
+import com.mybatisflex.core.paginate.Page;
+import com.mybatisflex.core.query.QueryWrapper;
+import jakarta.annotation.Resource;
 import org.eco.common.core.constant.CacheNames;
 import org.eco.common.core.constant.UserConstants;
 import org.eco.common.core.core.page.PageResult;
+import org.eco.common.core.exception.BusinessException;
 import org.eco.common.core.service.DictService;
 import org.eco.common.core.utils.MapstructUtils;
 import org.eco.common.core.utils.SpringUtils;
@@ -18,13 +16,13 @@ import org.eco.common.core.utils.StringUtils;
 import org.eco.common.orm.core.page.PageQuery;
 import org.eco.common.orm.core.service.impl.BaseServiceImpl;
 import org.eco.common.redis.utils.CacheUtils;
+import org.eco.system.domain.SysDictType;
+import org.eco.system.domain.bo.SysDictTypeBo;
 import org.eco.system.domain.vo.SysDictDataVo;
+import org.eco.system.domain.vo.SysDictTypeVo;
 import org.eco.system.mapper.SysDictTypeMapper;
 import org.eco.system.service.ISysDictDataService;
 import org.eco.system.service.ISysDictTypeService;
-import com.mybatisflex.core.paginate.Page;
-import com.mybatisflex.core.query.QueryWrapper;
-import jakarta.annotation.Resource;
 import org.springframework.cache.annotation.CachePut;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
@@ -233,16 +231,16 @@ public class SysDictTypeServiceImpl extends BaseServiceImpl<SysDictTypeMapper, S
      * @param separator 分隔符
      * @return 字典标签
      */
-    @SuppressWarnings("unchecked cast")
     @Override
     public String getDictLabel(String dictType, String dictValue, String separator) {
-        // 优先从本地缓存获取
-        List<SysDictDataVo> lists = (List<SysDictDataVo>) SaHolder.getStorage().get(CacheConstants.SYS_DICT_KEY + dictType);
+        return getDictResult(dictType, dictValue, separator);
+    }
+
+    private String getDictResult(String dictType, String dictValue, String separator) {
+        List<SysDictDataVo> lists = SpringUtils.getAopProxy(this).selectDictDataByType(dictType);
         if (ObjectUtil.isNull(lists)) {
-            lists = SpringUtils.getAopProxy(this).selectDictDataByType(dictType);
-            SaHolder.getStorage().set(CacheConstants.SYS_DICT_KEY + dictType, lists);
+            return StringUtils.EMPTY;
         }
-
         Map<String, String> map = StreamUtils.toMap(lists, SysDictDataVo::getDictValue, SysDictDataVo::getDictLabel);
         if (StringUtils.containsAny(dictValue, separator)) {
             return Arrays.stream(dictValue.split(separator))
@@ -261,24 +259,9 @@ public class SysDictTypeServiceImpl extends BaseServiceImpl<SysDictTypeMapper, S
      * @param separator 分隔符
      * @return 字典值
      */
-    @SuppressWarnings("unchecked cast")
     @Override
     public String getDictValue(String dictType, String dictLabel, String separator) {
-        // 优先从本地缓存获取
-        List<SysDictDataVo> lists = (List<SysDictDataVo>) SaHolder.getStorage().get(CacheConstants.SYS_DICT_KEY + dictType);
-        if (ObjectUtil.isNull(lists)) {
-            lists = SpringUtils.getAopProxy(this).selectDictDataByType(dictType);
-            SaHolder.getStorage().set(CacheConstants.SYS_DICT_KEY + dictType, lists);
-        }
-
-        Map<String, String> map = StreamUtils.toMap(lists, SysDictDataVo::getDictLabel, SysDictDataVo::getDictValue);
-        if (StringUtils.containsAny(dictLabel, separator)) {
-            return Arrays.stream(dictLabel.split(separator))
-                .map(l -> map.getOrDefault(l, StringUtils.EMPTY))
-                .collect(Collectors.joining(separator));
-        } else {
-            return map.getOrDefault(dictLabel, StringUtils.EMPTY);
-        }
+        return getDictResult(dictType, dictLabel, separator);
     }
 
     @Override

eco-modules/system/src/main/java/org/eco/system/service/impl/SysOssConfigServiceImpl.java

@@ -34,8 +34,6 @@ import static org.eco.system.domain.table.SysOssConfigTableDef.SYS_OSS_CONFIG;
  * 对象存储配置Service业务层处理
  *
  * @author wgk
- * @author 孤舟烟雨
- * @author wgk
  * @date 2023-11-30
  */
 @Slf4j