🏷️ feat: 配置相关实体类验证分组

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.configuration.dto.EmailTemplateDto;
-import cn.bunny.services.domain.email.entity.EmailTemplate;
+import cn.bunny.services.domain.configuration.entity.EmailTemplate;
-import cn.bunny.services.domain.email.vo.EmailTemplateVo;
+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<String> addEmailTemplate(@Validated(ValidationGroups.Add.class) @RequestBody EmailTemplateDto dto) {
+    public Result<String> saveEmailTemplate(@Validated(ValidationGroups.Add.class) @RequestBody EmailTemplateDto dto) {
-        emailTemplateService.addEmailTemplate(dto);
+        emailTemplateService.saveEmailTemplate(dto);
         return Result.success(ResultCodeEnum.ADD_SUCCESS);
     }
 

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.configuration.dto.EmailUsersDto;
-import cn.bunny.services.domain.email.entity.EmailUsers;
+import cn.bunny.services.domain.configuration.entity.EmailUsers;
-import cn.bunny.services.domain.email.vo.EmailUsersVo;
+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<String> addEmailUsers(@Validated(ValidationGroups.Add.class) @RequestBody EmailUsersDto dto) {
+    public Result<String> saveEmailUsers(@Validated(ValidationGroups.Add.class) @RequestBody EmailUsersDto dto) {
-        emailUsersService.addEmailUsers(dto);
+        emailUsersService.saveEmailUsers(dto);
         return Result.success(ResultCodeEnum.ADD_SUCCESS);
     }
 

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.configuration.dto.I18nDto;
-import cn.bunny.services.domain.i18n.dto.I18nDto;
+import cn.bunny.services.domain.configuration.dto.I18nUpdateByFileDto;
-import cn.bunny.services.domain.i18n.dto.I18nUpdateByFileDto;
+import cn.bunny.services.domain.configuration.entity.I18n;
-import cn.bunny.services.domain.i18n.dto.I18nUpdateDto;
+import cn.bunny.services.domain.configuration.vo.I18nVo;
-import cn.bunny.services.domain.i18n.entity.I18n;
-import cn.bunny.services.domain.i18n.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<String> updateI18n(@Valid @RequestBody I18nUpdateDto dto) {
-        i18nService.updateI18n(dto);
-        return Result.success(ResultCodeEnum.UPDATE_SUCCESS);
-    }
-
     @Operation(summary = "添加多语言", description = "添加多语言")
     @PermissionTag(permission = "i18n:add")
     @PostMapping()
-    public Result<String> addI18n(@Valid @RequestBody I18nAddDto dto) {
+    public Result<String> saveI18n(@Validated(ValidationGroups.Update.class) @RequestBody I18nDto dto) {
-        i18nService.addI18n(dto);
+        i18nService.saveI18n(dto);
         return Result.success(ResultCodeEnum.ADD_SUCCESS);
     }
 
+    @Operation(summary = "更新多语言", description = "更新多语言")
+    @PermissionTag(permission = "i18n:update")
+    @PutMapping()
+    public Result<String> 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()

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.configuration.dto.I18nTypeDto;
-import cn.bunny.services.domain.i18n.dto.I18nTypeDto;
+import cn.bunny.services.domain.configuration.vo.I18nTypeVo;
-import cn.bunny.services.domain.i18n.dto.I18nTypeUpdateDto;
-import cn.bunny.services.domain.i18n.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<String> addI18nType(@Valid @RequestBody I18nTypeAddDto dto) {
+    public Result<String> saveI18nType(@Validated(ValidationGroups.Add.class) @RequestBody I18nTypeDto dto) {
-        i18nTypeService.addI18nType(dto);
+        i18nTypeService.saveI18nType(dto);
         return Result.success(ResultCodeEnum.ADD_SUCCESS);
     }
 
     @Operation(summary = "更新多语言类型", description = "更新多语言类型")
     @PermissionTag(permission = "i18n:update")
     @PutMapping()
-    public Result<String> updateI18nType(@Valid @RequestBody I18nTypeUpdateDto dto) {
+    public Result<String> updateI18nType(@Validated(ValidationGroups.Update.class) @RequestBody I18nTypeDto dto) {
         i18nTypeService.updateI18nType(dto);
         return Result.success(ResultCodeEnum.UPDATE_SUCCESS);
     }

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.configuration.dto.MenuIconDto;
-import cn.bunny.services.domain.menuIcon.dto.MenuIconDto;
+import cn.bunny.services.domain.configuration.entity.MenuIcon;
-import cn.bunny.services.domain.menuIcon.dto.MenuIconUpdateDto;
+import cn.bunny.services.domain.configuration.vo.MenuIconVo;
-import cn.bunny.services.domain.menuIcon.entity.MenuIcon;
-import cn.bunny.services.domain.menuIcon.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<String> addMenuIcon(@Valid @RequestBody MenuIconAddDto dto) {
+    public Result<String> saveMenuIcon(@Validated(ValidationGroups.Add.class) @RequestBody MenuIconDto dto) {
-        menuIconService.addMenuIcon(dto);
+        menuIconService.saveMenuIcon(dto);
         return Result.success(ResultCodeEnum.ADD_SUCCESS);
     }
 
     @Operation(summary = "更新菜单图标", description = "更新系统菜单图标")
     @PermissionTag(permission = "menuIcon:update")
     @PutMapping()
-    public Result<String> updateMenuIcon(@Valid @RequestBody MenuIconUpdateDto dto) {
+    public Result<String> updateMenuIcon(@Validated(ValidationGroups.Update.class) @RequestBody MenuIconDto dto) {
         menuIconService.updateMenuIcon(dto);
         return Result.success(ResultCodeEnum.UPDATE_SUCCESS);
     }

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;

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;

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;
+
+}
+

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 = "多语言类型更新内容")
+@Builder
-public class I18nTypeUpdateDto {
+@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 = "是否为默认")

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;

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;
+
+}
+

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nAddDto.java

@@ -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;
-
-}
-

auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nDto.java

@@ -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;
-
-}
-

auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nTypeAddDto.java

@@ -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;
-
-}
-
-

auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nTypeDto.java

@@ -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;
-
-}

