diff --git a/dao/src/main/java/cn/bunny/dao/constant/LocalDateTimeConstant.java b/dao/src/main/java/cn/bunny/dao/constant/LocalDateTimeConstant.java deleted file mode 100644 index 158a036..0000000 --- a/dao/src/main/java/cn/bunny/dao/constant/LocalDateTimeConstant.java +++ /dev/null @@ -1,11 +0,0 @@ -package cn.bunny.dao.constant; - -import lombok.Data; - -@Data -public class LocalDateTimeConstant { - public static final String YYYY_MM_DD = "yyyy-MM-dd"; - public static final String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss"; - public static final String YYYY_MM_DD_HH_MM_SS_SLASH = "yyyy/MM/dd HH:mm:ss"; - public static final String YYYY_MM_DD_HH_MM_SS_UNDERLINE = "yyyy_MM_dd_HH_mm_ss_SSS"; -} diff --git a/dao/src/main/java/cn/bunny/dao/constant/MinioConstant.java b/dao/src/main/java/cn/bunny/dao/constant/MinioConstant.java deleted file mode 100644 index 21dd2c5..0000000 --- a/dao/src/main/java/cn/bunny/dao/constant/MinioConstant.java +++ /dev/null @@ -1,35 +0,0 @@ -package cn.bunny.dao.constant; - -import lombok.Data; - -import java.util.HashMap; -import java.util.Map; - -@Data -public class MinioConstant { - public static final String favicon = "favicon"; - public static final String avatar = "avatar"; - public static final String message = "message"; - public static final String carousel = "carousel"; - public static final String feedback = "feedback"; - public static final String backup = "backup"; - public static final Map typeMap = new HashMap<>(); - - static { - typeMap.put(favicon, "/favicon/"); - typeMap.put(avatar, "/avatar/"); - typeMap.put(message, "/message/"); - typeMap.put(carousel, "/carousel/"); - typeMap.put(feedback, "/feedback/"); - typeMap.put(backup, "/backup/"); - typeMap.put("images", "/images/"); - typeMap.put("video", "/video/"); - typeMap.put("default", "/default/"); - } - - public static String getType(String type) { - String value = typeMap.get(type); - if (value != null) return value; - throw new RuntimeException("上传类型错误或缺失"); - } -} diff --git a/dao/src/main/java/cn/bunny/dao/constant/RedisUserConstant.java b/dao/src/main/java/cn/bunny/dao/constant/RedisUserConstant.java deleted file mode 100644 index 6cc314e..0000000 --- a/dao/src/main/java/cn/bunny/dao/constant/RedisUserConstant.java +++ /dev/null @@ -1,28 +0,0 @@ -package cn.bunny.dao.constant; - -import lombok.Data; - -/** - * Redis用户前缀设置 - */ -@Data -public class RedisUserConstant { - // 过期时间 - public static final Long REDIS_EXPIRATION_TIME = 7L;// 7 天/分钟 Redis过期 - public static final Integer Cookie_EXPIRATION_TIME = 5 * 60 * 60;// cookies 过期时间 5 分钟 - public static final String WEB_CONFIG_KEY = "webConfig::platformConfig";// web配置 - - private static final String ADMIN_LOGIN_INFO_PREFIX = "admin::login_info::"; - private static final String ADMIN_EMAIL_CODE_PREFIX = "admin::email_code::"; - private static final String USER_LOGIN_INFO_PREFIX = "user::login_info::"; - private static final String USER_EMAIL_CODE_PREFIX = "user::email_code::"; - - public static String getAdminLoginInfoPrefix(String adminUser) { - return ADMIN_LOGIN_INFO_PREFIX + adminUser; - } - - public static String getAdminUserEmailCodePrefix(String adminUser) { - return ADMIN_EMAIL_CODE_PREFIX + adminUser; - } - -} diff --git a/dao/src/main/java/cn/bunny/dao/constant/UserConstant.java b/dao/src/main/java/cn/bunny/dao/constant/UserConstant.java deleted file mode 100644 index 5fe7066..0000000 --- a/dao/src/main/java/cn/bunny/dao/constant/UserConstant.java +++ /dev/null @@ -1,9 +0,0 @@ -package cn.bunny.dao.constant; - -import lombok.Data; - -@Data -public class UserConstant { - public static final String USER_AVATAR = "https://thirdwx.qlogo.cn/mmopen/vi_32/DYAIOgq83eoj0hHXhgJNOTSOFsS4uZs8x1ConecaVOB8eIl115xmJZcT4oCicvia7wMEufibKtTLqiaJeanU2Lpg3w/132"; - public static final String PERSON_DESCRIPTION = "这个人很懒没有介绍..."; -} diff --git a/dao/src/main/java/cn/bunny/dao/entity/BaseUserEntity.java b/dao/src/main/java/cn/bunny/dao/entity/BaseUserEntity.java deleted file mode 100644 index da9de85..0000000 --- a/dao/src/main/java/cn/bunny/dao/entity/BaseUserEntity.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bunny.dao.entity; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@EqualsAndHashCode(callSuper = true) -@Data -@Schema(name = "BaseUserEntity", title = "基础信息字段包含用户信息", description = "基础信息字段包含用户信息") -public class BaseUserEntity extends BaseEntity { - - @Schema(name = "username", title = "用户名") - private String createUsername; - - @Schema(name = "nickname", title = "昵称") - private String updateUsername; - -} diff --git a/dao/src/main/java/cn/bunny/dao/enums/EmailTemplateEnums.java b/dao/src/main/java/cn/bunny/dao/enums/EmailTemplateEnums.java deleted file mode 100644 index ad841b8..0000000 --- a/dao/src/main/java/cn/bunny/dao/enums/EmailTemplateEnums.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.bunny.dao.enums; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; - -@Getter -@Schema(description = "Email Template Types") -public enum EmailTemplateEnums { - VERIFICATION_CODE("verification_code", "邮箱验证码发送"), - NOTIFICATION("notification", "通知型邮件"), - WARNING("warning", "警告型邮件"), - ; - - private final String type; - private final String summary; - - EmailTemplateEnums(String type, String summary) { - this.type = type; - this.summary = summary; - } -} \ No newline at end of file diff --git a/dao/src/main/java/cn/bunny/dao/enums/JobEnums.java b/dao/src/main/java/cn/bunny/dao/enums/JobEnums.java deleted file mode 100644 index 370c704..0000000 --- a/dao/src/main/java/cn/bunny/dao/enums/JobEnums.java +++ /dev/null @@ -1,20 +0,0 @@ -package cn.bunny.dao.enums; - -import lombok.Getter; - -@Getter -public enum JobEnums { - FINISH("finish", "完成"), - UNFINISHED("unfinished", "未完成"), - RUNNING("running", "正在运行"), - ERROR("error", "错误"), - ; - - private final String type; - private final String summary; - - JobEnums(String type, String summary) { - this.type = type; - this.summary = summary; - } -} diff --git a/dao/src/main/java/cn/bunny/dao/vo/BaseUserVo.java b/dao/src/main/java/cn/bunny/dao/vo/BaseUserVo.java deleted file mode 100644 index c14c5ec..0000000 --- a/dao/src/main/java/cn/bunny/dao/vo/BaseUserVo.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bunny.dao.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@EqualsAndHashCode(callSuper = true) -@Data -@Schema(name = "BaseVo", title = "基础返回对象内容包含用户信息", description = "基础返回对象内容包含用户信息") -public class BaseUserVo extends BaseVo { - - @Schema(name = "username", title = "用户名") - private String createUsername; - - @Schema(name = "nickname", title = "昵称") - private String updateUsername; - -} diff --git a/service/cloud-demo2/src/main/java/cn/bunny/config/CloudConfiguration.java b/service/cloud-demo2/src/main/java/cn/bunny/config/CloudConfiguration.java index af8145c..0519da2 100644 --- a/service/cloud-demo2/src/main/java/cn/bunny/config/CloudConfiguration.java +++ b/service/cloud-demo2/src/main/java/cn/bunny/config/CloudConfiguration.java @@ -8,6 +8,9 @@ import org.springframework.web.client.RestTemplate; @Configuration public class CloudConfiguration { + /** + * 添加使用负载均衡调用 + */ @Bean @LoadBalanced public RestTemplate restTemplate() {