refactor: 目录结构优化
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system;
|
||||
package com.youlai.boot;
|
||||
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
@@ -8,8 +8,8 @@ import org.springframework.scheduling.annotation.EnableScheduling;
|
||||
@SpringBootApplication
|
||||
@ConfigurationPropertiesScan
|
||||
@EnableScheduling
|
||||
public class SystemApplication {
|
||||
public class BootApplication {
|
||||
public static void main(String[] args) {
|
||||
SpringApplication.run(SystemApplication.class, args);
|
||||
SpringApplication.run(BootApplication.class, args);
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.plugin.mybatis.annotation;
|
||||
package com.youlai.boot.common.annotation;
|
||||
|
||||
import java.lang.annotation.*;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.plugin.syslog.annotation;
|
||||
package com.youlai.boot.common.annotation;
|
||||
|
||||
import com.youlai.system.enums.LogModuleEnum;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.plugin.norepeat.annotation;
|
||||
package com.youlai.boot.common.annotation;
|
||||
|
||||
|
||||
import java.lang.annotation.*;
|
||||
@@ -16,7 +16,7 @@ import java.lang.annotation.*;
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
@Documented
|
||||
@Inherited
|
||||
public @interface PreventRepeatSubmit {
|
||||
public @interface NoRepeat {
|
||||
|
||||
/**
|
||||
* 锁过期时间(秒)
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.plugin.easyexcel;
|
||||
package com.youlai.boot.common.base;
|
||||
|
||||
import com.alibaba.excel.event.AnalysisEventListener;
|
||||
|
||||
@@ -8,7 +8,7 @@ import com.alibaba.excel.event.AnalysisEventListener;
|
||||
* @author haoxr
|
||||
* @since 2023/03/01
|
||||
*/
|
||||
public abstract class MyAnalysisEventListener<T> extends AnalysisEventListener<T> {
|
||||
public abstract class BaseAnalysisEventListener<T> extends AnalysisEventListener<T> {
|
||||
|
||||
private String msg;
|
||||
public abstract String getMsg();
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.common.base;
|
||||
package com.youlai.boot.common.base;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.common.base;
|
||||
package com.youlai.boot.common.base;
|
||||
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.common.base;
|
||||
package com.youlai.boot.common.base;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.ToString;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.common.base;
|
||||
package com.youlai.boot.common.base;
|
||||
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.common.constant;
|
||||
package com.youlai.boot.common.constant;
|
||||
|
||||
/**
|
||||
* JWT Claims声明常量
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.common.constant;
|
||||
package com.youlai.boot.common.constant;
|
||||
|
||||
/**
|
||||
* Redis Key常量
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.common.constant;
|
||||
package com.youlai.boot.common.constant;
|
||||
|
||||
/**
|
||||
* 缓存常量
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.common.constant;
|
||||
package com.youlai.boot.common.constant;
|
||||
|
||||
/**
|
||||
* 符号和特殊符号常用类
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.common.constant;
|
||||
package com.youlai.boot.common.constant;
|
||||
|
||||
/**
|
||||
* 系统常量
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.enums;
|
||||
package com.youlai.boot.common.enums;
|
||||
|
||||
/**
|
||||
* EasyCaptcha 验证码类型枚举
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.enums;
|
||||
package com.youlai.boot.common.enums;
|
||||
|
||||
/**
|
||||
* 联系方式类型
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.enums;
|
||||
package com.youlai.boot.common.enums;
|
||||
|
||||
import com.youlai.system.common.base.IBaseEnum;
|
||||
import lombok.Getter;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.enums;
|
||||
package com.youlai.boot.common.enums;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.EnumValue;
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.enums;
|
||||
package com.youlai.boot.common.enums;
|
||||
|
||||
import com.youlai.system.common.base.IBaseEnum;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.enums;
|
||||
package com.youlai.boot.common.enums;
|
||||
|
||||
import lombok.Getter;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.enums;
|
||||
package com.youlai.boot.common.enums;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.enums;
|
||||
package com.youlai.boot.common.enums;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.EnumValue;
|
||||
import com.youlai.system.common.base.IBaseEnum;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.enums;
|
||||
package com.youlai.boot.common.enums;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.EnumValue;
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.enums;
|
||||
package com.youlai.boot.common.enums;
|
||||
|
||||
import com.youlai.system.common.base.IBaseEnum;
|
||||
import lombok.Getter;
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.youlai.system.exception;
|
||||
package com.youlai.boot.common.exception;
|
||||
|
||||
import com.youlai.system.common.result.IResultCode;
|
||||
import com.youlai.boot.common.result.IResultCode;
|
||||
import lombok.Getter;
|
||||
import org.slf4j.helpers.MessageFormatter;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.exception;
|
||||
package com.youlai.boot.common.exception;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.common.model;
|
||||
package com.youlai.boot.common.model;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.common.model;
|
||||
package com.youlai.boot.common.model;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.common.result;
|
||||
package com.youlai.boot.common.result;
|
||||
|
||||
/**
|
||||
* 响应码接口
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.common.result;
|
||||
package com.youlai.boot.common.result;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import lombok.Data;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.common.result;
|
||||
package com.youlai.boot.common.result;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.common.result;
|
||||
package com.youlai.boot.common.result;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.NoArgsConstructor;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.service;
|
||||
package com.youlai.boot.common.service;
|
||||
|
||||
/**
|
||||
* 邮件服务接口层
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.youlai.system.service;
|
||||
package com.youlai.boot.common.service;
|
||||
|
||||
import com.youlai.system.model.dto.FileInfo;
|
||||
import com.youlai.boot.module.system.model.dto.FileInfo;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
/**
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.service;
|
||||
package com.youlai.boot.common.service;
|
||||
|
||||
/**
|
||||
* 短信服务接口层
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.service.impl.oss;
|
||||
package com.youlai.boot.common.service.impl;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.io.FileUtil;
|
||||
@@ -8,7 +8,7 @@ import com.aliyun.oss.OSS;
|
||||
import com.aliyun.oss.OSSClientBuilder;
|
||||
import com.aliyun.oss.model.ObjectMetadata;
|
||||
import com.aliyun.oss.model.PutObjectRequest;
|
||||
import com.youlai.system.model.dto.FileInfo;
|
||||
import com.youlai.boot.module.system.model.dto.FileInfo;
|
||||
import com.youlai.system.service.OssService;
|
||||
import jakarta.annotation.PostConstruct;
|
||||
import lombok.Data;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.service.impl.sms;
|
||||
package com.youlai.boot.common.service.impl;
|
||||
|
||||
import com.aliyuncs.CommonRequest;
|
||||
import com.aliyuncs.CommonResponse;
|
||||
@@ -8,7 +8,7 @@ import com.aliyuncs.exceptions.ClientException;
|
||||
import com.aliyuncs.exceptions.ServerException;
|
||||
import com.aliyuncs.http.MethodType;
|
||||
import com.aliyuncs.profile.DefaultProfile;
|
||||
import com.youlai.system.config.property.AliyunSmsProperties;
|
||||
import com.youlai.boot.config.property.AliyunSmsProperties;
|
||||
import com.youlai.system.service.SmsService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.youlai.system.service.impl.mail;
|
||||
package com.youlai.boot.common.service.impl;
|
||||
|
||||
import com.youlai.system.config.property.MailProperties;
|
||||
import com.youlai.boot.config.property.MailProperties;
|
||||
import com.youlai.system.service.MailService;
|
||||
import jakarta.mail.MessagingException;
|
||||
import jakarta.mail.internet.MimeMessage;
|
||||
@@ -1,11 +1,11 @@
|
||||
package com.youlai.system.service.impl.oss;
|
||||
package com.youlai.boot.common.service.impl;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.io.FileUtil;
|
||||
import cn.hutool.core.lang.Assert;
|
||||
import cn.hutool.core.util.IdUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.youlai.system.model.dto.FileInfo;
|
||||
import com.youlai.boot.module.system.model.dto.FileInfo;
|
||||
import com.youlai.system.service.OssService;
|
||||
import io.minio.*;
|
||||
import io.minio.errors.*;
|
||||
@@ -1,5 +1,5 @@
|
||||
|
||||
package com.youlai.system.util;
|
||||
package com.youlai.boot.common.util;
|
||||
|
||||
import cn.hutool.core.date.DateTime;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.youlai.system.util;
|
||||
package com.youlai.boot.common.util;
|
||||
|
||||
import com.alibaba.excel.EasyExcel;
|
||||
import com.youlai.system.plugin.easyexcel.MyAnalysisEventListener;
|
||||
import com.youlai.boot.common.base.BaseAnalysisEventListener;
|
||||
|
||||
import java.io.InputStream;
|
||||
|
||||
@@ -13,7 +13,7 @@ import java.io.InputStream;
|
||||
*/
|
||||
public class ExcelUtils {
|
||||
|
||||
public static <T> String importExcel(InputStream is, Class clazz, MyAnalysisEventListener<T> listener) {
|
||||
public static <T> String importExcel(InputStream is, Class clazz, BaseAnalysisEventListener<T> listener) {
|
||||
EasyExcel.read(is, clazz, listener).sheet().doRead();
|
||||
return listener.getMsg();
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.util;
|
||||
package com.youlai.boot.common.util;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import jakarta.annotation.PostConstruct;
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.youlai.system.util;
|
||||
package com.youlai.boot.common.util;
|
||||
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import com.youlai.system.common.result.Result;
|
||||
import com.youlai.system.common.result.ResultCode;
|
||||
import com.youlai.boot.common.result.Result;
|
||||
import com.youlai.boot.common.result.ResultCode;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.http.HttpStatus;
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.youlai.system.config;
|
||||
package com.youlai.boot.config;
|
||||
|
||||
import cn.hutool.captcha.generator.CodeGenerator;
|
||||
import cn.hutool.captcha.generator.MathGenerator;
|
||||
import cn.hutool.captcha.generator.RandomGenerator;
|
||||
import com.youlai.system.config.property.CaptchaProperties;
|
||||
import com.youlai.boot.config.property.CaptchaProperties;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.config;
|
||||
package com.youlai.boot.config;
|
||||
|
||||
import org.springframework.boot.web.servlet.FilterRegistrationBean;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.youlai.system.config;
|
||||
package com.youlai.boot.config;
|
||||
|
||||
import com.youlai.system.config.property.MailProperties;
|
||||
import com.youlai.boot.config.property.MailProperties;
|
||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.config;
|
||||
package com.youlai.boot.config;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.DbType;
|
||||
import com.baomidou.mybatisplus.core.config.GlobalConfig;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.config;
|
||||
package com.youlai.boot.config;
|
||||
|
||||
import org.springframework.boot.autoconfigure.cache.CacheProperties;
|
||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.config;
|
||||
package com.youlai.boot.config;
|
||||
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
@@ -1,15 +1,15 @@
|
||||
package com.youlai.system.config;
|
||||
package com.youlai.boot.config;
|
||||
|
||||
import cn.hutool.captcha.generator.CodeGenerator;
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import com.youlai.system.common.constant.SecurityConstants;
|
||||
import com.youlai.system.config.property.SecurityProperties;
|
||||
import com.youlai.system.filter.RedisRateLimiterFilter;
|
||||
import com.youlai.system.security.exception.MyAccessDeniedHandler;
|
||||
import com.youlai.system.security.exception.MyAuthenticationEntryPoint;
|
||||
import com.youlai.system.filter.JwtValidationFilter;
|
||||
import com.youlai.system.filter.CaptchaValidationFilter;
|
||||
import com.youlai.system.service.SysConfigService;
|
||||
import com.youlai.boot.common.constant.SecurityConstants;
|
||||
import com.youlai.boot.config.property.SecurityProperties;
|
||||
import com.youlai.boot.framework.filter.RateLimiterFilter;
|
||||
import com.youlai.boot.framework.security.exception.MyAccessDeniedHandler;
|
||||
import com.youlai.boot.framework.security.exception.MyAuthenticationEntryPoint;
|
||||
import com.youlai.boot.framework.security.filter.JwtValidationFilter;
|
||||
import com.youlai.boot.framework.security.filter.CaptchaValidationFilter;
|
||||
import com.youlai.boot.module.system.service.SysConfigService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
@@ -68,7 +68,7 @@ public class SecurityConfig {
|
||||
|
||||
;
|
||||
// 限流过滤器
|
||||
http.addFilterBefore(new RedisRateLimiterFilter(redisTemplate, sysConfigService), UsernamePasswordAuthenticationFilter.class);
|
||||
http.addFilterBefore(new RateLimiterFilter(redisTemplate, sysConfigService), UsernamePasswordAuthenticationFilter.class);
|
||||
// 验证码校验过滤器
|
||||
http.addFilterBefore(new CaptchaValidationFilter(redisTemplate, codeGenerator), UsernamePasswordAuthenticationFilter.class);
|
||||
// JWT 校验过滤器
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.config;
|
||||
package com.youlai.boot.config;
|
||||
|
||||
import io.swagger.v3.oas.models.Components;
|
||||
import io.swagger.v3.oas.models.OpenAPI;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.config;
|
||||
package com.youlai.boot.config;
|
||||
|
||||
import com.fasterxml.jackson.core.JsonParser;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
@@ -1,16 +1,13 @@
|
||||
package com.youlai.system.config;
|
||||
package com.youlai.boot.config;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import cn.hutool.jwt.JWTPayload;
|
||||
import cn.hutool.jwt.JWTUtil;
|
||||
import com.youlai.system.common.constant.SecurityConstants;
|
||||
import com.youlai.system.event.UserConnectionEvent;
|
||||
import com.youlai.boot.module.system.event.UserConnectionEvent;
|
||||
import com.youlai.system.service.WebsocketService;
|
||||
import groovy.lang.Lazy;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.context.ApplicationEventPublisher;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.config;
|
||||
package com.youlai.boot.config;
|
||||
|
||||
import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.config.property;
|
||||
package com.youlai.boot.config.property;
|
||||
|
||||
import lombok.Data;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.config.property;
|
||||
package com.youlai.boot.config.property;
|
||||
|
||||
import lombok.Data;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.config.property;
|
||||
package com.youlai.boot.config.property;
|
||||
|
||||
import cn.hutool.core.io.file.FileNameUtil;
|
||||
import cn.hutool.core.map.MapUtil;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.config.property;
|
||||
package com.youlai.boot.config.property;
|
||||
|
||||
import lombok.Data;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.config.property;
|
||||
package com.youlai.boot.config.property;
|
||||
|
||||
import lombok.Data;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
@@ -1,16 +1,16 @@
|
||||
package com.youlai.system.plugin.syslog.aspect;
|
||||
package com.youlai.boot.framework.aspect;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.date.TimeInterval;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import cn.hutool.http.useragent.UserAgent;
|
||||
import cn.hutool.http.useragent.UserAgentUtil;
|
||||
import com.youlai.system.common.constant.SecurityConstants;
|
||||
import com.youlai.system.util.IPUtils;
|
||||
import com.youlai.system.model.entity.SysLog;
|
||||
import com.youlai.system.plugin.syslog.annotation.LogAnnotation;
|
||||
import com.youlai.system.security.util.SecurityUtils;
|
||||
import com.youlai.system.service.SysLogService;
|
||||
import com.youlai.boot.common.constant.SecurityConstants;
|
||||
import com.youlai.boot.common.util.IPUtils;
|
||||
import com.youlai.boot.module.system.model.entity.SysLog;
|
||||
import com.youlai.boot.common.annotation.LogAnnotation;
|
||||
import com.youlai.boot.framework.security.util.SecurityUtils;
|
||||
import com.youlai.boot.module.system.service.SysLogService;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -35,7 +35,7 @@ public class LogAspect {
|
||||
private final SysLogService logService;
|
||||
private final HttpServletRequest request;
|
||||
|
||||
@Pointcut("@annotation(com.youlai.system.plugin.syslog.annotation.LogAnnotation)")
|
||||
@Pointcut("@annotation(com.youlai.boot.common.annotation.LogAnnotation)")
|
||||
public void logPointcut() {
|
||||
}
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
package com.youlai.system.plugin.norepeat.aspect;
|
||||
package com.youlai.boot.framework.aspect;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import cn.hutool.jwt.JWTUtil;
|
||||
import cn.hutool.jwt.RegisteredPayload;
|
||||
import com.youlai.system.common.constant.RedisConstants;
|
||||
import com.youlai.system.common.constant.SecurityConstants;
|
||||
import com.youlai.system.exception.BusinessException;
|
||||
import com.youlai.system.common.result.ResultCode;
|
||||
import com.youlai.system.plugin.norepeat.annotation.PreventRepeatSubmit;
|
||||
import com.youlai.boot.common.constant.RedisConstants;
|
||||
import com.youlai.boot.common.constant.SecurityConstants;
|
||||
import com.youlai.boot.common.result.ResultCode;
|
||||
import com.youlai.boot.common.exception.BusinessException;
|
||||
import com.youlai.boot.common.annotation.NoRepeat;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -34,24 +34,24 @@ import java.util.concurrent.TimeUnit;
|
||||
@Component
|
||||
@Slf4j
|
||||
@RequiredArgsConstructor
|
||||
public class DuplicateSubmitAspect {
|
||||
public class NoRepeatAspect {
|
||||
|
||||
private final RedissonClient redissonClient;
|
||||
|
||||
/**
|
||||
* 防重复提交切点
|
||||
*/
|
||||
@Pointcut("@annotation(preventRepeatSubmit)")
|
||||
public void preventDuplicateSubmitPointCut(PreventRepeatSubmit preventRepeatSubmit) {
|
||||
@Pointcut("@annotation(noRepeat)")
|
||||
public void preventDuplicateSubmitPointCut(NoRepeat noRepeat) {
|
||||
log.info("定义防重复提交切点");
|
||||
}
|
||||
|
||||
@Around("preventDuplicateSubmitPointCut(preventRepeatSubmit)")
|
||||
public Object doAround(ProceedingJoinPoint pjp, PreventRepeatSubmit preventRepeatSubmit) throws Throwable {
|
||||
@Around("preventDuplicateSubmitPointCut(noRepeat)")
|
||||
public Object doAround(ProceedingJoinPoint pjp, NoRepeat noRepeat) throws Throwable {
|
||||
|
||||
String resubmitLockKey = generateResubmitLockKey();
|
||||
if (resubmitLockKey != null) {
|
||||
int expire = preventRepeatSubmit.expire(); // 防重提交锁过期时间
|
||||
int expire = noRepeat.expire(); // 防重提交锁过期时间
|
||||
RLock lock = redissonClient.getLock(resubmitLockKey);
|
||||
boolean lockResult = lock.tryLock(0, expire, TimeUnit.SECONDS); // 获取锁失败,直接返回 false
|
||||
if (!lockResult) {
|
||||
@@ -1,10 +1,10 @@
|
||||
package com.youlai.system.filter;
|
||||
package com.youlai.boot.framework.filter;
|
||||
|
||||
import com.youlai.system.common.constant.RedisConstants;
|
||||
import com.youlai.system.common.result.ResultCode;
|
||||
import com.youlai.system.service.SysConfigService;
|
||||
import com.youlai.system.util.IPUtils;
|
||||
import com.youlai.system.util.ResponseUtils;
|
||||
import com.youlai.boot.common.constant.RedisConstants;
|
||||
import com.youlai.boot.common.result.ResultCode;
|
||||
import com.youlai.boot.common.util.IPUtils;
|
||||
import com.youlai.boot.common.util.ResponseUtils;
|
||||
import com.youlai.boot.module.system.service.SysConfigService;
|
||||
import jakarta.servlet.FilterChain;
|
||||
import jakarta.servlet.ServletException;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
@@ -24,12 +24,12 @@ import java.util.concurrent.TimeUnit;
|
||||
* @since 2024/08/10 14:38
|
||||
*/
|
||||
@Slf4j
|
||||
public class RedisRateLimiterFilter extends OncePerRequestFilter {
|
||||
public class RateLimiterFilter extends OncePerRequestFilter {
|
||||
|
||||
private final RedisTemplate<String, Object> redisTemplate;
|
||||
private final SysConfigService sysConfigService;
|
||||
|
||||
public RedisRateLimiterFilter(RedisTemplate<String, Object> redisTemplate, SysConfigService sysConfigService) {
|
||||
public RateLimiterFilter(RedisTemplate<String, Object> redisTemplate, SysConfigService sysConfigService) {
|
||||
this.redisTemplate = redisTemplate;
|
||||
this.sysConfigService = sysConfigService;
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.filter;
|
||||
package com.youlai.boot.framework.filter;
|
||||
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.youlai.system.security.exception;
|
||||
package com.youlai.boot.framework.security.exception;
|
||||
|
||||
import com.youlai.system.common.result.ResultCode;
|
||||
import com.youlai.system.util.ResponseUtils;
|
||||
import com.youlai.boot.common.util.ResponseUtils;
|
||||
import org.springframework.security.access.AccessDeniedException;
|
||||
import org.springframework.security.web.access.AccessDeniedHandler;
|
||||
import org.springframework.stereotype.Component;
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.youlai.system.security.exception;
|
||||
package com.youlai.boot.framework.security.exception;
|
||||
|
||||
import com.youlai.system.common.result.ResultCode;
|
||||
import com.youlai.system.util.ResponseUtils;
|
||||
import com.youlai.boot.common.util.ResponseUtils;
|
||||
import org.springframework.security.authentication.BadCredentialsException;
|
||||
import org.springframework.security.core.AuthenticationException;
|
||||
import org.springframework.security.web.AuthenticationEntryPoint;
|
||||
@@ -1,10 +1,10 @@
|
||||
package com.youlai.system.filter;
|
||||
package com.youlai.boot.framework.security.filter;
|
||||
|
||||
import cn.hutool.captcha.generator.CodeGenerator;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.youlai.system.common.constant.SecurityConstants;
|
||||
import com.youlai.system.common.result.ResultCode;
|
||||
import com.youlai.system.util.ResponseUtils;
|
||||
import com.youlai.boot.common.constant.SecurityConstants;
|
||||
import com.youlai.boot.common.result.ResultCode;
|
||||
import com.youlai.boot.common.util.ResponseUtils;
|
||||
import jakarta.servlet.FilterChain;
|
||||
import jakarta.servlet.ServletException;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
@@ -1,14 +1,14 @@
|
||||
package com.youlai.system.filter;
|
||||
package com.youlai.boot.framework.security.filter;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import cn.hutool.json.JSONObject;
|
||||
import cn.hutool.jwt.JWT;
|
||||
import cn.hutool.jwt.JWTPayload;
|
||||
import cn.hutool.jwt.JWTUtil;
|
||||
import com.youlai.system.common.constant.SecurityConstants;
|
||||
import com.youlai.system.common.result.ResultCode;
|
||||
import com.youlai.system.security.util.JwtUtils;
|
||||
import com.youlai.system.util.ResponseUtils;
|
||||
import com.youlai.boot.common.constant.SecurityConstants;
|
||||
import com.youlai.boot.common.result.ResultCode;
|
||||
import com.youlai.boot.framework.security.util.JwtUtils;
|
||||
import com.youlai.boot.common.util.ResponseUtils;
|
||||
import jakarta.servlet.FilterChain;
|
||||
import jakarta.servlet.ServletException;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.youlai.system.security.model;
|
||||
package com.youlai.boot.framework.security.model;
|
||||
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import com.youlai.system.model.dto.UserAuthInfo;
|
||||
import com.youlai.boot.module.system.model.dto.UserAuthInfo;
|
||||
import lombok.Data;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.youlai.system.security.service;
|
||||
package com.youlai.boot.framework.security.service;
|
||||
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.youlai.system.common.constant.SecurityConstants;
|
||||
import com.youlai.system.security.util.SecurityUtils;
|
||||
import com.youlai.boot.framework.security.util.SecurityUtils;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.data.redis.core.RedisTemplate;
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.youlai.system.security.service;
|
||||
package com.youlai.boot.framework.security.service;
|
||||
|
||||
import com.youlai.system.security.model.SysUserDetails;
|
||||
import com.youlai.system.model.dto.UserAuthInfo;
|
||||
import com.youlai.system.service.SysUserService;
|
||||
import com.youlai.boot.framework.security.model.SysUserDetails;
|
||||
import com.youlai.boot.module.system.model.dto.UserAuthInfo;
|
||||
import com.youlai.boot.module.system.service.SysUserService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.security.core.userdetails.UserDetails;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.security.util;
|
||||
package com.youlai.boot.framework.security.util;
|
||||
|
||||
import cn.hutool.core.convert.Convert;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
@@ -7,7 +7,7 @@ import cn.hutool.json.JSONObject;
|
||||
import cn.hutool.jwt.JWTPayload;
|
||||
import cn.hutool.jwt.JWTUtil;
|
||||
import com.youlai.system.common.constant.JwtClaimConstants;
|
||||
import com.youlai.system.security.model.SysUserDetails;
|
||||
import com.youlai.boot.framework.security.model.SysUserDetails;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
|
||||
import org.springframework.security.core.Authentication;
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.youlai.system.security.util;
|
||||
package com.youlai.boot.framework.security.util;
|
||||
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.youlai.system.common.constant.SystemConstants;
|
||||
import com.youlai.system.security.model.SysUserDetails;
|
||||
import com.youlai.boot.framework.security.model.SysUserDetails;
|
||||
import org.springframework.security.core.Authentication;
|
||||
import org.springframework.security.core.GrantedAuthority;
|
||||
import org.springframework.security.core.context.SecurityContextHolder;
|
||||
@@ -1,15 +1,15 @@
|
||||
package com.youlai.system.controller;
|
||||
package com.youlai.boot.module.generator.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.youlai.system.common.result.PageResult;
|
||||
import com.youlai.system.common.result.Result;
|
||||
import com.youlai.system.config.property.GeneratorProperties;
|
||||
import com.youlai.boot.config.property.GeneratorProperties;
|
||||
import com.youlai.system.enums.LogModuleEnum;
|
||||
import com.youlai.system.model.form.GenConfigForm;
|
||||
import com.youlai.system.model.query.TablePageQuery;
|
||||
import com.youlai.system.model.vo.GeneratorPreviewVO;
|
||||
import com.youlai.system.model.vo.TablePageVO;
|
||||
import com.youlai.system.plugin.syslog.annotation.LogAnnotation;
|
||||
import com.youlai.boot.module.system.model.form.GenConfigForm;
|
||||
import com.youlai.boot.module.system.model.query.TablePageQuery;
|
||||
import com.youlai.boot.module.system.model.vo.GeneratorPreviewVO;
|
||||
import com.youlai.boot.module.system.model.vo.TablePageVO;
|
||||
import com.youlai.boot.common.annotation.LogAnnotation;
|
||||
import com.youlai.system.service.GeneratorService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
@@ -18,7 +18,6 @@ import jakarta.servlet.http.HttpServletResponse;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.apache.commons.io.IOUtils;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.util.UriUtils;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.URLEncoder;
|
||||
@@ -1,12 +1,12 @@
|
||||
package com.youlai.system.mapper;
|
||||
package com.youlai.boot.module.generator.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.youlai.system.model.bo.ColumnMetaData;
|
||||
import com.youlai.system.model.bo.TableMetaData;
|
||||
import com.youlai.system.model.entity.SysDept;
|
||||
import com.youlai.system.model.query.TablePageQuery;
|
||||
import com.youlai.system.model.vo.TablePageVO;
|
||||
import com.youlai.boot.module.system.model.bo.ColumnMetaData;
|
||||
import com.youlai.boot.module.system.model.bo.TableMetaData;
|
||||
import com.youlai.boot.module.system.model.entity.SysDept;
|
||||
import com.youlai.boot.module.system.model.query.TablePageQuery;
|
||||
import com.youlai.boot.module.system.model.vo.TablePageVO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.youlai.system.mapper;
|
||||
package com.youlai.boot.module.generator.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.youlai.system.model.entity.GenConfig;
|
||||
import com.youlai.boot.module.system.model.entity.GenConfig;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.youlai.system.mapper;
|
||||
package com.youlai.boot.module.generator.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.youlai.system.model.entity.GenFieldConfig;
|
||||
import com.youlai.boot.module.system.model.entity.GenFieldConfig;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.youlai.system.service;
|
||||
package com.youlai.boot.module.generator.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.youlai.system.model.entity.GenConfig;
|
||||
import com.youlai.boot.module.system.model.entity.GenConfig;
|
||||
|
||||
/**
|
||||
* 代码生成配置接口
|
||||
@@ -1,8 +1,7 @@
|
||||
package com.youlai.system.service;
|
||||
package com.youlai.boot.module.generator.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.youlai.system.model.entity.GenConfig;
|
||||
import com.youlai.system.model.entity.GenFieldConfig;
|
||||
import com.youlai.boot.module.system.model.entity.GenFieldConfig;
|
||||
|
||||
/**
|
||||
* 代码生成配置接口
|
||||
@@ -1,10 +1,10 @@
|
||||
package com.youlai.system.service;
|
||||
package com.youlai.boot.module.generator.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.youlai.system.model.form.GenConfigForm;
|
||||
import com.youlai.system.model.query.TablePageQuery;
|
||||
import com.youlai.system.model.vo.GeneratorPreviewVO;
|
||||
import com.youlai.system.model.vo.TablePageVO;
|
||||
import com.youlai.boot.module.system.model.form.GenConfigForm;
|
||||
import com.youlai.boot.module.system.model.query.TablePageQuery;
|
||||
import com.youlai.boot.module.system.model.vo.GeneratorPreviewVO;
|
||||
import com.youlai.boot.module.system.model.vo.TablePageVO;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.youlai.system.service.impl;
|
||||
package com.youlai.boot.module.generator.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.youlai.system.mapper.GenConfigMapper;
|
||||
import com.youlai.system.model.entity.GenConfig;
|
||||
import com.youlai.boot.module.generator.mapper.GenConfigMapper;
|
||||
import com.youlai.boot.module.system.model.entity.GenConfig;
|
||||
import com.youlai.system.service.GenConfigService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.youlai.system.service.impl;
|
||||
package com.youlai.boot.module.generator.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.youlai.system.mapper.GenFieldConfigMapper;
|
||||
import com.youlai.system.model.entity.GenFieldConfig;
|
||||
import com.youlai.boot.module.generator.mapper.GenFieldConfigMapper;
|
||||
import com.youlai.boot.module.system.model.entity.GenFieldConfig;
|
||||
import com.youlai.system.service.GenFieldConfigService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.youlai.system.service.impl;
|
||||
package com.youlai.boot.module.generator.service.impl;
|
||||
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
@@ -12,21 +12,21 @@ import cn.hutool.extra.template.TemplateUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.youlai.system.SystemApplication;
|
||||
import com.youlai.system.config.property.GeneratorProperties;
|
||||
import com.youlai.system.converter.GenConfigConverter;
|
||||
import com.youlai.boot.config.property.GeneratorProperties;
|
||||
import com.youlai.boot.module.system.converter.GenConfigConverter;
|
||||
import com.youlai.system.enums.FormTypeEnum;
|
||||
import com.youlai.system.enums.JavaTypeEnum;
|
||||
import com.youlai.system.enums.QueryTypeEnum;
|
||||
import com.youlai.system.exception.BusinessException;
|
||||
import com.youlai.system.mapper.DatabaseMapper;
|
||||
import com.youlai.system.model.bo.ColumnMetaData;
|
||||
import com.youlai.system.model.bo.TableMetaData;
|
||||
import com.youlai.system.model.entity.GenConfig;
|
||||
import com.youlai.system.model.entity.GenFieldConfig;
|
||||
import com.youlai.system.model.form.GenConfigForm;
|
||||
import com.youlai.system.model.query.TablePageQuery;
|
||||
import com.youlai.system.model.vo.GeneratorPreviewVO;
|
||||
import com.youlai.system.model.vo.TablePageVO;
|
||||
import com.youlai.boot.common.exception.BusinessException;
|
||||
import com.youlai.boot.module.generator.mapper.DatabaseMapper;
|
||||
import com.youlai.boot.module.system.model.bo.ColumnMetaData;
|
||||
import com.youlai.boot.module.system.model.bo.TableMetaData;
|
||||
import com.youlai.boot.module.system.model.entity.GenConfig;
|
||||
import com.youlai.boot.module.system.model.entity.GenFieldConfig;
|
||||
import com.youlai.boot.module.system.model.form.GenConfigForm;
|
||||
import com.youlai.boot.module.system.model.query.TablePageQuery;
|
||||
import com.youlai.boot.module.system.model.vo.GeneratorPreviewVO;
|
||||
import com.youlai.boot.module.system.model.vo.TablePageVO;
|
||||
import com.youlai.system.service.GeneratorService;
|
||||
import com.youlai.system.service.GenConfigService;
|
||||
import com.youlai.system.service.GenFieldConfigService;
|
||||
@@ -40,7 +40,6 @@ import java.io.ByteArrayOutputStream;
|
||||
import java.io.File;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.zip.ZipOutputStream;
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
package com.youlai.system.controller;
|
||||
package com.youlai.boot.module.system.controller;
|
||||
|
||||
import com.youlai.system.enums.LogModuleEnum;
|
||||
import com.youlai.system.common.result.Result;
|
||||
import com.youlai.system.model.dto.CaptchaResult;
|
||||
import com.youlai.system.model.dto.LoginResult;
|
||||
import com.youlai.system.plugin.syslog.annotation.LogAnnotation;
|
||||
import com.youlai.boot.module.system.model.dto.CaptchaResult;
|
||||
import com.youlai.boot.module.system.model.dto.LoginResult;
|
||||
import com.youlai.boot.common.annotation.LogAnnotation;
|
||||
import com.youlai.system.service.AuthService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.youlai.system.controller;
|
||||
package com.youlai.boot.module.system.controller;
|
||||
|
||||
import com.youlai.system.common.result.Result;
|
||||
import com.youlai.system.model.dto.FileInfo;
|
||||
import com.youlai.boot.module.system.model.dto.FileInfo;
|
||||
import com.youlai.system.service.OssService;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.enums.ParameterIn;
|
||||
@@ -1,12 +1,12 @@
|
||||
package com.youlai.system.controller;
|
||||
package com.youlai.boot.module.system.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.youlai.system.common.result.PageResult;
|
||||
import com.youlai.system.common.result.Result;
|
||||
import com.youlai.system.model.form.ConfigForm;
|
||||
import com.youlai.system.model.query.ConfigPageQuery;
|
||||
import com.youlai.system.model.vo.ConfigVO;
|
||||
import com.youlai.system.service.SysConfigService;
|
||||
import com.youlai.boot.common.result.PageResult;
|
||||
import com.youlai.boot.common.result.Result;
|
||||
import com.youlai.boot.module.system.model.form.ConfigForm;
|
||||
import com.youlai.boot.module.system.model.query.ConfigPageQuery;
|
||||
import com.youlai.boot.module.system.model.vo.ConfigVO;
|
||||
import com.youlai.boot.module.system.service.SysConfigService;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import jakarta.validation.Valid;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
@@ -1,13 +1,13 @@
|
||||
package com.youlai.system.controller;
|
||||
package com.youlai.boot.module.system.controller;
|
||||
|
||||
import com.youlai.system.enums.LogModuleEnum;
|
||||
import com.youlai.system.plugin.norepeat.annotation.PreventRepeatSubmit;
|
||||
import com.youlai.boot.common.annotation.NoRepeat;
|
||||
import com.youlai.system.common.model.Option;
|
||||
import com.youlai.system.common.result.Result;
|
||||
import com.youlai.system.model.form.DeptForm;
|
||||
import com.youlai.system.model.query.DeptQuery;
|
||||
import com.youlai.system.model.vo.DeptVO;
|
||||
import com.youlai.system.plugin.syslog.annotation.LogAnnotation;
|
||||
import com.youlai.boot.module.system.model.form.DeptForm;
|
||||
import com.youlai.boot.module.system.model.query.DeptQuery;
|
||||
import com.youlai.boot.module.system.model.vo.DeptVO;
|
||||
import com.youlai.boot.common.annotation.LogAnnotation;
|
||||
import com.youlai.system.service.SysDeptService;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
@@ -53,7 +53,7 @@ public class SysDeptController {
|
||||
@Operation(summary = "新增部门")
|
||||
@PostMapping
|
||||
@PreAuthorize("@ss.hasPerm('sys:dept:add')")
|
||||
@PreventRepeatSubmit
|
||||
@NoRepeat
|
||||
public Result<?> saveDept(
|
||||
@Valid @RequestBody DeptForm formData
|
||||
) {
|
||||
@@ -1,15 +1,15 @@
|
||||
package com.youlai.system.controller;
|
||||
package com.youlai.boot.module.system.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.youlai.system.common.model.Option;
|
||||
import com.youlai.system.common.result.PageResult;
|
||||
import com.youlai.system.common.result.Result;
|
||||
import com.youlai.system.enums.LogModuleEnum;
|
||||
import com.youlai.system.model.query.DictPageQuery;
|
||||
import com.youlai.system.model.vo.DictPageVO;
|
||||
import com.youlai.system.plugin.norepeat.annotation.PreventRepeatSubmit;
|
||||
import com.youlai.system.model.form.DictForm;
|
||||
import com.youlai.system.plugin.syslog.annotation.LogAnnotation;
|
||||
import com.youlai.boot.module.system.model.query.DictPageQuery;
|
||||
import com.youlai.boot.module.system.model.vo.DictPageVO;
|
||||
import com.youlai.boot.common.annotation.NoRepeat;
|
||||
import com.youlai.boot.module.system.model.form.DictForm;
|
||||
import com.youlai.boot.common.annotation.LogAnnotation;
|
||||
import com.youlai.system.service.SysDictService;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
@@ -72,7 +72,7 @@ public class SysDictController {
|
||||
@Operation(summary = "新增字典")
|
||||
@PostMapping
|
||||
@PreAuthorize("@ss.hasPerm('sys:dict:add')")
|
||||
@PreventRepeatSubmit
|
||||
@NoRepeat
|
||||
public Result<?> saveDict(@RequestBody DictForm formData) {
|
||||
boolean result = dictService.saveDict(formData);
|
||||
return Result.judge(result);
|
||||
@@ -1,12 +1,12 @@
|
||||
package com.youlai.system.controller;
|
||||
package com.youlai.boot.module.system.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.youlai.system.common.result.PageResult;
|
||||
import com.youlai.system.common.result.Result;
|
||||
import com.youlai.system.model.query.LogPageQuery;
|
||||
import com.youlai.system.model.vo.LogPageVO;
|
||||
import com.youlai.system.model.vo.VisitStatsVO;
|
||||
import com.youlai.system.model.vo.VisitTrendVO;
|
||||
import com.youlai.boot.module.system.model.query.LogPageQuery;
|
||||
import com.youlai.boot.module.system.model.vo.LogPageVO;
|
||||
import com.youlai.boot.module.system.model.vo.VisitStatsVO;
|
||||
import com.youlai.boot.module.system.model.vo.VisitTrendVO;
|
||||
import com.youlai.system.service.SysLogService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
@@ -1,15 +1,15 @@
|
||||
package com.youlai.system.controller;
|
||||
package com.youlai.boot.module.system.controller;
|
||||
|
||||
import com.youlai.system.common.result.Result;
|
||||
import com.youlai.system.enums.LogModuleEnum;
|
||||
import com.youlai.system.plugin.norepeat.annotation.PreventRepeatSubmit;
|
||||
import com.youlai.system.model.form.MenuForm;
|
||||
import com.youlai.system.model.query.MenuQuery;
|
||||
import com.youlai.system.model.vo.MenuVO;
|
||||
import com.youlai.boot.common.annotation.NoRepeat;
|
||||
import com.youlai.boot.module.system.model.form.MenuForm;
|
||||
import com.youlai.boot.module.system.model.query.MenuQuery;
|
||||
import com.youlai.boot.module.system.model.vo.MenuVO;
|
||||
import com.youlai.system.common.model.Option;
|
||||
import com.youlai.system.model.vo.RouteVO;
|
||||
import com.youlai.system.plugin.syslog.annotation.LogAnnotation;
|
||||
import com.youlai.system.security.util.SecurityUtils;
|
||||
import com.youlai.boot.module.system.model.vo.RouteVO;
|
||||
import com.youlai.boot.common.annotation.LogAnnotation;
|
||||
import com.youlai.boot.framework.security.util.SecurityUtils;
|
||||
import com.youlai.system.service.SysMenuService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
@@ -75,7 +75,7 @@ public class SysMenuController {
|
||||
@Operation(summary = "新增菜单")
|
||||
@PostMapping
|
||||
@PreAuthorize("@ss.hasPerm('sys:menu:add')")
|
||||
@PreventRepeatSubmit
|
||||
@NoRepeat
|
||||
public Result<?> addMenu(@RequestBody MenuForm menuForm) {
|
||||
boolean result = menuService.saveMenu(menuForm);
|
||||
return Result.judge(result);
|
||||
@@ -1,15 +1,15 @@
|
||||
package com.youlai.system.controller;
|
||||
package com.youlai.boot.module.system.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.youlai.system.enums.LogModuleEnum;
|
||||
import com.youlai.system.plugin.norepeat.annotation.PreventRepeatSubmit;
|
||||
import com.youlai.boot.common.annotation.NoRepeat;
|
||||
import com.youlai.system.common.model.Option;
|
||||
import com.youlai.system.common.result.PageResult;
|
||||
import com.youlai.system.common.result.Result;
|
||||
import com.youlai.system.model.form.RoleForm;
|
||||
import com.youlai.system.model.query.RolePageQuery;
|
||||
import com.youlai.system.model.vo.RolePageVO;
|
||||
import com.youlai.system.plugin.syslog.annotation.LogAnnotation;
|
||||
import com.youlai.boot.module.system.model.form.RoleForm;
|
||||
import com.youlai.boot.module.system.model.query.RolePageQuery;
|
||||
import com.youlai.boot.module.system.model.vo.RolePageVO;
|
||||
import com.youlai.boot.common.annotation.LogAnnotation;
|
||||
import com.youlai.system.service.SysRoleService;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
@@ -57,7 +57,7 @@ public class SysRoleController {
|
||||
@Operation(summary = "新增角色")
|
||||
@PostMapping
|
||||
@PreAuthorize("@ss.hasPerm('sys:role:add')")
|
||||
@PreventRepeatSubmit
|
||||
@NoRepeat
|
||||
public Result<?> addRole(@Valid @RequestBody RoleForm roleForm) {
|
||||
boolean result = roleService.saveRole(roleForm);
|
||||
return Result.judge(result);
|
||||
@@ -1,26 +1,27 @@
|
||||
package com.youlai.system.controller;
|
||||
package com.youlai.boot.module.system.controller;
|
||||
|
||||
import com.alibaba.excel.EasyExcel;
|
||||
import com.alibaba.excel.ExcelWriter;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.youlai.boot.module.system.model.form.*;
|
||||
import com.youlai.boot.system.model.form.*;
|
||||
import com.youlai.system.common.result.PageResult;
|
||||
import com.youlai.system.common.result.Result;
|
||||
import com.youlai.system.enums.ContactType;
|
||||
import com.youlai.system.model.form.*;
|
||||
import com.youlai.system.model.vo.UserProfileVO;
|
||||
import com.youlai.system.security.util.SecurityUtils;
|
||||
import com.youlai.system.util.ExcelUtils;
|
||||
import com.youlai.boot.module.system.model.vo.UserProfileVO;
|
||||
import com.youlai.boot.framework.security.util.SecurityUtils;
|
||||
import com.youlai.boot.common.util.ExcelUtils;
|
||||
import com.youlai.system.enums.LogModuleEnum;
|
||||
import com.youlai.system.model.dto.UserImportDTO;
|
||||
import com.youlai.system.plugin.norepeat.annotation.PreventRepeatSubmit;
|
||||
import com.youlai.system.plugin.easyexcel.UserImportListener;
|
||||
import com.youlai.system.model.entity.SysUser;
|
||||
import com.youlai.system.model.query.UserPageQuery;
|
||||
import com.youlai.system.model.dto.UserExportDTO;
|
||||
import com.youlai.system.model.vo.UserInfoVO;
|
||||
import com.youlai.system.model.vo.UserPageVO;
|
||||
import com.youlai.system.plugin.syslog.annotation.LogAnnotation;
|
||||
import com.youlai.boot.module.system.model.dto.UserImportDTO;
|
||||
import com.youlai.boot.common.annotation.NoRepeat;
|
||||
import com.youlai.boot.module.system.listener.UserImportListener;
|
||||
import com.youlai.boot.module.system.model.entity.SysUser;
|
||||
import com.youlai.boot.module.system.model.query.UserPageQuery;
|
||||
import com.youlai.boot.module.system.model.dto.UserExportDTO;
|
||||
import com.youlai.boot.module.system.model.vo.UserInfoVO;
|
||||
import com.youlai.boot.module.system.model.vo.UserPageVO;
|
||||
import com.youlai.boot.common.annotation.LogAnnotation;
|
||||
import com.youlai.system.service.SysUserService;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
@@ -69,7 +70,7 @@ public class SysUserController {
|
||||
@Operation(summary = "新增用户")
|
||||
@PostMapping
|
||||
@PreAuthorize("@ss.hasPerm('sys:user:add')")
|
||||
@PreventRepeatSubmit
|
||||
@NoRepeat
|
||||
public Result<?> saveUser(
|
||||
@RequestBody @Valid UserForm userForm
|
||||
) {
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.youlai.system.controller;
|
||||
package com.youlai.boot.module.system.controller;
|
||||
|
||||
import com.youlai.system.model.dto.ChatMessage;
|
||||
import com.youlai.boot.module.system.model.dto.ChatMessage;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.messaging.handler.annotation.DestinationVariable;
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.youlai.system.converter;
|
||||
package com.youlai.boot.module.system.converter;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.youlai.system.model.entity.SysConfig;
|
||||
import com.youlai.system.model.form.ConfigForm;
|
||||
import com.youlai.system.model.vo.ConfigVO;
|
||||
import com.youlai.boot.module.system.model.entity.SysConfig;
|
||||
import com.youlai.boot.module.system.model.vo.ConfigVO;
|
||||
import com.youlai.boot.module.system.model.form.ConfigForm;
|
||||
import org.mapstruct.Mapper;
|
||||
|
||||
/**
|
||||
@@ -13,7 +13,7 @@ import org.mapstruct.Mapper;
|
||||
* @since 2024-7-29 11:42:49
|
||||
*/
|
||||
@Mapper(componentModel = "spring")
|
||||
public interface SysConfigConverter {
|
||||
public interface ConfigConverter {
|
||||
|
||||
Page<ConfigVO> toPageVo(Page<SysConfig> page);
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.youlai.system.converter;
|
||||
package com.youlai.boot.module.system.converter;
|
||||
|
||||
import com.youlai.system.model.entity.SysDept;
|
||||
import com.youlai.system.model.form.DeptForm;
|
||||
import com.youlai.system.model.vo.DeptVO;
|
||||
import com.youlai.boot.module.system.model.entity.SysDept;
|
||||
import com.youlai.boot.module.system.model.vo.DeptVO;
|
||||
import com.youlai.boot.module.system.model.form.DeptForm;
|
||||
import org.mapstruct.Mapper;
|
||||
|
||||
/**
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.youlai.system.converter;
|
||||
package com.youlai.boot.module.system.converter;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.youlai.system.model.entity.SysDict;
|
||||
import com.youlai.system.model.form.DictForm;
|
||||
import com.youlai.system.model.vo.DictPageVO;
|
||||
import com.youlai.boot.module.system.model.entity.SysDict;
|
||||
import com.youlai.boot.module.system.model.vo.DictPageVO;
|
||||
import com.youlai.boot.module.system.model.form.DictForm;
|
||||
import org.mapstruct.Mapper;
|
||||
|
||||
/**
|
||||
@@ -1,10 +1,10 @@
|
||||
package com.youlai.system.converter;
|
||||
package com.youlai.boot.module.system.converter;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.youlai.boot.module.system.model.entity.SysDictItem;
|
||||
import com.youlai.boot.module.system.model.vo.DictPageVO;
|
||||
import com.youlai.system.common.model.Option;
|
||||
import com.youlai.system.model.entity.SysDictItem;
|
||||
import com.youlai.system.model.form.DictForm;
|
||||
import com.youlai.system.model.vo.DictPageVO;
|
||||
import com.youlai.boot.module.system.model.form.DictForm;
|
||||
import org.mapstruct.Mapper;
|
||||
import org.mapstruct.Mapping;
|
||||
import org.mapstruct.Mappings;
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.youlai.system.converter;
|
||||
package com.youlai.boot.module.system.converter;
|
||||
|
||||
import com.youlai.system.model.entity.GenConfig;
|
||||
import com.youlai.system.model.entity.GenFieldConfig;
|
||||
import com.youlai.system.model.form.GenConfigForm;
|
||||
import com.youlai.boot.module.system.model.entity.GenConfig;
|
||||
import com.youlai.boot.module.system.model.entity.GenFieldConfig;
|
||||
import com.youlai.boot.module.system.model.form.GenConfigForm;
|
||||
import org.mapstruct.Mapper;
|
||||
import org.mapstruct.Mapping;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.youlai.system.converter;
|
||||
package com.youlai.boot.module.system.converter;
|
||||
|
||||
import com.youlai.system.model.entity.SysMenu;
|
||||
import com.youlai.system.model.form.MenuForm;
|
||||
import com.youlai.system.model.vo.MenuVO;
|
||||
import com.youlai.boot.module.system.model.entity.SysMenu;
|
||||
import com.youlai.boot.module.system.model.vo.MenuVO;
|
||||
import com.youlai.boot.module.system.model.form.MenuForm;
|
||||
import org.mapstruct.Mapper;
|
||||
import org.mapstruct.Mapping;
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
package com.youlai.system.converter;
|
||||
package com.youlai.boot.module.system.converter;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.youlai.boot.module.system.model.entity.SysRole;
|
||||
import com.youlai.boot.module.system.model.vo.RolePageVO;
|
||||
import com.youlai.system.common.model.Option;
|
||||
import com.youlai.system.model.entity.SysRole;
|
||||
import com.youlai.system.model.form.RoleForm;
|
||||
import com.youlai.system.model.vo.RolePageVO;
|
||||
import com.youlai.boot.module.system.model.form.RoleForm;
|
||||
import org.mapstruct.Mapper;
|
||||
import org.mapstruct.Mapping;
|
||||
import org.mapstruct.Mappings;
|
||||
@@ -1,14 +1,14 @@
|
||||
package com.youlai.system.converter;
|
||||
package com.youlai.boot.module.system.converter;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.youlai.system.model.bo.UserBO;
|
||||
import com.youlai.system.model.entity.SysUser;
|
||||
import com.youlai.system.model.form.UserForm;
|
||||
import com.youlai.system.model.dto.UserImportDTO;
|
||||
import com.youlai.system.model.form.UserProfileForm;
|
||||
import com.youlai.system.model.vo.UserInfoVO;
|
||||
import com.youlai.system.model.vo.UserPageVO;
|
||||
import com.youlai.system.model.vo.UserProfileVO;
|
||||
import com.youlai.boot.module.system.model.entity.SysUser;
|
||||
import com.youlai.boot.module.system.model.vo.UserInfoVO;
|
||||
import com.youlai.boot.module.system.model.vo.UserPageVO;
|
||||
import com.youlai.boot.module.system.model.vo.UserProfileVO;
|
||||
import com.youlai.boot.module.system.model.bo.UserBO;
|
||||
import com.youlai.boot.module.system.model.form.UserForm;
|
||||
import com.youlai.boot.module.system.model.dto.UserImportDTO;
|
||||
import com.youlai.boot.module.system.model.form.UserProfileForm;
|
||||
import org.mapstruct.InheritInverseConfiguration;
|
||||
import org.mapstruct.Mapper;
|
||||
import org.mapstruct.Mapping;
|
||||
@@ -24,7 +24,7 @@ import org.mapstruct.Mappings;
|
||||
public interface UserConverter {
|
||||
|
||||
@Mappings({
|
||||
@Mapping(target = "genderLabel", expression = "java(com.youlai.system.common.base.IBaseEnum.getLabelByValue(bo.getGender(), com.youlai.system.enums.GenderEnum.class))")
|
||||
@Mapping(target = "genderLabel", expression = "java(com.youlai.boot.common.base.IBaseEnum.getLabelByValue(bo.getGender(), com.youlai.boot.common.enums.GenderEnum.class))")
|
||||
})
|
||||
UserPageVO toPageVo(UserBO bo);
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user