From 36de38fda3e24985a62b7a505c2757790fea18e1 Mon Sep 17 00:00:00 2001 From: zhuoda Date: Thu, 22 Jan 2026 20:17:48 +0800 Subject: [PATCH] =?UTF-8?q?v3.29=20=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90;?= =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E4=BC=98=E5=8C=96redis?= =?UTF-8?q?=E7=BC=93=E5=AD=98key;=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?= =?UTF-8?q?=E5=91=98=E5=B7=A5=E7=A6=81=E7=94=A8=E5=BC=BA=E5=88=B6=E4=B8=8B?= =?UTF-8?q?=E7=BA=BFbug;=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E6=96=87=E4=BB=B6=E4=BD=BF=E7=94=A8File.separator?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- .../domain/entity/DepartmentEntity.java | 1 - .../employee/service/EmployeeService.java | 8 ++--- .../mapper/business/goods/GoodsMapper.xml | 2 +- .../lab1024/sa/base/config/CacheConfig.java | 5 ++- .../lab1024/sa/base/config/FileConfig.java | 2 +- .../support/cache/RedisCacheServiceImpl.java | 3 +- .../service/FileStorageLocalServiceImpl.java | 4 +-- .../loginlog/domain/LoginLogEntity.java | 4 +++ .../domain/LoginFailEntity.java | 4 +++ .../domain/entity/DepartmentEntity.java | 1 - .../employee/service/EmployeeService.java | 8 ++--- .../mapper/business/goods/GoodsMapper.xml | 2 +- .../lab1024/sa/base/config/CacheConfig.java | 25 +++++++------- .../lab1024/sa/base/config/FileConfig.java | 2 +- .../support/cache/RedisCacheServiceImpl.java | 3 +- .../service/FileStorageLocalServiceImpl.java | 4 +-- .../loginlog/domain/LoginLogEntity.java | 4 +++ .../domain/LoginFailEntity.java | 4 +++ .../components/enterprise-bank-list.vue | 3 +- .../components/enterprise-invoice-list.vue | 3 +- .../code-generator/code-generator-util.js | 12 +++++++ .../form/code-generator-table-config-form.vue | 1 + .../dict/components/dict-data-modal.vue | 6 ++-- .../job/components/job-log-list-modal.vue | 33 ++++++++++++------- .../views/support/message/message-list.vue | 3 +- .../src/views/system/home/ad-modal.vue | 5 +-- .../src/store/modules/system/spin.ts | 23 +++---------- .../code-generator/code-generator-util.ts | 12 +++++++ .../form/code-generator-table-config-form.vue | 1 + .../dict/components/dict-data-modal.vue | 6 ++-- .../account/components/center/index.vue | 9 ----- 数据库SQL脚本/README.md | 28 ++++++++-------- 33 files changed, 136 insertions(+), 97 deletions(-) diff --git a/README.md b/README.md index e27fdc95..d2d22308 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ **国内首个满足《网络安全-三级等保》、《数据安全》** 功能要求，支持登录限制、接口国产加解密、数据脱敏等一系列安全要求。 -**支持国产数据库：【达梦、金仓、南大通用、海量数据、神州通用、OceanBase、GaussDB 高斯、阿里PolarDB、GoldenDB】等，主流数据库：【Mysql、PostgreSQL、SqlServer】等** +**支持国产数据库：【达梦、金仓、南大通用、海量数据、神州通用、OceanBase、GaussDB 高斯、阿里PolarDB、GoldenDB】等，主流数据库：【Mysql、PostgreSQL、SqlServer、Oracle】等** **前端提供JavaScript和TypeScript双版本，后端提供Java8+SpringBoot2.X和Java17+SpringBoot3.X 双版本**。 diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/entity/DepartmentEntity.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/entity/DepartmentEntity.java index cc4b1639..259d2592 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/entity/DepartmentEntity.java +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/entity/DepartmentEntity.java @@ -36,7 +36,6 @@ public class DepartmentEntity { /** * 负责人员工 id */ - @TableField(updateStrategy = FieldStrategy.NEVER) private Long managerId; /** diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java index 1598e4a2..b900140e 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java @@ -274,12 +274,12 @@ public class EmployeeService { if (null == employeeEntity) { return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST); } + + // 更新禁用状态 employeeDao.updateDisableFlag(employeeId, !employeeEntity.getDisabledFlag()); - if (employeeEntity.getDisabledFlag()) { - // 强制退出登录 - StpUtil.logout(UserTypeEnum.ADMIN_EMPLOYEE.getValue() + StringConst.COLON + employeeId); - } + // 强制退出登录 + StpUtil.logout(UserTypeEnum.ADMIN_EMPLOYEE.getValue() + StringConst.COLON + employeeId); return ResponseDTO.ok(); } diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/business/goods/GoodsMapper.xml b/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/business/goods/GoodsMapper.xml index 05316d83..60274c14 100644 --- a/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/business/goods/GoodsMapper.xml +++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/business/goods/GoodsMapper.xml @@ -15,7 +15,7 @@ SELECT * FROM t_goods - INSTR(goods_name,#{query.searchWord}) + AND INSTR(goods_name,#{query.searchWord}) AND INSTR(place,#{query.place}) diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/CacheConfig.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/CacheConfig.java index bccb2de9..6e506a42 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/CacheConfig.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/CacheConfig.java @@ -23,8 +23,11 @@ import org.springframework.data.redis.serializer.RedisSerializationContext; public class CacheConfig { private static final String REDIS_CACHE = "redis"; + private static final String CAFFEINE_CACHE = "caffeine"; + public static final String REDIS_CACHE_PREFIX = "cache"; + @Resource private RedisConnectionFactory redisConnectionFactory; @@ -45,7 +48,7 @@ public class CacheConfig { RedisCacheConfiguration defaultCacheConfig = RedisCacheConfiguration.defaultCacheConfig() // 禁止缓存 null 值，避免缓存穿透 .disableCachingNullValues() - .computePrefixWith(name -> "cache:" + name + ":") + .computePrefixWith(name -> REDIS_CACHE_PREFIX + name + ":") // 使用 FastJSON 序列化缓存值，支持复杂对象 .serializeValuesWith(RedisSerializationContext.SerializationPair .fromSerializer(new GenericFastJsonRedisSerializer())); diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/FileConfig.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/FileConfig.java index 97dce114..98eb03fe 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/FileConfig.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/FileConfig.java @@ -81,7 +81,7 @@ public class FileConfig implements WebMvcConfigurer { StaticCredentialsProvider.create( AwsBasicCredentials.create(accessKey, secretKey))) .serviceConfiguration(S3Configuration.builder() - .pathStyleAccessEnabled(true) + .pathStyleAccessEnabled(false) .chunkedEncodingEnabled(false) .build()) .build(); diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/cache/RedisCacheServiceImpl.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/cache/RedisCacheServiceImpl.java index 5e04fcca..cc77cc3a 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/cache/RedisCacheServiceImpl.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/cache/RedisCacheServiceImpl.java @@ -3,6 +3,7 @@ package net.lab1024.sa.base.module.support.cache; import cn.hutool.core.util.StrUtil; import com.google.common.collect.Lists; import jakarta.annotation.Resource; +import net.lab1024.sa.base.config.CacheConfig; import net.lab1024.sa.base.constant.ReloadConst; import net.lab1024.sa.base.module.support.reload.core.annoation.SmartReload; import org.springframework.data.redis.cache.RedisCache; @@ -49,7 +50,7 @@ public class RedisCacheServiceImpl implements CacheService { // 获取 Redis 连接 RedisConnection connection = redisConnectionFactory.getConnection(); // 根据指定的 key 模式获取所有匹配的键 - Set keys = connection.keyCommands().keys((cacheName + ":*").getBytes()); + Set keys = connection.keyCommands().keys((CacheConfig.REDIS_CACHE_PREFIX + ":" + cacheName + "*").getBytes()); if (keys != null) { return keys.stream().map(key -> { diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageLocalServiceImpl.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageLocalServiceImpl.java index b65244e5..9e1c5564 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageLocalServiceImpl.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageLocalServiceImpl.java @@ -78,8 +78,8 @@ public class FileStorageLocalServiceImpl implements IFileStorageService { // 目录不存在，新建 directory.mkdirs(); } - if (!path.endsWith("/")) { - path = path + "/"; + if (!path.endsWith(File.separator)) { + path = path + File.separator; } FileUploadVO fileUploadVO = new FileUploadVO(); //原文件名 diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/domain/LoginLogEntity.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/domain/LoginLogEntity.java index 2ef5dbab..1c53b2d4 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/domain/LoginLogEntity.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/domain/LoginLogEntity.java @@ -3,8 +3,10 @@ package net.lab1024.sa.base.module.support.loginlog.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.time.LocalDateTime; @@ -20,6 +22,8 @@ import java.time.LocalDateTime; @TableName("t_login_log") @Data @Builder +@AllArgsConstructor +@NoArgsConstructor public class LoginLogEntity { @TableId(type = IdType.AUTO) diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/domain/LoginFailEntity.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/domain/LoginFailEntity.java index f1219b42..93ca52ee 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/domain/LoginFailEntity.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/domain/LoginFailEntity.java @@ -3,8 +3,10 @@ package net.lab1024.sa.base.module.support.securityprotect.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.time.LocalDateTime; @@ -21,6 +23,8 @@ import java.time.LocalDateTime; @Data @Builder @TableName("t_login_fail") +@AllArgsConstructor +@NoArgsConstructor public class LoginFailEntity { diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/entity/DepartmentEntity.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/entity/DepartmentEntity.java index cc4b1639..259d2592 100644 --- a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/entity/DepartmentEntity.java +++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/entity/DepartmentEntity.java @@ -36,7 +36,6 @@ public class DepartmentEntity { /** * 负责人员工 id */ - @TableField(updateStrategy = FieldStrategy.NEVER) private Long managerId; /** diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java index 9de2d20c..8ac17204 100644 --- a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java +++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java @@ -275,12 +275,12 @@ public class EmployeeService { if (null == employeeEntity) { return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST); } + + // 更新禁用状态 employeeDao.updateDisableFlag(employeeId, !employeeEntity.getDisabledFlag()); - if (employeeEntity.getDisabledFlag()) { - // 强制退出登录 - StpUtil.logout(UserTypeEnum.ADMIN_EMPLOYEE.getValue() + StringConst.COLON + employeeId); - } + // 强制退出登录 + StpUtil.logout(UserTypeEnum.ADMIN_EMPLOYEE.getValue() + StringConst.COLON + employeeId); return ResponseDTO.ok(); } diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/goods/GoodsMapper.xml b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/goods/GoodsMapper.xml index 05316d83..60274c14 100644 --- a/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/goods/GoodsMapper.xml +++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/goods/GoodsMapper.xml @@ -15,7 +15,7 @@ SELECT * FROM t_goods - INSTR(goods_name,#{query.searchWord}) + AND INSTR(goods_name,#{query.searchWord}) AND INSTR(place,#{query.place}) diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/CacheConfig.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/CacheConfig.java index 665a23ff..34b93f27 100644 --- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/CacheConfig.java +++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/CacheConfig.java @@ -24,8 +24,11 @@ import javax.annotation.Resource; public class CacheConfig { private static final String REDIS_CACHE = "redis"; + private static final String CAFFEINE_CACHE = "caffeine"; + public static final String REDIS_CACHE_PREFIX = "cache"; + @Resource private RedisConnectionFactory redisConnectionFactory; @@ -46,7 +49,7 @@ public class CacheConfig { RedisCacheConfiguration defaultCacheConfig = RedisCacheConfiguration.defaultCacheConfig() // 禁止缓存 null 值，避免缓存穿透 .disableCachingNullValues() - .computePrefixWith(name -> "cache:" + name + ":") + .computePrefixWith(name -> REDIS_CACHE_PREFIX + name + ":") // 使用 FastJSON 序列化缓存值，支持复杂对象 .serializeValuesWith(RedisSerializationContext.SerializationPair .fromSerializer(new GenericFastJsonRedisSerializer())); @@ -56,16 +59,16 @@ public class CacheConfig { } -@Bean -@ConditionalOnProperty(prefix = "spring.cache", name = {"type"}, havingValue = REDIS_CACHE) -public CacheService redisCacheService() { - return new RedisCacheServiceImpl(); -} + @Bean + @ConditionalOnProperty(prefix = "spring.cache", name = {"type"}, havingValue = REDIS_CACHE) + public CacheService redisCacheService() { + return new RedisCacheServiceImpl(); + } -@Bean -@ConditionalOnProperty(prefix = "spring.cache", name = {"type"}, havingValue = CAFFEINE_CACHE) -public CacheService caffeineCacheService() { - return new CaffeineCacheServiceImpl(); -} + @Bean + @ConditionalOnProperty(prefix = "spring.cache", name = {"type"}, havingValue = CAFFEINE_CACHE) + public CacheService caffeineCacheService() { + return new CaffeineCacheServiceImpl(); + } } \ No newline at end of file diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/FileConfig.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/FileConfig.java index 97dce114..98eb03fe 100644 --- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/FileConfig.java +++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/FileConfig.java @@ -81,7 +81,7 @@ public class FileConfig implements WebMvcConfigurer { StaticCredentialsProvider.create( AwsBasicCredentials.create(accessKey, secretKey))) .serviceConfiguration(S3Configuration.builder() - .pathStyleAccessEnabled(true) + .pathStyleAccessEnabled(false) .chunkedEncodingEnabled(false) .build()) .build(); diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/cache/RedisCacheServiceImpl.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/cache/RedisCacheServiceImpl.java index dc6391fa..7298e216 100644 --- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/cache/RedisCacheServiceImpl.java +++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/cache/RedisCacheServiceImpl.java @@ -2,6 +2,7 @@ package net.lab1024.sa.base.module.support.cache; import cn.hutool.core.util.StrUtil; import com.google.common.collect.Lists; +import net.lab1024.sa.base.config.CacheConfig; import net.lab1024.sa.base.constant.ReloadConst; import net.lab1024.sa.base.module.support.reload.core.annoation.SmartReload; import org.springframework.data.redis.cache.RedisCache; @@ -49,7 +50,7 @@ public class RedisCacheServiceImpl implements CacheService { // 获取 Redis 连接 RedisConnection connection = redisConnectionFactory.getConnection(); // 根据指定的 key 模式获取所有匹配的键 - Set keys = connection.keyCommands().keys((cacheName + ":*").getBytes()); + Set keys = connection.keyCommands().keys((CacheConfig.REDIS_CACHE_PREFIX + ":" + cacheName + "*").getBytes()); if (keys != null) { return keys.stream().map(key -> { diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageLocalServiceImpl.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageLocalServiceImpl.java index c75ce0bc..2a12eb6e 100644 --- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageLocalServiceImpl.java +++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/service/FileStorageLocalServiceImpl.java @@ -78,8 +78,8 @@ public class FileStorageLocalServiceImpl implements IFileStorageService { // 目录不存在，新建 directory.mkdirs(); } - if (!path.endsWith("/")) { - path = path + "/"; + if (!path.endsWith(File.separator)) { + path = path + File.separator; } FileUploadVO fileUploadVO = new FileUploadVO(); //原文件名 diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/domain/LoginLogEntity.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/domain/LoginLogEntity.java index 2ef5dbab..1c53b2d4 100644 --- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/domain/LoginLogEntity.java +++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/loginlog/domain/LoginLogEntity.java @@ -3,8 +3,10 @@ package net.lab1024.sa.base.module.support.loginlog.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.time.LocalDateTime; @@ -20,6 +22,8 @@ import java.time.LocalDateTime; @TableName("t_login_log") @Data @Builder +@AllArgsConstructor +@NoArgsConstructor public class LoginLogEntity { @TableId(type = IdType.AUTO) diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/domain/LoginFailEntity.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/domain/LoginFailEntity.java index f1219b42..93ca52ee 100644 --- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/domain/LoginFailEntity.java +++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/domain/LoginFailEntity.java @@ -3,8 +3,10 @@ package net.lab1024.sa.base.module.support.securityprotect.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.time.LocalDateTime; @@ -21,6 +23,8 @@ import java.time.LocalDateTime; @Data @Builder @TableName("t_login_fail") +@AllArgsConstructor +@NoArgsConstructor public class LoginFailEntity { diff --git a/smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-bank-list.vue b/smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-bank-list.vue index f98b9171..06af2e0e 100644 --- a/smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-bank-list.vue +++ b/smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-bank-list.vue @@ -16,7 +16,7 @@ - + @@ -93,6 +93,7 @@ import { SmartLoading } from '/@/components/framework/smart-loading'; import { message, Modal } from 'ant-design-vue'; import { smartSentry } from '/@/lib/smart-sentry'; + import { defaultTimeRanges } from '/@/lib/default-time-ranges'; import TableOperator from '/@/components/support/table-operator/index.vue'; import { TABLE_ID_CONST } from '/@/constants/support/table-id-const'; diff --git a/smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-invoice-list.vue b/smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-invoice-list.vue index 42e07555..dbd8ac19 100644 --- a/smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-invoice-list.vue +++ b/smart-admin-web-javascript/src/views/business/oa/enterprise/components/enterprise-invoice-list.vue @@ -16,7 +16,7 @@ - + @@ -92,6 +92,7 @@ import { smartSentry } from '/@/lib/smart-sentry'; import TableOperator from '/@/components/support/table-operator/index.vue'; import { TABLE_ID_CONST } from '/@/constants/support/table-id-const'; + import { defaultTimeRanges } from '/@/lib/default-time-ranges.js'; const props = defineProps({ enterpriseId: { diff --git a/smart-admin-web-javascript/src/views/support/code-generator/code-generator-util.js b/smart-admin-web-javascript/src/views/support/code-generator/code-generator-util.js index 01ff5cd0..bd8148f6 100644 --- a/smart-admin-web-javascript/src/views/support/code-generator/code-generator-util.js +++ b/smart-admin-web-javascript/src/views/support/code-generator/code-generator-util.js @@ -13,16 +13,20 @@ JavaTypeMap.set('integer', 'Integer'); JavaTypeMap.set('year', 'Integer'); JavaTypeMap.set('bigint', 'Long'); JavaTypeMap.set('int8', 'Long'); +JavaTypeMap.set('number', 'Long'); JavaTypeMap.set('float', 'BigDecimal'); JavaTypeMap.set('double', 'BigDecimal'); JavaTypeMap.set('decimal', 'BigDecimal'); JavaTypeMap.set('char', 'String'); JavaTypeMap.set('varchar', 'String'); +JavaTypeMap.set('varchar2', 'String'); JavaTypeMap.set('nvarchar', 'String'); +JavaTypeMap.set('nvarchar2', 'String'); JavaTypeMap.set('tinytext', 'String'); JavaTypeMap.set('text', 'String'); JavaTypeMap.set('longtext', 'String'); JavaTypeMap.set('blob', 'String'); +JavaTypeMap.set('clob', 'String'); JavaTypeMap.set('date', 'LocalDate'); JavaTypeMap.set('datetime', 'LocalDateTime'); JavaTypeMap.set('datetime2', 'LocalDateTime'); @@ -52,6 +56,7 @@ JsTypeMap.set('int', 'Number'); JsTypeMap.set('int2', 'Number'); JsTypeMap.set('int4', 'Number'); JsTypeMap.set('int8', 'Number'); +JsTypeMap.set('number', 'Number'); JsTypeMap.set('tinyint', 'Number'); JsTypeMap.set('smallint', 'Number'); JsTypeMap.set('integer', 'Number'); @@ -62,12 +67,15 @@ JsTypeMap.set('double', 'Number'); JsTypeMap.set('decimal', 'Number'); JsTypeMap.set('char', 'String'); JsTypeMap.set('varchar', 'String'); +JsTypeMap.set('varchar2', 'String'); JsTypeMap.set('nvarchar', 'String'); +JsTypeMap.set('nvarchar2', 'String'); JsTypeMap.set('character', 'String'); JsTypeMap.set('tinytext', 'String'); JsTypeMap.set('text', 'String'); JsTypeMap.set('longtext', 'String'); JsTypeMap.set('blob', 'String'); +JsTypeMap.set('clob', 'String'); JsTypeMap.set('date', 'Date'); JsTypeMap.set('datetime', 'Date'); JsTypeMap.set('datetime2', 'Date'); @@ -94,6 +102,7 @@ FrontComponentMap.set('int', 'InputNumber'); FrontComponentMap.set('int2', 'InputNumber'); FrontComponentMap.set('int4', 'InputNumber'); FrontComponentMap.set('int8', 'InputNumber'); +FrontComponentMap.set('number', 'InputNumber'); FrontComponentMap.set('tinyint', 'InputNumber'); FrontComponentMap.set('smallint', 'InputNumber'); FrontComponentMap.set('integer', 'InputNumber'); @@ -105,12 +114,15 @@ FrontComponentMap.set('double', 'InputNumber'); FrontComponentMap.set('decimal', 'InputNumber'); FrontComponentMap.set('char', 'Input'); FrontComponentMap.set('varchar', 'Input'); +FrontComponentMap.set('varchar2', 'Input'); FrontComponentMap.set('nvarchar', 'Input'); +FrontComponentMap.set('nvarchar2', 'Input'); FrontComponentMap.set('character', 'Input'); FrontComponentMap.set('tinytext', 'Input'); FrontComponentMap.set('text', 'Textarea'); FrontComponentMap.set('longtext', 'Textarea'); FrontComponentMap.set('blob', 'FileUpload'); +FrontComponentMap.set('clob', 'FileUpload'); FrontComponentMap.set('date', 'Date'); FrontComponentMap.set('datetime', 'DateTime'); FrontComponentMap.set('datetime2', 'DateTime'); diff --git a/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form.vue b/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form.vue index 069251b8..76c7de4d 100644 --- a/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form.vue +++ b/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form.vue @@ -102,6 +102,7 @@ const visibleFlag = ref(false); function showModal(table) { Object.assign(tableInfo, table); + tableInfo.tableName = tableInfo.tableName.toLowerCase(); tableInfo.createTime = table.createTime ? table.createTime : new Date(); activeKey.value = '1'; visibleFlag.value = true; diff --git a/smart-admin-web-javascript/src/views/support/dict/components/dict-data-modal.vue b/smart-admin-web-javascript/src/views/support/dict/components/dict-data-modal.vue index 01bf81de..12fd8d76 100644 --- a/smart-admin-web-javascript/src/views/support/dict/components/dict-data-modal.vue +++ b/smart-admin-web-javascript/src/views/support/dict/components/dict-data-modal.vue @@ -168,9 +168,9 @@ let keywordsFilterFlag = true; if (keywords.value) { keywordsFilterFlag = - _.includes(item.dataValue.toLowerCase(), keywords.value.toLowerCase()) || - _.includes(item.dataLabel.toLowerCase(), keywords.value.toLowerCase()) || - _.includes(item.remark.toLowerCase(), keywords.value.toLowerCase()); + (item.dataValue &&_.includes(item.dataValue.toLowerCase(), keywords.value.toLowerCase())) || + (item.dataLabel && _.includes(item.dataLabel.toLowerCase(), keywords.value.toLowerCase())) || + (item.remark && _.includes(item.remark.toLowerCase(), keywords.value.toLowerCase())); } let disabledFilterFlag = _.isNull(disabledFlag.value) ? true : item.disabledFlag === disabledFlag.value; return disabledFilterFlag && keywordsFilterFlag; diff --git a/smart-admin-web-javascript/src/views/support/job/components/job-log-list-modal.vue b/smart-admin-web-javascript/src/views/support/job/components/job-log-list-modal.vue index 5c42c1a5..cec74357 100644 --- a/smart-admin-web-javascript/src/views/support/job/components/job-log-list-modal.vue +++ b/smart-admin-web-javascript/src/views/support/job/components/job-log-list-modal.vue @@ -4,7 +4,7 @@ * @Date: 2024/06/25 -->