From d1e5327cc9c6d1e50dc87b842b3ee31b4d14d5e4 Mon Sep 17 00:00:00 2001 From: hunter-cloud09 Date: Fri, 1 Mar 2024 14:25:38 +0800 Subject: [PATCH] reset something --- seatunnel-server/seatunnel-app/pom.xml | 2 +- .../service/impl/JobExecutorServiceImpl.java | 4 ++-- .../src/main/resources/hazelcast-client.yaml | 24 ------------------- 3 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 seatunnel-server/seatunnel-app/src/main/resources/hazelcast-client.yaml diff --git a/seatunnel-server/seatunnel-app/pom.xml b/seatunnel-server/seatunnel-app/pom.xml index b6a94db22..24c2a44fe 100644 --- a/seatunnel-server/seatunnel-app/pom.xml +++ b/seatunnel-server/seatunnel-app/pom.xml @@ -479,7 +479,7 @@ mysql mysql-connector-java ${mysql.version} - compile + test diff --git a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/JobExecutorServiceImpl.java b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/JobExecutorServiceImpl.java index 3542e5019..947519f1f 100644 --- a/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/JobExecutorServiceImpl.java +++ b/seatunnel-server/seatunnel-app/src/main/java/org/apache/seatunnel/app/service/impl/JobExecutorServiceImpl.java @@ -76,9 +76,9 @@ public Result jobExecute(Integer userId, Long jobDefineId) { } public String writeJobConfigIntoConfFile(String jobConfig, Long jobDefineId) { - String projectRoot = System.getProperty("SEATUNNEL_HOME"); + String projectRoot = System.getProperty("user.dir"); String filePath = - projectRoot + File.separator + "json" + File.separator + jobDefineId + ".conf"; + projectRoot + File.separator + "profile" + File.separator + jobDefineId + ".conf"; try { File file = new File(filePath); if (!file.exists()) { diff --git a/seatunnel-server/seatunnel-app/src/main/resources/hazelcast-client.yaml b/seatunnel-server/seatunnel-app/src/main/resources/hazelcast-client.yaml deleted file mode 100644 index 1e2f7fdc2..000000000 --- a/seatunnel-server/seatunnel-app/src/main/resources/hazelcast-client.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -hazelcast-client: - cluster-name: seatunnel - properties: - hazelcast.logging.type: log4j2 - network: - cluster-members: - - 106.15.250.130:5801 \ No newline at end of file