13693261870
7 天以前 3701213986cfe65042d459a832207ae0b76f0989
精简代码~
已重命名9个文件
已添加1个文件
已删除66个文件
已修改6个文件
7671 ■■■■■ 文件已修改
se-common/src/main/java/com/terra/common/annotation/Excel.java 187 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/annotation/Excels.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/configure/FastJson2JsonRedisSerializer.java 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/configure/RedisConfig.java 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/constant/CacheConstants.java 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/constant/GenConstants.java 117 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/constant/HttpStatus.java 94 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/constant/ScheduleConstants.java 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/constant/SecurityConstants.java 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/constant/ServiceNameConstants.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/constant/TokenConstants.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/constant/UserConstants.java 88 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/context/SecurityContextHolder.java 98 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/enums/UserStatus.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/exception/CaptchaException.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/exception/CheckedException.java 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/exception/DemoModeException.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/exception/GlobalException.java 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/exception/InnerAuthException.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/exception/PreAuthorizeException.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/exception/ServiceException.java 74 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/exception/UtilException.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/exception/auth/NotLoginException.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/exception/auth/NotPermissionException.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/exception/auth/NotRoleException.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/exception/base/BaseException.java 79 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/exception/file/FileException.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/exception/file/FileNameLengthLimitExceededException.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/exception/file/FileSizeLimitExceededException.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/exception/file/FileUploadException.java 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/exception/file/InvalidExtensionException.java 80 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/exception/job/TaskException.java 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/exception/user/CaptchaExpireException.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/exception/user/UserException.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/exception/user/UserPasswordNotMatchException.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/service/RedisService.java 265 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/utils/DateUtils.java 191 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/utils/ExceptionUtil.java 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/utils/JwtUtils.java 123 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/utils/PageUtils.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/utils/SpringUtils.java 114 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/utils/bean/BeanUtils.java 110 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/utils/bean/BeanValidators.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/utils/file/FileTypeUtils.java 95 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/utils/file/FileUtils.java 253 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/utils/file/ImageUtils.java 84 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/utils/file/MimeTypeUtils.java 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/utils/ip/IpUtils.java 382 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/utils/poi/ExcelHandlerAdapter.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/utils/poi/ExcelUtil.java 1626 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/utils/reflect/ReflectUtils.java 410 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/utils/sign/Base64.java 291 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/utils/sql/SqlUtil.java 70 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/utils/uuid/IdUtils.java 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/utils/uuid/Seq.java 86 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/utils/uuid/UUID.java 484 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/web/controller/BaseController.java 160 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/web/domain/AjaxResult.java 216 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/web/domain/BaseEntity.java 118 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/web/domain/TreeEntity.java 79 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/web/page/PageDomain.java 101 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/web/page/TableDataInfo.java 85 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/web/page/TableSupport.java 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/xss/Xss.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/xss/XssValidator.java 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-gateway/pom.xml 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-gateway/src/main/java/com/terra/gateway/config/SpringDocConfig.java 94 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-gateway/src/main/java/com/terra/gateway/constant/Constants.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-gateway/src/main/java/com/terra/gateway/domain/R.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-gateway/src/main/java/com/terra/gateway/filter/AuthFilter.java 128 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-gateway/src/main/java/com/terra/gateway/filter/BlackListUrlFilter.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-gateway/src/main/java/com/terra/gateway/filter/XssFilter.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-gateway/src/main/java/com/terra/gateway/handler/GatewayExceptionHandler.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-gateway/src/main/java/com/terra/gateway/handler/SentinelFallbackHandler.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-gateway/src/main/java/com/terra/gateway/text/CharsetKit.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-gateway/src/main/java/com/terra/gateway/text/Convert.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-gateway/src/main/java/com/terra/gateway/text/StrFormatter.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-gateway/src/main/java/com/terra/gateway/utils/ServletUtils.java 37 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-gateway/src/main/java/com/terra/gateway/utils/StringUtils.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-gateway/src/main/java/com/terra/gateway/utils/html/EscapeUtil.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-gateway/src/main/java/com/terra/gateway/utils/html/HTMLFilter.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
se-common/src/main/java/com/terra/common/annotation/Excel.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/annotation/Excels.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/configure/FastJson2JsonRedisSerializer.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/configure/RedisConfig.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/constant/CacheConstants.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/constant/GenConstants.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/constant/HttpStatus.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/constant/ScheduleConstants.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/constant/SecurityConstants.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/constant/ServiceNameConstants.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/constant/TokenConstants.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/constant/UserConstants.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/context/SecurityContextHolder.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/enums/UserStatus.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/exception/CaptchaException.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/exception/CheckedException.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/exception/DemoModeException.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/exception/GlobalException.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/exception/InnerAuthException.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/exception/PreAuthorizeException.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/exception/ServiceException.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/exception/UtilException.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/exception/auth/NotLoginException.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/exception/auth/NotPermissionException.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/exception/auth/NotRoleException.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/exception/base/BaseException.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/exception/file/FileException.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/exception/file/FileNameLengthLimitExceededException.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/exception/file/FileSizeLimitExceededException.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/exception/file/FileUploadException.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/exception/file/InvalidExtensionException.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/exception/job/TaskException.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/exception/user/CaptchaExpireException.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/exception/user/UserException.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/exception/user/UserPasswordNotMatchException.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/service/RedisService.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/utils/DateUtils.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/utils/ExceptionUtil.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/utils/JwtUtils.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/utils/PageUtils.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/utils/SpringUtils.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/utils/bean/BeanUtils.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/utils/bean/BeanValidators.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/utils/file/FileTypeUtils.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/utils/file/FileUtils.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/utils/file/ImageUtils.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/utils/file/MimeTypeUtils.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/utils/ip/IpUtils.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/utils/poi/ExcelHandlerAdapter.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/utils/poi/ExcelUtil.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/utils/reflect/ReflectUtils.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/utils/sign/Base64.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/utils/sql/SqlUtil.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/utils/uuid/IdUtils.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/utils/uuid/Seq.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/utils/uuid/UUID.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/web/controller/BaseController.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/web/domain/AjaxResult.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/web/domain/BaseEntity.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/web/domain/TreeEntity.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/web/page/PageDomain.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/web/page/TableDataInfo.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/web/page/TableSupport.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/xss/Xss.java
ÎļþÒÑɾ³ý
se-common/src/main/java/com/terra/common/xss/XssValidator.java
ÎļþÒÑɾ³ý
se-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,3 +0,0 @@
com.terra.common.utils.SpringUtils
com.terra.common.service.RedisService
com.terra.common.configure.RedisConfig
se-gateway/pom.xml
@@ -58,12 +58,23 @@
            <artifactId>spring-cloud-loadbalancer</artifactId>
        </dependency>
        <!-- se-common -->
        <!-- Springdoc -->
        <dependency>
            <groupId>com.terra</groupId>
            <artifactId>se-common</artifactId>
            <version>1.0.2</version>
            <scope>compile</scope>
            <groupId>org.springdoc</groupId>
            <artifactId>springdoc-openapi-webflux-ui</artifactId>
            <version>${springdoc.version}</version>
        </dependency>
        <!-- Alibaba Fastjson -->
        <dependency>
            <groupId>com.alibaba.fastjson2</groupId>
            <artifactId>fastjson2</artifactId>
        </dependency>
        <!-- Java Servlet -->
        <dependency>
            <groupId>javax.servlet</groupId>
            <artifactId>javax.servlet-api</artifactId>
        </dependency>
    </dependencies>
se-gateway/src/main/java/com/terra/gateway/config/SpringDocConfig.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,94 @@
package com.terra.gateway.config;
import com.alibaba.nacos.client.naming.event.InstancesChangeEvent;
import com.alibaba.nacos.common.notify.Event;
import com.alibaba.nacos.common.notify.NotifyCenter;
import com.alibaba.nacos.common.notify.listener.Subscriber;
import com.terra.gateway.utils.StringUtils;
import org.springdoc.core.AbstractSwaggerUiConfigProperties;
import org.springdoc.core.SwaggerUiConfigProperties;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.context.annotation.Configuration;
import java.util.Set;
import java.util.stream.Collectors;
/**
 * SpringDoc配置类
 *
 * @author ruoyi
 */
@Configuration(proxyBeanMethods = false)
@ConditionalOnProperty(value = "springdoc.api-docs.enabled", matchIfMissing = true)
public class SpringDocConfig implements InitializingBean
{
    @Autowired
    private SwaggerUiConfigProperties swaggerUiConfigProperties;
    @Autowired
    private DiscoveryClient discoveryClient;
    /**
     * åœ¨åˆå§‹åŒ–后调用的方法
     */
    @Override
    public void afterPropertiesSet()
    {
        NotifyCenter.registerSubscriber(new SwaggerDocRegister(swaggerUiConfigProperties, discoveryClient));
    }
}
/**
 * Swagger文档注册器
 */
