From 1bd8b75e8c00290ab50f0495388ec3e98060dcc9 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 2 Apr 2022 18:10:08 +0800 Subject: [PATCH 1/2] bug --- .../com/epmet/commons/tools/utils/EpmetRequestHolder.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/EpmetRequestHolder.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/EpmetRequestHolder.java index 94304fab98..2a70916069 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/EpmetRequestHolder.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/EpmetRequestHolder.java @@ -1,6 +1,7 @@ package com.epmet.commons.tools.utils; import com.alibaba.ttl.TransmittableThreadLocal; +import com.epmet.commons.tools.constant.StrConstant; import org.apache.commons.lang3.StringUtils; import java.util.HashMap; @@ -46,7 +47,11 @@ public class EpmetRequestHolder { * @return */ public static String getHeader(String headerName) { - return requestHeaderTtl.get().get(headerName.toLowerCase()); + Map stringStringMap = requestHeaderTtl.get(); + if (stringStringMap == null){ + return StrConstant.EPMETY_STR; + } + return stringStringMap.get(headerName.toLowerCase()); } /** From d1d8a9f3b82e6bbd0cc9ce31cae55c4ed0edf5f5 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 6 Apr 2022 10:28:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E6=97=A5->=E5=BA=9F=E5=BC=83=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=86=85=E9=83=A8=E8=B0=83=E7=94=A8=E7=9A=84=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V0.0.2__add_workdayinit_job.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/resources/db/migration/V0.0.2__add_workdayinit_job.sql diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/resources/db/migration/V0.0.2__add_workdayinit_job.sql b/epmet-module/epmet-job/epmet-job-server/src/main/resources/db/migration/V0.0.2__add_workdayinit_job.sql new file mode 100644 index 0000000000..e06095639b --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/resources/db/migration/V0.0.2__add_workdayinit_job.sql @@ -0,0 +1 @@ +INSERT INTO `epmet_job`.`schedule_job` (`id`, `bean_name`, `params`, `cron_expression`, `status`, `remark`, `creator`, `create_date`, `updater`, `update_date`) VALUES (1511526737639378945, 'workDayInitTask', '', '3 0 0 * * ?', 1, '调用第三方api初始化工作日（有调用限制）参数：20220406', NULL, '2022-04-06 10:10:32', 0, '2022-04-06 10:11:04');