From 5e03601fc0a02b62055418d46647892492e4e9cc Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期五, 20 六月 2025 15:00:38 +0800 Subject: [PATCH] 修改名称空间和作者 --- se-common/src/main/java/com/terra/common/exception/file/FileSizeLimitExceededException.java | 2 se-common/src/main/java/com/terra/common/enums/UserStatus.java | 2 se-common/src/main/java/com/terra/common/service/RedisService.java | 2 se-common/src/main/java/com/terra/common/web/domain/BaseEntity.java | 2 se-common/src/main/java/com/terra/common/web/page/TableDataInfo.java | 2 se-common/src/main/java/com/terra/common/exception/CheckedException.java | 2 se-common/src/main/java/com/terra/common/exception/user/UserPasswordNotMatchException.java | 2 se-common/src/main/java/com/terra/common/web/controller/BaseController.java | 2 se-common/src/main/java/com/terra/common/constant/HttpStatus.java | 2 se-common/src/main/java/com/terra/common/exception/DemoModeException.java | 2 se-common/src/main/java/com/terra/common/exception/file/FileNameLengthLimitExceededException.java | 2 se-gateway/src/main/java/com/terra/gateway/handler/SentinelFallbackHandler.java | 4 se-common/src/main/java/com/terra/common/exception/auth/NotRoleException.java | 2 se-common/src/main/java/com/terra/common/utils/sql/SqlUtil.java | 2 se-common/src/main/java/com/terra/common/utils/uuid/UUID.java | 2 se-common/src/main/java/com/terra/common/web/domain/AjaxResult.java | 2 se-common/src/main/java/com/terra/common/utils/poi/ExcelUtil.java | 2 se-common/src/main/java/com/terra/common/exception/file/FileUploadException.java | 2 se-common/src/main/java/com/terra/common/exception/UtilException.java | 2 se-common/src/main/java/com/terra/common/utils/file/MimeTypeUtils.java | 2 se-common/src/main/java/com/terra/common/utils/poi/ExcelHandlerAdapter.java | 2 se-common/src/main/java/com/terra/common/web/page/TableSupport.java | 2 se-common/src/main/java/com/terra/common/utils/JwtUtils.java | 2 se-common/src/main/java/com/terra/common/constant/TokenConstants.java | 2 se-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 2 se-system/src/main/resources/banner.txt | 16 ++-- se-common/src/main/java/com/terra/common/annotation/Excel.java | 2 se-common/src/main/java/com/terra/common/exception/InnerAuthException.java | 2 se-common/src/main/java/com/terra/common/utils/bean/BeanUtils.java | 2 se-gateway/pom.xml | 8 ++ se-common/src/main/java/com/terra/common/utils/uuid/IdUtils.java | 2 se-common/src/main/java/com/terra/common/constant/ScheduleConstants.java | 2 se-common/src/main/java/com/terra/common/exception/file/FileException.java | 2 se-common/src/main/java/com/terra/common/utils/bean/BeanValidators.java | 2 se-common/src/main/java/com/terra/common/text/StrFormatter.java | 2 se-common/src/main/java/com/terra/common/xss/Xss.java | 2 se-common/src/main/java/com/terra/common/xss/XssValidator.java | 2 se-common/src/main/java/com/terra/common/utils/file/ImageUtils.java | 2 se-common/src/main/java/com/terra/common/constant/UserConstants.java | 2 se-common/src/main/java/com/terra/common/exception/GlobalException.java | 2 se-common/src/main/java/com/terra/common/constant/ServiceNameConstants.java | 8 +- se-common/src/main/java/com/terra/common/text/CharsetKit.java | 2 se-common/src/main/java/com/terra/common/exception/file/InvalidExtensionException.java | 2 se-common/src/main/java/com/terra/common/configure/properties/SpringDocProperties.java | 2 se-common/src/main/java/com/terra/common/constant/SecurityConstants.java | 2 se-common/src/main/java/com/terra/common/exception/PreAuthorizeException.java | 2 se-common/src/main/java/com/terra/common/utils/uuid/Seq.java | 2 se-common/src/main/java/com/terra/common/exception/auth/NotPermissionException.java | 2 se-common/src/main/java/com/terra/common/utils/SpringUtils.java | 2 se-common/src/main/java/com/terra/common/exception/user/UserException.java | 2 se-common/src/main/java/com/terra/common/utils/reflect/ReflectUtils.java | 2 se-common/src/main/java/com/terra/common/utils/sign/Base64.java | 2 se-gateway/src/main/java/com/terra/gateway/config/SpringDocConfig.java | 30 +++--- se-common/src/main/java/com/terra/common/context/SecurityContextHolder.java | 2 se-common/src/main/java/com/terra/common/exception/CaptchaException.java | 2 se-common/src/main/java/com/terra/common/exception/user/CaptchaExpireException.java | 2 se-common/src/main/java/com/terra/common/utils/ServletUtils.java | 2 se-common/src/main/java/com/terra/common/utils/ip/IpUtils.java | 2 se-common/src/main/java/com/terra/common/utils/ExceptionUtil.java | 2 se-common/src/main/java/com/terra/common/utils/PageUtils.java | 2 se-common/src/main/java/com/terra/common/exception/auth/NotLoginException.java | 2 se-common/src/main/java/com/terra/common/constant/Constants.java | 6 se-common/src/main/java/com/terra/common/utils/StringUtils.java | 2 se-common/src/main/java/com/terra/common/configure/SpringDocAutoConfiguration.java | 2 se-common/src/main/java/com/terra/common/utils/html/HTMLFilter.java | 2 se-common/src/main/java/com/terra/common/web/page/PageDomain.java | 2 se-common/src/main/java/com/terra/common/utils/file/FileUtils.java | 2 se-common/src/main/java/com/terra/common/utils/DateUtils.java | 2 se-common/src/main/java/com/terra/common/web/domain/TreeEntity.java | 2 se-common/src/main/java/com/terra/common/utils/file/FileTypeUtils.java | 6 se-common/src/main/java/com/terra/common/constant/GenConstants.java | 2 se-common/src/main/java/com/terra/common/exception/job/TaskException.java | 2 se-common/src/main/java/com/terra/common/annotation/Excels.java | 2 se-common/src/main/java/com/terra/common/utils/html/EscapeUtil.java | 2 se-common/src/main/java/com/terra/common/domain/R.java | 2 se-common/src/main/java/com/terra/common/text/Convert.java | 2 se-common/src/main/java/com/terra/common/exception/base/BaseException.java | 2 se-common/src/main/java/com/terra/common/configure/FastJson2JsonRedisSerializer.java | 2 se-common/src/main/java/com/terra/common/exception/ServiceException.java | 2 se-common/src/main/java/com/terra/common/configure/RedisConfig.java | 2 se-common/src/main/java/com/terra/common/constant/CacheConstants.java | 2 81 files changed, 117 insertions(+), 109 deletions(-) diff --git a/se-common/src/main/java/com/terra/common/annotation/Excel.java b/se-common/src/main/java/com/terra/common/annotation/Excel.java index 53885d6..2528d81 100644 --- a/se-common/src/main/java/com/terra/common/annotation/Excel.java +++ b/se-common/src/main/java/com/terra/common/annotation/Excel.java @@ -12,7 +12,7 @@ /** * 鑷畾涔夊鍑篍xcel鏁版嵁娉ㄨВ * - * @author ruoyi + * @author admin */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) diff --git a/se-common/src/main/java/com/terra/common/annotation/Excels.java b/se-common/src/main/java/com/terra/common/annotation/Excels.java index ea0cb6a..434143d 100644 --- a/se-common/src/main/java/com/terra/common/annotation/Excels.java +++ b/se-common/src/main/java/com/terra/common/annotation/Excels.java @@ -8,7 +8,7 @@ /** * Excel娉ㄨВ闆� * - * @author ruoyi + * @author admin */ @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) diff --git a/se-common/src/main/java/com/terra/common/configure/FastJson2JsonRedisSerializer.java b/se-common/src/main/java/com/terra/common/configure/FastJson2JsonRedisSerializer.java index ea766ee..4acc655 100644 --- a/se-common/src/main/java/com/terra/common/configure/FastJson2JsonRedisSerializer.java +++ b/se-common/src/main/java/com/terra/common/configure/FastJson2JsonRedisSerializer.java @@ -13,7 +13,7 @@ /** * Redis浣跨敤FastJson搴忓垪鍖� * - * @author ruoyi + * @author admin */ public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T> { diff --git a/se-common/src/main/java/com/terra/common/configure/RedisConfig.java b/se-common/src/main/java/com/terra/common/configure/RedisConfig.java index b548dd3..a053746 100644 --- a/se-common/src/main/java/com/terra/common/configure/RedisConfig.java +++ b/se-common/src/main/java/com/terra/common/configure/RedisConfig.java @@ -13,7 +13,7 @@ /** * redis閰嶇疆 * - * @author ruoyi + * @author admin */ @Configuration @EnableCaching diff --git a/se-common/src/main/java/com/terra/common/configure/SpringDocAutoConfiguration.java b/se-common/src/main/java/com/terra/common/configure/SpringDocAutoConfiguration.java index 55eb8d7..dbfbb68 100644 --- a/se-common/src/main/java/com/terra/common/configure/SpringDocAutoConfiguration.java +++ b/se-common/src/main/java/com/terra/common/configure/SpringDocAutoConfiguration.java @@ -18,7 +18,7 @@ /** * Swagger 鏂囨。閰嶇疆 * - * @author ruoyi + * @author admin */ @EnableConfigurationProperties(SpringDocProperties.class) @ConditionalOnProperty(name = "springdoc.api-docs.enabled", havingValue = "true", matchIfMissing = true) diff --git a/se-common/src/main/java/com/terra/common/configure/properties/SpringDocProperties.java b/se-common/src/main/java/com/terra/common/configure/properties/SpringDocProperties.java index a14dd88..5519d46 100644 --- a/se-common/src/main/java/com/terra/common/configure/properties/SpringDocProperties.java +++ b/se-common/src/main/java/com/terra/common/configure/properties/SpringDocProperties.java @@ -8,7 +8,7 @@ /** * Swagger 閰嶇疆灞炴�� * - * @author ruoyi + * @author admin */ @ConfigurationProperties(prefix = "springdoc") public class SpringDocProperties diff --git a/se-common/src/main/java/com/terra/common/constant/CacheConstants.java b/se-common/src/main/java/com/terra/common/constant/CacheConstants.java index 57067c7..4b6eead 100644 --- a/se-common/src/main/java/com/terra/common/constant/CacheConstants.java +++ b/se-common/src/main/java/com/terra/common/constant/CacheConstants.java @@ -3,7 +3,7 @@ /** * 缂撳瓨甯搁噺淇℃伅 * - * @author ruoyi + * @author admin */ public class CacheConstants { diff --git a/se-common/src/main/java/com/terra/common/constant/Constants.java b/se-common/src/main/java/com/terra/common/constant/Constants.java index 56c1d26..03e018b 100644 --- a/se-common/src/main/java/com/terra/common/constant/Constants.java +++ b/se-common/src/main/java/com/terra/common/constant/Constants.java @@ -3,7 +3,7 @@ /** * 閫氱敤甯搁噺淇℃伅 * - * @author ruoyi + * @author admin */ public class Constants { @@ -120,12 +120,12 @@ /** * 鑷姩璇嗗埆json瀵硅薄鐧藉悕鍗曢厤缃紙浠呭厑璁歌В鏋愮殑鍖呭悕锛岃寖鍥磋秺灏忚秺瀹夊叏锛� */ - public static final String[] JSON_WHITELIST_STR = { "org.springframework", "com.ruoyi" }; + public static final String[] JSON_WHITELIST_STR = { "org.springframework", "com.terra" }; /** * 瀹氭椂浠诲姟鐧藉悕鍗曢厤缃紙浠呭厑璁歌闂殑鍖呭悕锛屽鍏朵粬闇�瑕佸彲浠ヨ嚜琛屾坊鍔狅級 */ - public static final String[] JOB_WHITELIST_STR = { "com.ruoyi.job.task" }; + public static final String[] JOB_WHITELIST_STR = { "com.terra.job.task" }; /** * 瀹氭椂浠诲姟杩濊鐨勫瓧绗� diff --git a/se-common/src/main/java/com/terra/common/constant/GenConstants.java b/se-common/src/main/java/com/terra/common/constant/GenConstants.java index 12a49a2..66776b7 100644 --- a/se-common/src/main/java/com/terra/common/constant/GenConstants.java +++ b/se-common/src/main/java/com/terra/common/constant/GenConstants.java @@ -3,7 +3,7 @@ /** * 浠g爜鐢熸垚閫氱敤甯搁噺 * - * @author ruoyi + * @author admin */ public class GenConstants { diff --git a/se-common/src/main/java/com/terra/common/constant/HttpStatus.java b/se-common/src/main/java/com/terra/common/constant/HttpStatus.java index ef08f7c..8149493 100644 --- a/se-common/src/main/java/com/terra/common/constant/HttpStatus.java +++ b/se-common/src/main/java/com/terra/common/constant/HttpStatus.java @@ -3,7 +3,7 @@ /** * 杩斿洖鐘舵�佺爜 * - * @author ruoyi + * @author admin */ public class HttpStatus { diff --git a/se-common/src/main/java/com/terra/common/constant/ScheduleConstants.java b/se-common/src/main/java/com/terra/common/constant/ScheduleConstants.java index 25e77d7..e9a8014 100644 --- a/se-common/src/main/java/com/terra/common/constant/ScheduleConstants.java +++ b/se-common/src/main/java/com/terra/common/constant/ScheduleConstants.java @@ -3,7 +3,7 @@ /** * 浠诲姟璋冨害閫氱敤甯搁噺 * - * @author ruoyi + * @author admin */ public class ScheduleConstants { diff --git a/se-common/src/main/java/com/terra/common/constant/SecurityConstants.java b/se-common/src/main/java/com/terra/common/constant/SecurityConstants.java index 3c73370..e7daa20 100644 --- a/se-common/src/main/java/com/terra/common/constant/SecurityConstants.java +++ b/se-common/src/main/java/com/terra/common/constant/SecurityConstants.java @@ -3,7 +3,7 @@ /** * 鏉冮檺鐩稿叧閫氱敤甯搁噺 * - * @author ruoyi + * @author admin */ public class SecurityConstants { diff --git a/se-common/src/main/java/com/terra/common/constant/ServiceNameConstants.java b/se-common/src/main/java/com/terra/common/constant/ServiceNameConstants.java index d4e61f8..78b2d8a 100644 --- a/se-common/src/main/java/com/terra/common/constant/ServiceNameConstants.java +++ b/se-common/src/main/java/com/terra/common/constant/ServiceNameConstants.java @@ -3,22 +3,22 @@ /** * 鏈嶅姟鍚嶇О * - * @author ruoyi + * @author admin */ public class ServiceNameConstants { /** * 璁よ瘉鏈嶅姟鐨剆erviceid */ - public static final String AUTH_SERVICE = "ruoyi-auth"; + public static final String AUTH_SERVICE = "se-auth"; /** * 绯荤粺妯″潡鐨剆erviceid */ - public static final String SYSTEM_SERVICE = "ruoyi-system"; + public static final String SYSTEM_SERVICE = "se-system"; /** * 鏂囦欢鏈嶅姟鐨剆erviceid */ - public static final String FILE_SERVICE = "ruoyi-file"; + public static final String FILE_SERVICE = "se-file"; } diff --git a/se-common/src/main/java/com/terra/common/constant/TokenConstants.java b/se-common/src/main/java/com/terra/common/constant/TokenConstants.java index 9a8063d..ce5cfd8 100644 --- a/se-common/src/main/java/com/terra/common/constant/TokenConstants.java +++ b/se-common/src/main/java/com/terra/common/constant/TokenConstants.java @@ -3,7 +3,7 @@ /** * Token鐨凨ey甯搁噺 * - * @author ruoyi + * @author admin */ public class TokenConstants { diff --git a/se-common/src/main/java/com/terra/common/constant/UserConstants.java b/se-common/src/main/java/com/terra/common/constant/UserConstants.java index 0a0a556..ce96cbb 100644 --- a/se-common/src/main/java/com/terra/common/constant/UserConstants.java +++ b/se-common/src/main/java/com/terra/common/constant/UserConstants.java @@ -3,7 +3,7 @@ /** * 鐢ㄦ埛甯搁噺淇℃伅 * - * @author ruoyi + * @author admin */ public class UserConstants { diff --git a/se-common/src/main/java/com/terra/common/context/SecurityContextHolder.java b/se-common/src/main/java/com/terra/common/context/SecurityContextHolder.java index c45d763..e340a52 100644 --- a/se-common/src/main/java/com/terra/common/context/SecurityContextHolder.java +++ b/se-common/src/main/java/com/terra/common/context/SecurityContextHolder.java @@ -11,7 +11,7 @@ * 鑾峰彇褰撳墠绾跨▼鍙橀噺涓殑 鐢ㄦ埛id銆佺敤鎴峰悕绉般�乀oken绛変俊鎭� * 娉ㄦ剰锛� 蹇呴』鍦ㄧ綉鍏抽�氳繃璇锋眰澶寸殑鏂规硶浼犲叆锛屽悓鏃跺湪HeaderInterceptor鎷︽埅鍣ㄨ缃�笺�� 鍚﹀垯杩欓噷鏃犳硶鑾峰彇 * - * @author ruoyi + * @author admin */ public class SecurityContextHolder { diff --git a/se-common/src/main/java/com/terra/common/domain/R.java b/se-common/src/main/java/com/terra/common/domain/R.java index 1103b50..4fe8a9a 100644 --- a/se-common/src/main/java/com/terra/common/domain/R.java +++ b/se-common/src/main/java/com/terra/common/domain/R.java @@ -6,7 +6,7 @@ /** * 鍝嶅簲淇℃伅涓讳綋 * - * @author ruoyi + * @author admin */ public class R<T> implements Serializable { diff --git a/se-common/src/main/java/com/terra/common/enums/UserStatus.java b/se-common/src/main/java/com/terra/common/enums/UserStatus.java index 45d2eca..4be49d8 100644 --- a/se-common/src/main/java/com/terra/common/enums/UserStatus.java +++ b/se-common/src/main/java/com/terra/common/enums/UserStatus.java @@ -3,7 +3,7 @@ /** * 鐢ㄦ埛鐘舵�� * - * @author ruoyi + * @author admin */ public enum UserStatus { diff --git a/se-common/src/main/java/com/terra/common/exception/CaptchaException.java b/se-common/src/main/java/com/terra/common/exception/CaptchaException.java index 32be5b2..6df7de0 100644 --- a/se-common/src/main/java/com/terra/common/exception/CaptchaException.java +++ b/se-common/src/main/java/com/terra/common/exception/CaptchaException.java @@ -3,7 +3,7 @@ /** * 楠岃瘉鐮侀敊璇紓甯哥被 * - * @author ruoyi + * @author admin */ public class CaptchaException extends RuntimeException { diff --git a/se-common/src/main/java/com/terra/common/exception/CheckedException.java b/se-common/src/main/java/com/terra/common/exception/CheckedException.java index 6168e8c..50a0ba0 100644 --- a/se-common/src/main/java/com/terra/common/exception/CheckedException.java +++ b/se-common/src/main/java/com/terra/common/exception/CheckedException.java @@ -3,7 +3,7 @@ /** * 妫�鏌ュ紓甯� * - * @author ruoyi + * @author admin */ public class CheckedException extends RuntimeException { diff --git a/se-common/src/main/java/com/terra/common/exception/DemoModeException.java b/se-common/src/main/java/com/terra/common/exception/DemoModeException.java index d159e46..1123b3d 100644 --- a/se-common/src/main/java/com/terra/common/exception/DemoModeException.java +++ b/se-common/src/main/java/com/terra/common/exception/DemoModeException.java @@ -3,7 +3,7 @@ /** * 婕旂ず妯″紡寮傚父 * - * @author ruoyi + * @author admin */ public class DemoModeException extends RuntimeException { diff --git a/se-common/src/main/java/com/terra/common/exception/GlobalException.java b/se-common/src/main/java/com/terra/common/exception/GlobalException.java index 4f554d5..61f1fb1 100644 --- a/se-common/src/main/java/com/terra/common/exception/GlobalException.java +++ b/se-common/src/main/java/com/terra/common/exception/GlobalException.java @@ -3,7 +3,7 @@ /** * 鍏ㄥ眬寮傚父 * - * @author ruoyi + * @author admin */ public class GlobalException extends RuntimeException { diff --git a/se-common/src/main/java/com/terra/common/exception/InnerAuthException.java b/se-common/src/main/java/com/terra/common/exception/InnerAuthException.java index 266d124..18d2c95 100644 --- a/se-common/src/main/java/com/terra/common/exception/InnerAuthException.java +++ b/se-common/src/main/java/com/terra/common/exception/InnerAuthException.java @@ -3,7 +3,7 @@ /** * 鍐呴儴璁よ瘉寮傚父 * - * @author ruoyi + * @author admin */ public class InnerAuthException extends RuntimeException { diff --git a/se-common/src/main/java/com/terra/common/exception/PreAuthorizeException.java b/se-common/src/main/java/com/terra/common/exception/PreAuthorizeException.java index e68e528..7591bed 100644 --- a/se-common/src/main/java/com/terra/common/exception/PreAuthorizeException.java +++ b/se-common/src/main/java/com/terra/common/exception/PreAuthorizeException.java @@ -3,7 +3,7 @@ /** * 鏉冮檺寮傚父 * - * @author ruoyi + * @author admin */ public class PreAuthorizeException extends RuntimeException { diff --git a/se-common/src/main/java/com/terra/common/exception/ServiceException.java b/se-common/src/main/java/com/terra/common/exception/ServiceException.java index d35de2a..d3d4f91 100644 --- a/se-common/src/main/java/com/terra/common/exception/ServiceException.java +++ b/se-common/src/main/java/com/terra/common/exception/ServiceException.java @@ -3,7 +3,7 @@ /** * 涓氬姟寮傚父 * - * @author ruoyi + * @author admin */ public final class ServiceException extends RuntimeException { diff --git a/se-common/src/main/java/com/terra/common/exception/UtilException.java b/se-common/src/main/java/com/terra/common/exception/UtilException.java index 80330a8..c7f346f 100644 --- a/se-common/src/main/java/com/terra/common/exception/UtilException.java +++ b/se-common/src/main/java/com/terra/common/exception/UtilException.java @@ -3,7 +3,7 @@ /** * 宸ュ叿绫诲紓甯� * - * @author ruoyi + * @author admin */ public class UtilException extends RuntimeException { diff --git a/se-common/src/main/java/com/terra/common/exception/auth/NotLoginException.java b/se-common/src/main/java/com/terra/common/exception/auth/NotLoginException.java index 7d842c8..071f594 100644 --- a/se-common/src/main/java/com/terra/common/exception/auth/NotLoginException.java +++ b/se-common/src/main/java/com/terra/common/exception/auth/NotLoginException.java @@ -3,7 +3,7 @@ /** * 鏈兘閫氳繃鐨勭櫥褰曡璇佸紓甯� * - * @author ruoyi + * @author admin */ public class NotLoginException extends RuntimeException { diff --git a/se-common/src/main/java/com/terra/common/exception/auth/NotPermissionException.java b/se-common/src/main/java/com/terra/common/exception/auth/NotPermissionException.java index 8b05533..ae31683 100644 --- a/se-common/src/main/java/com/terra/common/exception/auth/NotPermissionException.java +++ b/se-common/src/main/java/com/terra/common/exception/auth/NotPermissionException.java @@ -5,7 +5,7 @@ /** * 鏈兘閫氳繃鐨勬潈闄愯璇佸紓甯� * - * @author ruoyi + * @author admin */ public class NotPermissionException extends RuntimeException { diff --git a/se-common/src/main/java/com/terra/common/exception/auth/NotRoleException.java b/se-common/src/main/java/com/terra/common/exception/auth/NotRoleException.java index 64f03fe..ac8cd32 100644 --- a/se-common/src/main/java/com/terra/common/exception/auth/NotRoleException.java +++ b/se-common/src/main/java/com/terra/common/exception/auth/NotRoleException.java @@ -5,7 +5,7 @@ /** * 鏈兘閫氳繃鐨勮鑹茶璇佸紓甯� * - * @author ruoyi + * @author admin */ public class NotRoleException extends RuntimeException { diff --git a/se-common/src/main/java/com/terra/common/exception/base/BaseException.java b/se-common/src/main/java/com/terra/common/exception/base/BaseException.java index 820b5c8..bb8d3a0 100644 --- a/se-common/src/main/java/com/terra/common/exception/base/BaseException.java +++ b/se-common/src/main/java/com/terra/common/exception/base/BaseException.java @@ -3,7 +3,7 @@ /** * 鍩虹寮傚父 * - * @author ruoyi + * @author admin */ public class BaseException extends RuntimeException { diff --git a/se-common/src/main/java/com/terra/common/exception/file/FileException.java b/se-common/src/main/java/com/terra/common/exception/file/FileException.java index bfb3dca..f5e7d29 100644 --- a/se-common/src/main/java/com/terra/common/exception/file/FileException.java +++ b/se-common/src/main/java/com/terra/common/exception/file/FileException.java @@ -5,7 +5,7 @@ /** * 鏂囦欢淇℃伅寮傚父绫� * - * @author ruoyi + * @author admin */ public class FileException extends BaseException { diff --git a/se-common/src/main/java/com/terra/common/exception/file/FileNameLengthLimitExceededException.java b/se-common/src/main/java/com/terra/common/exception/file/FileNameLengthLimitExceededException.java index d044180..3368ce9 100644 --- a/se-common/src/main/java/com/terra/common/exception/file/FileNameLengthLimitExceededException.java +++ b/se-common/src/main/java/com/terra/common/exception/file/FileNameLengthLimitExceededException.java @@ -3,7 +3,7 @@ /** * 鏂囦欢鍚嶇О瓒呴暱闄愬埗寮傚父绫� * - * @author ruoyi + * @author admin */ public class FileNameLengthLimitExceededException extends FileException { diff --git a/se-common/src/main/java/com/terra/common/exception/file/FileSizeLimitExceededException.java b/se-common/src/main/java/com/terra/common/exception/file/FileSizeLimitExceededException.java index a5436a2..3892fbe 100644 --- a/se-common/src/main/java/com/terra/common/exception/file/FileSizeLimitExceededException.java +++ b/se-common/src/main/java/com/terra/common/exception/file/FileSizeLimitExceededException.java @@ -3,7 +3,7 @@ /** * 鏂囦欢鍚嶅ぇ灏忛檺鍒跺紓甯哥被 * - * @author ruoyi + * @author admin */ public class FileSizeLimitExceededException extends FileException { diff --git a/se-common/src/main/java/com/terra/common/exception/file/FileUploadException.java b/se-common/src/main/java/com/terra/common/exception/file/FileUploadException.java index 654d93f..15aba53 100644 --- a/se-common/src/main/java/com/terra/common/exception/file/FileUploadException.java +++ b/se-common/src/main/java/com/terra/common/exception/file/FileUploadException.java @@ -6,7 +6,7 @@ /** * 鏂囦欢涓婁紶寮傚父绫� * - * @author ruoyi + * @author admin */ public class FileUploadException extends Exception { diff --git a/se-common/src/main/java/com/terra/common/exception/file/InvalidExtensionException.java b/se-common/src/main/java/com/terra/common/exception/file/InvalidExtensionException.java index 11f7d79..f123dc5 100644 --- a/se-common/src/main/java/com/terra/common/exception/file/InvalidExtensionException.java +++ b/se-common/src/main/java/com/terra/common/exception/file/InvalidExtensionException.java @@ -5,7 +5,7 @@ /** * 鏂囦欢涓婁紶 璇紓甯哥被 * - * @author ruoyi + * @author admin */ public class InvalidExtensionException extends FileUploadException { diff --git a/se-common/src/main/java/com/terra/common/exception/job/TaskException.java b/se-common/src/main/java/com/terra/common/exception/job/TaskException.java index e942c2e..06453b1 100644 --- a/se-common/src/main/java/com/terra/common/exception/job/TaskException.java +++ b/se-common/src/main/java/com/terra/common/exception/job/TaskException.java @@ -3,7 +3,7 @@ /** * 璁″垝绛栫暐寮傚父 * - * @author ruoyi + * @author admin */ public class TaskException extends Exception { diff --git a/se-common/src/main/java/com/terra/common/exception/user/CaptchaExpireException.java b/se-common/src/main/java/com/terra/common/exception/user/CaptchaExpireException.java index 3191bf4..34b28ad 100644 --- a/se-common/src/main/java/com/terra/common/exception/user/CaptchaExpireException.java +++ b/se-common/src/main/java/com/terra/common/exception/user/CaptchaExpireException.java @@ -3,7 +3,7 @@ /** * 楠岃瘉鐮佸け鏁堝紓甯哥被 * - * @author ruoyi + * @author admin */ public class CaptchaExpireException extends UserException { diff --git a/se-common/src/main/java/com/terra/common/exception/user/UserException.java b/se-common/src/main/java/com/terra/common/exception/user/UserException.java index fd3d0be..6c0be17 100644 --- a/se-common/src/main/java/com/terra/common/exception/user/UserException.java +++ b/se-common/src/main/java/com/terra/common/exception/user/UserException.java @@ -5,7 +5,7 @@ /** * 鐢ㄦ埛淇℃伅寮傚父绫� * - * @author ruoyi + * @author admin */ public class UserException extends BaseException { diff --git a/se-common/src/main/java/com/terra/common/exception/user/UserPasswordNotMatchException.java b/se-common/src/main/java/com/terra/common/exception/user/UserPasswordNotMatchException.java index aceb3eb..0bcb4fa 100644 --- a/se-common/src/main/java/com/terra/common/exception/user/UserPasswordNotMatchException.java +++ b/se-common/src/main/java/com/terra/common/exception/user/UserPasswordNotMatchException.java @@ -3,7 +3,7 @@ /** * 鐢ㄦ埛瀵嗙爜涓嶆纭垨涓嶇鍚堣鑼冨紓甯哥被 * - * @author ruoyi + * @author admin */ public class UserPasswordNotMatchException extends UserException { diff --git a/se-common/src/main/java/com/terra/common/service/RedisService.java b/se-common/src/main/java/com/terra/common/service/RedisService.java index 2e17787..7fb5714 100644 --- a/se-common/src/main/java/com/terra/common/service/RedisService.java +++ b/se-common/src/main/java/com/terra/common/service/RedisService.java @@ -13,7 +13,7 @@ /** * spring redis 宸ュ叿绫� * - * @author ruoyi + * @author admin **/ @SuppressWarnings(value = { "unchecked", "rawtypes" }) @Component diff --git a/se-common/src/main/java/com/terra/common/text/CharsetKit.java b/se-common/src/main/java/com/terra/common/text/CharsetKit.java index 0396b6f..2e1a91d 100644 --- a/se-common/src/main/java/com/terra/common/text/CharsetKit.java +++ b/se-common/src/main/java/com/terra/common/text/CharsetKit.java @@ -7,7 +7,7 @@ /** * 瀛楃闆嗗伐鍏风被 * - * @author ruoyi + * @author admin */ public class CharsetKit { diff --git a/se-common/src/main/java/com/terra/common/text/Convert.java b/se-common/src/main/java/com/terra/common/text/Convert.java index f6f77ec..bb3a76f 100644 --- a/se-common/src/main/java/com/terra/common/text/Convert.java +++ b/se-common/src/main/java/com/terra/common/text/Convert.java @@ -12,7 +12,7 @@ /** * 绫诲瀷杞崲鍣� * - * @author ruoyi + * @author admin */ public class Convert { diff --git a/se-common/src/main/java/com/terra/common/text/StrFormatter.java b/se-common/src/main/java/com/terra/common/text/StrFormatter.java index 08ac715..de1ba52 100644 --- a/se-common/src/main/java/com/terra/common/text/StrFormatter.java +++ b/se-common/src/main/java/com/terra/common/text/StrFormatter.java @@ -5,7 +5,7 @@ /** * 瀛楃涓叉牸寮忓寲 * - * @author ruoyi + * @author admin */ public class StrFormatter { diff --git a/se-common/src/main/java/com/terra/common/utils/DateUtils.java b/se-common/src/main/java/com/terra/common/utils/DateUtils.java index da8ea47..da55f02 100644 --- a/se-common/src/main/java/com/terra/common/utils/DateUtils.java +++ b/se-common/src/main/java/com/terra/common/utils/DateUtils.java @@ -14,7 +14,7 @@ /** * 鏃堕棿宸ュ叿绫� * - * @author ruoyi + * @author admin */ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { diff --git a/se-common/src/main/java/com/terra/common/utils/ExceptionUtil.java b/se-common/src/main/java/com/terra/common/utils/ExceptionUtil.java index 754a433..863f04f 100644 --- a/se-common/src/main/java/com/terra/common/utils/ExceptionUtil.java +++ b/se-common/src/main/java/com/terra/common/utils/ExceptionUtil.java @@ -7,7 +7,7 @@ /** * 閿欒淇℃伅澶勭悊绫汇�� * - * @author ruoyi + * @author admin */ public class ExceptionUtil { diff --git a/se-common/src/main/java/com/terra/common/utils/JwtUtils.java b/se-common/src/main/java/com/terra/common/utils/JwtUtils.java index 94cb273..d6417d4 100644 --- a/se-common/src/main/java/com/terra/common/utils/JwtUtils.java +++ b/se-common/src/main/java/com/terra/common/utils/JwtUtils.java @@ -11,7 +11,7 @@ /** * Jwt宸ュ叿绫� * - * @author ruoyi + * @author admin */ public class JwtUtils { diff --git a/se-common/src/main/java/com/terra/common/utils/PageUtils.java b/se-common/src/main/java/com/terra/common/utils/PageUtils.java index 5d10d4e..c123a8b 100644 --- a/se-common/src/main/java/com/terra/common/utils/PageUtils.java +++ b/se-common/src/main/java/com/terra/common/utils/PageUtils.java @@ -8,7 +8,7 @@ /** * 鍒嗛〉宸ュ叿绫� * - * @author ruoyi + * @author admin */ public class PageUtils extends PageHelper { diff --git a/se-common/src/main/java/com/terra/common/utils/ServletUtils.java b/se-common/src/main/java/com/terra/common/utils/ServletUtils.java index 52064ab..fc5ed17 100644 --- a/se-common/src/main/java/com/terra/common/utils/ServletUtils.java +++ b/se-common/src/main/java/com/terra/common/utils/ServletUtils.java @@ -30,7 +30,7 @@ /** * 瀹㈡埛绔伐鍏风被 * - * @author ruoyi + * @author admin */ public class ServletUtils { diff --git a/se-common/src/main/java/com/terra/common/utils/SpringUtils.java b/se-common/src/main/java/com/terra/common/utils/SpringUtils.java index 295436b..94b46ce 100644 --- a/se-common/src/main/java/com/terra/common/utils/SpringUtils.java +++ b/se-common/src/main/java/com/terra/common/utils/SpringUtils.java @@ -10,7 +10,7 @@ /** * spring宸ュ叿绫� 鏂逛究鍦ㄩ潪spring绠$悊鐜涓幏鍙朾ean * - * @author ruoyi + * @author admin */ @Component public final class SpringUtils implements BeanFactoryPostProcessor diff --git a/se-common/src/main/java/com/terra/common/utils/StringUtils.java b/se-common/src/main/java/com/terra/common/utils/StringUtils.java index 873a937..99050a1 100644 --- a/se-common/src/main/java/com/terra/common/utils/StringUtils.java +++ b/se-common/src/main/java/com/terra/common/utils/StringUtils.java @@ -10,7 +10,7 @@ /** * 瀛楃涓插伐鍏风被 * - * @author ruoyi + * @author admin */ public class StringUtils extends org.apache.commons.lang3.StringUtils { diff --git a/se-common/src/main/java/com/terra/common/utils/bean/BeanUtils.java b/se-common/src/main/java/com/terra/common/utils/bean/BeanUtils.java index d7bdba1..5b9be13 100644 --- a/se-common/src/main/java/com/terra/common/utils/bean/BeanUtils.java +++ b/se-common/src/main/java/com/terra/common/utils/bean/BeanUtils.java @@ -9,7 +9,7 @@ /** * Bean 宸ュ叿绫� * - * @author ruoyi + * @author admin */ public class BeanUtils extends org.springframework.beans.BeanUtils { diff --git a/se-common/src/main/java/com/terra/common/utils/bean/BeanValidators.java b/se-common/src/main/java/com/terra/common/utils/bean/BeanValidators.java index 959123d..3181e9f 100644 --- a/se-common/src/main/java/com/terra/common/utils/bean/BeanValidators.java +++ b/se-common/src/main/java/com/terra/common/utils/bean/BeanValidators.java @@ -8,7 +8,7 @@ /** * bean瀵硅薄灞炴�ч獙璇� * - * @author ruoyi + * @author admin */ public class BeanValidators { diff --git a/se-common/src/main/java/com/terra/common/utils/file/FileTypeUtils.java b/se-common/src/main/java/com/terra/common/utils/file/FileTypeUtils.java index 585db89..aba1054 100644 --- a/se-common/src/main/java/com/terra/common/utils/file/FileTypeUtils.java +++ b/se-common/src/main/java/com/terra/common/utils/file/FileTypeUtils.java @@ -9,14 +9,14 @@ /** * 鏂囦欢绫诲瀷宸ュ叿绫� * - * @author ruoyi + * @author admin */ public class FileTypeUtils { /** * 鑾峰彇鏂囦欢绫诲瀷 * <p> - * 渚嬪: ruoyi.txt, 杩斿洖: txt + * 渚嬪: terra.txt, 杩斿洖: txt * * @param file 鏂囦欢鍚� * @return 鍚庣紑锛堜笉鍚�".") @@ -33,7 +33,7 @@ /** * 鑾峰彇鏂囦欢绫诲瀷 * <p> - * 渚嬪: ruoyi.txt, 杩斿洖: txt + * 渚嬪: terra.txt, 杩斿洖: txt * * @param fileName 鏂囦欢鍚� * @return 鍚庣紑锛堜笉鍚�".") diff --git a/se-common/src/main/java/com/terra/common/utils/file/FileUtils.java b/se-common/src/main/java/com/terra/common/utils/file/FileUtils.java index 43ac4de..c9501a3 100644 --- a/se-common/src/main/java/com/terra/common/utils/file/FileUtils.java +++ b/se-common/src/main/java/com/terra/common/utils/file/FileUtils.java @@ -16,7 +16,7 @@ /** * 鏂囦欢澶勭悊宸ュ叿绫� * - * @author ruoyi + * @author admin */ public class FileUtils { diff --git a/se-common/src/main/java/com/terra/common/utils/file/ImageUtils.java b/se-common/src/main/java/com/terra/common/utils/file/ImageUtils.java index 0f93b2f..14aef38 100644 --- a/se-common/src/main/java/com/terra/common/utils/file/ImageUtils.java +++ b/se-common/src/main/java/com/terra/common/utils/file/ImageUtils.java @@ -12,7 +12,7 @@ /** * 鍥剧墖澶勭悊宸ュ叿绫� * - * @author ruoyi + * @author admin */ public class ImageUtils { diff --git a/se-common/src/main/java/com/terra/common/utils/file/MimeTypeUtils.java b/se-common/src/main/java/com/terra/common/utils/file/MimeTypeUtils.java index 46ef4ca..b9a4197 100644 --- a/se-common/src/main/java/com/terra/common/utils/file/MimeTypeUtils.java +++ b/se-common/src/main/java/com/terra/common/utils/file/MimeTypeUtils.java @@ -3,7 +3,7 @@ /** * 濯掍綋绫诲瀷宸ュ叿绫� * - * @author ruoyi + * @author admin */ public class MimeTypeUtils { diff --git a/se-common/src/main/java/com/terra/common/utils/html/EscapeUtil.java b/se-common/src/main/java/com/terra/common/utils/html/EscapeUtil.java index c11960a..47dd439 100644 --- a/se-common/src/main/java/com/terra/common/utils/html/EscapeUtil.java +++ b/se-common/src/main/java/com/terra/common/utils/html/EscapeUtil.java @@ -5,7 +5,7 @@ /** * 杞箟鍜屽弽杞箟宸ュ叿绫� * - * @author ruoyi + * @author admin */ public class EscapeUtil { diff --git a/se-common/src/main/java/com/terra/common/utils/html/HTMLFilter.java b/se-common/src/main/java/com/terra/common/utils/html/HTMLFilter.java index a751949..6fadc1a 100644 --- a/se-common/src/main/java/com/terra/common/utils/html/HTMLFilter.java +++ b/se-common/src/main/java/com/terra/common/utils/html/HTMLFilter.java @@ -13,7 +13,7 @@ /** * HTML杩囨护鍣紝鐢ㄤ簬鍘婚櫎XSS婕忔礊闅愭偅銆� * - * @author ruoyi + * @author admin */ public final class HTMLFilter { diff --git a/se-common/src/main/java/com/terra/common/utils/ip/IpUtils.java b/se-common/src/main/java/com/terra/common/utils/ip/IpUtils.java index 5c89db5..0494079 100644 --- a/se-common/src/main/java/com/terra/common/utils/ip/IpUtils.java +++ b/se-common/src/main/java/com/terra/common/utils/ip/IpUtils.java @@ -9,7 +9,7 @@ /** * 鑾峰彇IP鏂规硶 * - * @author ruoyi + * @author admin */ public class IpUtils { diff --git a/se-common/src/main/java/com/terra/common/utils/poi/ExcelHandlerAdapter.java b/se-common/src/main/java/com/terra/common/utils/poi/ExcelHandlerAdapter.java index eead235..c12d05b 100644 --- a/se-common/src/main/java/com/terra/common/utils/poi/ExcelHandlerAdapter.java +++ b/se-common/src/main/java/com/terra/common/utils/poi/ExcelHandlerAdapter.java @@ -6,7 +6,7 @@ /** * Excel鏁版嵁鏍煎紡澶勭悊閫傞厤鍣� * - * @author ruoyi + * @author admin */ public interface ExcelHandlerAdapter { diff --git a/se-common/src/main/java/com/terra/common/utils/poi/ExcelUtil.java b/se-common/src/main/java/com/terra/common/utils/poi/ExcelUtil.java index 6cc107f..4b07536 100644 --- a/se-common/src/main/java/com/terra/common/utils/poi/ExcelUtil.java +++ b/se-common/src/main/java/com/terra/common/utils/poi/ExcelUtil.java @@ -67,7 +67,7 @@ /** * Excel鐩稿叧澶勭悊 * - * @author ruoyi + * @author admin */ public class ExcelUtil<T> { diff --git a/se-common/src/main/java/com/terra/common/utils/reflect/ReflectUtils.java b/se-common/src/main/java/com/terra/common/utils/reflect/ReflectUtils.java index 5c705c3..f220dff 100644 --- a/se-common/src/main/java/com/terra/common/utils/reflect/ReflectUtils.java +++ b/se-common/src/main/java/com/terra/common/utils/reflect/ReflectUtils.java @@ -18,7 +18,7 @@ /** * 鍙嶅皠宸ュ叿绫�. 鎻愪緵璋冪敤getter/setter鏂规硶, 璁块棶绉佹湁鍙橀噺, 璋冪敤绉佹湁鏂规硶, 鑾峰彇娉涘瀷绫诲瀷Class, 琚獳OP杩囩殑鐪熷疄绫荤瓑宸ュ叿鍑芥暟. * - * @author ruoyi + * @author admin */ @SuppressWarnings("rawtypes") public class ReflectUtils diff --git a/se-common/src/main/java/com/terra/common/utils/sign/Base64.java b/se-common/src/main/java/com/terra/common/utils/sign/Base64.java index 9729ef5..71d7e61 100644 --- a/se-common/src/main/java/com/terra/common/utils/sign/Base64.java +++ b/se-common/src/main/java/com/terra/common/utils/sign/Base64.java @@ -3,7 +3,7 @@ /** * Base64宸ュ叿绫� * - * @author ruoyi + * @author admin */ public final class Base64 { diff --git a/se-common/src/main/java/com/terra/common/utils/sql/SqlUtil.java b/se-common/src/main/java/com/terra/common/utils/sql/SqlUtil.java index f1cbaa0..fb8df2b 100644 --- a/se-common/src/main/java/com/terra/common/utils/sql/SqlUtil.java +++ b/se-common/src/main/java/com/terra/common/utils/sql/SqlUtil.java @@ -6,7 +6,7 @@ /** * sql鎿嶄綔宸ュ叿绫� * - * @author ruoyi + * @author admin */ public class SqlUtil { diff --git a/se-common/src/main/java/com/terra/common/utils/uuid/IdUtils.java b/se-common/src/main/java/com/terra/common/utils/uuid/IdUtils.java index 87f2426..a5e9a79 100644 --- a/se-common/src/main/java/com/terra/common/utils/uuid/IdUtils.java +++ b/se-common/src/main/java/com/terra/common/utils/uuid/IdUtils.java @@ -3,7 +3,7 @@ /** * ID鐢熸垚鍣ㄥ伐鍏风被 * - * @author ruoyi + * @author admin */ public class IdUtils { diff --git a/se-common/src/main/java/com/terra/common/utils/uuid/Seq.java b/se-common/src/main/java/com/terra/common/utils/uuid/Seq.java index a0ef134..ffd4aa1 100644 --- a/se-common/src/main/java/com/terra/common/utils/uuid/Seq.java +++ b/se-common/src/main/java/com/terra/common/utils/uuid/Seq.java @@ -5,7 +5,7 @@ import com.terra.common.utils.StringUtils; /** - * @author ruoyi 搴忓垪鐢熸垚绫� + * @author admin 搴忓垪鐢熸垚绫� */ public class Seq { diff --git a/se-common/src/main/java/com/terra/common/utils/uuid/UUID.java b/se-common/src/main/java/com/terra/common/utils/uuid/UUID.java index 52295cd..f4d88eb 100644 --- a/se-common/src/main/java/com/terra/common/utils/uuid/UUID.java +++ b/se-common/src/main/java/com/terra/common/utils/uuid/UUID.java @@ -10,7 +10,7 @@ /** * 鎻愪緵閫氱敤鍞竴璇嗗埆鐮侊紙universally unique identifier锛夛紙UUID锛夊疄鐜� * - * @author ruoyi + * @author admin */ public final class UUID implements java.io.Serializable, Comparable<UUID> { diff --git a/se-common/src/main/java/com/terra/common/web/controller/BaseController.java b/se-common/src/main/java/com/terra/common/web/controller/BaseController.java index d4470a8..e3c9f32 100644 --- a/se-common/src/main/java/com/terra/common/web/controller/BaseController.java +++ b/se-common/src/main/java/com/terra/common/web/controller/BaseController.java @@ -22,7 +22,7 @@ /** * web灞傞�氱敤鏁版嵁澶勭悊 * - * @author ruoyi + * @author admin */ public class BaseController { diff --git a/se-common/src/main/java/com/terra/common/web/domain/AjaxResult.java b/se-common/src/main/java/com/terra/common/web/domain/AjaxResult.java index a44c3ac..ef48594 100644 --- a/se-common/src/main/java/com/terra/common/web/domain/AjaxResult.java +++ b/se-common/src/main/java/com/terra/common/web/domain/AjaxResult.java @@ -8,7 +8,7 @@ /** * 鎿嶄綔娑堟伅鎻愰啋 * - * @author ruoyi + * @author admin */ public class AjaxResult extends HashMap<String, Object> { diff --git a/se-common/src/main/java/com/terra/common/web/domain/BaseEntity.java b/se-common/src/main/java/com/terra/common/web/domain/BaseEntity.java index 8f212b2..0ad3e56 100644 --- a/se-common/src/main/java/com/terra/common/web/domain/BaseEntity.java +++ b/se-common/src/main/java/com/terra/common/web/domain/BaseEntity.java @@ -11,7 +11,7 @@ /** * Entity鍩虹被 * - * @author ruoyi + * @author admin */ public class BaseEntity implements Serializable { diff --git a/se-common/src/main/java/com/terra/common/web/domain/TreeEntity.java b/se-common/src/main/java/com/terra/common/web/domain/TreeEntity.java index 7c58299..0e7ab5b 100644 --- a/se-common/src/main/java/com/terra/common/web/domain/TreeEntity.java +++ b/se-common/src/main/java/com/terra/common/web/domain/TreeEntity.java @@ -6,7 +6,7 @@ /** * Tree鍩虹被 * - * @author ruoyi + * @author admin */ public class TreeEntity extends BaseEntity { diff --git a/se-common/src/main/java/com/terra/common/web/page/PageDomain.java b/se-common/src/main/java/com/terra/common/web/page/PageDomain.java index 88dd503..8090e62 100644 --- a/se-common/src/main/java/com/terra/common/web/page/PageDomain.java +++ b/se-common/src/main/java/com/terra/common/web/page/PageDomain.java @@ -5,7 +5,7 @@ /** * 鍒嗛〉鏁版嵁 * - * @author ruoyi + * @author admin */ public class PageDomain { diff --git a/se-common/src/main/java/com/terra/common/web/page/TableDataInfo.java b/se-common/src/main/java/com/terra/common/web/page/TableDataInfo.java index 59b3178..8dee3b8 100644 --- a/se-common/src/main/java/com/terra/common/web/page/TableDataInfo.java +++ b/se-common/src/main/java/com/terra/common/web/page/TableDataInfo.java @@ -6,7 +6,7 @@ /** * 琛ㄦ牸鍒嗛〉鏁版嵁瀵硅薄 * - * @author ruoyi + * @author admin */ public class TableDataInfo implements Serializable { diff --git a/se-common/src/main/java/com/terra/common/web/page/TableSupport.java b/se-common/src/main/java/com/terra/common/web/page/TableSupport.java index b4852ba..6c5799b 100644 --- a/se-common/src/main/java/com/terra/common/web/page/TableSupport.java +++ b/se-common/src/main/java/com/terra/common/web/page/TableSupport.java @@ -6,7 +6,7 @@ /** * 琛ㄦ牸鏁版嵁澶勭悊 * - * @author ruoyi + * @author admin */ public class TableSupport { diff --git a/se-common/src/main/java/com/terra/common/xss/Xss.java b/se-common/src/main/java/com/terra/common/xss/Xss.java index 8ec1d3a..a8d0500 100644 --- a/se-common/src/main/java/com/terra/common/xss/Xss.java +++ b/se-common/src/main/java/com/terra/common/xss/Xss.java @@ -10,7 +10,7 @@ /** * 鑷畾涔墄ss鏍¢獙娉ㄨВ * - * @author ruoyi + * @author admin */ @Retention(RetentionPolicy.RUNTIME) @Target(value = { ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.PARAMETER }) diff --git a/se-common/src/main/java/com/terra/common/xss/XssValidator.java b/se-common/src/main/java/com/terra/common/xss/XssValidator.java index 234918c..03fd8aa 100644 --- a/se-common/src/main/java/com/terra/common/xss/XssValidator.java +++ b/se-common/src/main/java/com/terra/common/xss/XssValidator.java @@ -9,7 +9,7 @@ /** * 鑷畾涔墄ss鏍¢獙娉ㄨВ瀹炵幇 * - * @author ruoyi + * @author admin */ public class XssValidator implements ConstraintValidator<Xss, String> { diff --git a/se-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/se-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index a9cbde5..2540503 100644 --- a/se-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/se-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,4 +1,4 @@ com.terra.common.utils.SpringUtils com.terra.common.service.RedisService com.terra.common.configure.RedisConfig -com.ruoyi.common.configure.SpringDocAutoConfiguration \ No newline at end of file +com.terra.common.configure.SpringDocAutoConfiguration \ No newline at end of file diff --git a/se-gateway/pom.xml b/se-gateway/pom.xml index 72ba188..437e766 100644 --- a/se-gateway/pom.xml +++ b/se-gateway/pom.xml @@ -71,6 +71,14 @@ <version>${springdoc.version}</version> </dependency> + <!-- se-common --> + <dependency> + <groupId>com.terra</groupId> + <artifactId>se-common</artifactId> + <version>1.0.2</version> + <scope>compile</scope> + </dependency> + </dependencies> <build> diff --git a/se-gateway/src/main/java/com/terra/gateway/config/SpringDocConfig.java b/se-gateway/src/main/java/com/terra/gateway/config/SpringDocConfig.java index ba589dd..02329a3 100644 --- a/se-gateway/src/main/java/com/terra/gateway/config/SpringDocConfig.java +++ b/se-gateway/src/main/java/com/terra/gateway/config/SpringDocConfig.java @@ -2,10 +2,11 @@ import java.util.Set; import java.util.stream.Collectors; + +import org.apache.commons.lang3.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; @@ -13,7 +14,6 @@ import com.alibaba.nacos.common.notify.Event; import com.alibaba.nacos.common.notify.NotifyCenter; import com.alibaba.nacos.common.notify.listener.Subscriber; - import javax.annotation.Resource; /** @@ -25,10 +25,10 @@ @ConditionalOnProperty(value = "springdoc.api-docs.enabled", matchIfMissing = true) public class SpringDocConfig implements InitializingBean { - @Autowired + @Resource private SwaggerUiConfigProperties swaggerUiConfigProperties; - @Autowired + @Resource private DiscoveryClient discoveryClient; /** @@ -52,7 +52,7 @@ @Resource private DiscoveryClient discoveryClient; - private final static String[] EXCLUDE_ROUTES = new String[] { "se-gateway", "se-auth", "se-file", "se-monitor", "se-system" }; + private final static String[] EXCLUDE_ROUTES = new String[] { "se-gateway", "se-auth", "se-file", "se-monitor" }; public SwaggerDocRegister(SwaggerUiConfigProperties swaggerUiConfigProperties, DiscoveryClient discoveryClient) { @@ -68,16 +68,16 @@ 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()); + .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); } diff --git a/se-gateway/src/main/java/com/terra/gateway/handler/SentinelFallbackHandler.java b/se-gateway/src/main/java/com/terra/gateway/handler/SentinelFallbackHandler.java index 6352ca5..87ada50 100644 --- a/se-gateway/src/main/java/com/terra/gateway/handler/SentinelFallbackHandler.java +++ b/se-gateway/src/main/java/com/terra/gateway/handler/SentinelFallbackHandler.java @@ -2,6 +2,7 @@ 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 org.springframework.web.reactive.function.server.ServerResponse; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebExceptionHandler; @@ -16,8 +17,7 @@ { private Mono<Void> writeResponse(ServerResponse response, ServerWebExchange exchange) { - //return ServletUtils.webFluxResponseWriter(exchange.getResponse(), "璇锋眰瓒呰繃鏈�澶ф暟锛岃绋嶅�欏啀璇�"); - return null; + return ServletUtils.webFluxResponseWriter(exchange.getResponse(), "璇锋眰瓒呰繃鏈�澶ф暟锛岃绋嶅�欏啀璇�"); } @Override diff --git a/se-system/src/main/resources/banner.txt b/se-system/src/main/resources/banner.txt index fbd45f5..eebd6fe 100644 --- a/se-system/src/main/resources/banner.txt +++ b/se-system/src/main/resources/banner.txt @@ -1,10 +1,10 @@ Spring Boot Version: ${spring-boot.version} Spring Application Name: ${spring.application.name} - _ _ - (_) | | - _ __ _ _ ___ _ _ _ ______ ___ _ _ ___ | |_ ___ _ __ ___ -| '__|| | | | / _ \ | | | || ||______|/ __|| | | |/ __|| __| / _ \| '_ ` _ \ -| | | |_| || (_) || |_| || | \__ \| |_| |\__ \| |_ | __/| | | | | | -|_| \__,_| \___/ \__, ||_| |___/ \__, ||___/ \__| \___||_| |_| |_| - __/ | __/ | - |___/ |___/ \ No newline at end of file + _ + | | + ___ _ _ ___ | |_ ___ _ __ ___ +/ __|| | | |/ __|| __| / _ \| '_ ` _ \ +\__ \| |_| |\__ \| |_ | __/| | | | | | +|___/ \__, ||___/ \__| \___||_| |_| |_| + __/ | + |___/ \ No newline at end of file -- Gitblit v1.9.3