class SwaggerDocRegister extends Subscriber<InstancesChangeEvent>
{
    @Autowired
    private SwaggerUiConfigProperties swaggerUiConfigProperties;
    @Autowired
    private DiscoveryClient discoveryClient;
    private final static String[] EXCLUDE_ROUTES = new String[] { "se-gateway" };
    public SwaggerDocRegister(SwaggerUiConfigProperties swaggerUiConfigProperties, DiscoveryClient discoveryClient)
    {
        this.swaggerUiConfigProperties = swaggerUiConfigProperties;
        this.discoveryClient = discoveryClient;
    }
    /**
     * äº‹ä»¶å›žè°ƒæ–¹æ³•,处理InstancesChangeEvent事件
     * @param event äº‹ä»¶å¯¹è±¡
     */
    @Override
    public void onEvent(InstancesChangeEvent event)
    {
        Set<AbstractSwaggerUiConfigProperties.SwaggerUrl> swaggerUrlSet = discoveryClient.getServices()
            .stream()
            .flatMap(serviceId -> discoveryClient.getInstances(serviceId).stream())
            .filter(instance -> !StringUtils.equalsAnyIgnoreCase(instance.getServiceId(), EXCLUDE_ROUTES))
            .map(instance -> {
                AbstractSwaggerUiConfigProperties.SwaggerUrl swaggerUrl = new AbstractSwaggerUiConfigProperties.SwaggerUrl();
                swaggerUrl.setName(instance.getServiceId());
                swaggerUrl.setUrl(String.format("/%s/v3/api-docs", instance.getServiceId()));
                return swaggerUrl;
            })
            .collect(Collectors.toSet());
        swaggerUiConfigProperties.setUrls(swaggerUrlSet);
    }
    /**
     * è®¢é˜…类型方法,返回订阅的事件类型
     * @return è®¢é˜…的事件类型
     */
    @Override
    public Class<? extends Event> subscribeType()
    {
        return InstancesChangeEvent.class;
    }
}
se-gateway/src/main/java/com/terra/gateway/constant/Constants.java
ÎļþÃû´Ó se-common/src/main/java/com/terra/common/constant/Constants.java ÐÞ¸Ä
@@ -1,9 +1,9 @@
package com.terra.common.constant;
package com.terra.gateway.constant;
/**
 * é€šç”¨å¸¸é‡ä¿¡æ¯
 * 
 * @author admin
 * @author ruoyi
 */
public class Constants
{
@@ -120,16 +120,16 @@
    /**
     * è‡ªåŠ¨è¯†åˆ«json对象白名单配置(仅允许解析的包名,范围越小越安全)
     */
    public static final String[] JSON_WHITELIST_STR = { "org.springframework", "com.terra" };
    public static final String[] JSON_WHITELIST_STR = { "org.springframework", "com.ruoyi" };
    /**
     * å®šæ—¶ä»»åŠ¡ç™½åå•é…ç½®ï¼ˆä»…å…è®¸è®¿é—®çš„åŒ…åï¼Œå¦‚å…¶ä»–éœ€è¦å¯ä»¥è‡ªè¡Œæ·»åŠ ï¼‰
     */
    public static final String[] JOB_WHITELIST_STR = { "com.terra.job.task" };
    public static final String[] JOB_WHITELIST_STR = { "com.ruoyi.job.task" };
    /**
     * å®šæ—¶ä»»åŠ¡è¿è§„çš„å­—ç¬¦
     */
    public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
            "org.springframework", "org.apache", "com.terra.common.utils.file" };
            "org.springframework", "org.apache", "com.terra" };
}
se-gateway/src/main/java/com/terra/gateway/domain/R.java
ÎļþÃû´Ó se-common/src/main/java/com/terra/common/domain/R.java ÐÞ¸Ä
@@ -1,12 +1,13 @@
package com.terra.common.domain;
package com.terra.gateway.domain;
import com.terra.gateway.constant.Constants;
import java.io.Serializable;
import com.terra.common.constant.Constants;
/**
 * å“åº”信息主体
 *
 * @author admin
 * @author ruoyi
 */
