diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java index 771c6a1..ae7f3b3 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java @@ -2,6 +2,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.language.I18nFactory; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.enums.AcsExportEnum; @@ -124,10 +125,10 @@ acsPermissionService.addPermission(doorCode, personList, strategyId); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("重复授权"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("添加授权失败", e); - return ResponseData.error("添加授权失败"); + logger.error("add door permission error", e); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } return ResponseData.success(); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java index 771c6a1..ae7f3b3 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java @@ -2,6 +2,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.language.I18nFactory; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.enums.AcsExportEnum; @@ -124,10 +125,10 @@ acsPermissionService.addPermission(doorCode, personList, strategyId); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("重复授权"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("添加授权失败", e); - return ResponseData.error("添加授权失败"); + logger.error("add door permission error", e); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } return ResponseData.success(); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java index 899c451..ac89d3f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.exceptions.MybatisPlusException; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.language.I18nFactory; //import com.casic.missiles.core.result.ResultData; import com.casic.missiles.core.base.response.ResponseData; import com.casic.missiles.core.common.annotion.BussinessLog; @@ -89,10 +90,10 @@ doorService.insert(door); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("门禁编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("门禁添加失败", e); - return ResponseData.error("门禁添加失败"); + logger.error("add door error", e); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -113,10 +114,10 @@ doorService.updateById(door); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("门禁编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("门禁更新失败", e); - return ResponseData.error("门禁更新失败"); + logger.error("update door error", e); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -131,9 +132,9 @@ try { doorService.deleteBatch(ids); }catch (Exception e){ - logger.error("门禁删除失败", e); + logger.error("delete door error", e); e.printStackTrace(); - return ResponseData.error("删除失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -160,7 +161,7 @@ doorService.updateOpenStatus(doorId, openStatus, beginDateTime, endDateTime); }catch (Exception e){ e.printStackTrace(); - return ResponseData.error("更新失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -174,7 +175,7 @@ if(doorService.remoteOpenDoor(doorId)){ return ResponseData.success(); }else { - return ResponseData.error("开门失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } } } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java index 771c6a1..ae7f3b3 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java @@ -2,6 +2,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.language.I18nFactory; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.enums.AcsExportEnum; @@ -124,10 +125,10 @@ acsPermissionService.addPermission(doorCode, personList, strategyId); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("重复授权"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("添加授权失败", e); - return ResponseData.error("添加授权失败"); + logger.error("add door permission error", e); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } return ResponseData.success(); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java index 899c451..ac89d3f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.exceptions.MybatisPlusException; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.language.I18nFactory; //import com.casic.missiles.core.result.ResultData; import com.casic.missiles.core.base.response.ResponseData; import com.casic.missiles.core.common.annotion.BussinessLog; @@ -89,10 +90,10 @@ doorService.insert(door); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("门禁编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("门禁添加失败", e); - return ResponseData.error("门禁添加失败"); + logger.error("add door error", e); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -113,10 +114,10 @@ doorService.updateById(door); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("门禁编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("门禁更新失败", e); - return ResponseData.error("门禁更新失败"); + logger.error("update door error", e); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -131,9 +132,9 @@ try { doorService.deleteBatch(ids); }catch (Exception e){ - logger.error("门禁删除失败", e); + logger.error("delete door error", e); e.printStackTrace(); - return ResponseData.error("删除失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -160,7 +161,7 @@ doorService.updateOpenStatus(doorId, openStatus, beginDateTime, endDateTime); }catch (Exception e){ e.printStackTrace(); - return ResponseData.error("更新失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -174,7 +175,7 @@ if(doorService.remoteOpenDoor(doorId)){ return ResponseData.success(); }else { - return ResponseData.error("开门失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } } } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 193565d..95a4d66 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.exceptions.MybatisPlusException; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.language.I18nFactory; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.datascope.DataScope; @@ -95,10 +96,10 @@ deviceService.insert(device); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("设备编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("设备添加失败", e); - return ResponseData.error("设备添加失败"); + logger.error("add device error", e); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } return ResponseData.success(); } @@ -122,10 +123,10 @@ deviceService.updateById(device); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("设备编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("设备修改失败", e); - return ResponseData.error("设备修改失败"); + logger.error("update device error", e); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -140,9 +141,9 @@ try { deviceService.deleteBatchIds(ids); }catch (Exception e){ - logger.error("设备删除失败", e); + logger.error("delete device error", e); e.printStackTrace(); - return ResponseData.error("设备删除失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -163,7 +164,7 @@ for (Integer failedId : failedIds) { failedCodes.add(deviceService.selectById(failedId).getDevCode()); } - return ResponseData.error(String.join(",",failedCodes) + " 更新失败"); + return ResponseData.error(String.join(",",failedCodes) + I18nFactory.getMessage("operation.error")); } } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java index 771c6a1..ae7f3b3 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java @@ -2,6 +2,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.language.I18nFactory; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.enums.AcsExportEnum; @@ -124,10 +125,10 @@ acsPermissionService.addPermission(doorCode, personList, strategyId); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("重复授权"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("添加授权失败", e); - return ResponseData.error("添加授权失败"); + logger.error("add door permission error", e); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } return ResponseData.success(); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java index 899c451..ac89d3f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.exceptions.MybatisPlusException; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.language.I18nFactory; //import com.casic.missiles.core.result.ResultData; import com.casic.missiles.core.base.response.ResponseData; import com.casic.missiles.core.common.annotion.BussinessLog; @@ -89,10 +90,10 @@ doorService.insert(door); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("门禁编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("门禁添加失败", e); - return ResponseData.error("门禁添加失败"); + logger.error("add door error", e); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -113,10 +114,10 @@ doorService.updateById(door); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("门禁编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("门禁更新失败", e); - return ResponseData.error("门禁更新失败"); + logger.error("update door error", e); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -131,9 +132,9 @@ try { doorService.deleteBatch(ids); }catch (Exception e){ - logger.error("门禁删除失败", e); + logger.error("delete door error", e); e.printStackTrace(); - return ResponseData.error("删除失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -160,7 +161,7 @@ doorService.updateOpenStatus(doorId, openStatus, beginDateTime, endDateTime); }catch (Exception e){ e.printStackTrace(); - return ResponseData.error("更新失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -174,7 +175,7 @@ if(doorService.remoteOpenDoor(doorId)){ return ResponseData.success(); }else { - return ResponseData.error("开门失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } } } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 193565d..95a4d66 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.exceptions.MybatisPlusException; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.language.I18nFactory; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.datascope.DataScope; @@ -95,10 +96,10 @@ deviceService.insert(device); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("设备编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("设备添加失败", e); - return ResponseData.error("设备添加失败"); + logger.error("add device error", e); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } return ResponseData.success(); } @@ -122,10 +123,10 @@ deviceService.updateById(device); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("设备编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("设备修改失败", e); - return ResponseData.error("设备修改失败"); + logger.error("update device error", e); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -140,9 +141,9 @@ try { deviceService.deleteBatchIds(ids); }catch (Exception e){ - logger.error("设备删除失败", e); + logger.error("delete device error", e); e.printStackTrace(); - return ResponseData.error("设备删除失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -163,7 +164,7 @@ for (Integer failedId : failedIds) { failedCodes.add(deviceService.selectById(failedId).getDevCode()); } - return ResponseData.error(String.join(",",failedCodes) + " 更新失败"); + return ResponseData.error(String.join(",",failedCodes) + I18nFactory.getMessage("operation.error")); } } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java index 4a169ac..cb04a52 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java @@ -3,6 +3,7 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.language.I18nFactory; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.metadata.service.IMetadataSupportService; @@ -57,7 +58,7 @@ @ResponseBody public Object imageUpload(String image_zy0,String image_zy1,String image_yy0,String image_yy1,String personId,String idCardNo) throws IOException { if(ToolUtil.isEmpty(image_zy0)||ToolUtil.isEmpty(image_zy1) || ToolUtil.isEmpty(image_yy0) || ToolUtil.isEmpty(image_yy1)){ - return ResponseData.error("有图像为空"); + return ResponseData.error(I18nFactory.getMessage("image.empty")); } String leftFilePath1 = this.filePath+personId+"_left_1.jpg"; @@ -65,16 +66,16 @@ String rightFilePath1 = this.filePath+personId+"_right_1.bmp"; String rightFilePath2 = this.filePath+personId+"_right_2.bmp"; if(!Base64Util.Base64ToImage(image_zy0,leftFilePath1)){ - return ResponseData.error("左眼图像1转换失败"); + return ResponseData.error(I18nFactory.getMessage("image.convertError")); } if(!Base64Util.Base64ToImage(image_zy1,leftFilePath2)){ - return ResponseData.error("左眼图像2转换失败"); + return ResponseData.error(I18nFactory.getMessage("image.convertError")); } if(!Base64Util.Base64ToImage(image_yy0,rightFilePath1 )){ - return ResponseData.error("右眼图像1转换失败"); + return ResponseData.error(I18nFactory.getMessage("image.convertError")); } if(!Base64Util.Base64ToImage(image_yy1,rightFilePath2)){ - return ResponseData.error("右眼图像2转换失败"); + return ResponseData.error(I18nFactory.getMessage("image.convertError")); } String result = irisDataService.addIrisData(leftFilePath1,leftFilePath2,rightFilePath1,rightFilePath2,personId,idCardNo); diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java index 771c6a1..ae7f3b3 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java @@ -2,6 +2,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.language.I18nFactory; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.enums.AcsExportEnum; @@ -124,10 +125,10 @@ acsPermissionService.addPermission(doorCode, personList, strategyId); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("重复授权"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("添加授权失败", e); - return ResponseData.error("添加授权失败"); + logger.error("add door permission error", e); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } return ResponseData.success(); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java index 899c451..ac89d3f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.exceptions.MybatisPlusException; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.language.I18nFactory; //import com.casic.missiles.core.result.ResultData; import com.casic.missiles.core.base.response.ResponseData; import com.casic.missiles.core.common.annotion.BussinessLog; @@ -89,10 +90,10 @@ doorService.insert(door); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("门禁编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("门禁添加失败", e); - return ResponseData.error("门禁添加失败"); + logger.error("add door error", e); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -113,10 +114,10 @@ doorService.updateById(door); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("门禁编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("门禁更新失败", e); - return ResponseData.error("门禁更新失败"); + logger.error("update door error", e); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -131,9 +132,9 @@ try { doorService.deleteBatch(ids); }catch (Exception e){ - logger.error("门禁删除失败", e); + logger.error("delete door error", e); e.printStackTrace(); - return ResponseData.error("删除失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -160,7 +161,7 @@ doorService.updateOpenStatus(doorId, openStatus, beginDateTime, endDateTime); }catch (Exception e){ e.printStackTrace(); - return ResponseData.error("更新失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -174,7 +175,7 @@ if(doorService.remoteOpenDoor(doorId)){ return ResponseData.success(); }else { - return ResponseData.error("开门失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } } } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 193565d..95a4d66 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.exceptions.MybatisPlusException; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.language.I18nFactory; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.datascope.DataScope; @@ -95,10 +96,10 @@ deviceService.insert(device); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("设备编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("设备添加失败", e); - return ResponseData.error("设备添加失败"); + logger.error("add device error", e); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } return ResponseData.success(); } @@ -122,10 +123,10 @@ deviceService.updateById(device); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("设备编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("设备修改失败", e); - return ResponseData.error("设备修改失败"); + logger.error("update device error", e); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -140,9 +141,9 @@ try { deviceService.deleteBatchIds(ids); }catch (Exception e){ - logger.error("设备删除失败", e); + logger.error("delete device error", e); e.printStackTrace(); - return ResponseData.error("设备删除失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -163,7 +164,7 @@ for (Integer failedId : failedIds) { failedCodes.add(deviceService.selectById(failedId).getDevCode()); } - return ResponseData.error(String.join(",",failedCodes) + " 更新失败"); + return ResponseData.error(String.join(",",failedCodes) + I18nFactory.getMessage("operation.error")); } } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java index 4a169ac..cb04a52 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java @@ -3,6 +3,7 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.language.I18nFactory; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.metadata.service.IMetadataSupportService; @@ -57,7 +58,7 @@ @ResponseBody public Object imageUpload(String image_zy0,String image_zy1,String image_yy0,String image_yy1,String personId,String idCardNo) throws IOException { if(ToolUtil.isEmpty(image_zy0)||ToolUtil.isEmpty(image_zy1) || ToolUtil.isEmpty(image_yy0) || ToolUtil.isEmpty(image_yy1)){ - return ResponseData.error("有图像为空"); + return ResponseData.error(I18nFactory.getMessage("image.empty")); } String leftFilePath1 = this.filePath+personId+"_left_1.jpg"; @@ -65,16 +66,16 @@ String rightFilePath1 = this.filePath+personId+"_right_1.bmp"; String rightFilePath2 = this.filePath+personId+"_right_2.bmp"; if(!Base64Util.Base64ToImage(image_zy0,leftFilePath1)){ - return ResponseData.error("左眼图像1转换失败"); + return ResponseData.error(I18nFactory.getMessage("image.convertError")); } if(!Base64Util.Base64ToImage(image_zy1,leftFilePath2)){ - return ResponseData.error("左眼图像2转换失败"); + return ResponseData.error(I18nFactory.getMessage("image.convertError")); } if(!Base64Util.Base64ToImage(image_yy0,rightFilePath1 )){ - return ResponseData.error("右眼图像1转换失败"); + return ResponseData.error(I18nFactory.getMessage("image.convertError")); } if(!Base64Util.Base64ToImage(image_yy1,rightFilePath2)){ - return ResponseData.error("右眼图像2转换失败"); + return ResponseData.error(I18nFactory.getMessage("image.convertError")); } String result = irisDataService.addIrisData(leftFilePath1,leftFilePath2,rightFilePath1,rightFilePath2,personId,idCardNo); diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java index f015d33..350ebf5 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java @@ -5,6 +5,7 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.language.I18nFactory; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.common.constant.Const; import com.casic.missiles.core.common.constant.PersonConst; @@ -107,7 +108,7 @@ } catch (DuplicateKeyException e) { e.printStackTrace(); GunsException gunsException = new GunsException(BizExceptionEnum.SERVER_ERROR); - gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? "身份证号重复" : "人员编码重复"); + gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? I18nFactory.getMessage("person.idCardDuplicated") : I18nFactory.getMessage("person.personIdDuplicate")); throw gunsException; } } @@ -143,7 +144,7 @@ } catch (DuplicateKeyException e) { e.printStackTrace(); GunsException gunsException = new GunsException(BizExceptionEnum.SERVER_ERROR); - gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? "身份证号重复" : "人员编码重复"); + gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? I18nFactory.getMessage("person.idCardDuplicated") : I18nFactory.getMessage("person.personIdDuplicate")); throw gunsException; } } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java index 771c6a1..ae7f3b3 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java @@ -2,6 +2,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.language.I18nFactory; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.enums.AcsExportEnum; @@ -124,10 +125,10 @@ acsPermissionService.addPermission(doorCode, personList, strategyId); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("重复授权"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("添加授权失败", e); - return ResponseData.error("添加授权失败"); + logger.error("add door permission error", e); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } return ResponseData.success(); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java index 899c451..ac89d3f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.exceptions.MybatisPlusException; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.language.I18nFactory; //import com.casic.missiles.core.result.ResultData; import com.casic.missiles.core.base.response.ResponseData; import com.casic.missiles.core.common.annotion.BussinessLog; @@ -89,10 +90,10 @@ doorService.insert(door); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("门禁编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("门禁添加失败", e); - return ResponseData.error("门禁添加失败"); + logger.error("add door error", e); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -113,10 +114,10 @@ doorService.updateById(door); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("门禁编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("门禁更新失败", e); - return ResponseData.error("门禁更新失败"); + logger.error("update door error", e); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -131,9 +132,9 @@ try { doorService.deleteBatch(ids); }catch (Exception e){ - logger.error("门禁删除失败", e); + logger.error("delete door error", e); e.printStackTrace(); - return ResponseData.error("删除失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -160,7 +161,7 @@ doorService.updateOpenStatus(doorId, openStatus, beginDateTime, endDateTime); }catch (Exception e){ e.printStackTrace(); - return ResponseData.error("更新失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -174,7 +175,7 @@ if(doorService.remoteOpenDoor(doorId)){ return ResponseData.success(); }else { - return ResponseData.error("开门失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } } } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 193565d..95a4d66 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.exceptions.MybatisPlusException; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.language.I18nFactory; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.datascope.DataScope; @@ -95,10 +96,10 @@ deviceService.insert(device); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("设备编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("设备添加失败", e); - return ResponseData.error("设备添加失败"); + logger.error("add device error", e); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } return ResponseData.success(); } @@ -122,10 +123,10 @@ deviceService.updateById(device); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("设备编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("设备修改失败", e); - return ResponseData.error("设备修改失败"); + logger.error("update device error", e); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -140,9 +141,9 @@ try { deviceService.deleteBatchIds(ids); }catch (Exception e){ - logger.error("设备删除失败", e); + logger.error("delete device error", e); e.printStackTrace(); - return ResponseData.error("设备删除失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -163,7 +164,7 @@ for (Integer failedId : failedIds) { failedCodes.add(deviceService.selectById(failedId).getDevCode()); } - return ResponseData.error(String.join(",",failedCodes) + " 更新失败"); + return ResponseData.error(String.join(",",failedCodes) + I18nFactory.getMessage("operation.error")); } } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java index 4a169ac..cb04a52 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java @@ -3,6 +3,7 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.language.I18nFactory; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.metadata.service.IMetadataSupportService; @@ -57,7 +58,7 @@ @ResponseBody public Object imageUpload(String image_zy0,String image_zy1,String image_yy0,String image_yy1,String personId,String idCardNo) throws IOException { if(ToolUtil.isEmpty(image_zy0)||ToolUtil.isEmpty(image_zy1) || ToolUtil.isEmpty(image_yy0) || ToolUtil.isEmpty(image_yy1)){ - return ResponseData.error("有图像为空"); + return ResponseData.error(I18nFactory.getMessage("image.empty")); } String leftFilePath1 = this.filePath+personId+"_left_1.jpg"; @@ -65,16 +66,16 @@ String rightFilePath1 = this.filePath+personId+"_right_1.bmp"; String rightFilePath2 = this.filePath+personId+"_right_2.bmp"; if(!Base64Util.Base64ToImage(image_zy0,leftFilePath1)){ - return ResponseData.error("左眼图像1转换失败"); + return ResponseData.error(I18nFactory.getMessage("image.convertError")); } if(!Base64Util.Base64ToImage(image_zy1,leftFilePath2)){ - return ResponseData.error("左眼图像2转换失败"); + return ResponseData.error(I18nFactory.getMessage("image.convertError")); } if(!Base64Util.Base64ToImage(image_yy0,rightFilePath1 )){ - return ResponseData.error("右眼图像1转换失败"); + return ResponseData.error(I18nFactory.getMessage("image.convertError")); } if(!Base64Util.Base64ToImage(image_yy1,rightFilePath2)){ - return ResponseData.error("右眼图像2转换失败"); + return ResponseData.error(I18nFactory.getMessage("image.convertError")); } String result = irisDataService.addIrisData(leftFilePath1,leftFilePath2,rightFilePath1,rightFilePath2,personId,idCardNo); diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java index f015d33..350ebf5 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java @@ -5,6 +5,7 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.language.I18nFactory; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.common.constant.Const; import com.casic.missiles.core.common.constant.PersonConst; @@ -107,7 +108,7 @@ } catch (DuplicateKeyException e) { e.printStackTrace(); GunsException gunsException = new GunsException(BizExceptionEnum.SERVER_ERROR); - gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? "身份证号重复" : "人员编码重复"); + gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? I18nFactory.getMessage("person.idCardDuplicated") : I18nFactory.getMessage("person.personIdDuplicate")); throw gunsException; } } @@ -143,7 +144,7 @@ } catch (DuplicateKeyException e) { e.printStackTrace(); GunsException gunsException = new GunsException(BizExceptionEnum.SERVER_ERROR); - gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? "身份证号重复" : "人员编码重复"); + gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? I18nFactory.getMessage("person.idCardDuplicated") : I18nFactory.getMessage("person.personIdDuplicate")); throw gunsException; } } diff --git a/casic-web/src/main/build/package.xml b/casic-web/src/main/build/package.xml index 68b7576..d3fa097 100644 --- a/casic-web/src/main/build/package.xml +++ b/casic-web/src/main/build/package.xml @@ -14,6 +14,11 @@ src/main/resources/config / + + + src/main/resources/i18n + / + ${project.build.directory} / diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java index 771c6a1..ae7f3b3 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java @@ -2,6 +2,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.language.I18nFactory; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.enums.AcsExportEnum; @@ -124,10 +125,10 @@ acsPermissionService.addPermission(doorCode, personList, strategyId); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("重复授权"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("添加授权失败", e); - return ResponseData.error("添加授权失败"); + logger.error("add door permission error", e); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } return ResponseData.success(); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java index 899c451..ac89d3f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.exceptions.MybatisPlusException; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.language.I18nFactory; //import com.casic.missiles.core.result.ResultData; import com.casic.missiles.core.base.response.ResponseData; import com.casic.missiles.core.common.annotion.BussinessLog; @@ -89,10 +90,10 @@ doorService.insert(door); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("门禁编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("门禁添加失败", e); - return ResponseData.error("门禁添加失败"); + logger.error("add door error", e); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -113,10 +114,10 @@ doorService.updateById(door); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("门禁编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("门禁更新失败", e); - return ResponseData.error("门禁更新失败"); + logger.error("update door error", e); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -131,9 +132,9 @@ try { doorService.deleteBatch(ids); }catch (Exception e){ - logger.error("门禁删除失败", e); + logger.error("delete door error", e); e.printStackTrace(); - return ResponseData.error("删除失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -160,7 +161,7 @@ doorService.updateOpenStatus(doorId, openStatus, beginDateTime, endDateTime); }catch (Exception e){ e.printStackTrace(); - return ResponseData.error("更新失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -174,7 +175,7 @@ if(doorService.remoteOpenDoor(doorId)){ return ResponseData.success(); }else { - return ResponseData.error("开门失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } } } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 193565d..95a4d66 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.exceptions.MybatisPlusException; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.language.I18nFactory; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.datascope.DataScope; @@ -95,10 +96,10 @@ deviceService.insert(device); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("设备编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("设备添加失败", e); - return ResponseData.error("设备添加失败"); + logger.error("add device error", e); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } return ResponseData.success(); } @@ -122,10 +123,10 @@ deviceService.updateById(device); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("设备编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("设备修改失败", e); - return ResponseData.error("设备修改失败"); + logger.error("update device error", e); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -140,9 +141,9 @@ try { deviceService.deleteBatchIds(ids); }catch (Exception e){ - logger.error("设备删除失败", e); + logger.error("delete device error", e); e.printStackTrace(); - return ResponseData.error("设备删除失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -163,7 +164,7 @@ for (Integer failedId : failedIds) { failedCodes.add(deviceService.selectById(failedId).getDevCode()); } - return ResponseData.error(String.join(",",failedCodes) + " 更新失败"); + return ResponseData.error(String.join(",",failedCodes) + I18nFactory.getMessage("operation.error")); } } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java index 4a169ac..cb04a52 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java @@ -3,6 +3,7 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.language.I18nFactory; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.metadata.service.IMetadataSupportService; @@ -57,7 +58,7 @@ @ResponseBody public Object imageUpload(String image_zy0,String image_zy1,String image_yy0,String image_yy1,String personId,String idCardNo) throws IOException { if(ToolUtil.isEmpty(image_zy0)||ToolUtil.isEmpty(image_zy1) || ToolUtil.isEmpty(image_yy0) || ToolUtil.isEmpty(image_yy1)){ - return ResponseData.error("有图像为空"); + return ResponseData.error(I18nFactory.getMessage("image.empty")); } String leftFilePath1 = this.filePath+personId+"_left_1.jpg"; @@ -65,16 +66,16 @@ String rightFilePath1 = this.filePath+personId+"_right_1.bmp"; String rightFilePath2 = this.filePath+personId+"_right_2.bmp"; if(!Base64Util.Base64ToImage(image_zy0,leftFilePath1)){ - return ResponseData.error("左眼图像1转换失败"); + return ResponseData.error(I18nFactory.getMessage("image.convertError")); } if(!Base64Util.Base64ToImage(image_zy1,leftFilePath2)){ - return ResponseData.error("左眼图像2转换失败"); + return ResponseData.error(I18nFactory.getMessage("image.convertError")); } if(!Base64Util.Base64ToImage(image_yy0,rightFilePath1 )){ - return ResponseData.error("右眼图像1转换失败"); + return ResponseData.error(I18nFactory.getMessage("image.convertError")); } if(!Base64Util.Base64ToImage(image_yy1,rightFilePath2)){ - return ResponseData.error("右眼图像2转换失败"); + return ResponseData.error(I18nFactory.getMessage("image.convertError")); } String result = irisDataService.addIrisData(leftFilePath1,leftFilePath2,rightFilePath1,rightFilePath2,personId,idCardNo); diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java index f015d33..350ebf5 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java @@ -5,6 +5,7 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.language.I18nFactory; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.common.constant.Const; import com.casic.missiles.core.common.constant.PersonConst; @@ -107,7 +108,7 @@ } catch (DuplicateKeyException e) { e.printStackTrace(); GunsException gunsException = new GunsException(BizExceptionEnum.SERVER_ERROR); - gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? "身份证号重复" : "人员编码重复"); + gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? I18nFactory.getMessage("person.idCardDuplicated") : I18nFactory.getMessage("person.personIdDuplicate")); throw gunsException; } } @@ -143,7 +144,7 @@ } catch (DuplicateKeyException e) { e.printStackTrace(); GunsException gunsException = new GunsException(BizExceptionEnum.SERVER_ERROR); - gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? "身份证号重复" : "人员编码重复"); + gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? I18nFactory.getMessage("person.idCardDuplicated") : I18nFactory.getMessage("person.personIdDuplicate")); throw gunsException; } } diff --git a/casic-web/src/main/build/package.xml b/casic-web/src/main/build/package.xml index 68b7576..d3fa097 100644 --- a/casic-web/src/main/build/package.xml +++ b/casic-web/src/main/build/package.xml @@ -14,6 +14,11 @@ src/main/resources/config / + + + src/main/resources/i18n + / + ${project.build.directory} / diff --git a/casic-web/src/main/resources/config/application-prod.yml b/casic-web/src/main/resources/config/application-prod.yml index eb47a59..cc89f54 100644 --- a/casic-web/src/main/resources/config/application-prod.yml +++ b/casic-web/src/main/resources/config/application-prod.yml @@ -3,16 +3,21 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://localhost:3306/casic_iris_temperature?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://localhost:8098/casic_iris_temperature?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root password: Casic203 initial-size: 2 min-idle: 1 + messages: + locale: US #默认国际化配置 US为英文 SIMPLIFIED_CHINESE为中文 #flowable数据源和多数据源配置 casic: kaptcha-open: false #是否开启登录时验证码 (true/false) nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram export-temp-path: D:\java\boot\iris\temp\ + iris: + recServiceHost: localhost + recServicePort: 20004 mybatis-plus: global-config: sql-injector: com.casic.missiles.modular.metadata.inject.MetaSqlInject diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java index 771c6a1..ae7f3b3 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java @@ -2,6 +2,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.language.I18nFactory; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.enums.AcsExportEnum; @@ -124,10 +125,10 @@ acsPermissionService.addPermission(doorCode, personList, strategyId); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("重复授权"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("添加授权失败", e); - return ResponseData.error("添加授权失败"); + logger.error("add door permission error", e); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } return ResponseData.success(); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java index 899c451..ac89d3f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.exceptions.MybatisPlusException; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.language.I18nFactory; //import com.casic.missiles.core.result.ResultData; import com.casic.missiles.core.base.response.ResponseData; import com.casic.missiles.core.common.annotion.BussinessLog; @@ -89,10 +90,10 @@ doorService.insert(door); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("门禁编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("门禁添加失败", e); - return ResponseData.error("门禁添加失败"); + logger.error("add door error", e); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -113,10 +114,10 @@ doorService.updateById(door); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("门禁编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("门禁更新失败", e); - return ResponseData.error("门禁更新失败"); + logger.error("update door error", e); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -131,9 +132,9 @@ try { doorService.deleteBatch(ids); }catch (Exception e){ - logger.error("门禁删除失败", e); + logger.error("delete door error", e); e.printStackTrace(); - return ResponseData.error("删除失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -160,7 +161,7 @@ doorService.updateOpenStatus(doorId, openStatus, beginDateTime, endDateTime); }catch (Exception e){ e.printStackTrace(); - return ResponseData.error("更新失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -174,7 +175,7 @@ if(doorService.remoteOpenDoor(doorId)){ return ResponseData.success(); }else { - return ResponseData.error("开门失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } } } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 193565d..95a4d66 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.exceptions.MybatisPlusException; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.language.I18nFactory; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.datascope.DataScope; @@ -95,10 +96,10 @@ deviceService.insert(device); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("设备编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("设备添加失败", e); - return ResponseData.error("设备添加失败"); + logger.error("add device error", e); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } return ResponseData.success(); } @@ -122,10 +123,10 @@ deviceService.updateById(device); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("设备编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("设备修改失败", e); - return ResponseData.error("设备修改失败"); + logger.error("update device error", e); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -140,9 +141,9 @@ try { deviceService.deleteBatchIds(ids); }catch (Exception e){ - logger.error("设备删除失败", e); + logger.error("delete device error", e); e.printStackTrace(); - return ResponseData.error("设备删除失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -163,7 +164,7 @@ for (Integer failedId : failedIds) { failedCodes.add(deviceService.selectById(failedId).getDevCode()); } - return ResponseData.error(String.join(",",failedCodes) + " 更新失败"); + return ResponseData.error(String.join(",",failedCodes) + I18nFactory.getMessage("operation.error")); } } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java index 4a169ac..cb04a52 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java @@ -3,6 +3,7 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.language.I18nFactory; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.metadata.service.IMetadataSupportService; @@ -57,7 +58,7 @@ @ResponseBody public Object imageUpload(String image_zy0,String image_zy1,String image_yy0,String image_yy1,String personId,String idCardNo) throws IOException { if(ToolUtil.isEmpty(image_zy0)||ToolUtil.isEmpty(image_zy1) || ToolUtil.isEmpty(image_yy0) || ToolUtil.isEmpty(image_yy1)){ - return ResponseData.error("有图像为空"); + return ResponseData.error(I18nFactory.getMessage("image.empty")); } String leftFilePath1 = this.filePath+personId+"_left_1.jpg"; @@ -65,16 +66,16 @@ String rightFilePath1 = this.filePath+personId+"_right_1.bmp"; String rightFilePath2 = this.filePath+personId+"_right_2.bmp"; if(!Base64Util.Base64ToImage(image_zy0,leftFilePath1)){ - return ResponseData.error("左眼图像1转换失败"); + return ResponseData.error(I18nFactory.getMessage("image.convertError")); } if(!Base64Util.Base64ToImage(image_zy1,leftFilePath2)){ - return ResponseData.error("左眼图像2转换失败"); + return ResponseData.error(I18nFactory.getMessage("image.convertError")); } if(!Base64Util.Base64ToImage(image_yy0,rightFilePath1 )){ - return ResponseData.error("右眼图像1转换失败"); + return ResponseData.error(I18nFactory.getMessage("image.convertError")); } if(!Base64Util.Base64ToImage(image_yy1,rightFilePath2)){ - return ResponseData.error("右眼图像2转换失败"); + return ResponseData.error(I18nFactory.getMessage("image.convertError")); } String result = irisDataService.addIrisData(leftFilePath1,leftFilePath2,rightFilePath1,rightFilePath2,personId,idCardNo); diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java index f015d33..350ebf5 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java @@ -5,6 +5,7 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.language.I18nFactory; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.common.constant.Const; import com.casic.missiles.core.common.constant.PersonConst; @@ -107,7 +108,7 @@ } catch (DuplicateKeyException e) { e.printStackTrace(); GunsException gunsException = new GunsException(BizExceptionEnum.SERVER_ERROR); - gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? "身份证号重复" : "人员编码重复"); + gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? I18nFactory.getMessage("person.idCardDuplicated") : I18nFactory.getMessage("person.personIdDuplicate")); throw gunsException; } } @@ -143,7 +144,7 @@ } catch (DuplicateKeyException e) { e.printStackTrace(); GunsException gunsException = new GunsException(BizExceptionEnum.SERVER_ERROR); - gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? "身份证号重复" : "人员编码重复"); + gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? I18nFactory.getMessage("person.idCardDuplicated") : I18nFactory.getMessage("person.personIdDuplicate")); throw gunsException; } } diff --git a/casic-web/src/main/build/package.xml b/casic-web/src/main/build/package.xml index 68b7576..d3fa097 100644 --- a/casic-web/src/main/build/package.xml +++ b/casic-web/src/main/build/package.xml @@ -14,6 +14,11 @@ src/main/resources/config / + + + src/main/resources/i18n + / + ${project.build.directory} / diff --git a/casic-web/src/main/resources/config/application-prod.yml b/casic-web/src/main/resources/config/application-prod.yml index eb47a59..cc89f54 100644 --- a/casic-web/src/main/resources/config/application-prod.yml +++ b/casic-web/src/main/resources/config/application-prod.yml @@ -3,16 +3,21 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://localhost:3306/casic_iris_temperature?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://localhost:8098/casic_iris_temperature?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root password: Casic203 initial-size: 2 min-idle: 1 + messages: + locale: US #默认国际化配置 US为英文 SIMPLIFIED_CHINESE为中文 #flowable数据源和多数据源配置 casic: kaptcha-open: false #是否开启登录时验证码 (true/false) nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram export-temp-path: D:\java\boot\iris\temp\ + iris: + recServiceHost: localhost + recServicePort: 20004 mybatis-plus: global-config: sql-injector: com.casic.missiles.modular.metadata.inject.MetaSqlInject diff --git a/casic-web/src/main/resources/i18n/messages.properties b/casic-web/src/main/resources/i18n/messages.properties new file mode 100644 index 0000000..eb9a134 --- /dev/null +++ b/casic-web/src/main/resources/i18n/messages.properties @@ -0,0 +1,12 @@ +admin.no.role=\u7528\u6237\u6CA1\u6709\u767B\u5F55\u89D2\u8272 +admin.password.error=\u7528\u6237\u540D\u6216\u5BC6\u7801\u9519\u8BEF\uFF01 +admin.user.frozen=\u5F53\u524D\u7528\u6237\u5DF2\u51BB\u7ED3\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458! +default.error=\u7F51\u7EDC\u5F02\u5E38 +default.sucess=\u8BF7\u6C42\u6210\u529F +image.convertError=\u56fe\u50cf\u8f6c\u6362\u5931\u8d25 +image.empty=\u6709\u56fe\u50cf\u4e3a\u7a7a +login.sucess=\u767B\u5F55\u6210\u529F +operation.duplicated=\u64cd\u4f5c\u91cd\u590d +operation.error=\u64cd\u4f5c\u5931\u8d25 +person.idCardDuplicated=\u4eba\u5458\u7f16\u53f7\u91cd\u590d +person.personIdDuplicate=\u8eab\u4efd\u8bc1\u53f7\u91cd\u590d \ No newline at end of file diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java index 771c6a1..ae7f3b3 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java @@ -2,6 +2,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.language.I18nFactory; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.enums.AcsExportEnum; @@ -124,10 +125,10 @@ acsPermissionService.addPermission(doorCode, personList, strategyId); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("重复授权"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("添加授权失败", e); - return ResponseData.error("添加授权失败"); + logger.error("add door permission error", e); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } return ResponseData.success(); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java index 899c451..ac89d3f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.exceptions.MybatisPlusException; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.language.I18nFactory; //import com.casic.missiles.core.result.ResultData; import com.casic.missiles.core.base.response.ResponseData; import com.casic.missiles.core.common.annotion.BussinessLog; @@ -89,10 +90,10 @@ doorService.insert(door); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("门禁编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("门禁添加失败", e); - return ResponseData.error("门禁添加失败"); + logger.error("add door error", e); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -113,10 +114,10 @@ doorService.updateById(door); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("门禁编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("门禁更新失败", e); - return ResponseData.error("门禁更新失败"); + logger.error("update door error", e); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -131,9 +132,9 @@ try { doorService.deleteBatch(ids); }catch (Exception e){ - logger.error("门禁删除失败", e); + logger.error("delete door error", e); e.printStackTrace(); - return ResponseData.error("删除失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -160,7 +161,7 @@ doorService.updateOpenStatus(doorId, openStatus, beginDateTime, endDateTime); }catch (Exception e){ e.printStackTrace(); - return ResponseData.error("更新失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -174,7 +175,7 @@ if(doorService.remoteOpenDoor(doorId)){ return ResponseData.success(); }else { - return ResponseData.error("开门失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } } } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 193565d..95a4d66 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.exceptions.MybatisPlusException; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.language.I18nFactory; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.datascope.DataScope; @@ -95,10 +96,10 @@ deviceService.insert(device); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("设备编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("设备添加失败", e); - return ResponseData.error("设备添加失败"); + logger.error("add device error", e); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } return ResponseData.success(); } @@ -122,10 +123,10 @@ deviceService.updateById(device); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("设备编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("设备修改失败", e); - return ResponseData.error("设备修改失败"); + logger.error("update device error", e); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -140,9 +141,9 @@ try { deviceService.deleteBatchIds(ids); }catch (Exception e){ - logger.error("设备删除失败", e); + logger.error("delete device error", e); e.printStackTrace(); - return ResponseData.error("设备删除失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -163,7 +164,7 @@ for (Integer failedId : failedIds) { failedCodes.add(deviceService.selectById(failedId).getDevCode()); } - return ResponseData.error(String.join(",",failedCodes) + " 更新失败"); + return ResponseData.error(String.join(",",failedCodes) + I18nFactory.getMessage("operation.error")); } } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java index 4a169ac..cb04a52 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java @@ -3,6 +3,7 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.language.I18nFactory; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.metadata.service.IMetadataSupportService; @@ -57,7 +58,7 @@ @ResponseBody public Object imageUpload(String image_zy0,String image_zy1,String image_yy0,String image_yy1,String personId,String idCardNo) throws IOException { if(ToolUtil.isEmpty(image_zy0)||ToolUtil.isEmpty(image_zy1) || ToolUtil.isEmpty(image_yy0) || ToolUtil.isEmpty(image_yy1)){ - return ResponseData.error("有图像为空"); + return ResponseData.error(I18nFactory.getMessage("image.empty")); } String leftFilePath1 = this.filePath+personId+"_left_1.jpg"; @@ -65,16 +66,16 @@ String rightFilePath1 = this.filePath+personId+"_right_1.bmp"; String rightFilePath2 = this.filePath+personId+"_right_2.bmp"; if(!Base64Util.Base64ToImage(image_zy0,leftFilePath1)){ - return ResponseData.error("左眼图像1转换失败"); + return ResponseData.error(I18nFactory.getMessage("image.convertError")); } if(!Base64Util.Base64ToImage(image_zy1,leftFilePath2)){ - return ResponseData.error("左眼图像2转换失败"); + return ResponseData.error(I18nFactory.getMessage("image.convertError")); } if(!Base64Util.Base64ToImage(image_yy0,rightFilePath1 )){ - return ResponseData.error("右眼图像1转换失败"); + return ResponseData.error(I18nFactory.getMessage("image.convertError")); } if(!Base64Util.Base64ToImage(image_yy1,rightFilePath2)){ - return ResponseData.error("右眼图像2转换失败"); + return ResponseData.error(I18nFactory.getMessage("image.convertError")); } String result = irisDataService.addIrisData(leftFilePath1,leftFilePath2,rightFilePath1,rightFilePath2,personId,idCardNo); diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java index f015d33..350ebf5 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java @@ -5,6 +5,7 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.language.I18nFactory; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.common.constant.Const; import com.casic.missiles.core.common.constant.PersonConst; @@ -107,7 +108,7 @@ } catch (DuplicateKeyException e) { e.printStackTrace(); GunsException gunsException = new GunsException(BizExceptionEnum.SERVER_ERROR); - gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? "身份证号重复" : "人员编码重复"); + gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? I18nFactory.getMessage("person.idCardDuplicated") : I18nFactory.getMessage("person.personIdDuplicate")); throw gunsException; } } @@ -143,7 +144,7 @@ } catch (DuplicateKeyException e) { e.printStackTrace(); GunsException gunsException = new GunsException(BizExceptionEnum.SERVER_ERROR); - gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? "身份证号重复" : "人员编码重复"); + gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? I18nFactory.getMessage("person.idCardDuplicated") : I18nFactory.getMessage("person.personIdDuplicate")); throw gunsException; } } diff --git a/casic-web/src/main/build/package.xml b/casic-web/src/main/build/package.xml index 68b7576..d3fa097 100644 --- a/casic-web/src/main/build/package.xml +++ b/casic-web/src/main/build/package.xml @@ -14,6 +14,11 @@ src/main/resources/config / + + + src/main/resources/i18n + / + ${project.build.directory} / diff --git a/casic-web/src/main/resources/config/application-prod.yml b/casic-web/src/main/resources/config/application-prod.yml index eb47a59..cc89f54 100644 --- a/casic-web/src/main/resources/config/application-prod.yml +++ b/casic-web/src/main/resources/config/application-prod.yml @@ -3,16 +3,21 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://localhost:3306/casic_iris_temperature?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://localhost:8098/casic_iris_temperature?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root password: Casic203 initial-size: 2 min-idle: 1 + messages: + locale: US #默认国际化配置 US为英文 SIMPLIFIED_CHINESE为中文 #flowable数据源和多数据源配置 casic: kaptcha-open: false #是否开启登录时验证码 (true/false) nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram export-temp-path: D:\java\boot\iris\temp\ + iris: + recServiceHost: localhost + recServicePort: 20004 mybatis-plus: global-config: sql-injector: com.casic.missiles.modular.metadata.inject.MetaSqlInject diff --git a/casic-web/src/main/resources/i18n/messages.properties b/casic-web/src/main/resources/i18n/messages.properties new file mode 100644 index 0000000..eb9a134 --- /dev/null +++ b/casic-web/src/main/resources/i18n/messages.properties @@ -0,0 +1,12 @@ +admin.no.role=\u7528\u6237\u6CA1\u6709\u767B\u5F55\u89D2\u8272 +admin.password.error=\u7528\u6237\u540D\u6216\u5BC6\u7801\u9519\u8BEF\uFF01 +admin.user.frozen=\u5F53\u524D\u7528\u6237\u5DF2\u51BB\u7ED3\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458! +default.error=\u7F51\u7EDC\u5F02\u5E38 +default.sucess=\u8BF7\u6C42\u6210\u529F +image.convertError=\u56fe\u50cf\u8f6c\u6362\u5931\u8d25 +image.empty=\u6709\u56fe\u50cf\u4e3a\u7a7a +login.sucess=\u767B\u5F55\u6210\u529F +operation.duplicated=\u64cd\u4f5c\u91cd\u590d +operation.error=\u64cd\u4f5c\u5931\u8d25 +person.idCardDuplicated=\u4eba\u5458\u7f16\u53f7\u91cd\u590d +person.personIdDuplicate=\u8eab\u4efd\u8bc1\u53f7\u91cd\u590d \ No newline at end of file diff --git a/casic-web/src/main/resources/i18n/messages_en_US.properties b/casic-web/src/main/resources/i18n/messages_en_US.properties new file mode 100644 index 0000000..c69d75d --- /dev/null +++ b/casic-web/src/main/resources/i18n/messages_en_US.properties @@ -0,0 +1,13 @@ +admin.no.role=No role +admin.password.error=Wrong user name or password! +admin.user.frozen=User frozen! +default.error=network anomaly +default.sucess=sucess +image.convertError=image convert error +image.empty=Some images are empty. +login.sucess=Login successfully +operation.duplicated=operation duplicated +operation.error=operation error +person.idCardDuplicated=person code duplicated +person.personIdDuplicate=IdCard duplicated + diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java index 771c6a1..ae7f3b3 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/AcsPermissionController.java @@ -2,6 +2,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.language.I18nFactory; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.enums.AcsExportEnum; @@ -124,10 +125,10 @@ acsPermissionService.addPermission(doorCode, personList, strategyId); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("重复授权"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("添加授权失败", e); - return ResponseData.error("添加授权失败"); + logger.error("add door permission error", e); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } return ResponseData.success(); } diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java index 899c451..ac89d3f 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/DoorController.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.exceptions.MybatisPlusException; import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.language.I18nFactory; //import com.casic.missiles.core.result.ResultData; import com.casic.missiles.core.base.response.ResponseData; import com.casic.missiles.core.common.annotion.BussinessLog; @@ -89,10 +90,10 @@ doorService.insert(door); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("门禁编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("门禁添加失败", e); - return ResponseData.error("门禁添加失败"); + logger.error("add door error", e); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -113,10 +114,10 @@ doorService.updateById(door); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("门禁编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("门禁更新失败", e); - return ResponseData.error("门禁更新失败"); + logger.error("update door error", e); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -131,9 +132,9 @@ try { doorService.deleteBatch(ids); }catch (Exception e){ - logger.error("门禁删除失败", e); + logger.error("delete door error", e); e.printStackTrace(); - return ResponseData.error("删除失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -160,7 +161,7 @@ doorService.updateOpenStatus(doorId, openStatus, beginDateTime, endDateTime); }catch (Exception e){ e.printStackTrace(); - return ResponseData.error("更新失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -174,7 +175,7 @@ if(doorService.remoteOpenDoor(doorId)){ return ResponseData.success(); }else { - return ResponseData.error("开门失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } } } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 193565d..95a4d66 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.exceptions.MybatisPlusException; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.language.I18nFactory; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.datascope.DataScope; @@ -95,10 +96,10 @@ deviceService.insert(device); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("设备编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("设备添加失败", e); - return ResponseData.error("设备添加失败"); + logger.error("add device error", e); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } return ResponseData.success(); } @@ -122,10 +123,10 @@ deviceService.updateById(device); }catch (Exception e){ if (e instanceof DuplicateKeyException) { - return ResponseData.error("设备编号重复"); + return ResponseData.error(I18nFactory.getMessage("operation.duplicated")); } - logger.error("设备修改失败", e); - return ResponseData.error("设备修改失败"); + logger.error("update device error", e); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -140,9 +141,9 @@ try { deviceService.deleteBatchIds(ids); }catch (Exception e){ - logger.error("设备删除失败", e); + logger.error("delete device error", e); e.printStackTrace(); - return ResponseData.error("设备删除失败"); + return ResponseData.error(I18nFactory.getMessage("operation.error")); } return ResponseData.success(); } @@ -163,7 +164,7 @@ for (Integer failedId : failedIds) { failedCodes.add(deviceService.selectById(failedId).getDevCode()); } - return ResponseData.error(String.join(",",failedCodes) + " 更新失败"); + return ResponseData.error(String.join(",",failedCodes) + I18nFactory.getMessage("operation.error")); } } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java index 4a169ac..cb04a52 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisDataController.java @@ -3,6 +3,7 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.language.I18nFactory; import com.casic.missiles.core.common.constant.factory.PageFactory; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.metadata.service.IMetadataSupportService; @@ -57,7 +58,7 @@ @ResponseBody public Object imageUpload(String image_zy0,String image_zy1,String image_yy0,String image_yy1,String personId,String idCardNo) throws IOException { if(ToolUtil.isEmpty(image_zy0)||ToolUtil.isEmpty(image_zy1) || ToolUtil.isEmpty(image_yy0) || ToolUtil.isEmpty(image_yy1)){ - return ResponseData.error("有图像为空"); + return ResponseData.error(I18nFactory.getMessage("image.empty")); } String leftFilePath1 = this.filePath+personId+"_left_1.jpg"; @@ -65,16 +66,16 @@ String rightFilePath1 = this.filePath+personId+"_right_1.bmp"; String rightFilePath2 = this.filePath+personId+"_right_2.bmp"; if(!Base64Util.Base64ToImage(image_zy0,leftFilePath1)){ - return ResponseData.error("左眼图像1转换失败"); + return ResponseData.error(I18nFactory.getMessage("image.convertError")); } if(!Base64Util.Base64ToImage(image_zy1,leftFilePath2)){ - return ResponseData.error("左眼图像2转换失败"); + return ResponseData.error(I18nFactory.getMessage("image.convertError")); } if(!Base64Util.Base64ToImage(image_yy0,rightFilePath1 )){ - return ResponseData.error("右眼图像1转换失败"); + return ResponseData.error(I18nFactory.getMessage("image.convertError")); } if(!Base64Util.Base64ToImage(image_yy1,rightFilePath2)){ - return ResponseData.error("右眼图像2转换失败"); + return ResponseData.error(I18nFactory.getMessage("image.convertError")); } String result = irisDataService.addIrisData(leftFilePath1,leftFilePath2,rightFilePath1,rightFilePath2,personId,idCardNo); diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java index f015d33..350ebf5 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java @@ -5,6 +5,7 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.base.language.I18nFactory; import com.casic.missiles.core.common.annotion.BussinessLog; import com.casic.missiles.core.common.constant.Const; import com.casic.missiles.core.common.constant.PersonConst; @@ -107,7 +108,7 @@ } catch (DuplicateKeyException e) { e.printStackTrace(); GunsException gunsException = new GunsException(BizExceptionEnum.SERVER_ERROR); - gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? "身份证号重复" : "人员编码重复"); + gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? I18nFactory.getMessage("person.idCardDuplicated") : I18nFactory.getMessage("person.personIdDuplicate")); throw gunsException; } } @@ -143,7 +144,7 @@ } catch (DuplicateKeyException e) { e.printStackTrace(); GunsException gunsException = new GunsException(BizExceptionEnum.SERVER_ERROR); - gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? "身份证号重复" : "人员编码重复"); + gunsException.setMessage(e.getMessage().contains("ID_CARD_INDEX") ? I18nFactory.getMessage("person.idCardDuplicated") : I18nFactory.getMessage("person.personIdDuplicate")); throw gunsException; } } diff --git a/casic-web/src/main/build/package.xml b/casic-web/src/main/build/package.xml index 68b7576..d3fa097 100644 --- a/casic-web/src/main/build/package.xml +++ b/casic-web/src/main/build/package.xml @@ -14,6 +14,11 @@ src/main/resources/config / + + + src/main/resources/i18n + / + ${project.build.directory} / diff --git a/casic-web/src/main/resources/config/application-prod.yml b/casic-web/src/main/resources/config/application-prod.yml index eb47a59..cc89f54 100644 --- a/casic-web/src/main/resources/config/application-prod.yml +++ b/casic-web/src/main/resources/config/application-prod.yml @@ -3,16 +3,21 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://localhost:3306/casic_iris_temperature?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://localhost:8098/casic_iris_temperature?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull username: root password: Casic203 initial-size: 2 min-idle: 1 + messages: + locale: US #默认国际化配置 US为英文 SIMPLIFIED_CHINESE为中文 #flowable数据源和多数据源配置 casic: kaptcha-open: false #是否开启登录时验证码 (true/false) nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram export-temp-path: D:\java\boot\iris\temp\ + iris: + recServiceHost: localhost + recServicePort: 20004 mybatis-plus: global-config: sql-injector: com.casic.missiles.modular.metadata.inject.MetaSqlInject diff --git a/casic-web/src/main/resources/i18n/messages.properties b/casic-web/src/main/resources/i18n/messages.properties new file mode 100644 index 0000000..eb9a134 --- /dev/null +++ b/casic-web/src/main/resources/i18n/messages.properties @@ -0,0 +1,12 @@ +admin.no.role=\u7528\u6237\u6CA1\u6709\u767B\u5F55\u89D2\u8272 +admin.password.error=\u7528\u6237\u540D\u6216\u5BC6\u7801\u9519\u8BEF\uFF01 +admin.user.frozen=\u5F53\u524D\u7528\u6237\u5DF2\u51BB\u7ED3\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458! +default.error=\u7F51\u7EDC\u5F02\u5E38 +default.sucess=\u8BF7\u6C42\u6210\u529F +image.convertError=\u56fe\u50cf\u8f6c\u6362\u5931\u8d25 +image.empty=\u6709\u56fe\u50cf\u4e3a\u7a7a +login.sucess=\u767B\u5F55\u6210\u529F +operation.duplicated=\u64cd\u4f5c\u91cd\u590d +operation.error=\u64cd\u4f5c\u5931\u8d25 +person.idCardDuplicated=\u4eba\u5458\u7f16\u53f7\u91cd\u590d +person.personIdDuplicate=\u8eab\u4efd\u8bc1\u53f7\u91cd\u590d \ No newline at end of file diff --git a/casic-web/src/main/resources/i18n/messages_en_US.properties b/casic-web/src/main/resources/i18n/messages_en_US.properties new file mode 100644 index 0000000..c69d75d --- /dev/null +++ b/casic-web/src/main/resources/i18n/messages_en_US.properties @@ -0,0 +1,13 @@ +admin.no.role=No role +admin.password.error=Wrong user name or password! +admin.user.frozen=User frozen! +default.error=network anomaly +default.sucess=sucess +image.convertError=image convert error +image.empty=Some images are empty. +login.sucess=Login successfully +operation.duplicated=operation duplicated +operation.error=operation error +person.idCardDuplicated=person code duplicated +person.personIdDuplicate=IdCard duplicated + diff --git a/casic-web/src/main/resources/i18n/messages_zh_CN.properties b/casic-web/src/main/resources/i18n/messages_zh_CN.properties new file mode 100644 index 0000000..cfbae16 --- /dev/null +++ b/casic-web/src/main/resources/i18n/messages_zh_CN.properties @@ -0,0 +1,12 @@ +admin.no.role=\u7528\u6237\u6CA1\u6709\u767B\u5F55\u89D2\u8272 +admin.password.error=\u7528\u6237\u540D\u6216\u5BC6\u7801\u9519\u8BEF\uFF01 +admin.user.frozen=\u5F53\u524D\u7528\u6237\u5DF2\u51BB\u7ED3\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458! +default.error=\u7F51\u7EDC\u5F02\u5E38 +default.sucess=\u8BF7\u6C42\u6210\u529F +image.convertError=\u56fe\u50cf\u8f6c\u6362\u5931\u8d25 +image.empty=\u6709\u56fe\u50cf\u4e3a\u7a7a +login.sucess=\u767B\u5F55\u6210\u529F +operation.duplicated=\u64cd\u4f5c\u91cd\u590d +operation.error=\u64cd\u4f5c\u5931\u8d25 +person.idCardDuplicated=\u4eba\u5458\u7f16\u53f7\u91cd\u590d +person.personIdDuplicate=\u8eab\u4efd\u8bc1\u53f7\u91cd\u590d