Merge branch 'dev' into jdbc-connect-parameters-json-validation-question

apache · Nov 8, 2024 · a080642 · a080642
2 parents 797bce0 + 53efdaa
commit a080642
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 5 deletions.
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/bin/jvm_args_env.sh b/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/bin/jvm_args_env.sh
@@ -22,7 +22,7 @@
 -XX:+IgnoreUnrecognizedVMOptions
 -XX:+PrintGCDateStamps
 -XX:+PrintGCDetails
--Xloggc:gc.log
+-Xloggc:gc-%t.log
 
 -XX:-OmitStackTraceInFastThrow
 -XX:+ExitOnOutOfMemoryError

diff --git a/dolphinscheduler-api/src/main/bin/jvm_args_env.sh b/dolphinscheduler-api/src/main/bin/jvm_args_env.sh
@@ -22,7 +22,7 @@
 -XX:+IgnoreUnrecognizedVMOptions
 -XX:+PrintGCDateStamps
 -XX:+PrintGCDetails
--Xloggc:gc.log
+-Xloggc:gc-%t.log
 
 -XX:-OmitStackTraceInFastThrow
 -XX:+ExitOnOutOfMemoryError

diff --git a/...c/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectParameterServiceImpl.java b/...c/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectParameterServiceImpl.java
@@ -101,6 +101,7 @@ public Result createProjectParameter(User loginUser, long projectCode, String pr
                     .code(CodeGenerateUtils.genCode())
                     .projectCode(projectCode)
                     .userId(loginUser.getId())
+                    .operator(loginUser.getId())
                     .createTime(now)
                     .updateTime(now)
                     .build();

diff --git a/...pi/src/test/java/org/apache/dolphinscheduler/api/service/ProjectParameterServiceTest.java b/...pi/src/test/java/org/apache/dolphinscheduler/api/service/ProjectParameterServiceTest.java
@@ -114,6 +114,9 @@ public void testCreateProjectParameter() {
         result = projectParameterService.createProjectParameter(loginUser, projectCode, "key1", "value",
                 DataType.VARCHAR.name());
         assertEquals(Status.SUCCESS.getCode(), result.getCode());
+
+        ProjectParameter projectParameter = (ProjectParameter) result.getData();
+        assertEquals(loginUser.getId(), projectParameter.getOperator());
     }
 
     @Test

diff --git a/dolphinscheduler-master/src/main/bin/jvm_args_env.sh b/dolphinscheduler-master/src/main/bin/jvm_args_env.sh
@@ -22,7 +22,7 @@
 -XX:+IgnoreUnrecognizedVMOptions
 -XX:+PrintGCDateStamps
 -XX:+PrintGCDetails
--Xloggc:gc.log
+-Xloggc:gc-%t.log
 
 -XX:-OmitStackTraceInFastThrow
 -XX:+ExitOnOutOfMemoryError

diff --git a/dolphinscheduler-standalone-server/src/main/bin/jvm_args_env.sh b/dolphinscheduler-standalone-server/src/main/bin/jvm_args_env.sh
@@ -22,7 +22,7 @@
 -XX:+IgnoreUnrecognizedVMOptions
 -XX:+PrintGCDateStamps
 -XX:+PrintGCDetails
--Xloggc:gc.log
+-Xloggc:gc-%t.log
 
 -XX:-OmitStackTraceInFastThrow
 -XX:+ExitOnOutOfMemoryError

diff --git a/dolphinscheduler-worker/src/main/bin/jvm_args_env.sh b/dolphinscheduler-worker/src/main/bin/jvm_args_env.sh
@@ -22,7 +22,7 @@
 -XX:+IgnoreUnrecognizedVMOptions
 -XX:+PrintGCDateStamps
 -XX:+PrintGCDetails
--Xloggc:gc.log
+-Xloggc:gc-%t.log
 
 -XX:-OmitStackTraceInFastThrow
 -XX:+ExitOnOutOfMemoryError