public class R<T> implements Serializable
{
se-gateway/src/main/java/com/terra/gateway/filter/AuthFilter.java
ÎļþÒÑɾ³ý
se-gateway/src/main/java/com/terra/gateway/filter/BlackListUrlFilter.java
@@ -3,6 +3,8 @@
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Pattern;
import com.terra.gateway.utils.ServletUtils;
import org.springframework.cloud.gateway.filter.GatewayFilter;
import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory;
import org.springframework.stereotype.Component;
@@ -23,7 +25,7 @@
            String url = exchange.getRequest().getURI().getPath();
            if (config.matchBlacklist(url))
            {
                //return ServletUtils.webFluxResponseWriter(exchange.getResponse(), "请求地址不允许访问");
                return ServletUtils.webFluxResponseWriter(exchange.getResponse(), "请求地址不允许访问");
            }
            return chain.filter(exchange);
se-gateway/src/main/java/com/terra/gateway/filter/XssFilter.java
@@ -2,6 +2,9 @@
import java.nio.charset.StandardCharsets;
import javax.annotation.Resource;
import com.terra.gateway.utils.StringUtils;
import com.terra.gateway.utils.html.EscapeUtil;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.cloud.gateway.filter.GatewayFilterChain;
import org.springframework.cloud.gateway.filter.GlobalFilter;
@@ -58,10 +61,10 @@
        }
        // excludeUrls ä¸è¿‡æ»¤
        String url = request.getURI().getPath();
//        if (StringUtils.matches(url, xss.getExcludeUrls()))
//        {
//            return chain.filter(exchange);
//        }
        if (StringUtils.matches(url, xss.getExcludeUrls()))
        {
            return chain.filter(exchange);
        }
        ServerHttpRequestDecorator httpRequestDecorator = requestDecorator(exchange);
        return chain.filter(exchange.mutate().request(httpRequestDecorator).build());
@@ -83,7 +86,7 @@
                    DataBufferUtils.release(join);
                    String bodyStr = new String(content, StandardCharsets.UTF_8);
                    // é˜²xss攻击过滤
                    //bodyStr = EscapeUtil.clean(bodyStr);
                    bodyStr = EscapeUtil.clean(bodyStr);
                    // è½¬æˆå­—节
                    byte[] bytes = bodyStr.getBytes(StandardCharsets.UTF_8);
                    NettyDataBufferFactory nettyDataBufferFactory = new NettyDataBufferFactory(ByteBufAllocator.DEFAULT);
@@ -110,14 +113,13 @@
    /**
     * æ˜¯å¦æ˜¯Json请求
     *
     *
     * @param exchange HTTP请求
     */
    public boolean isJsonRequest(ServerWebExchange exchange)
    {
        String header = exchange.getRequest().getHeaders().getFirst(HttpHeaders.CONTENT_TYPE);
        //return StringUtils.startsWithIgnoreCase(header, MediaType.APPLICATION_JSON_VALUE);
        return true;
        return StringUtils.startsWithIgnoreCase(header, MediaType.APPLICATION_JSON_VALUE);
    }
    @Override
se-gateway/src/main/java/com/terra/gateway/handler/GatewayExceptionHandler.java
@@ -1,5 +1,6 @@
package com.terra.gateway.handler;
import com.terra.gateway.utils.ServletUtils;
import org.springframework.cloud.gateway.support.NotFoundException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -50,7 +51,6 @@
        log.error("[网关异常处理]请求路径:{},异常信息:{}", exchange.getRequest().getPath(), ex.getMessage());
        //return ServletUtils.webFluxResponseWriter(response, msg);
        return Mono.error(ex);
        return ServletUtils.webFluxResponseWriter(response, msg);
    }
}
se-gateway/src/main/java/com/terra/gateway/handler/SentinelFallbackHandler.java
@@ -2,7 +2,8 @@
import com.alibaba.csp.sentinel.adapter.gateway.sc.callback.GatewayCallbackManager;
import com.alibaba.csp.sentinel.slots.block.BlockException;
import com.terra.common.utils.ServletUtils;
import com.terra.gateway.utils.ServletUtils;
import org.springframework.web.reactive.function.server.ServerResponse;
import org.springframework.web.server.ServerWebExchange;
import org.springframework.web.server.WebExceptionHandler;
se-gateway/src/main/java/com/terra/gateway/text/CharsetKit.java
ÎļþÃû´Ó se-common/src/main/java/com/terra/common/text/CharsetKit.java ÐÞ¸Ä
@@ -1,13 +1,14 @@
package com.terra.common.text;
package com.terra.gateway.text;
import com.terra.gateway.utils.StringUtils;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import com.terra.common.utils.StringUtils;
/**
 * å­—符集工具类
 * 
 * @author admin
 * @author ruoyi
 */
