Merge 62a7665 into f99d3f1

ruanwenjun · web-flow · commit 2249d3c8c323 · 2024-04-15T11:44:20.000Z
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/python/PythonGateway.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/python/PythonGateway.java
@@ -184,7 +184,7 @@ public Map<String, Long> getCodeAndVersion(String projectName, String processDef
         Map<String, Long> result = new HashMap<>();
         // project do not exists, mean task not exists too, so we should directly return init value
         if (project == null) {
-            result.put("code", CodeGenerateUtils.getInstance().genCode());
+            result.put("code", CodeGenerateUtils.genCode());
             result.put("version", 0L);
             return result;
         }
@@ -194,15 +194,15 @@ public Map<String, Long> getCodeAndVersion(String projectName, String processDef
         // In the case project exists, but current workflow still not created, we should also return the init
         // version of it
         if (processDefinition == null) {
-            result.put("code", CodeGenerateUtils.getInstance().genCode());
+            result.put("code", CodeGenerateUtils.genCode());
             result.put("version", 0L);
             return result;
         }
 
         TaskDefinition taskDefinition =
                 taskDefinitionMapper.queryByName(project.getCode(), processDefinition.getCode(), taskName);
         if (taskDefinition == null) {
-            result.put("code", CodeGenerateUtils.getInstance().genCode());
+            result.put("code", CodeGenerateUtils.genCode());
             result.put("version", 0L);
         } else {
             result.put("code", taskDefinition.getCode());
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ClusterServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ClusterServiceImpl.java
@@ -96,7 +96,7 @@ public Long createCluster(User loginUser, String name, String config, String des
         cluster.setOperator(loginUser.getId());
         cluster.setCreateTime(new Date());
         cluster.setUpdateTime(new Date());
-        cluster.setCode(CodeGenerateUtils.getInstance().genCode());
+        cluster.setCode(CodeGenerateUtils.genCode());
 
         if (clusterMapper.insert(cluster) > 0) {
             return cluster.getCode();
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/EnvironmentServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/EnvironmentServiceImpl.java
@@ -123,7 +123,7 @@ public Long createEnvironment(User loginUser,
         env.setUpdateTime(new Date());
         long code = 0L;
         try {
-            code = CodeGenerateUtils.getInstance().genCode();
+            code = CodeGenerateUtils.genCode();
             env.setCode(code);
         } catch (CodeGenerateException e) {
             log.error("Generate environment code error.", e);
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java
@@ -258,7 +258,7 @@ public Map<String, Object> execProcessInstance(User loginUser, long projectCode,
         checkScheduleTimeNumExceed(commandType, cronTime);
         checkMasterExists();
 
-        long triggerCode = CodeGenerateUtils.getInstance().genCode();
+        long triggerCode = CodeGenerateUtils.genCode();
 
         /**
          * create command
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/K8SNamespaceServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/K8SNamespaceServiceImpl.java
@@ -141,7 +141,7 @@ public Map<String, Object> registerK8sNamespace(User loginUser, String namespace
 
         long code = 0L;
         try {
-            code = CodeGenerateUtils.getInstance().genCode();
+            code = CodeGenerateUtils.genCode();
             cluster.setCode(code);
         } catch (CodeGenerateUtils.CodeGenerateException e) {
             log.error("Generate cluster code error.", e);
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
@@ -299,7 +299,7 @@ public Map<String, Object> createProcessDefinition(User loginUser,
         List<TaskDefinitionLog> taskDefinitionLogs = generateTaskDefinitionList(taskDefinitionJson);
         List<ProcessTaskRelationLog> taskRelationList = generateTaskRelationList(taskRelationJson, taskDefinitionLogs);
 
-        long processDefinitionCode = CodeGenerateUtils.getInstance().genCode();
+        long processDefinitionCode = CodeGenerateUtils.genCode();
         ProcessDefinition processDefinition =
                 new ProcessDefinition(projectCode, name, processDefinitionCode, description,
                         globalParams, locations, timeout, loginUser.getId());
@@ -360,7 +360,7 @@ public ProcessDefinition createSingleProcessDefinition(User loginUser,
 
         long processDefinitionCode;
         try {
-            processDefinitionCode = CodeGenerateUtils.getInstance().genCode();
+            processDefinitionCode = CodeGenerateUtils.genCode();
         } catch (CodeGenerateException e) {
             throw new ServiceException(Status.INTERNAL_SERVER_ERROR_ARGS);
         }
@@ -1233,7 +1233,7 @@ public Map<String, Object> importSqlProcessDefinition(User loginUser, long proje
             // build process definition
             processDefinition = new ProcessDefinition(projectCode,
                     processDefinitionName,
-                    CodeGenerateUtils.getInstance().genCode(),
+                    CodeGenerateUtils.genCode(),
                     "",
                     "[]", null,
                     0, loginUser.getId());
@@ -1388,7 +1388,7 @@ private TaskDefinitionLog buildNormalSqlTaskDefinition(String taskName, DataSour
         sqlParameters.setSqlType(SqlType.NON_QUERY.ordinal());
         sqlParameters.setLocalParams(Collections.emptyList());
         taskDefinition.setTaskParams(JSONUtils.toJsonString(sqlParameters));
-        taskDefinition.setCode(CodeGenerateUtils.getInstance().genCode());
+        taskDefinition.setCode(CodeGenerateUtils.genCode());
         taskDefinition.setTaskType(TASK_TYPE_SQL);
         taskDefinition.setFailRetryTimes(0);
         taskDefinition.setFailRetryInterval(0);
@@ -1433,7 +1433,7 @@ protected boolean checkAndImport(User loginUser,
         processDefinition.setProjectCode(projectCode);
         processDefinition.setUserId(loginUser.getId());
         try {
-            processDefinition.setCode(CodeGenerateUtils.getInstance().genCode());
+            processDefinition.setCode(CodeGenerateUtils.genCode());
         } catch (CodeGenerateException e) {
             log.error(
                     "Save process definition error because generate process definition code error, projectCode:{}.",
@@ -1456,7 +1456,7 @@ protected boolean checkAndImport(User loginUser,
             taskDefinitionLog.setOperator(loginUser.getId());
             taskDefinitionLog.setOperateTime(now);
             try {
-                long code = CodeGenerateUtils.getInstance().genCode();
+                long code = CodeGenerateUtils.genCode();
                 taskCodeMap.put(taskDefinitionLog.getCode(), code);
                 taskDefinitionLog.setCode(code);
             } catch (CodeGenerateException e) {
@@ -2074,7 +2074,7 @@ protected void doBatchOperateProcessDefinition(User loginUser,
                 Map<Long, Long> taskCodeMap = new HashMap<>();
                 for (TaskDefinitionLog taskDefinitionLog : taskDefinitionLogs) {
                     try {
-                        long taskCode = CodeGenerateUtils.getInstance().genCode();
+                        long taskCode = CodeGenerateUtils.genCode();
                         taskCodeMap.put(taskDefinitionLog.getCode(), taskCode);
                         taskDefinitionLog.setCode(taskCode);
                     } catch (CodeGenerateException e) {
@@ -2097,7 +2097,7 @@ protected void doBatchOperateProcessDefinition(User loginUser,
                 }
                 final long oldProcessDefinitionCode = processDefinition.getCode();
                 try {
-                    processDefinition.setCode(CodeGenerateUtils.getInstance().genCode());
+                    processDefinition.setCode(CodeGenerateUtils.genCode());
                 } catch (CodeGenerateException e) {
                     log.error("Generate process definition code error, projectCode:{}.", targetProjectCode, e);
                     putMsg(result, Status.INTERNAL_SERVER_ERROR_ARGS);
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectParameterServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectParameterServiceImpl.java
@@ -97,7 +97,7 @@ public Result createProjectParameter(User loginUser, long projectCode, String pr
                     .builder()
                     .paramName(projectParameterName)
                     .paramValue(projectParameterValue)
-                    .code(CodeGenerateUtils.getInstance().genCode())
+                    .code(CodeGenerateUtils.genCode())
                     .projectCode(projectCode)
                     .userId(loginUser.getId())
                     .createTime(now)
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectPreferenceServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectPreferenceServiceImpl.java
@@ -76,7 +76,7 @@ public Result updateProjectPreference(User loginUser, long projectCode, String p
             projectPreference.setProjectCode(projectCode);
             projectPreference.setPreferences(preferences);
             projectPreference.setUserId(loginUser.getId());
-            projectPreference.setCode(CodeGenerateUtils.getInstance().genCode());
+            projectPreference.setCode(CodeGenerateUtils.genCode());
             projectPreference.setState(1);
             projectPreference.setCreateTime(now);
             projectPreference.setUpdateTime(now);
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java
@@ -126,7 +126,7 @@ public Result createProject(User loginUser, String name, String desc) {
             project = Project
                     .builder()
                     .name(name)
-                    .code(CodeGenerateUtils.getInstance().genCode())
+                    .code(CodeGenerateUtils.genCode())
                     .description(desc)
                     .userId(loginUser.getId())
                     .userName(loginUser.getUserName())
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskDefinitionServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskDefinitionServiceImpl.java
@@ -265,7 +265,7 @@ public TaskDefinition createTaskDefinitionV2(User loginUser,
 
         long taskDefinitionCode;
         try {
-            taskDefinitionCode = CodeGenerateUtils.getInstance().genCode();
+            taskDefinitionCode = CodeGenerateUtils.genCode();
         } catch (CodeGenerateException e) {
             throw new ServiceException(Status.INTERNAL_SERVER_ERROR_ARGS);
         }
@@ -338,7 +338,7 @@ public Map<String, Object> createTaskBindsWorkFlow(User loginUser,
         }
         long taskCode = taskDefinition.getCode();
         if (taskCode == 0) {
-            taskDefinition.setCode(CodeGenerateUtils.getInstance().genCode());
+            taskDefinition.setCode(CodeGenerateUtils.genCode());
         }
         List<ProcessTaskRelationLog> processTaskRelationLogList =
                 processTaskRelationMapper.queryByProcessCode(processDefinitionCode)
@@ -1264,7 +1264,7 @@ public Map<String, Object> genTaskCodeList(Integer genNum) {
         List<Long> taskCodes = new ArrayList<>();
         try {
             for (int i = 0; i < genNum; i++) {
-                taskCodes.add(CodeGenerateUtils.getInstance().genCode());
+                taskCodes.add(CodeGenerateUtils.genCode());
             }
         } catch (CodeGenerateException e) {
             log.error("Generate task definition code error.", e);
diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/impl/EnvironmentServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/impl/EnvironmentServiceTest.java
@@ -96,9 +96,6 @@ public class EnvironmentServiceTest {
     @Mock
     private ResourcePermissionCheckService resourcePermissionCheckService;
 
-    @Mock
-    private CodeGenerateUtils codeGenerateUtils;
-
     public static final String testUserName = "environmentServerTest";
 
     public static final String environmentName = "Env1";
@@ -141,8 +138,7 @@ public void testCreateEnvironment() {
                 () -> environmentService.createEnvironment(adminUser, "testName", "test", "test", workerGroups));
 
         try (MockedStatic<CodeGenerateUtils> ignored = Mockito.mockStatic(CodeGenerateUtils.class)) {
-            when(CodeGenerateUtils.getInstance()).thenReturn(codeGenerateUtils);
-            when(codeGenerateUtils.genCode()).thenThrow(CodeGenerateUtils.CodeGenerateException.class);
+            when(CodeGenerateUtils.genCode()).thenThrow(CodeGenerateUtils.CodeGenerateException.class);
 
             assertThrowsServiceException(Status.INTERNAL_SERVER_ERROR_ARGS,
                     () -> environmentService.createEnvironment(adminUser, "testName", "test", "test", workerGroups));
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/CodeGenerateUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/CodeGenerateUtils.java
@@ -1,71 +1,78 @@
-/** Copyright 2010-2012 Twitter, Inc.*/
+/**
+ * Copyright 2010-2012 Twitter, Inc.
+ */
 
 package org.apache.dolphinscheduler.common.utils;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Objects;
 
+import lombok.extern.slf4j.Slf4j;
+
 /**
- *  Rewriting based on Twitter snowflake algorithm
+ * Rewriting based on Twitter snowflake algorithm
  */
+@Slf4j
 public class CodeGenerateUtils {
 
-    // start timestamp
-    private static final long START_TIMESTAMP = 1609430400000L; // 2021-01-01 00:00:00
-    // Each machine generates 32 in the same millisecond
-    private static final long LOW_DIGIT_BIT = 5L;
-    private static final long MIDDLE_BIT = 2L;
-    private static final long MAX_LOW_DIGIT = ~(-1L << LOW_DIGIT_BIT);
-    // The displacement to the left
-    private static final long MIDDLE_LEFT = LOW_DIGIT_BIT;
-    private static final long HIGH_DIGIT_LEFT = LOW_DIGIT_BIT + MIDDLE_BIT;
-    private final long machineHash;
-    private long lowDigit = 0L;
-    private long recordMillisecond = -1L;
-
-    private static final long SYSTEM_TIMESTAMP = System.currentTimeMillis();
-    private static final long SYSTEM_NANOTIME = System.nanoTime();
+    private static final CodeGenerator codeGenerator;
 
-    private CodeGenerateUtils() throws CodeGenerateException {
+    static {
         try {
-            this.machineHash =
-                    Math.abs(Objects.hash(InetAddress.getLocalHost().getHostName())) % (2 << (MIDDLE_BIT - 1));
+            codeGenerator = new CodeGenerator(InetAddress.getLocalHost().getHostName() + "-" + OSUtils.getProcessID());
         } catch (UnknownHostException e) {
             throw new CodeGenerateException(e.getMessage());
         }
     }
 
-    private static CodeGenerateUtils instance = null;
-
-    public static synchronized CodeGenerateUtils getInstance() throws CodeGenerateException {
-        if (instance == null) {
-            instance = new CodeGenerateUtils();
-        }
-        return instance;
+    public static long genCode() throws CodeGenerateException {
+        return codeGenerator.genCode();
     }
 
-    public synchronized long genCode() throws CodeGenerateException {
-        long nowtMillisecond = systemMillisecond();
-        if (nowtMillisecond < recordMillisecond) {
-            throw new CodeGenerateException("New code exception because time is set back.");
+    public static class CodeGenerator {
+
+        // start timestamp
+        private static final long START_TIMESTAMP = 1609430400000L; // 2021-01-01 00:00:00
+        // Each machine generates 32 in the same millisecond
+        private static final long LOW_DIGIT_BIT = 5L;
+        private static final long MACHINE_BIT = 5L;
+        private static final long MAX_LOW_DIGIT = ~(-1L << LOW_DIGIT_BIT);
+        // The displacement to the left
+        private static final long HIGH_DIGIT_LEFT = LOW_DIGIT_BIT + MACHINE_BIT;
+        public final long machineHash;
+        private long lowDigit = 0L;
+        private long recordMillisecond = -1L;
+
+        private static final long SYSTEM_TIMESTAMP = System.currentTimeMillis();
+        private static final long SYSTEM_NANOTIME = System.nanoTime();
+
+        public CodeGenerator(String appName) {
+            this.machineHash = Math.abs(Objects.hash(appName)) % (1 << MACHINE_BIT);
         }
-        if (nowtMillisecond == recordMillisecond) {
-            lowDigit = (lowDigit + 1) & MAX_LOW_DIGIT;
-            if (lowDigit == 0L) {
-                while (nowtMillisecond <= recordMillisecond) {
-                    nowtMillisecond = systemMillisecond();
+
+        public synchronized long genCode() throws CodeGenerateException {
+            long nowtMillisecond = systemMillisecond();
+            if (nowtMillisecond < recordMillisecond) {
+                throw new CodeGenerateException("New code exception because time is set back.");
+            }
+            if (nowtMillisecond == recordMillisecond) {
+                lowDigit = (lowDigit + 1) & MAX_LOW_DIGIT;
+                if (lowDigit == 0L) {
+                    while (nowtMillisecond <= recordMillisecond) {
+                        nowtMillisecond = systemMillisecond();
+                    }
                 }
+            } else {
+                lowDigit = 0L;
             }
-        } else {
-            lowDigit = 0L;
+            recordMillisecond = nowtMillisecond;
+            return (nowtMillisecond - START_TIMESTAMP) << HIGH_DIGIT_LEFT | machineHash << LOW_DIGIT_BIT | lowDigit;
         }
-        recordMillisecond = nowtMillisecond;
-        return (nowtMillisecond - START_TIMESTAMP) << HIGH_DIGIT_LEFT | machineHash << MIDDLE_LEFT | lowDigit;
-    }
 
-    private long systemMillisecond() {
-        return SYSTEM_TIMESTAMP + (System.nanoTime() - SYSTEM_NANOTIME) / 1000000;
+        private long systemMillisecond() {
+            return SYSTEM_TIMESTAMP + (System.nanoTime() - SYSTEM_NANOTIME) / 1000000;
+        }
     }
 
     public static class CodeGenerateException extends RuntimeException {
diff --git a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/CodeGenerateUtilsTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/CodeGenerateUtilsTest.java
@@ -17,20 +17,59 @@
 
 package org.apache.dolphinscheduler.common.utils;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CountDownLatch;
 
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-public class CodeGenerateUtilsTest {
+class CodeGenerateUtilsTest {
 
     @Test
-    public void testNoGenerateDuplicateCode() throws CodeGenerateUtils.CodeGenerateException {
-        HashSet<Long> existsCode = new HashSet<>();
-        for (int i = 0; i < 100; i++) {
-            Long currentCode = CodeGenerateUtils.getInstance().genCode();
-            Assertions.assertFalse(existsCode.contains(currentCode));
+    void testNoGenerateDuplicateCode() {
+        int codeNum = 10000000;
+        List<Long> existsCode = new ArrayList<>();
+        for (int i = 0; i < codeNum; i++) {
+            Long currentCode = CodeGenerateUtils.genCode();
             existsCode.add(currentCode);
         }
+        Set<Long> existsCodeSet = new HashSet<>(existsCode);
+        // Disallow duplicate code
+        assertEquals(existsCode.size(), existsCodeSet.size());
+    }
+
+    @Test
+    void testNoGenerateDuplicateCodeWithDifferentAppName() throws UnknownHostException, InterruptedException {
+        int threadNum = 10;
+        int codeNum = 1000000;
+
+        final String hostName = InetAddress.getLocalHost().getHostName();
+        Map<String, List<Long>> machineCodes = new ConcurrentHashMap<>();
+        CountDownLatch countDownLatch = new CountDownLatch(threadNum);
+
+        for (int i = 0; i < threadNum; i++) {
+            final int c = i;
+            new Thread(() -> {
+                List<Long> codes = new ArrayList<>(codeNum);
+                CodeGenerateUtils.CodeGenerator codeGenerator = new CodeGenerateUtils.CodeGenerator(hostName + "-" + c);
+                for (int j = 0; j < codeNum; j++) {
+                    codes.add(codeGenerator.genCode());
+                }
+                machineCodes.put(Thread.currentThread().getName(), codes);
+                countDownLatch.countDown();
+            }).start();
+        }
+        countDownLatch.await();
+        Set<Long> totalCodes = new HashSet<>();
+        machineCodes.values().forEach(totalCodes::addAll);
+        assertEquals(codeNum * threadNum, totalCodes.size());
     }
 }
diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
diff --git a/dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/dao/ProcessDefinitionDao.java b/dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/dao/ProcessDefinitionDao.java
diff --git a/dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/dao/ProjectDao.java b/dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/dao/ProjectDao.java
diff --git a/dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/upgrader/v200/V200DolphinSchedulerUpgrader.java b/dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/upgrader/v200/V200DolphinSchedulerUpgrader.java
diff --git a/dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/demo/ProcessDefinitionDemo.java b/dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/demo/ProcessDefinitionDemo.java

Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ public TaskDefinition createTaskDefinitionV2(User loginUser,`
`265`	`265`
`266`	`266`	`long taskDefinitionCode;`
`267`	`267`	`try {`
`268`		`- taskDefinitionCode = CodeGenerateUtils.getInstance().genCode();`
	`268`	`+ taskDefinitionCode = CodeGenerateUtils.genCode();`
`269`	`269`	`} catch (CodeGenerateException e) {`
`270`	`270`	`throw new ServiceException(Status.INTERNAL_SERVER_ERROR_ARGS);`
`271`	`271`	`}`
`@@ -338,7 +338,7 @@ public Map<String, Object> createTaskBindsWorkFlow(User loginUser,`
`338`	`338`	`}`
`339`	`339`	`long taskCode = taskDefinition.getCode();`
`340`	`340`	`if (taskCode == 0) {`
`341`		`- taskDefinition.setCode(CodeGenerateUtils.getInstance().genCode());`
	`341`	`+ taskDefinition.setCode(CodeGenerateUtils.genCode());`
`342`	`342`	`}`
`343`	`343`	`List<ProcessTaskRelationLog> processTaskRelationLogList =`
`344`	`344`	`processTaskRelationMapper.queryByProcessCode(processDefinitionCode)`
`@@ -1264,7 +1264,7 @@ public Map<String, Object> genTaskCodeList(Integer genNum) {`
`1264`	`1264`	`List<Long> taskCodes = new ArrayList<>();`
`1265`	`1265`	`try {`
`1266`	`1266`	`for (int i = 0; i < genNum; i++) {`
`1267`		`- taskCodes.add(CodeGenerateUtils.getInstance().genCode());`
	`1267`	`+ taskCodes.add(CodeGenerateUtils.genCode());`
`1268`	`1268`	`}`
`1269`	`1269`	`} catch (CodeGenerateException e) {`
`1270`	`1270`	`log.error("Generate task definition code error.", e);`