diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java index 1e2bc76d..599bb68e 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java @@ -87,4 +87,6 @@ public class ResultCommon { //该展示区域有关联数据,无法删除! public static final String TAG_ERROR_2 = "tag.error.2"; + public static final String FOLDER_ONLY_ONE = "folder.only.one"; + } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 63e19a56..1d102b48 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -1418,7 +1418,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { int length = Objects.requireNonNull(fileTemp.listFiles()).length; if (length > 2) { FileUnZip.deleteDir(saveDirectory); - throw new JeroBootException(MessageUtils.getMessage(ResultCommon.IMPORT_TEMPLATE_ERROR)); + throw new JeroBootException(MessageUtils.getMessage(ResultCommon.FOLDER_ONLY_ONE)); } File fileNew = new File(zipEntryName); List fileList = new ArrayList<>(); diff --git a/laws-single-startup/src/main/resources/i18n/messages.properties b/laws-single-startup/src/main/resources/i18n/messages.properties index 236077d6..495c217e 100644 --- a/laws-single-startup/src/main/resources/i18n/messages.properties +++ b/laws-single-startup/src/main/resources/i18n/messages.properties @@ -55,4 +55,5 @@ edit.error=\u7F16\u8F91\u5931\u8D25 tag.error.2=\u8BE5\u5C55\u793A\u533A\u57DF\u6709\u5173\u8054\u6570\u636E\uFF0C\u65E0\u6CD5\u5220\u9664\uFF01 check.data.error=\u8BF7\u9009\u62E9\u6570\u636E import.template.error=\u5BFC\u5165\u6A21\u677F\u9519\u8BEF -zip.charset.error=zip\u538B\u7F29\u5305\u7F16\u7801\u9519\u8BEF \ No newline at end of file +zip.charset.error=zip\u538B\u7F29\u5305\u7F16\u7801\u9519\u8BEF +folder.only.one=\u538B\u7F29\u5305\u4E0B\u6709\u4E14\u53EA\u80FD\u6709\u4E00\u4E2A\u6587\u4EF6\u5939 \ No newline at end of file diff --git a/laws-single-startup/src/main/resources/i18n/messages_en.properties b/laws-single-startup/src/main/resources/i18n/messages_en.properties index 3ef27f79..43decfce 100644 --- a/laws-single-startup/src/main/resources/i18n/messages_en.properties +++ b/laws-single-startup/src/main/resources/i18n/messages_en.properties @@ -58,4 +58,5 @@ edit.error=edit error tag.error.2=This exhibition area has associated data and cannot be deleted! check.data.error=Please select data import.template.error=Import template error -zip.charset.error=Zip charset error \ No newline at end of file +zip.charset.error=Zip charset error +folder.only.one=Only one folder can be selected \ No newline at end of file diff --git a/laws-single-startup/src/main/resources/i18n/messages_zh.properties b/laws-single-startup/src/main/resources/i18n/messages_zh.properties index 4cd7652d..4d2fc955 100644 --- a/laws-single-startup/src/main/resources/i18n/messages_zh.properties +++ b/laws-single-startup/src/main/resources/i18n/messages_zh.properties @@ -57,4 +57,5 @@ edit.error=\u7F16\u8F91\u5931\u8D25 tag.error.2=\u8BE5\u5C55\u793A\u533A\u57DF\u6709\u5173\u8054\u6570\u636E\uFF0C\u65E0\u6CD5\u5220\u9664\uFF01 check.data.error=\u8BF7\u9009\u62E9\u6570\u636E import.template.error=\u5BFC\u5165\u6A21\u677F\u9519\u8BEF -zip.charset.error=zip\u538B\u7F29\u5305\u7F16\u7801\u9519\u8BEF \ No newline at end of file +zip.charset.error=zip\u538B\u7F29\u5305\u7F16\u7801\u9519\u8BEF +folder.only.one=\u538B\u7F29\u5305\u4E0B\u6709\u4E14\u53EA\u80FD\u6709\u4E00\u4E2A\u6587\u4EF6\u5939 \ No newline at end of file