From 846f3e01e1353354abdb7bfd094fa0fd4bb78abc Mon Sep 17 00:00:00 2001 From: Zzm0809 <934230207@qq.com> Date: Thu, 17 Oct 2024 21:44:58 +0800 Subject: [PATCH 1/3] [Improvement] change token key name (#3865) Signed-off-by: Zzm0809 <934230207@qq.com> --- .../src/main/java/org/dinky/interceptor/TenantInterceptor.java | 2 +- dinky-admin/src/main/resources/application.yml | 2 +- dinky-web/src/services/constants.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dinky-admin/src/main/java/org/dinky/interceptor/TenantInterceptor.java b/dinky-admin/src/main/java/org/dinky/interceptor/TenantInterceptor.java index 330509e29f..dc68927584 100644 --- a/dinky-admin/src/main/java/org/dinky/interceptor/TenantInterceptor.java +++ b/dinky-admin/src/main/java/org/dinky/interceptor/TenantInterceptor.java @@ -59,7 +59,7 @@ public boolean preHandle(HttpServletRequest request, @NotNull HttpServletRespons if (Asserts.isNotNull(cookies)) { for (Cookie cookie : cookies) { switch (cookie.getName()) { - case "token": + case "dinky-token": token = Opt.ofBlankAble(cookie.getValue()); SaTokenDao saTokenDao = SaManager.getSaTokenDao(); String keyTokenValue = StpUtil.getStpLogic().splicingKeyTokenValue(token.get()); diff --git a/dinky-admin/src/main/resources/application.yml b/dinky-admin/src/main/resources/application.yml index a8c537a333..0855ab1b26 100644 --- a/dinky-admin/src/main/resources/application.yml +++ b/dinky-admin/src/main/resources/application.yml @@ -145,7 +145,7 @@ sa-token: is-write-header: true # is read header is-read-header: true - token-name: token + token-name: dinky-token is-read-cookie: true --- diff --git a/dinky-web/src/services/constants.tsx b/dinky-web/src/services/constants.tsx index c1dadc54e2..209361dd8d 100644 --- a/dinky-web/src/services/constants.tsx +++ b/dinky-web/src/services/constants.tsx @@ -35,7 +35,7 @@ export const LANGUAGE_EN = 'en-US'; export const SERVER_VERSION = 'dinky_server_version'; -export const TOKEN_KEY = 'token'; +export const TOKEN_KEY = 'dinky-token'; export const DATE_FORMAT = 'YYYY-MM-DD'; export const DATETIME_FORMAT = 'YYYY-MM-DD HH:mm:ss'; From ea1d900129c238dcc16da7c29434ccd0787982cd Mon Sep 17 00:00:00 2001 From: zhuxt2015 <594754793@qq.com> Date: Thu, 17 Oct 2024 21:46:10 +0800 Subject: [PATCH 2/3] [BugFix]fix job id is null exception in query model (#3869) Co-authored-by: zhuxt2015 --- .../main/java/org/dinky/job/handler/Job2MysqlHandler.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dinky-admin/src/main/java/org/dinky/job/handler/Job2MysqlHandler.java b/dinky-admin/src/main/java/org/dinky/job/handler/Job2MysqlHandler.java index a52f906d43..9694c50146 100644 --- a/dinky-admin/src/main/java/org/dinky/job/handler/Job2MysqlHandler.java +++ b/dinky-admin/src/main/java/org/dinky/job/handler/Job2MysqlHandler.java @@ -180,17 +180,19 @@ public boolean success() { history.setClusterId(clusterId); historyService.updateById(history); - if (Asserts.isNullCollection(job.getJids()) || Asserts.isNullString(job.getJobManagerAddress())) { + if (job.getJobConfig().isStatementSet() + && (Asserts.isNullCollection(job.getJids()) || Asserts.isNullString(job.getJobManagerAddress()))) { throw new BusException("The JobID or JobManagerAddress is null. "); } - String jid = job.getJids().get(0); JobInstance jobInstance = history.buildJobInstance(); jobInstance.setHistoryId(job.getId()); jobInstance.setClusterId(clusterId); jobInstance.setTaskId(taskId); jobInstance.setName(job.getJobConfig().getJobName()); - jobInstance.setJid(jid); + if (Asserts.isNotNullCollection(job.getJids())) { + jobInstance.setJid(job.getJids().get(0)); + } jobInstance.setStep(job.getJobConfig().getStep()); jobInstance.setStatus(JobStatus.INITIALIZING.getValue()); jobInstanceService.save(jobInstance); From 202a13ee75a2701035c38b24b836fafe86103591 Mon Sep 17 00:00:00 2001 From: zhuxt2015 <594754793@qq.com> Date: Thu, 17 Oct 2024 21:46:59 +0800 Subject: [PATCH 3/3] [Improvement][Docker]Limit the maximum percentage of container memory used by the JVM via -XX:MaxRAMPercentage (#3840) --- deploy/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile index 86d7d028ec..68502ff200 100755 --- a/deploy/docker/Dockerfile +++ b/deploy/docker/Dockerfile @@ -48,7 +48,7 @@ RUN rm -f /opt/dinky/extends/flink${FLINK_VERSION}/flink/flink-table-planner-lo COPY --from=flink-base /opt/flink/opt/flink-table-planner*.jar /opt/dinky/extends/flink${FLINK_VERSION}/flink/ -RUN mkdir /opt/dinky/customJar && chmod -R 777 /opt/dinky/ +RUN mkdir /opt/dinky/customJar && chmod -R 777 /opt/dinky/ && sed -i 's/-Xms512M -Xmx2048M -XX:PermSize=512M/-XX:+UseContainerSupport -XX:InitialRAMPercentage=70.0 -XX:MaxRAMPercentage=70.0/g' auto.sh EXPOSE 8888