auth-core/src/main/java/cn/bunny/services/domain/i18n/dto/I18nUpdateDto.java

@@ -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;
-
-}
-

auth-core/src/main/java/cn/bunny/services/domain/menuIcon/dto/MenuIconAddDto.java

@@ -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;
-
-}
-

auth-core/src/main/java/cn/bunny/services/domain/menuIcon/dto/MenuIconDto.java

@@ -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;
-
-}
-

auth-core/src/main/java/cn/bunny/services/domain/menuIcon/dto/MenuIconUpdateDto.java

@@ -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;
-
-}

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.configuration.dto.EmailTemplateDto;
-import cn.bunny.services.domain.email.entity.EmailTemplate;
+import cn.bunny.services.domain.configuration.entity.EmailTemplate;
-import cn.bunny.services.domain.email.vo.EmailTemplateVo;
+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;

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.configuration.dto.EmailUsersDto;
-import cn.bunny.services.domain.email.entity.EmailUsers;
+import cn.bunny.services.domain.configuration.entity.EmailUsers;
-import cn.bunny.services.domain.email.vo.EmailUsersVo;
+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;

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.configuration.dto.I18nDto;
-import cn.bunny.services.domain.i18n.entity.I18n;
+import cn.bunny.services.domain.configuration.entity.I18n;
-import cn.bunny.services.domain.i18n.vo.I18nVo;
+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;

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.configuration.dto.I18nTypeDto;
-import cn.bunny.services.domain.i18n.entity.I18nType;
+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;

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.configuration.dto.MenuIconDto;
-import cn.bunny.services.domain.menuIcon.entity.MenuIcon;
+import cn.bunny.services.domain.configuration.entity.MenuIcon;
-import cn.bunny.services.domain.menuIcon.vo.MenuIconVo;
+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;

