From 13069894aa82b9d4295538d5468cf52f0161a144 Mon Sep 17 00:00:00 2001 From: wangxuanran <3055088966@qq.com> Date: Tue, 11 Jul 2023 17:48:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85=E5=B7=A5=E5=85=B7=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cssc/cms/service/impl/WorkFlowToCmsServiceImpl.java | 4 ---- src/test/java/BuilderPackageEcology.java | 2 +- src/test/java/builderpackage/FileTreeBuilder.java | 8 ++++++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/weaver/xuanran/wang/cssc/cms/service/impl/WorkFlowToCmsServiceImpl.java b/src/main/java/weaver/xuanran/wang/cssc/cms/service/impl/WorkFlowToCmsServiceImpl.java index fd5903e..0c9f67a 100644 --- a/src/main/java/weaver/xuanran/wang/cssc/cms/service/impl/WorkFlowToCmsServiceImpl.java +++ b/src/main/java/weaver/xuanran/wang/cssc/cms/service/impl/WorkFlowToCmsServiceImpl.java @@ -1,18 +1,14 @@ package weaver.xuanran.wang.cssc.cms.service.impl; import aiyh.utils.Util; -import aiyh.utils.excention.CustomerException; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; -import sun.security.krb5.internal.PAData; import weaver.conn.RecordSet; import weaver.conn.RecordSetTrans; import weaver.cssc.workflow.voucher.util.InterfaceLoggerDao; -import weaver.cssc.workflow.voucher.util.VoucherConstants; import weaver.general.TimeUtil; import weaver.soa.workflow.request.RequestInfo; import weaver.xiao.commons.config.entity.RequestMappingConfig; diff --git a/src/test/java/BuilderPackageEcology.java b/src/test/java/BuilderPackageEcology.java index 5dab3d7..a11d4d3 100644 --- a/src/test/java/BuilderPackageEcology.java +++ b/src/test/java/BuilderPackageEcology.java @@ -80,7 +80,7 @@ public class BuilderPackageEcology extends Application { buttonBox.setPadding(new Insets(10)); buttonBox.setAlignment(Pos.CENTER_RIGHT); Map param = new HashMap<>(8); - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd"); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat(FileTreeBuilder.cusDateFormat); Date date = new Date(); param.put("date", simpleDateFormat.format(date)); Button button = new Button("生成升级包"); diff --git a/src/test/java/builderpackage/FileTreeBuilder.java b/src/test/java/builderpackage/FileTreeBuilder.java index 1471c40..1c964e4 100644 --- a/src/test/java/builderpackage/FileTreeBuilder.java +++ b/src/test/java/builderpackage/FileTreeBuilder.java @@ -2,6 +2,8 @@ package builderpackage; import aiyh.utils.excention.CustomerException; import aiyh.utils.tool.cn.hutool.core.util.StrUtil; +import org.apache.commons.lang3.StringUtils; +import weaver.common.util.string.StringUtil; import java.io.*; import java.nio.charset.StandardCharsets; @@ -19,6 +21,8 @@ public class FileTreeBuilder { public static String zipDefaultName; public static String defaultDir; + + public static String cusDateFormat; public static FileInfo buildFileTree() { String directoryPath = "target"; @@ -50,6 +54,10 @@ public class FileTreeBuilder { classPath = classRootPath; zipDefaultName = properties.getProperty("zipDefaultName"); defaultDir = properties.getProperty("defaultDir"); + cusDateFormat = properties.getProperty("cusDateFormat"); + if(StrUtil.isBlank(cusDateFormat)){ + cusDateFormat = "yyyyMMdd"; + } List blacklistPrefixes = Arrays.asList( directoryPath + "generated-sources", directoryPath + "generated-test-sources",