public class CharsetKit
{
se-gateway/src/main/java/com/terra/gateway/text/Convert.java
ÎļþÃû´Ó se-common/src/main/java/com/terra/common/text/Convert.java ÐÞ¸Ä
@@ -1,4 +1,6 @@
package com.terra.common.text;
package com.terra.gateway.text;
import com.terra.gateway.utils.StringUtils;
import java.math.BigDecimal;
import java.math.BigInteger;
@@ -7,12 +9,11 @@
import java.nio.charset.Charset;
import java.text.NumberFormat;
import java.util.Set;
import com.terra.common.utils.StringUtils;
/**
 * ç±»åž‹è½¬æ¢å™¨
 * 
 * @author admin
 * @author ruoyi
 */
public class Convert
{
se-gateway/src/main/java/com/terra/gateway/text/StrFormatter.java
ÎļþÃû´Ó se-common/src/main/java/com/terra/common/text/StrFormatter.java ÐÞ¸Ä
@@ -1,11 +1,12 @@
package com.terra.common.text;
package com.terra.gateway.text;
import com.terra.common.utils.StringUtils;
import com.terra.gateway.utils.StringUtils;
/**
 * å­—符串格式化
 * 
 * @author admin
 * @author ruoyi
 */
public class StrFormatter
{
se-gateway/src/main/java/com/terra/gateway/utils/ServletUtils.java
ÎļþÃû´Ó se-common/src/main/java/com/terra/common/utils/ServletUtils.java ÐÞ¸Ä
@@ -1,17 +1,9 @@
package com.terra.common.utils;
package com.terra.gateway.utils;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import com.alibaba.fastjson2.JSON;
import com.terra.gateway.constant.Constants;
import com.terra.gateway.domain.R;
import com.terra.gateway.text.Convert;
import org.springframework.core.io.buffer.DataBuffer;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
@@ -21,16 +13,25 @@
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import com.alibaba.fastjson2.JSON;
import com.terra.common.constant.Constants;
import com.terra.common.domain.R;
import com.terra.common.text.Convert;
import reactor.core.publisher.Mono;
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
/**
 * å®¢æˆ·ç«¯å·¥å…·ç±»
 * 
 * @author admin
 * @author ruoyi
 */
public class ServletUtils
{
se-gateway/src/main/java/com/terra/gateway/utils/StringUtils.java
ÎļþÃû´Ó se-common/src/main/java/com/terra/common/utils/StringUtils.java ÐÞ¸Ä
@@ -1,16 +1,17 @@
package com.terra.common.utils;
package com.terra.gateway.utils;
import com.terra.gateway.constant.Constants;
import com.terra.gateway.text.StrFormatter;
import org.springframework.util.AntPathMatcher;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import org.springframework.util.AntPathMatcher;
import com.terra.common.constant.Constants;
import com.terra.common.text.StrFormatter;
/**
 * å­—符串工具类
 * 
 * @author admin
 * @author ruoyi
 */
public class StringUtils extends org.apache.commons.lang3.StringUtils
{
se-gateway/src/main/java/com/terra/gateway/utils/html/EscapeUtil.java
ÎļþÃû´Ó se-common/src/main/java/com/terra/common/utils/html/EscapeUtil.java ÐÞ¸Ä
@@ -1,11 +1,12 @@
package com.terra.common.utils.html;
package com.terra.gateway.utils.html;
import com.terra.common.utils.StringUtils;
import com.terra.gateway.utils.StringUtils;
/**
 * è½¬ä¹‰å’Œåè½¬ä¹‰å·¥å…·ç±»
 * 
 * @author admin
 * @author ruoyi
 */
public class EscapeUtil
{
se-gateway/src/main/java/com/terra/gateway/utils/html/HTMLFilter.java
ÎļþÃû´Ó se-common/src/main/java/com/terra/common/utils/html/HTMLFilter.java ÐÞ¸Ä
@@ -1,10 +1,6 @@
package com.terra.common.utils.html;
package com.terra.gateway.utils.html;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.regex.Matcher;
@@ -13,7 +9,7 @@
/**
 * HTML过滤器,用于去除XSS漏洞隐患。
 *
 * @author admin
 * @author ruoyi
 */
public final class HTMLFilter
{