dao/src/main/resources/mapper/configuration/EmailTemplateMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="cn.bunny.services.mapper.configuration.EmailTemplateMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="cn.bunny.services.domain.email.entity.EmailTemplate">
+    <resultMap id="BaseResultMap" type="cn.bunny.services.domain.configuration.entity.EmailTemplate">
         <id column="id" property="id"/>
         <id column="create_time" property="createTime"/>
         <id column="update_time" property="updateTime"/>
@@ -25,7 +25,7 @@
     </sql>
 
     <!-- 分页查询邮件模板表内容 -->
-    <select id="selectListByPage" resultType="cn.bunny.services.domain.email.vo.EmailTemplateVo">
+    <select id="selectListByPage" resultType="cn.bunny.services.domain.configuration.vo.EmailTemplateVo">
         select
         template.*,
         create_user.username as create_username,

dao/src/main/resources/mapper/configuration/EmailUsersMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="cn.bunny.services.mapper.configuration.EmailUsersMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="cn.bunny.services.domain.email.entity.EmailUsers">
+    <resultMap id="BaseResultMap" type="cn.bunny.services.domain.configuration.entity.EmailUsers">
         <id column="id" property="id"/>
         <id column="create_time" property="createTime"/>
         <id column="update_time" property="updateTime"/>
@@ -26,7 +26,7 @@
     </sql>
 
     <!-- 分页查询邮箱用户发送配置内容 -->
-    <select id="selectListByPage" resultType="cn.bunny.services.domain.email.vo.EmailUsersVo">
+    <select id="selectListByPage" resultType="cn.bunny.services.domain.configuration.vo.EmailUsersVo">
         select
         email_user.*,
         create_user.username as create_username,

dao/src/main/resources/mapper/configuration/I18nMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="cn.bunny.services.mapper.configuration.I18nMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="cn.bunny.services.domain.i18n.entity.I18n">
+    <resultMap id="BaseResultMap" type="cn.bunny.services.domain.configuration.entity.I18n">
         <id column="id" property="id"/>
         <result column="key_name" property="keyName"/>
         <result column="translation" property="translation"/>
@@ -21,7 +21,7 @@
     </sql>
 
     <!-- 分页查询多语言内容 -->
-    <select id="selectListByPage" resultType="cn.bunny.services.domain.i18n.vo.I18nVo">
+    <select id="selectListByPage" resultType="cn.bunny.services.domain.configuration.vo.I18nVo">
         select
         i18n.*,
         create_user.username as create_username,

dao/src/main/resources/mapper/configuration/I18nTypeMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="cn.bunny.services.mapper.configuration.I18nTypeMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="cn.bunny.services.domain.i18n.entity.I18nType">
+    <resultMap id="BaseResultMap" type="cn.bunny.services.domain.configuration.entity.I18nType">
         <id column="id" property="id"/>
         <result column="type_name" property="typeName"/>
         <result column="summary" property="summary"/>
@@ -21,7 +21,7 @@
     </sql>
 
     <!-- 多语言类型查询 -->
-    <select id="selectListByPage" resultType="cn.bunny.services.domain.i18n.entity.I18nType">
+    <select id="selectListByPage" resultType="cn.bunny.services.domain.configuration.entity.I18nType">
         select
         i18n_type.*,
         create_user.username as createUsername,

dao/src/main/resources/mapper/configuration/MenuIconMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="cn.bunny.services.mapper.configuration.MenuIconMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="cn.bunny.services.domain.menuIcon.entity.MenuIcon">
+    <resultMap id="BaseResultMap" type="cn.bunny.services.domain.configuration.entity.MenuIcon">
         <id column="id" property="id"/>
         <id column="create_time" property="createTime"/>
         <id column="update_time" property="updateTime"/>
