xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-11-09 20:23:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

v3.12【新增】标签页Chome模式;【优化】优化很多细节

Browse Source
This commit is contained in:
zhuoda
2025-01-08 20:12:46 +08:00
parent 29064c176f
commit db5e0062a0
62 changed files with 1976 additions and 968 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/DataSourceConfig.java
View File

@@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.core.config.GlobalConfig;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.common.domain.DataScopePlugin;
import net.lab1024.sa.base.handler.MybatisPlusFillHandler;
@@ -25,6 +24,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import javax.sql.DataSource;
@@ -92,10 +92,10 @@ public class DataSourceConfig {
@Value("${spring.datasource.druid.method.pointcut}")
String methodPointcut;
@Resource
@jakarta.annotation.Resource
private MybatisPlusInterceptor paginationInterceptor;
@Resource
@jakarta.annotation.Resource
private DataScopePlugin dataScopePlugin;
@Bean
@@ -136,7 +136,7 @@ public class DataSourceConfig {
MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean();
factoryBean.setDataSource(druidDataSource());
PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
org.springframework.core.io.Resource[] resources = resolver.getResources("classpath*:/mapper/**/*.xml");
Resource[] resources = resolver.getResources("classpath*:/mapper/**/*.xml");
factoryBean.setMapperLocations(resources);
// 设置 MyBatis-Plus 分页插件 注意此处myBatisPlugin一定要放在后面

2
smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/JsonConfig.java
View File

@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
import java.time.format.DateTimeParseException;
/**
* Json 序列化配置
* json 序列化配置
*
* @Author 1024创新实验室-主任: 卓大
* @Date 2017-11-28 15:21:10

5
smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/RedisConfig.java
View File

@@ -33,7 +33,7 @@ public class RedisConfig {
@Bean
public RedisTemplate<String, Object> redisTemplate() {
Jackson2JsonRedisSerializer<Object> jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer<Object>(Object.class);
ObjectMapper om = new ObjectMapper();
om.registerModule(new JavaTimeModule())
.configure(SerializationFeature.WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS, false)
@@ -41,10 +41,11 @@ public class RedisConfig {
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
.configure(DeserializationFeature.READ_DATE_TIMESTAMPS_AS_NANOSECONDS, false)
.setSerializationInclusion(JsonInclude.Include.NON_NULL);
Jackson2JsonRedisSerializer<Object> jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer<>(om, Object.class);
om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
// enableDefaultTyping 官方已弃用 所以改为 activateDefaultTyping
om.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.NON_FINAL);
jackson2JsonRedisSerializer.setObjectMapper(om);
RedisTemplate<String, Object> template = new RedisTemplate<>();
template.setConnectionFactory(factory);
template.setKeySerializer(new StringRedisSerializer());

4
smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/TokenConfig.java
View File

@@ -1,11 +1,10 @@
package net.lab1024.sa.base.config;
import cn.dev33.satoken.config.SaTokenConfig;
import jakarta.annotation.Resource;
import net.lab1024.sa.base.module.support.securityprotect.service.Level3ProtectConfigService;
import org.springframework.context.annotation.Configuration;
import jakarta.annotation.Resource;
/**
*
* 三级等保配置初始化后最低活跃频率全局配置
@@ -26,6 +25,7 @@ public class TokenConfig {
// 此配置会覆盖 sa-base.yaml 中的配置
@Resource
public void configSaToken(SaTokenConfig config) {
config.setActiveTimeout(level3ProtectConfigService.getLoginActiveTimeoutSeconds());
}

6
smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/UrlConfig.java
View File

@@ -13,6 +13,7 @@ import org.apache.commons.collections4.CollectionUtils;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.mvc.condition.PathPatternsRequestCondition;
import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
@@ -47,11 +48,12 @@ public class UrlConfig {
Map<RequestMappingInfo, HandlerMethod> map = requestMappingHandlerMapping.getHandlerMethods();
for (Map.Entry<RequestMappingInfo, HandlerMethod> entry : map.entrySet()) {
RequestMappingInfo requestMappingInfo = entry.getKey();
if(requestMappingInfo.getPatternsCondition() == null){
PathPatternsRequestCondition pathPatternsCondition = requestMappingInfo.getPathPatternsCondition();
if(pathPatternsCondition == null){
continue;
}
Set<String> urls = requestMappingInfo.getPatternsCondition().getPatterns();
Set<String> urls = pathPatternsCondition.getPatternValues();
if (CollectionUtils.isEmpty(urls)) {
continue;
}

4
smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/captcha/CaptchaService.java
View File

@@ -42,8 +42,10 @@ public class CaptchaService {
@Resource
private DefaultKaptcha defaultKaptcha;
@Autowired
@Resource
private SystemEnvironment systemEnvironment;
@Resource
private RedisService redisService;

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

@@ -14,7 +14,7 @@ import java.util.stream.Collectors;
* @Date 2022/9/29 17:20:41
* @Wechat zhuoda1024
* @Email lab1024@163.com
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
*/
public class EntityVariableService extends CodeGenerateBaseVariableService {

78
smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/dict/service/DictService.java
View File

@@ -28,7 +28,7 @@ import java.util.List;
* @Date 2022/5/26 19:40:55
* @Wechat zhuoda1024
* @Email lab1024@163.com
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
*/
@Service
public class DictService {
@@ -39,10 +39,6 @@ public class DictService {
private DictValueDao dictValueDao;
@Resource
private DictCacheService dictCacheService;
/**
* CODE锁
*/
private static final Interner<String> CODE_POOL = Interners.newWeakInterner();
/**
@@ -51,15 +47,15 @@ public class DictService {
* @param keyAddForm
* @return
*/
public ResponseDTO<String> keyAdd(DictKeyAddForm keyAddForm) {
synchronized (CODE_POOL.intern(keyAddForm.getKeyCode())) {
DictKeyEntity dictKeyEntity = dictKeyDao.selectByCode(keyAddForm.getKeyCode(), false);
if (dictKeyEntity != null) {
return ResponseDTO.error(UserErrorCode.ALREADY_EXIST);
}
dictKeyEntity = SmartBeanUtil.copy(keyAddForm, DictKeyEntity.class);
dictKeyDao.insert(dictKeyEntity);
public synchronized ResponseDTO<String> keyAdd(DictKeyAddForm keyAddForm) {
DictKeyEntity dictKeyEntity = dictKeyDao.selectByCode(keyAddForm.getKeyCode(), false);
if (dictKeyEntity != null) {
return ResponseDTO.error(UserErrorCode.ALREADY_EXIST);
}
dictKeyEntity = SmartBeanUtil.copy(keyAddForm, DictKeyEntity.class);
dictKeyDao.insert(dictKeyEntity);
//刷新缓存
dictCacheService.cacheRefresh();
return ResponseDTO.ok();
}
@@ -69,15 +65,15 @@ public class DictService {
* @param valueAddForm
* @return
*/
public ResponseDTO<String> valueAdd(DictValueAddForm valueAddForm) {
synchronized (CODE_POOL.intern(valueAddForm.getValueCode())) {
DictValueEntity dictValueEntity = dictValueDao.selectByCode(valueAddForm.getValueCode(), false);
if (dictValueEntity != null) {
return ResponseDTO.error(UserErrorCode.ALREADY_EXIST);
}
dictValueEntity = SmartBeanUtil.copy(valueAddForm, DictValueEntity.class);
dictValueDao.insert(dictValueEntity);
public synchronized ResponseDTO<String> valueAdd(DictValueAddForm valueAddForm) {
DictValueEntity dictValueEntity = dictValueDao.selectByCode(valueAddForm.getValueCode(), false);
if (dictValueEntity != null) {
return ResponseDTO.error(UserErrorCode.ALREADY_EXIST);
}
dictValueEntity = SmartBeanUtil.copy(valueAddForm, DictValueEntity.class);
dictValueDao.insert(dictValueEntity);
//刷新缓存
dictCacheService.cacheRefresh();
return ResponseDTO.ok();
}
@@ -87,15 +83,15 @@ public class DictService {
* @param keyUpdateForm
* @return
*/
public ResponseDTO<String> keyEdit(DictKeyUpdateForm keyUpdateForm) {
synchronized (CODE_POOL.intern(keyUpdateForm.getKeyCode())) {
DictKeyEntity dictKeyEntity = dictKeyDao.selectByCode(keyUpdateForm.getKeyCode(), false);
if (dictKeyEntity != null && !dictKeyEntity.getDictKeyId().equals(keyUpdateForm.getDictKeyId())) {
return ResponseDTO.error(UserErrorCode.ALREADY_EXIST);
}
DictKeyEntity dictKeyUpdateEntity = SmartBeanUtil.copy(keyUpdateForm, DictKeyEntity.class);
dictKeyDao.updateById(dictKeyUpdateEntity);
public synchronized ResponseDTO<String> keyEdit(DictKeyUpdateForm keyUpdateForm) {
DictKeyEntity dictKeyEntity = dictKeyDao.selectByCode(keyUpdateForm.getKeyCode(), false);
if (dictKeyEntity != null && !dictKeyEntity.getDictKeyId().equals(keyUpdateForm.getDictKeyId())) {
return ResponseDTO.error(UserErrorCode.ALREADY_EXIST);
}
DictKeyEntity dictKeyUpdateEntity = SmartBeanUtil.copy(keyUpdateForm, DictKeyEntity.class);
dictKeyDao.updateById(dictKeyUpdateEntity);
//刷新缓存
dictCacheService.cacheRefresh();
return ResponseDTO.ok();
}
@@ -105,19 +101,19 @@ public class DictService {
* @param valueUpdateForm
* @return
*/
public ResponseDTO<String> valueEdit(DictValueUpdateForm valueUpdateForm) {
public synchronized ResponseDTO<String> valueEdit(DictValueUpdateForm valueUpdateForm) {
DictKeyEntity dictKeyEntity = dictKeyDao.selectById(valueUpdateForm.getDictKeyId());
if (dictKeyEntity == null || dictKeyEntity.getDeletedFlag()) {
return ResponseDTO.userErrorParam("key不能存在");
}
synchronized (CODE_POOL.intern(valueUpdateForm.getValueCode())) {
DictValueEntity dictValueEntity = dictValueDao.selectByCode(valueUpdateForm.getValueCode(), false);
if (dictValueEntity != null && !dictValueEntity.getDictValueId().equals(valueUpdateForm.getDictValueId())) {
return ResponseDTO.error(UserErrorCode.ALREADY_EXIST);
}
DictValueEntity dictValueUpdateEntity = SmartBeanUtil.copy(valueUpdateForm, DictValueEntity.class);
dictValueDao.updateById(dictValueUpdateEntity);
DictValueEntity dictValueEntity = dictValueDao.selectByCode(valueUpdateForm.getValueCode(), false);
if (dictValueEntity != null && !dictValueEntity.getDictValueId().equals(valueUpdateForm.getDictValueId())) {
return ResponseDTO.error(UserErrorCode.ALREADY_EXIST);
}
DictValueEntity dictValueUpdateEntity = SmartBeanUtil.copy(valueUpdateForm, DictValueEntity.class);
dictValueDao.updateById(dictValueUpdateEntity);
//刷新缓存
dictCacheService.cacheRefresh();
return ResponseDTO.ok();
}
@@ -127,11 +123,13 @@ public class DictService {
* @param keyIdList
* @return
*/
public ResponseDTO<String> keyDelete(List<Long> keyIdList) {
public synchronized ResponseDTO<String> keyDelete(List<Long> keyIdList) {
if (CollectionUtils.isEmpty(keyIdList)) {
return ResponseDTO.ok();
}
dictKeyDao.updateDeletedFlagByIdList(keyIdList, true);
//刷新缓存
dictCacheService.cacheRefresh();
return ResponseDTO.ok();
}
@@ -141,11 +139,13 @@ public class DictService {
* @param valueIdList
* @return
*/
public ResponseDTO<String> valueDelete(List<Long> valueIdList) {
public synchronized ResponseDTO<String> valueDelete(List<Long> valueIdList) {
if (CollectionUtils.isEmpty(valueIdList)) {
return ResponseDTO.ok();
}
dictValueDao.updateDeletedFlagByIdList(valueIdList, true);
//刷新缓存
dictCacheService.cacheRefresh();
return ResponseDTO.ok();
}

103
smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/SmartJobService.java
View File

@@ -5,6 +5,7 @@ import com.google.common.collect.Lists;
import jakarta.annotation.Resource;
import net.lab1024.sa.base.common.code.UserErrorCode;
import net.lab1024.sa.base.common.domain.PageResult;
import net.lab1024.sa.base.common.domain.RequestUser;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.common.util.SmartBeanUtil;
import net.lab1024.sa.base.common.util.SmartPageUtil;
@@ -125,27 +126,61 @@ public class SmartJobService {
return ResponseDTO.ok(pageResult);
}
/**
* 添加定时任务
*
* @param addForm
* @return
*/
public synchronized ResponseDTO<String> addJob(SmartJobAddForm addForm) {
// 校验参数
ResponseDTO<String> checkRes = this.checkParam(addForm);
if (!checkRes.getOk()) {
return checkRes;
}
// 校验重复的执行类
SmartJobEntity existJobClass = jobDao.selectByJobClass(addForm.getJobClass());
if (null != existJobClass && !existJobClass.getDeletedFlag()) {
return ResponseDTO.userErrorParam("已经存在相同的执行类");
}
// 添加数据
SmartJobEntity jobEntity = SmartBeanUtil.copy(addForm, SmartJobEntity.class);
jobDao.insert(jobEntity);
// 更新执行端
SmartJobMsg jobMsg = new SmartJobMsg();
jobMsg.setJobId(jobEntity.getJobId());
jobMsg.setMsgType(SmartJobMsg.MsgTypeEnum.UPDATE_JOB);
jobMsg.setUpdateName(addForm.getUpdateName());
jobClientManager.publishToClient(jobMsg);
return ResponseDTO.ok();
}
/**
* 更新定时任务
*
* @param updateForm
* @return
*/
public ResponseDTO<String> updateJob(SmartJobUpdateForm updateForm) {
public synchronized ResponseDTO<String> updateJob(SmartJobUpdateForm updateForm) {
// 校验参数
Integer jobId = updateForm.getJobId();
SmartJobEntity jobEntity = jobDao.selectById(jobId);
if (null == jobEntity) {
return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST);
}
// 校验触发时间配置
String triggerType = updateForm.getTriggerType();
String triggerValue = updateForm.getTriggerValue();
if (SmartJobTriggerTypeEnum.CRON.equalsValue(triggerType) && !SmartJobUtil.checkCron(triggerValue)) {
return ResponseDTO.userErrorParam("cron表达式错误");
ResponseDTO<String> checkRes = this.checkParam(updateForm);
if (!checkRes.getOk()) {
return checkRes;
}
if (SmartJobTriggerTypeEnum.FIXED_DELAY.equalsValue(triggerType) && !SmartJobUtil.checkFixedDelay(triggerValue)) {
return ResponseDTO.userErrorParam("固定间隔错误：整数且大于0");
// 校验重复的执行类
SmartJobEntity existJobClass = jobDao.selectByJobClass(updateForm.getJobClass());
if (null != existJobClass && !existJobClass.getDeletedFlag() && !existJobClass.getJobId().equals(jobId)) {
return ResponseDTO.userErrorParam("已经存在相同的执行类");
}
// 更新数据
@@ -161,6 +196,27 @@ public class SmartJobService {
return ResponseDTO.ok();
}
/**
* 校验参数
* 如需其他校验，请自行添加校验逻辑
*
* @param addForm
* @return
*/
private ResponseDTO<String> checkParam(SmartJobAddForm addForm) {
// 校验触发时间配置
String triggerType = addForm.getTriggerType();
String triggerValue = addForm.getTriggerValue();
if (SmartJobTriggerTypeEnum.CRON.equalsValue(triggerType) && !SmartJobUtil.checkCron(triggerValue)) {
return ResponseDTO.userErrorParam("cron表达式错误");
}
if (SmartJobTriggerTypeEnum.FIXED_DELAY.equalsValue(triggerType) && !SmartJobUtil.checkFixedDelay(triggerValue)) {
return ResponseDTO.userErrorParam("固定间隔配置错误：必须是大于0的整数");
}
// 校验job class
return SmartJobUtil.checkJobClass(addForm.getJobClass());
}
/**
* 更新定时任务-是否开启
*
@@ -218,28 +274,23 @@ public class SmartJobService {
}
/**
* 新增定时任务
* ps:目前没有业务场景需要通过接口 添加任务
* 因为新增定时任务无论如何都需要 手动编码
* 需要时手动给数据库增加一条就行
* 移除定时任务
* 物理删除
*
* @return
* @author huke
*/
public ResponseDTO<String> addJob() {
return ResponseDTO.userErrorParam("暂未支持");
public synchronized ResponseDTO<String> deleteJob(Integer jobId, RequestUser requestUser) {
// 删除任务
jobDao.updateDeletedFlag(jobId, Boolean.TRUE);
// 更新执行端
SmartJobMsg jobMsg = new SmartJobMsg();
jobMsg.setJobId(jobId);
jobMsg.setMsgType(SmartJobMsg.MsgTypeEnum.UPDATE_JOB);
jobMsg.setUpdateName(requestUser.getUserName());
jobClientManager.publishToClient(jobMsg);
return ResponseDTO.ok();
}
/**
* 移除定时任务
* ps：目前没有业务场景需要通过接口移除，理由同 {@link SmartJobService#addJob}，
* 彻底移除始终都需要手动删除代码
* 如果只是想暂停任务执行，可以调用 {@link SmartJobService#updateJobEnabled}
*
* @return
* @author huke
*/
public ResponseDTO<String> delJob() {
return ResponseDTO.userErrorParam("暂未支持");
}
}

58
smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobAddForm.java Normal file
View File

@@ -0,0 +1,58 @@
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;
/**
* 定时任务 添加
*
* @author huke
* @date 2024/12/19 19:30
*/
@Data
public class SmartJobAddForm {
@Schema(description = "任务名称")
@NotBlank(message = "任务名称不能为空")
@Length(max = 100, message = "任务名称最多100字符")
private String jobName;
@Schema(description = "任务执行类")
@NotBlank(message = "任务执行类不能为空")
@Length(max = 200, message = "任务执行类最多200字符")
private String jobClass;
@SchemaEnum(desc = "触发类型", value = SmartJobTriggerTypeEnum.class)
@CheckEnum(value = SmartJobTriggerTypeEnum.class, required = true, message = "触发类型错误")
private String triggerType;
@Schema(description = "触发配置")
@NotBlank(message = "触发配置不能为空")
@Length(max = 100, message = "触发配置最多100字符")
private String triggerValue;
@Schema(description = "定时任务参数|可选")
@Length(max = 1000, message = "定时任务参数最多1000字符")
private String param;
@Schema(description = "是否开启")
@NotNull(message = "是否开启不能为空")
private Boolean enabledFlag;
@Schema(description = "备注")
@Length(max = 250, message = "任务备注最多250字符")
private String remark;
@NotNull(message = "排序不能为空")
@Schema(description = "排序")
private Integer sort;
@Schema(hidden = true)
private String updateName;
}

3
smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/api/domain/SmartJobQueryForm.java
View File

@@ -27,4 +27,7 @@ public class SmartJobQueryForm extends PageParam {
@Schema(description = "是否启用|可选")
private Boolean enabledFlag;
@Schema(description = "是否删除|可选")
private Boolean deletedFlag;
}

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

@@ -16,47 +16,9 @@ import org.hibernate.validator.constraints.Length;
* @date 2024/6/17 21:30
*/
@Data
public class SmartJobUpdateForm {
public class SmartJobUpdateForm extends SmartJobAddForm {
@Schema(description = "任务id")
@NotNull(message = "任务id不能为空")
private Integer jobId;
@Schema(description = "任务名称")
@NotBlank(message = "任务名称不能为空")
@Length(max = 100, message = "任务名称最多100字符")
private String jobName;
@Schema(description = "任务执行类")
@NotBlank(message = "任务执行类不能为空")
@Length(max = 200, message = "任务执行类最多200字符")
private String jobClass;
@SchemaEnum(desc = "触发类型", value = SmartJobTriggerTypeEnum.class)
@CheckEnum(value = SmartJobTriggerTypeEnum.class, required = true, message = "触发类型错误")
private String triggerType;
@Schema(description = "触发配置")
@NotBlank(message = "触发配置不能为空")
@Length(max = 100, message = "触发配置最多100字符")
private String triggerValue;
@Schema(description = "定时任务参数|可选")
@Length(max = 1000, message = "定时任务参数最多1000字符")
private String param;
@Schema(description = "是否开启")
@NotNull(message = "是否开启不能为空")
private Boolean enabledFlag;
@Schema(description = "备注")
@Length(max = 250, message = "任务备注最多250字符")
private String remark;
@NotNull(message = "排序不能为空")
@Schema(description = "排序")
private Integer sort;
@Schema(hidden = true)
private String updateName;
}

24
smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/constant/SmartJobUtil.java
View File

@@ -1,5 +1,7 @@
package net.lab1024.sa.base.module.support.job.constant;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.module.support.job.core.SmartJob;
import org.springframework.scheduling.support.CronExpression;
import java.lang.management.ManagementFactory;
@@ -98,7 +100,7 @@ public class SmartJobUtil {
} else if (SmartJobTriggerTypeEnum.FIXED_DELAY.equalsValue(triggerType)) {
Integer fixedDelay = getFixedDelayVal(triggerVal);
LocalDateTime startTime = null == lastExecuteTime || lastExecuteTime.plusSeconds(fixedDelay).isBefore(nowTime)
? nowTime : lastExecuteTime;
? nowTime : lastExecuteTime;
nextTimeList = SmartJobUtil.queryNextTime(fixedDelay, startTime, num);
}
return nextTimeList;
@@ -174,6 +176,24 @@ public class SmartJobUtil {
return runtime.getName().split("@")[0];
}
/**
* 根据className 判断job class
*/
public static ResponseDTO<String> checkJobClass(String className) {
try {
Class<?> aClass = Class.forName(className);
// 判断是否实现了 SmartJob
if (!SmartJob.class.isAssignableFrom(aClass)) {
return ResponseDTO.userErrorParam(className + " 执行类没有实现 SmartJob 接口");
}
} catch (ClassNotFoundException e) {
return ResponseDTO.userErrorParam("没有在代码中发现执行类：" + className);
}
return ResponseDTO.ok();
}
public static void main(String[] args) {
LocalDateTime startTime = LocalDateTime.now();
List<LocalDateTime> timeList = SmartJobUtil.queryNextTime("5 * * * * *", startTime, 3);
@@ -184,5 +204,7 @@ public class SmartJobUtil {
System.out.println("project path ->" + getProgramPath());
System.out.println("project process id ->" + getProcessId());
ResponseDTO<String> res = checkJobClass("net.lab1024.sa.base.module.support.job.sample.SmartJobSample1");
System.out.println(res.getMsg());
}
}

5
smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/core/SmartJobLauncher.java
View File

@@ -103,6 +103,10 @@ public class SmartJobLauncher {
if (!jobEntity.getEnabledFlag()) {
continue;
}
// 任务删除
if (jobEntity.getDeletedFlag()) {
continue;
}
// 查找任务实现类
SmartJob jobImpl = jobImplMap.get(jobEntity.getJobClass());
if (null == jobImpl) {
@@ -135,6 +139,7 @@ public class SmartJobLauncher {
private static boolean isNeedUpdate(SmartJobEntity oldJob, SmartJobEntity newJob) {
// cron为空时 fixedDelay 才有意义
return !Objects.equals(oldJob.getEnabledFlag(), newJob.getEnabledFlag())
|| !Objects.equals(oldJob.getDeletedFlag(), newJob.getDeletedFlag())
|| !Objects.equals(oldJob.getTriggerType(), newJob.getTriggerType())
|| !Objects.equals(oldJob.getTriggerValue(), newJob.getTriggerValue())
|| !Objects.equals(oldJob.getJobClass(), newJob.getJobClass());

16
smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/repository/SmartJobDao.java
View File

@@ -29,4 +29,20 @@ public interface SmartJobDao extends BaseMapper<SmartJobEntity> {
* @return
*/
List<SmartJobVO> query(Page<?> page, @Param("query") SmartJobQueryForm queryForm);
/**
* 假删除
*
* @param jobId
* @return
*/
void updateDeletedFlag(@Param("jobId") Integer jobId, @Param("deletedFlag") Boolean deletedFlag);
/**
* 根据 任务class 查找
*
* @param jobClass
* @return
*/
SmartJobEntity selectByJobClass(@Param("jobClass") String jobClass);
}

5
smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/job/repository/domain/SmartJobEntity.java
View File

@@ -76,6 +76,11 @@ public class SmartJobEntity {
*/
private Integer sort;
/**
* 是否删除
*/
private Boolean deletedFlag;
private String updateName;
private LocalDateTime updateTime;

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

@@ -6,6 +6,8 @@ import freemarker.cache.StringTemplateLoader;
import freemarker.template.Configuration;
import freemarker.template.Template;
import jakarta.annotation.Resource;
import jakarta.mail.MessagingException;
import jakarta.mail.internet.MimeMessage;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.common.domain.SystemEnvironment;
@@ -23,8 +25,6 @@ import org.springframework.mail.javamail.JavaMailSender;
import org.springframework.mail.javamail.MimeMessageHelper;
import org.springframework.stereotype.Component;
import jakarta.mail.MessagingException;
import jakarta.mail.internet.MimeMessage;
import java.io.File;
import java.io.StringWriter;
import java.io.Writer;

34
smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/reload/core/AbstractSmartReloadCommand.java
View File

@@ -2,9 +2,11 @@ package net.lab1024.sa.base.module.support.reload.core;
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;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
@@ -14,21 +16,29 @@ import java.util.concurrent.ConcurrentHashMap;
* @Date 2015-03-02 19:11:52
* @Wechat zhuoda1024
* @Email lab1024@163.com
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
*/
public abstract class AbstractSmartReloadCommand {
/**
* 当前ReloadItem的存储器
*/
private static final ConcurrentHashMap<String, String> TAG_IDENTIFIER_MAP = new ConcurrentHashMap<>();
private ConcurrentHashMap<String, String> tagIdentifierMap = new ConcurrentHashMap<>();
private SmartReloadManager smartReloadManager;
/**
* @return
*/
public void setReloadManager(SmartReloadManager smartReloadManager) {
this.smartReloadManager = smartReloadManager;
}
public void init() {
List<SmartReloadItem> smartReloadItems = this.readReloadItem();
if (smartReloadItems != null) {
for (SmartReloadItem smartReloadItem : smartReloadItems) {
TAG_IDENTIFIER_MAP.put(smartReloadItem.getTag(), smartReloadItem.getIdentification());
tagIdentifierMap.put(smartReloadItem.getTag(), smartReloadItem.getIdentification());
}
}
}
@@ -57,7 +67,7 @@ public abstract class AbstractSmartReloadCommand {
* @return
*/
public ConcurrentHashMap<String, String> getTagIdentifierMap() {
return TAG_IDENTIFIER_MAP;
return tagIdentifierMap;
}
/**
@@ -67,6 +77,20 @@ public abstract class AbstractSmartReloadCommand {
* @param identification
*/
public void putIdentifierMap(String tag, String identification) {
TAG_IDENTIFIER_MAP.put(tag, identification);
tagIdentifierMap.put(tag, identification);
}
/**
* 获取重载对象
*
* @return
*/
public SmartReloadObject reloadObject(String tag) {
if (this.smartReloadManager == null) {
return null;
}
Map<String, SmartReloadObject> reloadObjectMap = smartReloadManager.reloadObjectMap();
return reloadObjectMap.get(tag);
}
}

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

@@ -1,19 +1,23 @@
package net.lab1024.sa.base.module.support.reload.core;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.module.support.reload.core.annoation.SmartReload;
import net.lab1024.sa.base.module.support.reload.core.domain.SmartReloadObject;
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;
import java.lang.reflect.Method;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledThreadPoolExecutor;
@@ -32,7 +36,10 @@ import java.util.concurrent.TimeUnit;
*/
@Slf4j
@Service
public class SmartReloadManager implements ApplicationListener<ContextRefreshedEvent> {
public class SmartReloadManager implements BeanPostProcessor {
private static final String THREAD_NAME_PREFIX = "smart-reload";
private static final int THREAD_COUNT = 1;
@Value("${reload.interval-seconds}")
private Integer intervalSeconds;
@@ -40,27 +47,13 @@ public class SmartReloadManager implements ApplicationListener<ContextRefreshedE
@Resource
private AbstractSmartReloadCommand reloadCommand;
private final static Map<String, SmartReloadObject> RELOAD_OBJECT_MAP = new ConcurrentHashMap<>();
private final Map<String, SmartReloadObject> reloadObjectMap = new ConcurrentHashMap<>();
private ScheduledThreadPoolExecutor threadPoolExecutor;
private static final String THREAD_NAME_PREFIX = "smart-reload";
private static final int THREAD_COUNT = 1;
private ApplicationContext applicationContext;
@Override
public void onApplicationEvent(ContextRefreshedEvent event) {
this.applicationContext = event.getApplicationContext();
// 初始化
this.init();
}
@PostConstruct
public void init() {
this.registerReloadBean();
if (threadPoolExecutor != null) {
return;
}
@@ -73,8 +66,10 @@ public class SmartReloadManager implements ApplicationListener<ContextRefreshedE
return t;
});
this.threadPoolExecutor.scheduleWithFixedDelay(new SmartReloadRunnable(this.reloadCommand), 10, this.intervalSeconds, TimeUnit.SECONDS);
this.reloadCommand.setReloadManager(this);
}
@PreDestroy
public void shutdown() {
if (this.threadPoolExecutor != null) {
@@ -83,28 +78,24 @@ public class SmartReloadManager implements ApplicationListener<ContextRefreshedE
}
}
/**
* 注册 reload bean
*/
public void registerReloadBean() {
// 遍历所有Bean
String[] beanNames = applicationContext.getBeanDefinitionNames();
for (String beanName : beanNames) {
Object bean = applicationContext.getBean(beanName);
ReflectionUtils.doWithMethods(bean.getClass(), method -> {
SmartReload smartReload = method.getAnnotation(SmartReload.class);
if (smartReload == null) {
return;
}
int paramCount = method.getParameterCount();
if (paramCount > 1) {
log.error("<<SmartReloadManager>> register tag reload : " + smartReload.value() + " , param count cannot greater than one !");
return;
}
String reloadTag = smartReload.value();
this.register(reloadTag, new SmartReloadObject(bean, method));
});
@Override
public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
Method[] methods = ReflectionUtils.getAllDeclaredMethods(bean.getClass());
for (Method method : methods) {
SmartReload smartReload = method.getAnnotation(SmartReload.class);
if (smartReload == null) {
continue;
}
int paramCount = method.getParameterCount();
if (paramCount > 1) {
log.error("<<SmartReloadManager>> register tag reload : " + smartReload.value() + " , param count cannot greater than one !");
continue;
}
String reloadTag = smartReload.value();
this.register(reloadTag, new SmartReloadObject(bean, method));
}
return bean;
}
/**
@@ -114,10 +105,10 @@ public class SmartReloadManager implements ApplicationListener<ContextRefreshedE
* @param smartReloadObject
*/
private void register(String tag, SmartReloadObject smartReloadObject) {
if (RELOAD_OBJECT_MAP.containsKey(tag)) {
if (reloadObjectMap.containsKey(tag)) {
log.error("<<SmartReloadManager>> register duplicated tag reload : " + tag + " , and it will be cover!");
}
RELOAD_OBJECT_MAP.put(tag, smartReloadObject);
reloadObjectMap.put(tag, smartReloadObject);
}
/**
@@ -125,7 +116,9 @@ public class SmartReloadManager implements ApplicationListener<ContextRefreshedE
*
* @return
*/
public static SmartReloadObject getReloadObject(String tag) {
return RELOAD_OBJECT_MAP.get(tag);
public Map<String, SmartReloadObject> reloadObjectMap() {
return this.reloadObjectMap;
}
}

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

@@ -20,17 +20,17 @@ import java.util.concurrent.ConcurrentHashMap;
* @Date 2015-03-02 19:11:52
* @Wechat zhuoda1024
* @Email lab1024@163.com
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
* @Copyright <a href="https://1024lab.net">1024创新实验室</a>
*/
@Slf4j
public class SmartReloadRunnable implements Runnable {
private final AbstractSmartReloadCommand reloadCommand;
private AbstractSmartReloadCommand abstractSmartReloadCommand;
private boolean isInit = false;
public SmartReloadRunnable(AbstractSmartReloadCommand reloadCommand) {
this.reloadCommand = reloadCommand;
public SmartReloadRunnable(AbstractSmartReloadCommand abstractSmartReloadCommand) {
this.abstractSmartReloadCommand = abstractSmartReloadCommand;
}
@Override
@@ -47,23 +47,23 @@ public class SmartReloadRunnable implements Runnable {
*/
private void doTask() {
if (!isInit) {
this.reloadCommand.init();
this.abstractSmartReloadCommand.init();
isInit = true;
return;
}
List<SmartReloadItem> smartReloadItemList = this.reloadCommand.readReloadItem();
ConcurrentHashMap<String, String> tagIdentifierMap = this.reloadCommand.getTagIdentifierMap();
List<SmartReloadItem> smartReloadItemList = this.abstractSmartReloadCommand.readReloadItem();
ConcurrentHashMap<String, String> tagIdentifierMap = this.abstractSmartReloadCommand.getTagIdentifierMap();
for (SmartReloadItem smartReloadItem : smartReloadItemList) {
String tag = smartReloadItem.getTag();
String tagIdentifier = smartReloadItem.getIdentification();
String preTagChangeIdentifier = tagIdentifierMap.get(tag);
// 数据不一致
if (preTagChangeIdentifier == null || !preTagChangeIdentifier.equals(tagIdentifier)) {
this.reloadCommand.putIdentifierMap(tag, tagIdentifier);
this.abstractSmartReloadCommand.putIdentifierMap(tag, tagIdentifier);
// 执行重新加载此项的动作
SmartReloadResult smartReloadResult = this.doReload(smartReloadItem);
this.reloadCommand.handleReloadResult(smartReloadResult);
this.abstractSmartReloadCommand.handleReloadResult(smartReloadResult);
}
}
}
@@ -76,7 +76,7 @@ public class SmartReloadRunnable implements Runnable {
*/
private SmartReloadResult doReload(SmartReloadItem smartReloadItem) {
SmartReloadResult result = new SmartReloadResult();
SmartReloadObject smartReloadObject = SmartReloadManager.getReloadObject(smartReloadItem.getTag());
SmartReloadObject smartReloadObject = this.abstractSmartReloadCommand.reloadObject(smartReloadItem.getTag());
try {
if (smartReloadObject == null) {
result.setResult(false);

2
smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityFileService.java
View File

@@ -5,6 +5,8 @@ import net.lab1024.sa.base.common.domain.ResponseDTO;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
/**
* 三级等保 文件上传 相关
*

1
smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/java/dao/Dao.java.vm
View File

@@ -49,5 +49,4 @@ public interface ${name.upperCamel}Dao extends BaseMapper<${name.upperCamel}Enti
#end
#end
#end
}

2
smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/CodeGeneratorMapper.xml
View File

@@ -26,7 +26,7 @@
tables.create_time,
tables.update_time,
t_code_generator_config.update_time configTime
from information_schema.tables
from information_schema.tables tables
left join t_code_generator_config on tables.table_name = t_code_generator_config.table_name
where tables.table_schema = (select database())
<if test="queryForm.tableNameKeywords != null and queryForm.tableNameKeywords != ''">

15
smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/SmartJobMapper.xml
View File

@@ -2,6 +2,12 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="net.lab1024.sa.base.module.support.job.repository.SmartJobDao">
<update id="updateDeletedFlag">
update t_smart_job
set deleted_flag = #{deletedFlag}
where job_id = #{jobId}
</update>
<!-- 定时任务-分页查询 -->
<select id="query" resultType="net.lab1024.sa.base.module.support.job.api.domain.SmartJobVO">
SELECT *
@@ -19,10 +25,19 @@
<if test="query.enabledFlag != null">
AND enabled_flag = #{query.enabledFlag}
</if>
<if test="query.deletedFlag != null">
AND deleted_flag = #{query.deletedFlag}
</if>
</where>
<if test="query.sortItemList == null or query.sortItemList.size == 0">
ORDER BY sort ASC,job_id DESC
</if>
</select>
<select id="selectByJobClass" resultType="net.lab1024.sa.base.module.support.job.repository.domain.SmartJobEntity">
SELECT *
FROM t_smart_job
WHERE job_class = #{jobClass}
</select>
</mapper>