Merge pull request #113 from hocgin/develop

Develop

Author: hocgin

spring-boot-cache/cache-spring-boot-autoconfigure/pom.xml

@@ -16,7 +16,7 @@
   <dependencies>
     <dependency>
       <groupId>org.springframework.cloud</groupId>
-      <artifactId>spring-cloud-starter</artifactId>
+      <artifactId>spring-cloud-context</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
@@ -43,7 +43,7 @@
     </dependency>
     <dependency>
       <groupId>org.redisson</groupId>
-      <artifactId>redisson-spring-boot-starter</artifactId>
+      <artifactId>redisson</artifactId>
     </dependency>
     <!-- Basic -->
     <dependency>

spring-boot-cache/cache-spring-boot-autoconfigure/src/main/java/in/hocg/boot/cache/autoconfiguration/RedissonAutoConfiguration.java

@@ -27,6 +27,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -40,7 +41,7 @@
  */
 @Configuration
 @ConditionalOnClass({Redisson.class})
-@AutoConfigureBefore({org.redisson.spring.starter.RedissonAutoConfiguration.class, CacheAutoConfiguration.class})
+@AutoConfigureBefore({CacheAutoConfiguration.class})
 @RequiredArgsConstructor(onConstructor = @__(@Lazy))
 @EnableConfigurationProperties(RedissonProperties.class)
 public class RedissonAutoConfiguration {
@@ -179,15 +180,18 @@ public DistributeLockAspect distributedLockAspect(DistributedLock distributedLoc
 
     @Bean
     @ConditionalOnMissingBean
-    @ConditionalOnBean({CacheRepository.class})
-    public NoRepeatSubmitAspect noRepeatSubmitAspect(CacheRepository repository) {
-        return new NoRepeatSubmitAspect(repository);
+    @ConditionalOnBean({RedissonClient.class})
+    @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
+    public RateLimitAspect rateLimitAspect(RedissonClient redissonClient) {
+        return new RateLimitAspect(redissonClient);
     }
 
     @Bean
     @ConditionalOnMissingBean
-    public RateLimitAspect rateLimitAspect(RedissonClient redissonClient) {
-        return new RateLimitAspect(redissonClient);
+    @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
+    @ConditionalOnBean({CacheRepository.class})
+    public NoRepeatSubmitAspect noRepeatSubmitAspect(CacheRepository repository) {
+        return new NoRepeatSubmitAspect(repository);
     }
 
     @Bean

spring-boot-cache/cache-spring-boot-autoconfigure/src/main/java/in/hocg/boot/cache/autoconfiguration/repository/CacheRepository.java

@@ -4,6 +4,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Created by hocgin on 2021/5/13
@@ -40,13 +41,29 @@ public interface CacheRepository {
      */
     <T> void setExpire(final String[] keys, final T[] values, final Duration duration);
 
+    /**
+     * 有效时间
+     *
+     * @param key
+     * @return
+     */
+    Long getExpire(String key);
+
+    /**
+     * 有效时间
+     *
+     * @param key
+     * @param timeUnit
+     * @return
+     */
+    Long getExpire(String key, TimeUnit timeUnit);
+
     /**
      * 一次性添加数组到过期时间的缓存，不用多次连接，节省开销
      *
      * @param keys   the keys
      * @param values the values
      */
-
     <T> void set(final String[] keys, final T[] values);
 
     /**

spring-boot-cache/cache-spring-boot-autoconfigure/src/main/java/in/hocg/boot/cache/autoconfiguration/repository/RedisRepositoryImpl.java

@@ -91,6 +91,16 @@ public <T> void setExpire(String[] keys, T[] values, Duration duration) {
         });
     }
 
+    @Override
+    public Long getExpire(String key) {
+        return redisTemplate.getExpire(key);
+    }
+
+    @Override
+    public Long getExpire(String key, final TimeUnit timeUnit) {
+        return redisTemplate.getExpire(key, timeUnit);
+    }
+
     @Override
     public <T> void set(String[] keys, T[] values) {
         redisTemplate.execute((RedisCallback<Long>) connection -> {

spring-boot-cache/cache-spring-boot-autoconfigure/src/main/java/in/hocg/boot/cache/autoconfiguration/utils/CacheUtils.java

@@ -0,0 +1,21 @@
+package in.hocg.boot.cache.autoconfiguration.utils;
+
+import lombok.experimental.UtilityClass;
+
+/**
+ * @author hocgin
+ */
+@UtilityClass
+public class CacheUtils {
+
+    /**
+     * 统一KEY
+     *
+     * @param prefix
+     * @param value
+     * @return
+     */
+    public static String useKey(Enum<?> prefix, String value) {
+        return String.format("%s:%s", prefix.name(), value);
+    }
+}

spring-boot-dependencies/pom.xml

@@ -666,6 +666,11 @@
         <artifactId>redisson-spring-boot-starter</artifactId>
         <version>${redisson.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.redisson</groupId>
+        <artifactId>redisson</artifactId>
+        <version>${redisson.version}</version>
+      </dependency>
       <dependency>
         <groupId>com.github.xiaoymin</groupId>
         <artifactId>knife4j-spring-boot-starter</artifactId>

spring-boot-excel/excel-spring-boot-autoconfigure/src/main/java/in/hocg/boot/excel/autoconfiguration/annotation/ExcelUnique.java

@@ -0,0 +1,17 @@
+package in.hocg.boot.excel.autoconfiguration.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface ExcelUnique {
+    /**
+     * 错误信息
+     */
+    String message() default "表格内出现重复数据";
+}

spring-boot-excel/excel-spring-boot-autoconfigure/src/main/java/in/hocg/boot/excel/autoconfiguration/convert/AsMappingConverter.java

@@ -0,0 +1,46 @@
+package in.hocg.boot.excel.autoconfiguration.convert;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.data.ReadCellData;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+import in.hocg.boot.utils.LangUtils;
+
+import java.io.Serializable;
+import java.util.Map;
+
+/**
+ * 枚举值转换
+ *
+ * @author hocgin
+ */
+public abstract class AsMappingConverter implements Converter<Serializable> {
+    private final Map<String, Serializable> toMapping;
+    private final Map<Serializable, String> asMapping;
+
+    public AsMappingConverter(Map<String, Serializable> mapping) {
+        this(mapping, LangUtils.reverse(mapping));
+    }
+
+    public AsMappingConverter(Map<String, Serializable> toMapping, Map<Serializable, String> asMapping) {
+        this.toMapping = toMapping;
+        this.asMapping = asMapping;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    @Override
+    public Serializable convertToJavaData(ReadCellData<?> cellData, ExcelContentProperty property, GlobalConfiguration configuration) throws Exception {
+        return toMapping.get(cellData.getStringValue());
+    }
+
+    @Override
+    public WriteCellData<Serializable> convertToExcelData(Serializable value, ExcelContentProperty property, GlobalConfiguration configuration) throws Exception {
+        return new WriteCellData<>(asMapping.get(value));
+    }
+}

spring-boot-excel/excel-spring-boot-autoconfigure/src/main/java/in/hocg/boot/excel/autoconfiguration/convert/DataDictConverter.java

@@ -0,0 +1,16 @@
+package in.hocg.boot.excel.autoconfiguration.convert;
+
+import in.hocg.boot.utils.enums.DataDictEnum;
+
+/**
+ * 数据字典转换
+ *
+ * @author hocgin
+ */
+public class DataDictConverter extends AsMappingConverter {
+
+    public DataDictConverter(DataDictEnum enumClass) {
+        super(enumClass.asMapping());
+    }
+
+}