diff --git a/wfc-common/wfc-common-core/src/main/resources/i18n/messages_en_US.properties b/wfc-common/wfc-common-core/src/main/resources/i18n/messages_en_US.properties index 63cd353..4724705 100644 --- a/wfc-common/wfc-common-core/src/main/resources/i18n/messages_en_US.properties +++ b/wfc-common/wfc-common-core/src/main/resources/i18n/messages_en_US.properties @@ -111,6 +111,9 @@ system.user.modify.user.failed.email.exist=Modify user ''{0}'' failed, email alr system.user.modify.failed.contact.administrator=Modify personal information exception, please contact the administrator system.user.cannot.delete=The current user cannot be deleted system.config.cannot.delete.builtin=The built-in parameter {0} cannot be deleted +system.dict.delete.failed.dict.assigned=The dictionary ''{0}'' has been assigned and cannot be deleted +system.config.add.failed.config.exist=Add parameter ''{0}'' failed, parameter key already exists +system.config.modify.failed.config.exist=Modify parameter ''{0}'' failed, parameter key already exists ## wfc-common common.operate.success=Operation successful diff --git a/wfc-common/wfc-common-core/src/main/resources/i18n/messages_zh_CN.properties b/wfc-common/wfc-common-core/src/main/resources/i18n/messages_zh_CN.properties index 16e2d71..72e2d9e 100644 --- a/wfc-common/wfc-common-core/src/main/resources/i18n/messages_zh_CN.properties +++ b/wfc-common/wfc-common-core/src/main/resources/i18n/messages_zh_CN.properties @@ -113,6 +113,8 @@ system.user.modify.failed.contact.administrator=修改个人信息异常,请 system.user.cannot.delete=当前用户不能删除 system.config.cannot.delete.builtin=内置参数{0}不能删除 system.dict.delete.failed.dict.assigned=字典数据{0}已分配,不能删除 +system.config.add.failed.config.exist=新增参数''{0}''失败,参数键名已存在 +system.config.modify.failed.config.exist=修改参数''{0}''失败,参数键名已存在 ## wfc-common common.operate.success=操作成功 diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysConfigController.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysConfigController.java index d8f155b..93528cc 100644 --- a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysConfigController.java +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysConfigController.java @@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import org.wfc.common.core.utils.MessageUtils; import org.wfc.common.core.utils.poi.ExcelUtil; import org.wfc.common.core.web.controller.BaseController; import org.wfc.common.core.web.domain.AjaxResult; @@ -85,7 +86,7 @@ public class SysConfigController extends BaseController { if (!configService.checkConfigKeyUnique(config)) { - return error("新增参数'" + config.getConfigName() + "'失败,参数键名已存在"); + return error(MessageUtils.message("system.config.add.failed.config.exist", config.getConfigName())); } config.setCreateBy(SecurityUtils.getUsername()); return toAjax(configService.insertConfig(config)); @@ -101,7 +102,7 @@ public class SysConfigController extends BaseController { if (!configService.checkConfigKeyUnique(config)) { - return error("修改参数'" + config.getConfigName() + "'失败,参数键名已存在"); + return error(MessageUtils.message("system.config.modify.failed.config.exist", config.getConfigName())); } config.setUpdateBy(SecurityUtils.getUsername()); return toAjax(configService.updateConfig(config));