@@ -20,7 +20,7 @@
     </sql>
 
     <!-- 分页查询系统菜单图标内容 -->
-    <select id="selectListByPage" resultType="cn.bunny.services.domain.menuIcon.vo.MenuIconVo">
+    <select id="selectListByPage" resultType="cn.bunny.services.domain.configuration.vo.MenuIconVo">
         select
         icon.*,
         create_user.username as create_username,

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;

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.configuration.entity.EmailTemplate;
-import cn.bunny.services.domain.email.entity.EmailUsers;
+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;

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;

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.configuration.dto.EmailTemplateDto;
-import cn.bunny.services.domain.email.entity.EmailTemplate;
+import cn.bunny.services.domain.configuration.entity.EmailTemplate;
-import cn.bunny.services.domain.email.vo.EmailTemplateVo;
+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<EmailTemplate> {
      *
      * @param dto 添加表单
      */
-    void addEmailTemplate(@Valid EmailTemplateDto dto);
+    void saveEmailTemplate(@Valid EmailTemplateDto dto);
 
     /**
      * 更新邮件模板表

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.configuration.dto.EmailUsersDto;
-import cn.bunny.services.domain.email.entity.EmailUsers;
+import cn.bunny.services.domain.configuration.entity.EmailUsers;
-import cn.bunny.services.domain.email.vo.EmailUsersVo;
+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<EmailUsers> {
      *
      * @param dto 添加表单
      */
-    void addEmailUsers(@Valid EmailUsersDto dto);
+    void saveEmailUsers(@Valid EmailUsersDto dto);
 
     /**
      * 更新邮箱用户发送配置

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<I18n> {
      *
      * @param dto 添加表单
      */
-    void addI18n(@Valid I18nAddDto dto);
+    void saveI18n(I18nDto dto);
 
     /**
      * * 更新多语言
      *
      * @param dto 更新表单
      */
-    void updateI18n(@Valid I18nUpdateDto dto);
+    void updateI18n(I18nDto dto);
 
     /**
      * * 删除多语言类型

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.configuration.dto.I18nTypeDto;
-import cn.bunny.services.domain.i18n.dto.I18nTypeDto;
+import cn.bunny.services.domain.configuration.entity.I18nType;
-import cn.bunny.services.domain.i18n.dto.I18nTypeUpdateDto;
+import cn.bunny.services.domain.configuration.vo.I18nTypeVo;
-import cn.bunny.services.domain.i18n.entity.I18nType;
-import cn.bunny.services.domain.i18n.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<I18nType> {
      *
      * @param dto 多语言类型添加
      */
-    void addI18nType(I18nTypeAddDto dto);
+    void saveI18nType(@Valid I18nTypeDto dto);
 
     /**
      * 更新多语言类型
      *
      * @param dto 多语言类型更新
      */
-    void updateI18nType(I18nTypeUpdateDto dto);
+    void updateI18nType(@Valid I18nTypeDto dto);
 
     /**
      * 删除多语言类型

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<MenuIcon> {
      *
      * @param dto 添加表单
      */
-    void addMenuIcon(@Valid MenuIconAddDto dto);
+    void saveMenuIcon(MenuIconDto dto);
 
     /**
      * * 更新系统菜单图标
      *
      * @param dto 更新表单
      */
-    void updateMenuIcon(@Valid MenuIconUpdateDto dto);
+    void updateMenuIcon(MenuIconDto dto);
 
     /**
      * * 删除|批量删除系统菜单图标类型

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.configuration.dto.EmailTemplateDto;
-import cn.bunny.services.domain.email.entity.EmailTemplate;
+import cn.bunny.services.domain.configuration.entity.EmailTemplate;
-import cn.bunny.services.domain.email.vo.EmailTemplateVo;
+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<EmailTemplateMapper, E
      * @param dto 邮件模板表添加
      */
     @Override
-    public void addEmailTemplate(@Valid EmailTemplateDto dto) {
+    public void saveEmailTemplate(@Valid EmailTemplateDto dto) {
         String type = dto.getType();
 
         // 保存数据

service/src/main/java/cn/bunny/services/service/configuration/impl/EmailUsersServiceImpl.java

@@ -2,9 +2,9 @@ package cn.bunny.services.service.configuration.impl;
 
 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.EmailUsersDto;
+import cn.bunny.services.domain.configuration.dto.EmailUsersDto;
-import cn.bunny.services.domain.email.entity.EmailUsers;
+import cn.bunny.services.domain.configuration.entity.EmailUsers;
-import cn.bunny.services.domain.email.vo.EmailUsersVo;
+import cn.bunny.services.domain.configuration.vo.EmailUsersVo;
 import cn.bunny.services.exception.AuthCustomerException;
 import cn.bunny.services.mapper.configuration.EmailUsersMapper;
 import cn.bunny.services.service.configuration.EmailUsersService;
@@ -62,7 +62,7 @@ public class EmailUsersServiceImpl extends ServiceImpl<EmailUsersMapper, EmailUs
      * @param dto 邮箱用户发送配置添加
      */
     @Override
-    public void addEmailUsers(@Valid EmailUsersDto dto) {
+    public void saveEmailUsers(@Valid EmailUsersDto dto) {
         // 更新邮箱默认状态
         updateEmailUserDefault(dto.getIsDefault());
 

service/src/main/java/cn/bunny/services/service/configuration/impl/I18nServiceImpl.java

@@ -8,13 +8,11 @@ import cn.bunny.services.domain.common.enums.ResultCodeEnum;
 import cn.bunny.services.domain.common.model.dto.excel.I18nExcel;
 import cn.bunny.services.domain.common.model.entity.BaseEntity;
 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.i18n.dto.I18nDto;
+import cn.bunny.services.domain.configuration.dto.I18nUpdateByFileDto;
-import cn.bunny.services.domain.i18n.dto.I18nUpdateByFileDto;
+import cn.bunny.services.domain.configuration.entity.I18n;
-import cn.bunny.services.domain.i18n.dto.I18nUpdateDto;
+import cn.bunny.services.domain.configuration.entity.I18nType;
-import cn.bunny.services.domain.i18n.entity.I18n;
+import cn.bunny.services.domain.configuration.vo.I18nVo;
-import cn.bunny.services.domain.i18n.entity.I18nType;
-import cn.bunny.services.domain.i18n.vo.I18nVo;
 import cn.bunny.services.exception.AuthCustomerException;
 import cn.bunny.services.mapper.configuration.I18nMapper;
 import cn.bunny.services.mapper.configuration.I18nTypeMapper;
@@ -29,7 +27,6 @@ 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.annotation.Resource;
-import jakarta.validation.Valid;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.BeanUtils;
 import org.springframework.cache.annotation.CacheEvict;
@@ -110,7 +107,7 @@ public class I18nServiceImpl extends ServiceImpl<I18nMapper, I18n> 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<I18nMapper, I18n> 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();
 
         // 查询数据是否存在

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.configuration.dto.I18nTypeDto;
-import cn.bunny.services.domain.i18n.dto.I18nTypeDto;
+import cn.bunny.services.domain.configuration.entity.I18nType;
-import cn.bunny.services.domain.i18n.dto.I18nTypeUpdateDto;
+import cn.bunny.services.domain.configuration.vo.I18nTypeVo;
-import cn.bunny.services.domain.i18n.entity.I18nType;
-import cn.bunny.services.domain.i18n.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<I18nTypeMapper, I18nType> 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<I18nTypeMapper, I18nType> 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();

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<MenuIconMapper, MenuIcon> 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<MenuIconMapper, MenuIcon> 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);

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;