From b7bdee35f16bd542fe8a061d00655d15b09be494 Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Thu, 22 May 2025 12:38:24 +0800 Subject: [PATCH] =?UTF-8?q?:label:=20feat:=20=E9=85=8D=E7=BD=AE=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E5=AE=9E=E4=BD=93=E7=B1=BB=E9=AA=8C=E8=AF=81=E5=88=86?= =?UTF-8?q?=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EmailTemplateController.java | 10 +++--- .../configuration/EmailUsersController.java | 10 +++--- .../configuration/I18nController.java | 32 ++++++++--------- .../configuration/I18nTypeController.java | 15 ++++---- .../configuration/MenuIconController.java | 17 +++++---- .../dto/EmailTemplateDto.java | 2 +- .../dto/EmailUsersDto.java | 2 +- .../domain/configuration/dto/I18nDto.java | 36 +++++++++++++++++++ .../dto/I18nTypeDto.java} | 15 ++++---- .../dto/I18nUpdateByFileDto.java | 2 +- .../domain/configuration/dto/MenuIconDto.java | 32 +++++++++++++++++ .../entity/EmailTemplate.java | 2 +- .../entity/EmailUsers.java | 2 +- .../{i18n => configuration}/entity/I18n.java | 2 +- .../entity/I18nType.java | 2 +- .../entity/MenuIcon.java | 2 +- .../vo/EmailTemplateVo.java | 2 +- .../vo/EmailUsersVo.java | 2 +- .../vo/I18nTypeVo.java | 2 +- .../{i18n => configuration}/vo/I18nVo.java | 2 +- .../vo/MenuIconVo.java | 2 +- .../services/domain/i18n/dto/I18nAddDto.java | 30 ---------------- .../services/domain/i18n/dto/I18nDto.java | 26 -------------- .../domain/i18n/dto/I18nTypeAddDto.java | 28 --------------- .../services/domain/i18n/dto/I18nTypeDto.java | 22 ------------ .../domain/i18n/dto/I18nUpdateDto.java | 34 ------------------ .../domain/menuIcon/dto/MenuIconAddDto.java | 26 -------------- .../domain/menuIcon/dto/MenuIconDto.java | 23 ------------ .../menuIcon/dto/MenuIconUpdateDto.java | 32 ----------------- .../configuration/EmailTemplateMapper.java | 6 ++-- .../configuration/EmailUsersMapper.java | 6 ++-- .../mapper/configuration/I18nMapper.java | 6 ++-- .../mapper/configuration/I18nTypeMapper.java | 4 +-- .../mapper/configuration/MenuIconMapper.java | 6 ++-- .../configuration/EmailTemplateMapper.xml | 4 +-- .../mapper/configuration/EmailUsersMapper.xml | 4 +-- .../mapper/configuration/I18nMapper.xml | 4 +-- .../mapper/configuration/I18nTypeMapper.xml | 4 +-- .../mapper/configuration/MenuIconMapper.xml | 4 +-- .../listener/excel/I18nExcelListener.java | 2 +- .../email/AbstractSenderEmailTemplate.java | 4 +-- .../email/ConcreteSenderEmailTemplate.java | 2 +- .../configuration/EmailTemplateService.java | 8 ++--- .../configuration/EmailUsersService.java | 8 ++--- .../service/configuration/I18nService.java | 14 ++++---- .../configuration/I18nTypeService.java | 13 ++++--- .../configuration/MenuIconService.java | 13 +++---- .../impl/EmailTemplateServiceImpl.java | 8 ++--- .../impl/EmailUsersServiceImpl.java | 8 ++--- .../configuration/impl/I18nServiceImpl.java | 17 ++++----- .../impl/I18nTypeServiceImpl.java | 13 ++++--- .../impl/MenuIconServiceImpl.java | 15 ++++---- .../system/impl/UserLoginServiceImpl.java | 2 +- 53 files changed, 212 insertions(+), 377 deletions(-) rename auth-core/src/main/java/cn/bunny/services/domain/{email => configuration}/dto/EmailTemplateDto.java (97%) rename auth-core/src/main/java/cn/bunny/services/domain/{email => configuration}/dto/EmailUsersDto.java (96%) create mode 100644 auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/I18nDto.java rename auth-core/src/main/java/cn/bunny/services/domain/{i18n/dto/I18nTypeUpdateDto.java => configuration/dto/I18nTypeDto.java} (52%) rename auth-core/src/main/java/cn/bunny/services/domain/{i18n => configuration}/dto/I18nUpdateByFileDto.java (95%) create mode 100644 auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/MenuIconDto.java rename auth-core/src/main/java/cn/bunny/services/domain/{email => configuration}/entity/EmailTemplate.java (95%) rename auth-core/src/main/java/cn/bunny/services/domain/{email => configuration}/entity/EmailUsers.java (96%) rename auth-core/src/main/java/cn/bunny/services/domain/{i18n => configuration}/entity/I18n.java (94%) rename auth-core/src/main/java/cn/bunny/services/domain/{i18n => configuration}/entity/I18nType.java (94%) rename auth-core/src/main/java/cn/bunny/services/domain/{menuIcon => configuration}/entity/MenuIcon.java (93%) rename auth-core/src/main/java/cn/bunny/services/domain/{email => configuration}/vo/EmailTemplateVo.java (96%) rename auth-core/src/main/java/cn/bunny/services/domain/{email => configuration}/vo/EmailUsersVo.java (94%) rename auth-core/src/main/java/cn/bunny/services/domain/{i18n => configuration}/vo/I18nTypeVo.java (92%) rename auth-core/src/main/java/cn/bunny/services/domain/{i18n => configuration}/vo/I18nVo.java (92%) rename auth-core/src/main/java/cn/bunny/services/domain/{menuIcon => configuration}/vo/MenuIconVo.java (91%) delete mode 100644 auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nAddDto.java delete mode 100644 auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nDto.java delete mode 100644 auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nTypeAddDto.java delete mode 100644 auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nTypeDto.java delete mode 100644 auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nUpdateDto.java delete mode 100644 auth-core/src/main/java/cn/bunny/services/domain/menuIcon/dto/MenuIconAddDto.java delete mode 100644 auth-core/src/main/java/cn/bunny/services/domain/menuIcon/dto/MenuIconDto.java delete mode 100644 auth-core/src/main/java/cn/bunny/services/domain/menuIcon/dto/MenuIconUpdateDto.java diff --git a/auth-api/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java b/auth-api/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java index 39a9e5e..4421a9e 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/configuration/EmailTemplateController.java @@ -5,9 +5,9 @@ import cn.bunny.services.domain.common.ValidationGroups; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.email.dto.EmailTemplateDto; -import cn.bunny.services.domain.email.entity.EmailTemplate; -import cn.bunny.services.domain.email.vo.EmailTemplateVo; +import cn.bunny.services.domain.configuration.dto.EmailTemplateDto; +import cn.bunny.services.domain.configuration.entity.EmailTemplate; +import cn.bunny.services.domain.configuration.vo.EmailTemplateVo; import cn.bunny.services.service.configuration.EmailTemplateService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; @@ -54,8 +54,8 @@ public class EmailTemplateController { @Operation(summary = "添加邮件模板", description = "添加邮件模板") @PermissionTag(permission = "emailTemplate:add") @PostMapping() - public Result addEmailTemplate(@Validated(ValidationGroups.Add.class) @RequestBody EmailTemplateDto dto) { - emailTemplateService.addEmailTemplate(dto); + public Result saveEmailTemplate(@Validated(ValidationGroups.Add.class) @RequestBody EmailTemplateDto dto) { + emailTemplateService.saveEmailTemplate(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } diff --git a/auth-api/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java b/auth-api/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java index afd6eca..38d2e6b 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/configuration/EmailUsersController.java @@ -5,9 +5,9 @@ import cn.bunny.services.domain.common.ValidationGroups; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.email.dto.EmailUsersDto; -import cn.bunny.services.domain.email.entity.EmailUsers; -import cn.bunny.services.domain.email.vo.EmailUsersVo; +import cn.bunny.services.domain.configuration.dto.EmailUsersDto; +import cn.bunny.services.domain.configuration.entity.EmailUsers; +import cn.bunny.services.domain.configuration.vo.EmailUsersVo; import cn.bunny.services.service.configuration.EmailUsersService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; @@ -54,8 +54,8 @@ public class EmailUsersController { @Operation(summary = "添加邮箱用户配置", description = "添加邮箱用户配置") @PermissionTag(permission = "emailUsers:add") @PostMapping() - public Result addEmailUsers(@Validated(ValidationGroups.Add.class) @RequestBody EmailUsersDto dto) { - emailUsersService.addEmailUsers(dto); + public Result saveEmailUsers(@Validated(ValidationGroups.Add.class) @RequestBody EmailUsersDto dto) { + emailUsersService.saveEmailUsers(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } diff --git a/auth-api/src/main/java/cn/bunny/services/controller/configuration/I18nController.java b/auth-api/src/main/java/cn/bunny/services/controller/configuration/I18nController.java index 0e48d37..cb43611 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/configuration/I18nController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/configuration/I18nController.java @@ -1,15 +1,14 @@ package cn.bunny.services.controller.configuration; import cn.bunny.services.aop.annotation.PermissionTag; +import cn.bunny.services.domain.common.ValidationGroups; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.i18n.dto.I18nAddDto; -import cn.bunny.services.domain.i18n.dto.I18nDto; -import cn.bunny.services.domain.i18n.dto.I18nUpdateByFileDto; -import cn.bunny.services.domain.i18n.dto.I18nUpdateDto; -import cn.bunny.services.domain.i18n.entity.I18n; -import cn.bunny.services.domain.i18n.vo.I18nVo; +import cn.bunny.services.domain.configuration.dto.I18nDto; +import cn.bunny.services.domain.configuration.dto.I18nUpdateByFileDto; +import cn.bunny.services.domain.configuration.entity.I18n; +import cn.bunny.services.domain.configuration.vo.I18nVo; import cn.bunny.services.service.configuration.I18nService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; @@ -18,6 +17,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import jakarta.validation.Valid; import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -54,22 +54,22 @@ public class I18nController { return Result.success(vo); } - @Operation(summary = "更新多语言", description = "更新多语言") - @PermissionTag(permission = "i18n:update") - @PutMapping() - public Result updateI18n(@Valid @RequestBody I18nUpdateDto dto) { - i18nService.updateI18n(dto); - return Result.success(ResultCodeEnum.UPDATE_SUCCESS); - } - @Operation(summary = "添加多语言", description = "添加多语言") @PermissionTag(permission = "i18n:add") @PostMapping() - public Result addI18n(@Valid @RequestBody I18nAddDto dto) { - i18nService.addI18n(dto); + public Result saveI18n(@Validated(ValidationGroups.Update.class) @RequestBody I18nDto dto) { + i18nService.saveI18n(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } + @Operation(summary = "更新多语言", description = "更新多语言") + @PermissionTag(permission = "i18n:update") + @PutMapping() + public Result updateI18n(@Validated(ValidationGroups.Add.class) @RequestBody I18nDto dto) { + i18nService.updateI18n(dto); + return Result.success(ResultCodeEnum.UPDATE_SUCCESS); + } + @Operation(summary = "删除多语言", description = "删除多语言") @PermissionTag(permission = "i18n:delete") @DeleteMapping() diff --git a/auth-api/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java b/auth-api/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java index 21349fd..c6da741 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/configuration/I18nTypeController.java @@ -1,17 +1,16 @@ package cn.bunny.services.controller.configuration; import cn.bunny.services.aop.annotation.PermissionTag; +import cn.bunny.services.domain.common.ValidationGroups; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.i18n.dto.I18nTypeAddDto; -import cn.bunny.services.domain.i18n.dto.I18nTypeDto; -import cn.bunny.services.domain.i18n.dto.I18nTypeUpdateDto; -import cn.bunny.services.domain.i18n.vo.I18nTypeVo; +import cn.bunny.services.domain.configuration.dto.I18nTypeDto; +import cn.bunny.services.domain.configuration.vo.I18nTypeVo; import cn.bunny.services.service.configuration.I18nTypeService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; -import jakarta.validation.Valid; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -36,15 +35,15 @@ public class I18nTypeController { @Operation(summary = "添加多语言类型", description = "添加多语言类型") @PermissionTag(permission = "i18n:query") @PostMapping() - public Result addI18nType(@Valid @RequestBody I18nTypeAddDto dto) { - i18nTypeService.addI18nType(dto); + public Result saveI18nType(@Validated(ValidationGroups.Add.class) @RequestBody I18nTypeDto dto) { + i18nTypeService.saveI18nType(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } @Operation(summary = "更新多语言类型", description = "更新多语言类型") @PermissionTag(permission = "i18n:update") @PutMapping() - public Result updateI18nType(@Valid @RequestBody I18nTypeUpdateDto dto) { + public Result updateI18nType(@Validated(ValidationGroups.Update.class) @RequestBody I18nTypeDto dto) { i18nTypeService.updateI18nType(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } diff --git a/auth-api/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java b/auth-api/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java index f5ddf80..d7570af 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/configuration/MenuIconController.java @@ -1,21 +1,20 @@ package cn.bunny.services.controller.configuration; import cn.bunny.services.aop.annotation.PermissionTag; +import cn.bunny.services.domain.common.ValidationGroups; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.common.model.vo.result.Result; -import cn.bunny.services.domain.menuIcon.dto.MenuIconAddDto; -import cn.bunny.services.domain.menuIcon.dto.MenuIconDto; -import cn.bunny.services.domain.menuIcon.dto.MenuIconUpdateDto; -import cn.bunny.services.domain.menuIcon.entity.MenuIcon; -import cn.bunny.services.domain.menuIcon.vo.MenuIconVo; +import cn.bunny.services.domain.configuration.dto.MenuIconDto; +import cn.bunny.services.domain.configuration.entity.MenuIcon; +import cn.bunny.services.domain.configuration.vo.MenuIconVo; import cn.bunny.services.service.configuration.MenuIconService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; -import jakarta.validation.Valid; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -54,15 +53,15 @@ public class MenuIconController { @Operation(summary = "添加菜单图标", description = "添加系统菜单图标") @PermissionTag(permission = "menuIcon:add") @PostMapping() - public Result addMenuIcon(@Valid @RequestBody MenuIconAddDto dto) { - menuIconService.addMenuIcon(dto); + public Result saveMenuIcon(@Validated(ValidationGroups.Add.class) @RequestBody MenuIconDto dto) { + menuIconService.saveMenuIcon(dto); return Result.success(ResultCodeEnum.ADD_SUCCESS); } @Operation(summary = "更新菜单图标", description = "更新系统菜单图标") @PermissionTag(permission = "menuIcon:update") @PutMapping() - public Result updateMenuIcon(@Valid @RequestBody MenuIconUpdateDto dto) { + public Result updateMenuIcon(@Validated(ValidationGroups.Update.class) @RequestBody MenuIconDto dto) { menuIconService.updateMenuIcon(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } diff --git a/auth-core/src/main/java/cn/bunny/services/domain/email/dto/EmailTemplateDto.java b/auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/EmailTemplateDto.java similarity index 97% rename from auth-core/src/main/java/cn/bunny/services/domain/email/dto/EmailTemplateDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/EmailTemplateDto.java index a21cc20..37e8ca4 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/email/dto/EmailTemplateDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/EmailTemplateDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.email.dto; +package cn.bunny.services.domain.configuration.dto; import cn.bunny.services.domain.common.ValidationGroups; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/email/dto/EmailUsersDto.java b/auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/EmailUsersDto.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/email/dto/EmailUsersDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/EmailUsersDto.java index ed80e97..816e708 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/email/dto/EmailUsersDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/EmailUsersDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.email.dto; +package cn.bunny.services.domain.configuration.dto; import cn.bunny.services.domain.common.ValidationGroups.Add; import cn.bunny.services.domain.common.ValidationGroups.Update; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/I18nDto.java b/auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/I18nDto.java new file mode 100644 index 0000000..87aaaf5 --- /dev/null +++ b/auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/I18nDto.java @@ -0,0 +1,36 @@ +package cn.bunny.services.domain.configuration.dto; + +import cn.bunny.services.domain.common.ValidationGroups; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Schema(name = "I18nDto对象", title = "多语言分页查询", description = "多语言分页查询") +public class I18nDto { + + @Schema(name = "id", title = "主键") + @NotNull(message = "id不能为空", groups = {ValidationGroups.Update.class}) + private Long id; + + @Schema(name = "keyName", title = "多语言key") + @NotBlank(message = "多语言key不能为空", groups = {ValidationGroups.Add.class, ValidationGroups.Update.class}) + private String keyName; + + @Schema(name = "translation", title = "多语言翻译名称") + @NotBlank(message = "多语言翻译名称不能为空", groups = {ValidationGroups.Add.class, ValidationGroups.Update.class}) + private String translation; + + @Schema(name = "typeName", title = "多语言类型名称") + @NotBlank(message = "多语言类型名称不能为空", groups = {ValidationGroups.Add.class}) + private String typeName; + +} + diff --git a/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nTypeUpdateDto.java b/auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/I18nTypeDto.java similarity index 52% rename from auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nTypeUpdateDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/I18nTypeDto.java index 2a6d85c..baf9e27 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nTypeUpdateDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/I18nTypeDto.java @@ -1,28 +1,31 @@ -package cn.bunny.services.domain.i18n.dto; +package cn.bunny.services.domain.configuration.dto; +import cn.bunny.services.domain.common.ValidationGroups; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @Data @AllArgsConstructor @NoArgsConstructor -@Schema(name = "I18nTypeUpdateDto对象", title = "多语言类型更新", description = "多语言类型更新内容") -public class I18nTypeUpdateDto { +@Builder +@Schema(name = "I18nTypeDto对象", title = "多语言类型", description = "多语言类型") +public class I18nTypeDto { @Schema(name = "id", title = "主键") - @NotNull(message = "id不能为空") + @NotNull(message = "id不能为空", groups = {ValidationGroups.Update.class}) private Long id; @Schema(name = "typeName", title = "多语言类型(比如zh,en)") - @NotBlank(message = "多语言类型不能为空") + @NotBlank(message = "多语言类型不能为空", groups = {ValidationGroups.Add.class, ValidationGroups.Update.class}) private String typeName; @Schema(name = "summary", title = "名称解释(比如中文,英文)") - @NotBlank(message = "名称解释不能为空") + @NotBlank(message = "名称解释不能为空", groups = {ValidationGroups.Add.class, ValidationGroups.Update.class}) private String summary; @Schema(name = "isDefault", title = "是否为默认") diff --git a/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nUpdateByFileDto.java b/auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/I18nUpdateByFileDto.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nUpdateByFileDto.java rename to auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/I18nUpdateByFileDto.java index 034d2e1..09b07d2 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nUpdateByFileDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/I18nUpdateByFileDto.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.i18n.dto; +package cn.bunny.services.domain.configuration.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/MenuIconDto.java b/auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/MenuIconDto.java new file mode 100644 index 0000000..e1c7cb0 --- /dev/null +++ b/auth-core/src/main/java/cn/bunny/services/domain/configuration/dto/MenuIconDto.java @@ -0,0 +1,32 @@ +package cn.bunny.services.domain.configuration.dto; + +import cn.bunny.services.domain.common.ValidationGroups; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Schema(name = "MenuIconDto对象", title = "系统菜单图标分页查询", description = "系统菜单图标管理") +public class MenuIconDto { + + @Schema(name = "id", title = "主键") + @NotNull(message = "id不能为空", groups = {ValidationGroups.Update.class}) + private Long id; + + @Schema(name = "iconCode", title = "icon类名") + @NotBlank(message = "iconCode不能为空", groups = {ValidationGroups.Add.class, ValidationGroups.Update.class}) + private String iconCode; + + @Schema(name = "iconName", title = "icon 名称") + @NotBlank(message = "icon 名称不能为空", groups = {ValidationGroups.Add.class, ValidationGroups.Update.class}) + private String iconName; + +} + diff --git a/auth-core/src/main/java/cn/bunny/services/domain/email/entity/EmailTemplate.java b/auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/EmailTemplate.java similarity index 95% rename from auth-core/src/main/java/cn/bunny/services/domain/email/entity/EmailTemplate.java rename to auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/EmailTemplate.java index 274c6ec..3598d03 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/email/entity/EmailTemplate.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/EmailTemplate.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.email.entity; +package cn.bunny.services.domain.configuration.entity; import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/email/entity/EmailUsers.java b/auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/EmailUsers.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/email/entity/EmailUsers.java rename to auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/EmailUsers.java index 3f1e620..66659aa 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/email/entity/EmailUsers.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/EmailUsers.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.email.entity; +package cn.bunny.services.domain.configuration.entity; import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/i18n/entity/I18n.java b/auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/I18n.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/i18n/entity/I18n.java rename to auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/I18n.java index f73d72c..6a0888c 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/i18n/entity/I18n.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/I18n.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.i18n.entity; +package cn.bunny.services.domain.configuration.entity; import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/i18n/entity/I18nType.java b/auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/I18nType.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/i18n/entity/I18nType.java rename to auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/I18nType.java index ac24676..8a1f288 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/i18n/entity/I18nType.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/I18nType.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.i18n.entity; +package cn.bunny.services.domain.configuration.entity; import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/menuIcon/entity/MenuIcon.java b/auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/MenuIcon.java similarity index 93% rename from auth-core/src/main/java/cn/bunny/services/domain/menuIcon/entity/MenuIcon.java rename to auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/MenuIcon.java index 517ecc9..673a792 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/menuIcon/entity/MenuIcon.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/configuration/entity/MenuIcon.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.menuIcon.entity; +package cn.bunny.services.domain.configuration.entity; import cn.bunny.services.domain.common.model.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/email/vo/EmailTemplateVo.java b/auth-core/src/main/java/cn/bunny/services/domain/configuration/vo/EmailTemplateVo.java similarity index 96% rename from auth-core/src/main/java/cn/bunny/services/domain/email/vo/EmailTemplateVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/configuration/vo/EmailTemplateVo.java index 0d240da..b618941 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/email/vo/EmailTemplateVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/configuration/vo/EmailTemplateVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.email.vo; +package cn.bunny.services.domain.configuration.vo; import cn.bunny.services.domain.common.model.vo.BaseUserVo; import com.alibaba.fastjson2.annotation.JSONField; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/email/vo/EmailUsersVo.java b/auth-core/src/main/java/cn/bunny/services/domain/configuration/vo/EmailUsersVo.java similarity index 94% rename from auth-core/src/main/java/cn/bunny/services/domain/email/vo/EmailUsersVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/configuration/vo/EmailUsersVo.java index 385772f..d7500bc 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/email/vo/EmailUsersVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/configuration/vo/EmailUsersVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.email.vo; +package cn.bunny.services.domain.configuration.vo; import cn.bunny.services.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/i18n/vo/I18nTypeVo.java b/auth-core/src/main/java/cn/bunny/services/domain/configuration/vo/I18nTypeVo.java similarity index 92% rename from auth-core/src/main/java/cn/bunny/services/domain/i18n/vo/I18nTypeVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/configuration/vo/I18nTypeVo.java index 468d029..0780752 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/i18n/vo/I18nTypeVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/configuration/vo/I18nTypeVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.i18n.vo; +package cn.bunny.services.domain.configuration.vo; import cn.bunny.services.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/i18n/vo/I18nVo.java b/auth-core/src/main/java/cn/bunny/services/domain/configuration/vo/I18nVo.java similarity index 92% rename from auth-core/src/main/java/cn/bunny/services/domain/i18n/vo/I18nVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/configuration/vo/I18nVo.java index 331e8e9..57fbbea 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/i18n/vo/I18nVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/configuration/vo/I18nVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.i18n.vo; +package cn.bunny.services.domain.configuration.vo; import cn.bunny.services.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/menuIcon/vo/MenuIconVo.java b/auth-core/src/main/java/cn/bunny/services/domain/configuration/vo/MenuIconVo.java similarity index 91% rename from auth-core/src/main/java/cn/bunny/services/domain/menuIcon/vo/MenuIconVo.java rename to auth-core/src/main/java/cn/bunny/services/domain/configuration/vo/MenuIconVo.java index 853ef8b..dd86fbf 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/menuIcon/vo/MenuIconVo.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/configuration/vo/MenuIconVo.java @@ -1,4 +1,4 @@ -package cn.bunny.services.domain.menuIcon.vo; +package cn.bunny.services.domain.configuration.vo; import cn.bunny.services.domain.common.model.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nAddDto.java b/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nAddDto.java deleted file mode 100644 index 8a51b70..0000000 --- a/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nAddDto.java +++ /dev/null @@ -1,30 +0,0 @@ -package cn.bunny.services.domain.i18n.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Schema(name = "I18nAddDto对象", title = "多语言添加", description = "多语言添加") -public class I18nAddDto { - - @Schema(name = "keyName", title = "多语言key") - @NotBlank(message = "多语言key不能为空") - private String keyName; - - @Schema(name = "translation", title = "多语言翻译名称") - @NotBlank(message = "多语言翻译名称不能为空") - private String translation; - - @Schema(name = "typeName", title = "多语言类型名称") - @NotBlank(message = "多语言类型名称不能为空") - private String typeName; - -} - diff --git a/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nDto.java b/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nDto.java deleted file mode 100644 index f3832b2..0000000 --- a/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nDto.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.bunny.services.domain.i18n.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Schema(name = "I18nDto对象", title = "多语言分页查询", description = "多语言分页查询") -public class I18nDto { - - @Schema(name = "keyName", title = "多语言key") - private String keyName; - - @Schema(name = "translation", title = "多语言翻译名称") - private String translation; - - @Schema(name = "typeName", title = "多语言类型名称") - private String typeName; - -} - diff --git a/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nTypeAddDto.java b/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nTypeAddDto.java deleted file mode 100644 index f435e64..0000000 --- a/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nTypeAddDto.java +++ /dev/null @@ -1,28 +0,0 @@ -package cn.bunny.services.domain.i18n.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Schema(name = "I18nTypeAddDto对象", title = "多语言类型添加", description = "多语言类型添加内容") -public class I18nTypeAddDto { - - @Schema(name = "typeName", title = "多语言类型(比如zh,en)") - @NotBlank(message = "多语言类型不能为空") - private String typeName; - - @Schema(name = "summary", title = "名称解释(比如中文,英文)") - @NotBlank(message = "名称解释不能为空") - private String summary; - - @Schema(name = "isDefault", title = "是否为默认") - private Boolean isDefault = false; - -} - - diff --git a/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nTypeDto.java b/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nTypeDto.java deleted file mode 100644 index d57f543..0000000 --- a/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nTypeDto.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.bunny.services.domain.i18n.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Schema(name = "I18nTypeDto对象", title = "多语言类型", description = "多语言类型") -public class I18nTypeDto { - - @Schema(name = "typeName", title = "多语言类型(比如zh,en)") - private String typeName; - - @Schema(name = "summary", title = "名称解释(比如中文,英文)") - private String summary; - -} \ No newline at end of file diff --git a/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nUpdateDto.java b/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nUpdateDto.java deleted file mode 100644 index bd366b5..0000000 --- a/auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nUpdateDto.java +++ /dev/null @@ -1,34 +0,0 @@ -package cn.bunny.services.domain.i18n.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Schema(name = "I18nUpdateDto对象", title = "多语言更新", description = "多语言更新") -public class I18nUpdateDto { - - @Schema(name = "id", title = "主键") - @NotNull(message = "id不能为空") - private Long id; - - @Schema(name = "keyName", title = "多语言key") - @NotBlank(message = "多语言key不能为空") - private String keyName; - - @Schema(name = "translation", title = "多语言翻译名称") - @NotBlank(message = "多语言翻译名称不能为空") - private String translation; - - @Schema(name = "typeId", title = "多语言类型id") - private Long typeId; - -} - diff --git a/auth-core/src/main/java/cn/bunny/services/domain/menuIcon/dto/MenuIconAddDto.java b/auth-core/src/main/java/cn/bunny/services/domain/menuIcon/dto/MenuIconAddDto.java deleted file mode 100644 index 9fc93d6..0000000 --- a/auth-core/src/main/java/cn/bunny/services/domain/menuIcon/dto/MenuIconAddDto.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.bunny.services.domain.menuIcon.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Schema(name = "MenuIconAddDto对象", title = "添加系统菜单图标", description = "添加系统菜单图标") -public class MenuIconAddDto { - - @Schema(name = "iconCode", title = "icon类名") - @NotBlank(message = "iconCode不能为空") - private String iconCode; - - @Schema(name = "iconName", title = "icon 名称") - @NotBlank(message = "icon 名称不能为空") - private String iconName; - -} - diff --git a/auth-core/src/main/java/cn/bunny/services/domain/menuIcon/dto/MenuIconDto.java b/auth-core/src/main/java/cn/bunny/services/domain/menuIcon/dto/MenuIconDto.java deleted file mode 100644 index b6877c2..0000000 --- a/auth-core/src/main/java/cn/bunny/services/domain/menuIcon/dto/MenuIconDto.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.bunny.services.domain.menuIcon.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Schema(name = "MenuIconDto对象", title = "系统菜单图标分页查询", description = "系统菜单图标管理") -public class MenuIconDto { - - @Schema(name = "iconCode", title = "icon类名") - private String iconCode; - - @Schema(name = "iconName", title = "icon 名称") - private String iconName; - -} - diff --git a/auth-core/src/main/java/cn/bunny/services/domain/menuIcon/dto/MenuIconUpdateDto.java b/auth-core/src/main/java/cn/bunny/services/domain/menuIcon/dto/MenuIconUpdateDto.java deleted file mode 100644 index 19d442a..0000000 --- a/auth-core/src/main/java/cn/bunny/services/domain/menuIcon/dto/MenuIconUpdateDto.java +++ /dev/null @@ -1,32 +0,0 @@ -package cn.bunny.services.domain.menuIcon.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Schema(name = "MenuIconUpdateDto对象", title = "更新系统菜单图标", description = "系统菜单图标管理") -public class MenuIconUpdateDto { - - @Schema(name = "id", title = "主键") - @NotNull(message = "id不能为空") - private Long id; - - @Schema(name = "iconCode", title = "icon类名") - @NotBlank(message = "iconCode不能为空") - @NotNull(message = "iconCode不能为空") - private String iconCode; - - @Schema(name = "iconName", title = "icon 名称") - @NotBlank(message = "icon 名称不能为空") - @NotNull(message = "icon 名称不能为空") - private String iconName; - -} \ No newline at end of file diff --git a/dao/src/main/java/cn/bunny/services/mapper/configuration/EmailTemplateMapper.java b/dao/src/main/java/cn/bunny/services/mapper/configuration/EmailTemplateMapper.java index f7f56eb..e869af7 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/configuration/EmailTemplateMapper.java +++ b/dao/src/main/java/cn/bunny/services/mapper/configuration/EmailTemplateMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.configuration; -import cn.bunny.services.domain.email.dto.EmailTemplateDto; -import cn.bunny.services.domain.email.entity.EmailTemplate; -import cn.bunny.services.domain.email.vo.EmailTemplateVo; +import cn.bunny.services.domain.configuration.dto.EmailTemplateDto; +import cn.bunny.services.domain.configuration.entity.EmailTemplate; +import cn.bunny.services.domain.configuration.vo.EmailTemplateVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/configuration/EmailUsersMapper.java b/dao/src/main/java/cn/bunny/services/mapper/configuration/EmailUsersMapper.java index c30d37d..1d23ec5 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/configuration/EmailUsersMapper.java +++ b/dao/src/main/java/cn/bunny/services/mapper/configuration/EmailUsersMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.configuration; -import cn.bunny.services.domain.email.dto.EmailUsersDto; -import cn.bunny.services.domain.email.entity.EmailUsers; -import cn.bunny.services.domain.email.vo.EmailUsersVo; +import cn.bunny.services.domain.configuration.dto.EmailUsersDto; +import cn.bunny.services.domain.configuration.entity.EmailUsers; +import cn.bunny.services.domain.configuration.vo.EmailUsersVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/configuration/I18nMapper.java b/dao/src/main/java/cn/bunny/services/mapper/configuration/I18nMapper.java index 003e1ef..8093e12 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/configuration/I18nMapper.java +++ b/dao/src/main/java/cn/bunny/services/mapper/configuration/I18nMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.configuration; -import cn.bunny.services.domain.i18n.dto.I18nDto; -import cn.bunny.services.domain.i18n.entity.I18n; -import cn.bunny.services.domain.i18n.vo.I18nVo; +import cn.bunny.services.domain.configuration.dto.I18nDto; +import cn.bunny.services.domain.configuration.entity.I18n; +import cn.bunny.services.domain.configuration.vo.I18nVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/java/cn/bunny/services/mapper/configuration/I18nTypeMapper.java b/dao/src/main/java/cn/bunny/services/mapper/configuration/I18nTypeMapper.java index dcf7c5c..23aff89 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/configuration/I18nTypeMapper.java +++ b/dao/src/main/java/cn/bunny/services/mapper/configuration/I18nTypeMapper.java @@ -1,7 +1,7 @@ package cn.bunny.services.mapper.configuration; -import cn.bunny.services.domain.i18n.dto.I18nTypeDto; -import cn.bunny.services.domain.i18n.entity.I18nType; +import cn.bunny.services.domain.configuration.dto.I18nTypeDto; +import cn.bunny.services.domain.configuration.entity.I18nType; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/dao/src/main/java/cn/bunny/services/mapper/configuration/MenuIconMapper.java b/dao/src/main/java/cn/bunny/services/mapper/configuration/MenuIconMapper.java index 1dbc561..fd302ed 100644 --- a/dao/src/main/java/cn/bunny/services/mapper/configuration/MenuIconMapper.java +++ b/dao/src/main/java/cn/bunny/services/mapper/configuration/MenuIconMapper.java @@ -1,8 +1,8 @@ package cn.bunny.services.mapper.configuration; -import cn.bunny.services.domain.menuIcon.dto.MenuIconDto; -import cn.bunny.services.domain.menuIcon.entity.MenuIcon; -import cn.bunny.services.domain.menuIcon.vo.MenuIconVo; +import cn.bunny.services.domain.configuration.dto.MenuIconDto; +import cn.bunny.services.domain.configuration.entity.MenuIcon; +import cn.bunny.services.domain.configuration.vo.MenuIconVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/dao/src/main/resources/mapper/configuration/EmailTemplateMapper.xml b/dao/src/main/resources/mapper/configuration/EmailTemplateMapper.xml index 3cfd2c6..7663482 100644 --- a/dao/src/main/resources/mapper/configuration/EmailTemplateMapper.xml +++ b/dao/src/main/resources/mapper/configuration/EmailTemplateMapper.xml @@ -3,7 +3,7 @@ - + @@ -25,7 +25,7 @@ - select template.*, create_user.username as create_username, diff --git a/dao/src/main/resources/mapper/configuration/EmailUsersMapper.xml b/dao/src/main/resources/mapper/configuration/EmailUsersMapper.xml index 2e78ab3..fe03187 100644 --- a/dao/src/main/resources/mapper/configuration/EmailUsersMapper.xml +++ b/dao/src/main/resources/mapper/configuration/EmailUsersMapper.xml @@ -3,7 +3,7 @@ - + @@ -26,7 +26,7 @@ - select email_user.*, create_user.username as create_username, diff --git a/dao/src/main/resources/mapper/configuration/I18nMapper.xml b/dao/src/main/resources/mapper/configuration/I18nMapper.xml index 6a565a7..d8eae46 100644 --- a/dao/src/main/resources/mapper/configuration/I18nMapper.xml +++ b/dao/src/main/resources/mapper/configuration/I18nMapper.xml @@ -3,7 +3,7 @@ - + @@ -21,7 +21,7 @@ - select i18n.*, create_user.username as create_username, diff --git a/dao/src/main/resources/mapper/configuration/I18nTypeMapper.xml b/dao/src/main/resources/mapper/configuration/I18nTypeMapper.xml index f874132..49afb90 100644 --- a/dao/src/main/resources/mapper/configuration/I18nTypeMapper.xml +++ b/dao/src/main/resources/mapper/configuration/I18nTypeMapper.xml @@ -3,7 +3,7 @@ - + @@ -21,7 +21,7 @@ - select i18n_type.*, create_user.username as createUsername, diff --git a/dao/src/main/resources/mapper/configuration/MenuIconMapper.xml b/dao/src/main/resources/mapper/configuration/MenuIconMapper.xml index 02be11d..5fa9b64 100644 --- a/dao/src/main/resources/mapper/configuration/MenuIconMapper.xml +++ b/dao/src/main/resources/mapper/configuration/MenuIconMapper.xml @@ -3,7 +3,7 @@ - + @@ -20,7 +20,7 @@ - select icon.*, create_user.username as create_username, diff --git a/service/src/main/java/cn/bunny/services/core/event/listener/excel/I18nExcelListener.java b/service/src/main/java/cn/bunny/services/core/event/listener/excel/I18nExcelListener.java index b4845e5..b698288 100644 --- a/service/src/main/java/cn/bunny/services/core/event/listener/excel/I18nExcelListener.java +++ b/service/src/main/java/cn/bunny/services/core/event/listener/excel/I18nExcelListener.java @@ -1,7 +1,7 @@ package cn.bunny.services.core.event.listener.excel; import cn.bunny.services.domain.common.model.dto.excel.I18nExcel; -import cn.bunny.services.domain.i18n.entity.I18n; +import cn.bunny.services.domain.configuration.entity.I18n; import cn.bunny.services.service.configuration.I18nService; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.read.listener.ReadListener; diff --git a/service/src/main/java/cn/bunny/services/core/template/email/AbstractSenderEmailTemplate.java b/service/src/main/java/cn/bunny/services/core/template/email/AbstractSenderEmailTemplate.java index d180d16..264bc48 100644 --- a/service/src/main/java/cn/bunny/services/core/template/email/AbstractSenderEmailTemplate.java +++ b/service/src/main/java/cn/bunny/services/core/template/email/AbstractSenderEmailTemplate.java @@ -4,8 +4,8 @@ import cn.bunny.services.config.mail.MailSenderConfiguration; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.dto.email.EmailSend; import cn.bunny.services.domain.common.model.dto.email.EmailSendInit; -import cn.bunny.services.domain.email.entity.EmailTemplate; -import cn.bunny.services.domain.email.entity.EmailUsers; +import cn.bunny.services.domain.configuration.entity.EmailTemplate; +import cn.bunny.services.domain.configuration.entity.EmailUsers; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.configuration.EmailUsersMapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/service/src/main/java/cn/bunny/services/core/template/email/ConcreteSenderEmailTemplate.java b/service/src/main/java/cn/bunny/services/core/template/email/ConcreteSenderEmailTemplate.java index 0bd8da5..dedbbb6 100644 --- a/service/src/main/java/cn/bunny/services/core/template/email/ConcreteSenderEmailTemplate.java +++ b/service/src/main/java/cn/bunny/services/core/template/email/ConcreteSenderEmailTemplate.java @@ -1,6 +1,6 @@ package cn.bunny.services.core.template.email; -import cn.bunny.services.domain.email.entity.EmailTemplate; +import cn.bunny.services.domain.configuration.entity.EmailTemplate; import cn.bunny.services.mapper.configuration.EmailTemplateMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/service/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java b/service/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java index e8bc1d4..63294c6 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/EmailTemplateService.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.configuration; import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.email.dto.EmailTemplateDto; -import cn.bunny.services.domain.email.entity.EmailTemplate; -import cn.bunny.services.domain.email.vo.EmailTemplateVo; +import cn.bunny.services.domain.configuration.dto.EmailTemplateDto; +import cn.bunny.services.domain.configuration.entity.EmailTemplate; +import cn.bunny.services.domain.configuration.vo.EmailTemplateVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.validation.Valid; @@ -33,7 +33,7 @@ public interface EmailTemplateService extends IService { * * @param dto 添加表单 */ - void addEmailTemplate(@Valid EmailTemplateDto dto); + void saveEmailTemplate(@Valid EmailTemplateDto dto); /** * 更新邮件模板表 diff --git a/service/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java b/service/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java index a7db809..6593238 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/EmailUsersService.java @@ -1,9 +1,9 @@ package cn.bunny.services.service.configuration; import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.email.dto.EmailUsersDto; -import cn.bunny.services.domain.email.entity.EmailUsers; -import cn.bunny.services.domain.email.vo.EmailUsersVo; +import cn.bunny.services.domain.configuration.dto.EmailUsersDto; +import cn.bunny.services.domain.configuration.entity.EmailUsers; +import cn.bunny.services.domain.configuration.vo.EmailUsersVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.validation.Valid; @@ -33,7 +33,7 @@ public interface EmailUsersService extends IService { * * @param dto 添加表单 */ - void addEmailUsers(@Valid EmailUsersDto dto); + void saveEmailUsers(@Valid EmailUsersDto dto); /** * 更新邮箱用户发送配置 diff --git a/service/src/main/java/cn/bunny/services/service/configuration/I18nService.java b/service/src/main/java/cn/bunny/services/service/configuration/I18nService.java index 8b7c5f8..265e461 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/I18nService.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/I18nService.java @@ -1,13 +1,11 @@ package cn.bunny.services.service.configuration; -import cn.bunny.services.domain.i18n.dto.I18nDto; -import cn.bunny.services.domain.i18n.dto.I18nUpdateByFileDto; -import cn.bunny.services.domain.i18n.dto.I18nUpdateDto; -import cn.bunny.services.domain.i18n.entity.I18n; -import cn.bunny.services.domain.i18n.vo.I18nVo; import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.i18n.dto.I18nAddDto; +import cn.bunny.services.domain.configuration.dto.I18nDto; +import cn.bunny.services.domain.configuration.dto.I18nUpdateByFileDto; +import cn.bunny.services.domain.configuration.entity.I18n; +import cn.bunny.services.domain.configuration.vo.I18nVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.validation.Valid; @@ -45,14 +43,14 @@ public interface I18nService extends IService { * * @param dto 添加表单 */ - void addI18n(@Valid I18nAddDto dto); + void saveI18n(I18nDto dto); /** * * 更新多语言 * * @param dto 更新表单 */ - void updateI18n(@Valid I18nUpdateDto dto); + void updateI18n(I18nDto dto); /** * * 删除多语言类型 diff --git a/service/src/main/java/cn/bunny/services/service/configuration/I18nTypeService.java b/service/src/main/java/cn/bunny/services/service/configuration/I18nTypeService.java index b79c297..2d12cd3 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/I18nTypeService.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/I18nTypeService.java @@ -1,11 +1,10 @@ package cn.bunny.services.service.configuration; -import cn.bunny.services.domain.i18n.dto.I18nTypeAddDto; -import cn.bunny.services.domain.i18n.dto.I18nTypeDto; -import cn.bunny.services.domain.i18n.dto.I18nTypeUpdateDto; -import cn.bunny.services.domain.i18n.entity.I18nType; -import cn.bunny.services.domain.i18n.vo.I18nTypeVo; +import cn.bunny.services.domain.configuration.dto.I18nTypeDto; +import cn.bunny.services.domain.configuration.entity.I18nType; +import cn.bunny.services.domain.configuration.vo.I18nTypeVo; import com.baomidou.mybatisplus.extension.service.IService; +import jakarta.validation.Valid; import java.util.List; @@ -31,14 +30,14 @@ public interface I18nTypeService extends IService { * * @param dto 多语言类型添加 */ - void addI18nType(I18nTypeAddDto dto); + void saveI18nType(@Valid I18nTypeDto dto); /** * 更新多语言类型 * * @param dto 多语言类型更新 */ - void updateI18nType(I18nTypeUpdateDto dto); + void updateI18nType(@Valid I18nTypeDto dto); /** * 删除多语言类型 diff --git a/service/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java b/service/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java index 5be85b6..451f56d 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/MenuIconService.java @@ -1,14 +1,11 @@ package cn.bunny.services.service.configuration; -import cn.bunny.services.domain.menuIcon.dto.MenuIconAddDto; -import cn.bunny.services.domain.menuIcon.dto.MenuIconDto; -import cn.bunny.services.domain.menuIcon.dto.MenuIconUpdateDto; -import cn.bunny.services.domain.menuIcon.entity.MenuIcon; -import cn.bunny.services.domain.menuIcon.vo.MenuIconVo; import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.configuration.dto.MenuIconDto; +import cn.bunny.services.domain.configuration.entity.MenuIcon; +import cn.bunny.services.domain.configuration.vo.MenuIconVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import jakarta.validation.Valid; import java.util.List; @@ -34,14 +31,14 @@ public interface MenuIconService extends IService { * * @param dto 添加表单 */ - void addMenuIcon(@Valid MenuIconAddDto dto); + void saveMenuIcon(MenuIconDto dto); /** * * 更新系统菜单图标 * * @param dto 更新表单 */ - void updateMenuIcon(@Valid MenuIconUpdateDto dto); + void updateMenuIcon(MenuIconDto dto); /** * * 删除|批量删除系统菜单图标类型 diff --git a/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java b/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java index 7bdc282..41421a0 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/impl/EmailTemplateServiceImpl.java @@ -3,9 +3,9 @@ package cn.bunny.services.service.configuration.impl; import cn.bunny.services.domain.common.enums.EmailTemplateEnums; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.result.PageResult; -import cn.bunny.services.domain.email.dto.EmailTemplateDto; -import cn.bunny.services.domain.email.entity.EmailTemplate; -import cn.bunny.services.domain.email.vo.EmailTemplateVo; +import cn.bunny.services.domain.configuration.dto.EmailTemplateDto; +import cn.bunny.services.domain.configuration.entity.EmailTemplate; +import cn.bunny.services.domain.configuration.vo.EmailTemplateVo; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.configuration.EmailTemplateMapper; import cn.bunny.services.service.configuration.EmailTemplateService; @@ -71,7 +71,7 @@ public class EmailTemplateServiceImpl extends ServiceImpl implements I1 */ @Override @CacheEvict(cacheNames = CACHE_NAMES, key = "'i18nMap'", beforeInvocation = true) - public void addI18n(@Valid I18nAddDto dto) { + public void saveI18n(I18nDto dto) { String keyName = dto.getKeyName(); String typeName = dto.getTypeName(); @@ -131,7 +128,7 @@ public class I18nServiceImpl extends ServiceImpl implements I1 */ @Override @CacheEvict(cacheNames = CACHE_NAMES, key = "'i18nMap'", beforeInvocation = true) - public void updateI18n(@Valid I18nUpdateDto dto) { + public void updateI18n(I18nDto dto) { Long id = dto.getId(); // 查询数据是否存在 diff --git a/service/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java b/service/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java index 0991c6a..f95eca3 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/impl/I18nTypeServiceImpl.java @@ -1,16 +1,15 @@ package cn.bunny.services.service.configuration.impl; import cn.bunny.services.domain.common.enums.ResultCodeEnum; -import cn.bunny.services.domain.i18n.dto.I18nTypeAddDto; -import cn.bunny.services.domain.i18n.dto.I18nTypeDto; -import cn.bunny.services.domain.i18n.dto.I18nTypeUpdateDto; -import cn.bunny.services.domain.i18n.entity.I18nType; -import cn.bunny.services.domain.i18n.vo.I18nTypeVo; +import cn.bunny.services.domain.configuration.dto.I18nTypeDto; +import cn.bunny.services.domain.configuration.entity.I18nType; +import cn.bunny.services.domain.configuration.vo.I18nTypeVo; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.configuration.I18nTypeMapper; import cn.bunny.services.service.configuration.I18nTypeService; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jakarta.validation.Valid; import org.springframework.beans.BeanUtils; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; @@ -59,7 +58,7 @@ public class I18nTypeServiceImpl extends ServiceImpl i @CacheEvict(cacheNames = CACHE_NAMES, key = "'i18nMap'", beforeInvocation = true), @CacheEvict(cacheNames = CACHE_NAMES, key = "'i18nTypeList'", beforeInvocation = true), }) - public void addI18nType(I18nTypeAddDto dto) { + public void saveI18nType(@Valid I18nTypeDto dto) { String typeName = dto.getTypeName(); Boolean isDefault = dto.getIsDefault(); I18nType i18nType = new I18nType(); @@ -90,7 +89,7 @@ public class I18nTypeServiceImpl extends ServiceImpl i @CacheEvict(cacheNames = CACHE_NAMES, key = "'i18nMap'", beforeInvocation = true), @CacheEvict(cacheNames = CACHE_NAMES, key = "'i18nTypeList'", beforeInvocation = true), }) - public void updateI18nType(I18nTypeUpdateDto dto) { + public void updateI18nType(@Valid I18nTypeDto dto) { Long id = dto.getId(); Boolean isDefault = dto.getIsDefault(); I18nType i18nType = new I18nType(); diff --git a/service/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java b/service/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java index de6af2d..4b848b4 100644 --- a/service/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/configuration/impl/MenuIconServiceImpl.java @@ -1,12 +1,10 @@ package cn.bunny.services.service.configuration.impl; -import cn.bunny.services.domain.menuIcon.dto.MenuIconAddDto; -import cn.bunny.services.domain.menuIcon.dto.MenuIconDto; -import cn.bunny.services.domain.menuIcon.dto.MenuIconUpdateDto; -import cn.bunny.services.domain.menuIcon.entity.MenuIcon; -import cn.bunny.services.domain.menuIcon.vo.MenuIconVo; -import cn.bunny.services.domain.common.model.vo.result.PageResult; import cn.bunny.services.domain.common.enums.ResultCodeEnum; +import cn.bunny.services.domain.common.model.vo.result.PageResult; +import cn.bunny.services.domain.configuration.dto.MenuIconDto; +import cn.bunny.services.domain.configuration.entity.MenuIcon; +import cn.bunny.services.domain.configuration.vo.MenuIconVo; import cn.bunny.services.exception.AuthCustomerException; import cn.bunny.services.mapper.configuration.MenuIconMapper; import cn.bunny.services.service.configuration.MenuIconService; @@ -14,7 +12,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import jakarta.validation.Valid; import org.springframework.beans.BeanUtils; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; @@ -77,7 +74,7 @@ public class MenuIconServiceImpl extends ServiceImpl i */ @Override @CacheEvict(cacheNames = "menuIcon", key = "'menuIconList'", beforeInvocation = true) - public void addMenuIcon(MenuIconAddDto dto) { + public void saveMenuIcon(MenuIconDto dto) { MenuIcon menuIcon = new MenuIcon(); BeanUtils.copyProperties(dto, menuIcon); save(menuIcon); @@ -90,7 +87,7 @@ public class MenuIconServiceImpl extends ServiceImpl i */ @Override @CacheEvict(cacheNames = "menuIcon", key = "'menuIconList'", beforeInvocation = true) - public void updateMenuIcon(@Valid MenuIconUpdateDto dto) { + public void updateMenuIcon(MenuIconDto dto) { MenuIcon menuIcon = new MenuIcon(); BeanUtils.copyProperties(dto, menuIcon); updateById(menuIcon); diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/UserLoginServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/UserLoginServiceImpl.java index 9cfd63f..028c89c 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/UserLoginServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/UserLoginServiceImpl.java @@ -15,7 +15,7 @@ import cn.bunny.services.domain.common.enums.EmailTemplateEnums; import cn.bunny.services.domain.common.enums.LoginEnums; import cn.bunny.services.domain.common.enums.ResultCodeEnum; import cn.bunny.services.domain.common.model.vo.LoginVo; -import cn.bunny.services.domain.email.entity.EmailTemplate; +import cn.bunny.services.domain.configuration.entity.EmailTemplate; import cn.bunny.services.domain.log.entity.UserLoginLog; import cn.bunny.services.domain.system.dto.user.AdminUserUpdateByLocalUserDto; import cn.bunny.services.domain.system.dto.user.LoginDto;