You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ke...@apache.org on 2021/12/24 03:11:04 UTC

[dolphinscheduler] branch dev updated: Revert "Fix database lose data in standalone (#7556)" (#7604)

This is an automated email from the ASF dual-hosted git repository.

kezhenxu94 pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new 97aecb4  Revert "Fix database lose data in standalone (#7556)" (#7604)
97aecb4 is described below

commit 97aecb40a6a265a9dcbd0e6082d5fe6afb40a347
Author: wind <ca...@users.noreply.github.com>
AuthorDate: Fri Dec 24 11:10:59 2021 +0800

    Revert "Fix database lose data in standalone (#7556)" (#7604)
    
    This reverts commit 82075a4476c16e1ab3806d914e571e0cf48bebc0.
---
 .../org/apache/dolphinscheduler/api/aspect/AccessLogAnnotation.java  | 2 +-
 .../src/main/resources/application.yaml                              | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/aspect/AccessLogAnnotation.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/aspect/AccessLogAnnotation.java
index db62bcd..a7bee62 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/aspect/AccessLogAnnotation.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/aspect/AccessLogAnnotation.java
@@ -28,7 +28,7 @@ import java.lang.annotation.Target;
 @Documented
 public @interface AccessLogAnnotation {
     // ignore request args
-    String[] ignoreRequestArgs() default {"loginUser"};
+    String[] ignoreRequestArgs() default {};
 
     boolean ignoreRequest() default false;
 
diff --git a/dolphinscheduler-standalone-server/src/main/resources/application.yaml b/dolphinscheduler-standalone-server/src/main/resources/application.yaml
index 7f5db4f..bd98cd2 100644
--- a/dolphinscheduler-standalone-server/src/main/resources/application.yaml
+++ b/dolphinscheduler-standalone-server/src/main/resources/application.yaml
@@ -31,12 +31,9 @@ spring:
       - taskDefinition
     caffeine:
       spec: maximumSize=100,expireAfterWrite=300s,recordStats
-  sql:
-    init:
-      schema-locations: classpath:sql/dolphinscheduler_h2.sql
   datasource:
     driver-class-name: org.h2.Driver
-    url: jdbc:h2:mem:dolphinscheduler;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true
+    url: jdbc:h2:mem:dolphinscheduler;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true;INIT=runscript from 'classpath:sql/dolphinscheduler_h2.sql'
     username: sa
     password: ""
     hikari: