Merge branch 'DataLinkDC:dev' into dev

gaoyan1998 · Oct 17, 2024 · 4ef3600 · 4ef3600
2 parents 102ae8e + 202a13e
commit 4ef3600
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git 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
 

diff --git 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/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);

diff --git 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
@@ -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';