v3.20.0 【新增】优化登录使用spring cache；【新增】优化部门cache；【新增】代码生成枚举；【优化】三级等保Label显示宽度

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/common/domain/UserPermission.java

@@ -2,6 +2,7 @@ package net.lab1024.sa.base.common.domain;
 
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -15,7 +16,7 @@ import java.util.List;
  */
 
 @Data
-public class UserPermission {
+public class UserPermission implements Serializable {
 
     /**
      * 权限列表

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/CacheConfig.java

@@ -1,11 +1,14 @@
 package net.lab1024.sa.base.config;
 
+import com.alibaba.fastjson.support.spring.GenericFastJsonRedisSerializer;
 import net.lab1024.sa.base.module.support.cache.CacheService;
 import net.lab1024.sa.base.module.support.cache.CaffeineCacheServiceImpl;
 import net.lab1024.sa.base.module.support.cache.RedisCacheServiceImpl;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.serializer.RedisSerializationContext;
 
 /**
  * 缓存配置
@@ -19,6 +22,14 @@ public class CacheConfig {
     private static final String REDIS_CACHE = "redis";
     private static final String CAFFEINE_CACHE = "caffeine";
 
+    @Bean
+    @ConditionalOnProperty(prefix = "spring.cache", name = {"type"}, havingValue = REDIS_CACHE)
+    public RedisCacheConfiguration redisCacheConfiguration() {
+        return RedisCacheConfiguration.defaultCacheConfig()
+                .disableCachingNullValues()
+                .computePrefixWith(name -> "cache:" + name + ":")
+                .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new GenericFastJsonRedisSerializer()));
+    }
 
     @Bean
     @ConditionalOnProperty(prefix = "spring.cache", name = {"type"}, havingValue = REDIS_CACHE)

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/cache/CacheService.java

@@ -1,17 +1,8 @@
 package net.lab1024.sa.base.module.support.cache;
 
-import com.google.common.collect.Lists;
-import jakarta.annotation.Resource;
-import net.lab1024.sa.base.constant.ReloadConst;
-import net.lab1024.sa.base.module.support.reload.core.annoation.SmartReload;
-import org.springframework.cache.caffeine.CaffeineCache;
-import org.springframework.cache.caffeine.CaffeineCacheManager;
 import org.springframework.stereotype.Service;
 
-import java.util.Collection;
 import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * 缓存服务

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/MapperVariableService.java

@@ -3,10 +3,8 @@ package net.lab1024.sa.base.module.support.codegenerator.service.variable.backen
 import cn.hutool.core.bean.BeanUtil;
 import net.lab1024.sa.base.module.support.codegenerator.constant.CodeQueryFieldQueryTypeEnum;
 import net.lab1024.sa.base.module.support.codegenerator.domain.form.CodeGeneratorConfigForm;
-import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeInsertAndUpdateField;
 import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeQueryField;
 import net.lab1024.sa.base.module.support.codegenerator.service.variable.CodeGenerateBaseVariableService;
-import org.apache.commons.collections4.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ListVariableService.java

@@ -47,7 +47,8 @@ public class ListVariableService extends CodeGenerateBaseVariableService {
             CodeField codeField = getCodeFieldByColumnName(queryField.getColumnNameList().get(0), form);
 
             if (CodeQueryFieldQueryTypeEnum.ENUM.equalsValue(queryField.getQueryTypeEnum())) {
-                objectMap.put("frontEnumName", codeField.getEnumName());
+                String upperUnderscoreEnum = CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, codeField.getEnumName());
+                objectMap.put("frontEnumName", upperUnderscoreEnum);
                 frontImportSet.add("import SmartEnumSelect from '/@/components/framework/smart-enum-select/index.vue';");
             }
 
@@ -76,6 +77,12 @@ public class ListVariableService extends CodeGenerateBaseVariableService {
                 continue;
             }
 
+            // 是否存在枚举
+            if (SmartStringUtil.isNotBlank(codeField.getEnumName())) {
+                String upperUnderscoreEnum = CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, codeField.getEnumName());
+                objectMap.put("frontEnumPlugin", "$smartEnumPlugin.getDescByValue('" + upperUnderscoreEnum + "', text)");
+            }
+
             // 是否存在字典
             if (SmartStringUtil.isNotBlank(codeField.getDict())) {
                 objectMap.put("dict", codeField.getDict());

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobUpdateForm.java

@@ -1,13 +1,8 @@
 package net.lab1024.sa.base.module.support.job.api.domain;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
-import net.lab1024.sa.base.common.swagger.SchemaEnum;
-import net.lab1024.sa.base.common.validator.enumeration.CheckEnum;
-import net.lab1024.sa.base.module.support.job.constant.SmartJobTriggerTypeEnum;
-import org.hibernate.validator.constraints.Length;
 
 /**
  * 定时任务 更新

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/MailService.java

@@ -33,7 +33,7 @@ import java.util.Map;
 
 /**
  *
- * 发生邮件：<br/>
+ * 发送邮件：<br/>
  * 1、支持直接发送 <br/>
  * 2、支持使用邮件模板发送
  *

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/message/domain/MessageTemplateSendForm.java

@@ -1,10 +1,13 @@
 package net.lab1024.sa.base.module.support.message.domain;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import net.lab1024.sa.base.common.enumeration.UserTypeEnum;
 import net.lab1024.sa.base.module.support.message.constant.MessageTemplateEnum;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -25,6 +28,10 @@ public class MessageTemplateSendForm {
     @NotNull(message = "接收者id不能为空")
     private Long receiverUserId;
 
+    @Schema(description = "接收者id")
+    @NotEmpty(message = "接收者id不能为空")
+    private List<Long> receiverUserIdList;
+
     /**
      * 相关业务id | 可选
      * 用于跳转具体业务

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/SmartReloadManager.java

@@ -11,9 +11,6 @@ import net.lab1024.sa.base.module.support.reload.core.thread.SmartReloadRunnable
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationListener;
-import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ReflectionUtils;
 

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/thread/SmartReloadRunnable.java

@@ -2,7 +2,6 @@ package net.lab1024.sa.base.module.support.reload.core.thread;
 
 import lombok.extern.slf4j.Slf4j;
 import net.lab1024.sa.base.module.support.reload.core.AbstractSmartReloadCommand;
-import net.lab1024.sa.base.module.support.reload.core.SmartReloadManager;
 import net.lab1024.sa.base.module.support.reload.core.domain.SmartReloadItem;
 import net.lab1024.sa.base.module.support.reload.core.domain.SmartReloadObject;
 import net.lab1024.sa.base.module.support.reload.core.domain.SmartReloadResult;

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/annoation/RepeatSubmit.java

@@ -13,7 +13,7 @@ import java.lang.annotation.Target;
  * @Date 2020-11-25 20:56:58
  * @Wechat zhuoda1024
  * @Email lab1024@163.com
- * @Copyright  <a href="https://1024lab.net">1024创新实验室</a>
+ * @Copyright <a href="https://1024lab.net">1024创新实验室</a>
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/ticket/RepeatSubmitCaffeineTicket.java

@@ -2,7 +2,6 @@ package net.lab1024.sa.base.module.support.repeatsubmit.ticket;
 
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
-import net.lab1024.sa.base.module.support.repeatsubmit.annoation.RepeatSubmit;
 
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;

smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/repeatsubmit/ticket/RepeatSubmitRedisTicket.java

@@ -1,9 +1,7 @@
 package net.lab1024.sa.base.module.support.repeatsubmit.ticket;
 
-import net.lab1024.sa.base.module.support.repeatsubmit.annoation.RepeatSubmit;
 import org.springframework.data.redis.core.ValueOperations;
 
-import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 
 /**

smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/java/domain/entity/Entity.java.vm

@@ -18,7 +18,7 @@ public class ${name.upperCamel}Entity {
 #foreach ($field in $fields)
 
     /**
-     * $field.label
+     * $field.columnComment
      */
     #if($field.primaryKeyFlag && $field.autoIncreaseFlag)
     @TableId(type = IdType.AUTO)

smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/js/list.vue.vm

@@ -89,6 +89,7 @@
         <!---------- 表格 begin ----------->
         <a-table
             size="small"
+            :scroll="{ y: 800 }"
             :dataSource="tableData"
             :columns="columns"
             rowKey="$!{primaryKeyFieldName}"
@@ -108,6 +109,13 @@
                 </template>
                 #end
             #end
+            #foreach ($field in $listFields)
+                #if($field.frontEnumPlugin)
+                <template v-if="column.dataIndex === '$!{field.fieldName}'">
+                    <span>{{ $!{field.frontEnumPlugin} }}</span>
+                </template>
+                #end
+            #end
             #foreach ($field in $listFields)
                 #if($field.dict)
                 <template v-if="column.dataIndex === '$!{field.fieldName}'">

smart-admin-api-java17-springboot3/sa-base/src/main/resources/pre/sa-base.yaml

@@ -67,7 +67,7 @@ spring:
 
   # 缓存实现类型
   cache:
-    type: caffeine
+    type: redis
 
 # tomcat 配置，主要用于 配置 访问日志（便于将来排查错误）
 server:

smart-admin-api-java17-springboot3/sa-base/src/main/resources/prod/sa-base.yaml

@@ -66,7 +66,7 @@ spring:
 
   # 缓存实现类型
   cache:
-    type: caffeine
+    type: redis
 
 # tomcat 配置，主要用于 配置 访问日志（便于将来排查错误）
 server:

smart-admin-api-java17-springboot3/sa-base/src/main/resources/test/sa-base.yaml

@@ -67,7 +67,7 @@ spring:
 
   # 缓存实现类型
   cache:
-    type: caffeine
+    type: redis
 
 # tomcat 配置，主要用于 配置 访问日志（便于将来排查错误）
 server: