This is an automated email from the ASF dual-hosted git repository.
gongzhongqiang pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new 47a137801 [Improve] Settings improvement (#2972)
47a137801 is described below
commit 47a137801616ce8d7b1e7a0b8e2eabab9e57f526
Author: benjobs <[email protected]>
AuthorDate: Thu Aug 24 21:36:21 2023 +0800
[Improve] Settings improvement (#2972)
* [Improve] settings improvement
* minor improvement
---------
Co-authored-by: benjobs <[email protected]>
---
...onfigWithParams.java => AlertConfigParams.java} | 6 +-
.../streampark/console/core/bean/Dependency.java | 2 +-
.../streampark/console/core/bean/DockerConfig.java | 69 ++++++++++++++++++++++
.../streampark/console/core/bean/EmailConfig.java | 39 ++++++------
...kConnectorResource.java => FlinkConnector.java} | 2 +-
.../streampark/console/core/bean/MavenConfig.java | 5 +-
.../console/core/bean/{Pom.java => MavenPom.java} | 2 +-
.../console/core/controller/AlertController.java | 18 +++---
.../console/core/entity/AlertConfig.java | 4 +-
.../console/core/service/SettingService.java | 28 ++++-----
.../core/service/alert/AlertConfigService.java | 4 +-
.../core/service/alert/AlertNotifyService.java | 4 +-
.../console/core/service/alert/AlertService.java | 4 +-
.../service/alert/impl/AlertConfigServiceImpl.java | 10 ++--
.../core/service/alert/impl/AlertServiceImpl.java | 6 +-
.../alert/impl/DingTalkAlertNotifyServiceImpl.java | 4 +-
.../alert/impl/EmailAlertNotifyServiceImpl.java | 6 +-
.../impl/HttpCallbackAlertNotifyServiceImpl.java | 4 +-
.../alert/impl/LarkAlertNotifyServiceImpl.java | 4 +-
.../alert/impl/WeComAlertNotifyServiceImpl.java | 4 +-
.../core/service/impl/AppBuildPipeServiceImpl.java | 10 ++--
.../core/service/impl/ResourceServiceImpl.java | 15 +++--
.../core/service/impl/SettingServiceImpl.java | 38 ++----------
.../console/base/util/DependencyUtilsTest.java | 6 +-
.../core/service/alert/AlertServiceTest.java | 4 +-
25 files changed, 171 insertions(+), 127 deletions(-)
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertConfigWithParams.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertConfigParams.java
similarity index 94%
rename from
streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertConfigWithParams.java
rename to
streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertConfigParams.java
index 634f99248..dff35a2f5 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertConfigWithParams.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertConfigParams.java
@@ -33,7 +33,7 @@ import java.io.Serializable;
@Schema(name = "AlertConfig")
@Data
@Slf4j
-public class AlertConfigWithParams implements Serializable {
+public class AlertConfigParams implements Serializable {
@Schema(example = "1")
private Long id;
@@ -65,11 +65,11 @@ public class AlertConfigWithParams implements Serializable {
@Schema(description = "lark alert parameters")
private AlertLarkParams larkParams;
- public static AlertConfigWithParams of(AlertConfig config) {
+ public static AlertConfigParams of(AlertConfig config) {
if (config == null) {
return null;
}
- AlertConfigWithParams params = new AlertConfigWithParams();
+ AlertConfigParams params = new AlertConfigParams();
BeanUtils.copyProperties(
config,
params,
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/Dependency.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/Dependency.java
index 413a2299a..0c5b283bb 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/Dependency.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/Dependency.java
@@ -37,7 +37,7 @@ import java.util.stream.Collectors;
@Data
public class Dependency {
- private List<Pom> pom = Collections.emptyList();
+ private List<MavenPom> pom = Collections.emptyList();
private List<String> jar = Collections.emptyList();
@SneakyThrows
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/DockerConfig.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/DockerConfig.java
new file mode 100644
index 000000000..9be549fe2
--- /dev/null
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/DockerConfig.java
@@ -0,0 +1,69 @@
+/*
+ * 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.
+ */
+
+package org.apache.streampark.console.core.bean;
+
+import org.apache.streampark.console.core.service.SettingService;
+
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * The DockerConfig class represents the configuration for an email system. It
holds the SMTP host,
+ * port, from address, username, password, and whether SSL is enabled.
+ *
+ * <p>This class also provides a static factory method to create an
DockerConfig object from a map
+ * of settings.
+ */
+@Data
+@Slf4j
+public class DockerConfig {
+
+ private String address;
+ private String user;
+ private String password;
+ private String namespace;
+
+ public static DockerConfig fromSetting() {
+ try {
+ DockerConfig dockerConfig = new DockerConfig();
+
+ dockerConfig.setAddress(
+ SettingService.SETTINGS
+ .get(SettingService.KEY_DOCKER_REGISTER_ADDRESS)
+ .getSettingValue());
+
+ dockerConfig.setUser(
+
SettingService.SETTINGS.get(SettingService.KEY_DOCKER_REGISTER_USER).getSettingValue());
+
+ dockerConfig.setPassword(
+ SettingService.SETTINGS
+ .get(SettingService.KEY_DOCKER_REGISTER_PASSWORD)
+ .getSettingValue());
+
+ dockerConfig.setNamespace(
+ SettingService.SETTINGS
+ .get(SettingService.KEY_DOCKER_REGISTER_NAMESPACE)
+ .getSettingValue());
+
+ return dockerConfig;
+ } catch (Exception e) {
+ log.warn("Failed to create DockerConfig from settings", e);
+ }
+ return null;
+ }
+}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/EmailConfig.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/EmailConfig.java
index 71425d896..f631f1269 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/EmailConfig.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/EmailConfig.java
@@ -17,13 +17,11 @@
package org.apache.streampark.console.core.bean;
-import org.apache.streampark.console.core.entity.Setting;
+import org.apache.streampark.console.core.service.SettingService;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
-import java.util.Map;
-
/**
* The EmailConfig class represents the configuration for an email system. It
holds the SMTP host,
* port, from address, username, password, and whether SSL is enabled.
@@ -35,13 +33,6 @@ import java.util.Map;
@Slf4j
public class EmailConfig {
- public static final String KEY_ALERT_EMAIL_HOST = "alert.email.host";
- public static final String KEY_ALERT_EMAIL_PORT = "alert.email.port";
- public static final String KEY_ALERT_EMAIL_FROM = "alert.email.from";
- public static final String KEY_ALERT_EMAIL_USERNAME = "alert.email.userName";
- public static final String KEY_ALERT_EMAIL_PASSWORD = "alert.email.password";
- public static final String KEY_ALERT_EMAIL_SSL = "alert.email.ssl";
-
private String smtpHost;
private Integer smtpPort;
private String from;
@@ -52,20 +43,32 @@ public class EmailConfig {
/**
* Constructs the EmailConfig object from the given settings map.
*
- * @param settingMap a map of settings
* @return a new EmailConfig object that has its fields set according to the
provided settings
*/
- public static EmailConfig fromSetting(Map<String, Setting> settingMap) {
+ public static EmailConfig fromSetting() {
try {
EmailConfig emailConfig = new EmailConfig();
-
emailConfig.setSmtpHost(settingMap.get(KEY_ALERT_EMAIL_HOST).getSettingValue());
+
+ emailConfig.setSmtpHost(
+
SettingService.SETTINGS.get(SettingService.KEY_ALERT_EMAIL_HOST).getSettingValue());
+
emailConfig.setSmtpPort(
-
Integer.valueOf(settingMap.get(KEY_ALERT_EMAIL_PORT).getSettingValue()));
-
emailConfig.setFrom(settingMap.get(KEY_ALERT_EMAIL_FROM).getSettingValue());
-
emailConfig.setUserName(settingMap.get(KEY_ALERT_EMAIL_USERNAME).getSettingValue());
-
emailConfig.setPassword(settingMap.get(KEY_ALERT_EMAIL_PASSWORD).getSettingValue());
+ Integer.valueOf(
+
SettingService.SETTINGS.get(SettingService.KEY_ALERT_EMAIL_PORT).getSettingValue()));
+
+ emailConfig.setFrom(
+
SettingService.SETTINGS.get(SettingService.KEY_ALERT_EMAIL_FROM).getSettingValue());
+
+ emailConfig.setUserName(
+
SettingService.SETTINGS.get(SettingService.KEY_ALERT_EMAIL_USERNAME).getSettingValue());
+
+ emailConfig.setPassword(
+
SettingService.SETTINGS.get(SettingService.KEY_ALERT_EMAIL_PASSWORD).getSettingValue());
+
emailConfig.setSsl(
-
Boolean.parseBoolean(settingMap.get(KEY_ALERT_EMAIL_SSL).getSettingValue()));
+ Boolean.parseBoolean(
+
SettingService.SETTINGS.get(SettingService.KEY_ALERT_EMAIL_SSL).getSettingValue()));
+
return emailConfig;
} catch (Exception e) {
log.warn("Failed to create EmailConfig from settings", e);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/FlinkConnectorResource.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/FlinkConnector.java
similarity index 96%
rename from
streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/FlinkConnectorResource.java
rename to
streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/FlinkConnector.java
index b6dc9db68..4546fee3d 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/FlinkConnectorResource.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/FlinkConnector.java
@@ -22,7 +22,7 @@ import lombok.Data;
import java.util.Map;
@Data
-public class FlinkConnectorResource {
+public class FlinkConnector {
private String className;
private String factoryIdentifier;
Map<String, String> requiredOptions;
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/MavenConfig.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/MavenConfig.java
index fc619d562..aad2a7062 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/MavenConfig.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/MavenConfig.java
@@ -20,6 +20,7 @@ package org.apache.streampark.console.core.bean;
import org.apache.streampark.common.conf.CommonConfig;
import org.apache.streampark.common.conf.InternalConfigHolder;
import org.apache.streampark.console.core.entity.Setting;
+import org.apache.streampark.console.core.service.SettingService;
import org.apache.commons.lang3.StringUtils;
@@ -47,9 +48,9 @@ public class MavenConfig {
private String mvnAuthPassword;
/** */
- public static MavenConfig fromSetting(Map<String, Setting> settings) {
+ public static MavenConfig fromSetting() {
MavenConfig mavenConfig = new MavenConfig();
-
+ Map<String, Setting> settings = SettingService.SETTINGS;
if (settings.containsKey(CommonConfig.MAVEN_SETTINGS_PATH().key())) {
mavenConfig.setMvnSettings(
settings.get(CommonConfig.MAVEN_SETTINGS_PATH().key()).getSettingValue());
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/Pom.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/MavenPom.java
similarity index 98%
rename from
streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/Pom.java
rename to
streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/MavenPom.java
index 479195915..eb59e7f63 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/Pom.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/MavenPom.java
@@ -24,7 +24,7 @@ import lombok.Data;
import java.util.Objects;
@Data
-public class Pom {
+public class MavenPom {
private String groupId;
private String artifactId;
private String version;
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/AlertController.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/AlertController.java
index aebd46e2d..04e6bbdb6 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/AlertController.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/AlertController.java
@@ -21,7 +21,7 @@ import org.apache.streampark.common.util.DateUtils;
import org.apache.streampark.console.base.domain.RestRequest;
import org.apache.streampark.console.base.domain.RestResponse;
import org.apache.streampark.console.base.exception.AlertException;
-import org.apache.streampark.console.core.bean.AlertConfigWithParams;
+import org.apache.streampark.console.core.bean.AlertConfigParams;
import org.apache.streampark.console.core.bean.AlertTemplate;
import org.apache.streampark.console.core.entity.AlertConfig;
import org.apache.streampark.console.core.service.alert.AlertConfigService;
@@ -61,37 +61,37 @@ public class AlertController {
@Operation(summary = "Create alert config")
@PostMapping(value = "/add")
- public RestResponse createAlertConfig(@RequestBody AlertConfigWithParams
params) {
+ public RestResponse createAlertConfig(@RequestBody AlertConfigParams params)
{
boolean save = alertConfigService.save(AlertConfig.of(params));
return RestResponse.success(save);
}
@Operation(summary = "Check alert config exist")
@PostMapping(value = "/exists")
- public RestResponse verifyAlertConfig(@RequestBody AlertConfigWithParams
params) {
+ public RestResponse verifyAlertConfig(@RequestBody AlertConfigParams params)
{
boolean exist = alertConfigService.exist(AlertConfig.of(params));
return RestResponse.success(exist);
}
@Operation(summary = "Update alert config")
@PostMapping(value = "/update")
- public RestResponse updateAlertConfig(@RequestBody AlertConfigWithParams
params) {
+ public RestResponse updateAlertConfig(@RequestBody AlertConfigParams params)
{
boolean update = alertConfigService.updateById(AlertConfig.of(params));
return RestResponse.success(update);
}
@Operation(summary = "Get alert config")
@PostMapping("/get")
- public RestResponse getAlertConfig(@RequestBody AlertConfigWithParams
params) {
+ public RestResponse getAlertConfig(@RequestBody AlertConfigParams params) {
AlertConfig alertConfig = alertConfigService.getById(params.getId());
- return RestResponse.success(AlertConfigWithParams.of(alertConfig));
+ return RestResponse.success(AlertConfigParams.of(alertConfig));
}
@Operation(summary = "List alert configs (Pagination)")
@PostMapping(value = "/list")
public RestResponse alertConfigsPaginationList(
- @RequestBody AlertConfigWithParams params, RestRequest request) {
- IPage<AlertConfigWithParams> page = alertConfigService.page(params,
request);
+ @RequestBody AlertConfigParams params, RestRequest request) {
+ IPage<AlertConfigParams> page = alertConfigService.page(params, request);
return RestResponse.success(page);
}
@@ -127,7 +127,7 @@ public class AlertController {
alertTemplate.setEndTime(DateUtils.format(date, DateUtils.fullFormat(),
TimeZone.getDefault()));
alertTemplate.setDuration("");
boolean alert =
-
alertService.alert(AlertConfigWithParams.of(alertConfigService.getById(id)),
alertTemplate);
+
alertService.alert(AlertConfigParams.of(alertConfigService.getById(id)),
alertTemplate);
return RestResponse.success(alert);
}
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/AlertConfig.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/AlertConfig.java
index 476f17511..fdb63f566 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/AlertConfig.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/AlertConfig.java
@@ -18,7 +18,7 @@
package org.apache.streampark.console.core.entity;
import org.apache.streampark.console.base.util.JacksonUtils;
-import org.apache.streampark.console.core.bean.AlertConfigWithParams;
+import org.apache.streampark.console.core.bean.AlertConfigParams;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -68,7 +68,7 @@ public class AlertConfig implements Serializable {
/** modify time */
private Date modifyTime;
- public static AlertConfig of(AlertConfigWithParams params) {
+ public static AlertConfig of(AlertConfigParams params) {
if (params == null) {
return null;
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/SettingService.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/SettingService.java
index 3bb807b7f..cb8cfb007 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/SettingService.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/SettingService.java
@@ -17,7 +17,7 @@
package org.apache.streampark.console.core.service;
-import org.apache.streampark.console.core.bean.EmailConfig;
+import org.apache.streampark.console.core.bean.DockerConfig;
import org.apache.streampark.console.core.bean.MavenConfig;
import org.apache.streampark.console.core.entity.Setting;
@@ -30,33 +30,33 @@ public interface SettingService extends IService<Setting> {
Map<String, Setting> SETTINGS = new ConcurrentHashMap<>();
- String KEY_STREAMPARK_ADDRESS = "streampark.console.webapp.address";
-
+ // docker
String KEY_DOCKER_REGISTER_ADDRESS = "docker.register.address";
String KEY_DOCKER_REGISTER_USER = "docker.register.user";
String KEY_DOCKER_REGISTER_PASSWORD = "docker.register.password";
-
String KEY_DOCKER_REGISTER_NAMESPACE = "docker.register.namespace";
+ // alert.
+ String KEY_ALERT_EMAIL_HOST = "alert.email.host";
+ String KEY_ALERT_EMAIL_PORT = "alert.email.port";
+ String KEY_ALERT_EMAIL_FROM = "alert.email.from";
+ String KEY_ALERT_EMAIL_USERNAME = "alert.email.userName";
+ String KEY_ALERT_EMAIL_PASSWORD = "alert.email.password";
+ String KEY_ALERT_EMAIL_SSL = "alert.email.ssl";
+
+ String KEY_STREAMPARK_ADDRESS = "streampark.console.webapp.address";
+
String KEY_INGRESS_MODE_DEFAULT = "ingress.mode.default";
Setting get(String key);
boolean update(Setting setting);
- String getStreamParkAddress();
-
MavenConfig getMavenConfig();
- EmailConfig getSenderEmail();
-
- String getDockerRegisterAddress();
+ DockerConfig getDockerConfig();
- String getDockerRegisterUser();
-
- String getDockerRegisterPassword();
-
- String getDockerRegisterNamespace();
+ String getStreamParkAddress();
String getIngressModeDefault();
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/AlertConfigService.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/AlertConfigService.java
index 582d78fda..3ee0cdb9c 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/AlertConfigService.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/AlertConfigService.java
@@ -19,14 +19,14 @@ package org.apache.streampark.console.core.service.alert;
import org.apache.streampark.console.base.domain.RestRequest;
import org.apache.streampark.console.base.exception.AlertException;
-import org.apache.streampark.console.core.bean.AlertConfigWithParams;
+import org.apache.streampark.console.core.bean.AlertConfigParams;
import org.apache.streampark.console.core.entity.AlertConfig;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
public interface AlertConfigService extends IService<AlertConfig> {
- IPage<AlertConfigWithParams> page(AlertConfigWithParams params, RestRequest
request);
+ IPage<AlertConfigParams> page(AlertConfigParams params, RestRequest request);
boolean exist(AlertConfig alertConfig);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/AlertNotifyService.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/AlertNotifyService.java
index b1c7e9ecc..fb401e168 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/AlertNotifyService.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/AlertNotifyService.java
@@ -18,10 +18,10 @@
package org.apache.streampark.console.core.service.alert;
import org.apache.streampark.console.base.exception.AlertException;
-import org.apache.streampark.console.core.bean.AlertConfigWithParams;
+import org.apache.streampark.console.core.bean.AlertConfigParams;
import org.apache.streampark.console.core.bean.AlertTemplate;
public interface AlertNotifyService {
- boolean doAlert(AlertConfigWithParams alertConfig, AlertTemplate template)
throws AlertException;
+ boolean doAlert(AlertConfigParams alertConfig, AlertTemplate template)
throws AlertException;
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/AlertService.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/AlertService.java
index d47b1ab62..59ab1dd02 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/AlertService.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/AlertService.java
@@ -19,7 +19,7 @@ package org.apache.streampark.console.core.service.alert;
import org.apache.streampark.common.enums.ClusterState;
import org.apache.streampark.console.base.exception.AlertException;
-import org.apache.streampark.console.core.bean.AlertConfigWithParams;
+import org.apache.streampark.console.core.bean.AlertConfigParams;
import org.apache.streampark.console.core.bean.AlertTemplate;
import org.apache.streampark.console.core.entity.Application;
import org.apache.streampark.console.core.entity.FlinkCluster;
@@ -34,5 +34,5 @@ public interface AlertService {
void alert(FlinkCluster flinkCluster, ClusterState clusterState);
- boolean alert(AlertConfigWithParams params, AlertTemplate alertTemplate)
throws AlertException;
+ boolean alert(AlertConfigParams params, AlertTemplate alertTemplate) throws
AlertException;
}
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/AlertConfigServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/AlertConfigServiceImpl.java
index 4074298e7..9506d38d6 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/AlertConfigServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/AlertConfigServiceImpl.java
@@ -20,7 +20,7 @@ package org.apache.streampark.console.core.service.alert.impl;
import org.apache.streampark.console.base.domain.RestRequest;
import org.apache.streampark.console.base.exception.AlertException;
import org.apache.streampark.console.base.mybatis.pager.MybatisPager;
-import org.apache.streampark.console.core.bean.AlertConfigWithParams;
+import org.apache.streampark.console.core.bean.AlertConfigParams;
import org.apache.streampark.console.core.entity.AlertConfig;
import org.apache.streampark.console.core.entity.Application;
import org.apache.streampark.console.core.mapper.AlertConfigMapper;
@@ -50,7 +50,7 @@ public class AlertConfigServiceImpl extends
ServiceImpl<AlertConfigMapper, Alert
@Autowired private ApplicationService applicationService;
@Override
- public IPage<AlertConfigWithParams> page(AlertConfigWithParams params,
RestRequest request) {
+ public IPage<AlertConfigParams> page(AlertConfigParams params, RestRequest
request) {
// build query conditions
LambdaQueryWrapper<AlertConfig> wrapper = new LambdaQueryWrapper();
wrapper.eq(params.getUserId() != null, AlertConfig::getUserId,
params.getUserId());
@@ -58,12 +58,10 @@ public class AlertConfigServiceImpl extends
ServiceImpl<AlertConfigMapper, Alert
Page<AlertConfig> page = new
MybatisPager<AlertConfig>().getDefaultPage(request);
IPage<AlertConfig> resultPage = getBaseMapper().selectPage(page, wrapper);
- Page<AlertConfigWithParams> result = new Page<>();
+ Page<AlertConfigParams> result = new Page<>();
if (CollectionUtils.isNotEmpty(resultPage.getRecords())) {
result.setRecords(
- resultPage.getRecords().stream()
- .map(AlertConfigWithParams::of)
- .collect(Collectors.toList()));
+
resultPage.getRecords().stream().map(AlertConfigParams::of).collect(Collectors.toList()));
}
return result;
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/AlertServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/AlertServiceImpl.java
index 05b1b8294..4ad4f1fe0 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/AlertServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/AlertServiceImpl.java
@@ -21,7 +21,7 @@ import org.apache.streampark.common.enums.ClusterState;
import org.apache.streampark.common.util.Utils;
import org.apache.streampark.console.base.exception.AlertException;
import org.apache.streampark.console.base.util.SpringContextUtils;
-import org.apache.streampark.console.core.bean.AlertConfigWithParams;
+import org.apache.streampark.console.core.bean.AlertConfigParams;
import org.apache.streampark.console.core.bean.AlertTemplate;
import org.apache.streampark.console.core.entity.AlertConfig;
import org.apache.streampark.console.core.entity.Application;
@@ -71,14 +71,14 @@ public class AlertServiceImpl implements AlertService {
}
AlertConfig alertConfig = alertConfigService.getById(alertId);
try {
- alert(AlertConfigWithParams.of(alertConfig), alertTemplate);
+ alert(AlertConfigParams.of(alertConfig), alertTemplate);
} catch (Exception e) {
log.error(e.getMessage(), e);
}
}
@Override
- public boolean alert(AlertConfigWithParams params, AlertTemplate
alertTemplate)
+ public boolean alert(AlertConfigParams params, AlertTemplate alertTemplate)
throws AlertException {
List<AlertType> alertTypes = AlertType.decode(params.getAlertType());
if (CollectionUtils.isEmpty(alertTypes)) {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/DingTalkAlertNotifyServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/DingTalkAlertNotifyServiceImpl.java
index 0b57be923..539910437 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/DingTalkAlertNotifyServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/DingTalkAlertNotifyServiceImpl.java
@@ -19,7 +19,7 @@ package org.apache.streampark.console.core.service.alert.impl;
import org.apache.streampark.console.base.exception.AlertException;
import org.apache.streampark.console.base.util.FreemarkerUtils;
-import org.apache.streampark.console.core.bean.AlertConfigWithParams;
+import org.apache.streampark.console.core.bean.AlertConfigParams;
import org.apache.streampark.console.core.bean.AlertDingTalkParams;
import org.apache.streampark.console.core.bean.AlertTemplate;
import org.apache.streampark.console.core.bean.RobotResponse;
@@ -70,7 +70,7 @@ public class DingTalkAlertNotifyServiceImpl implements
AlertNotifyService {
}
@Override
- public boolean doAlert(AlertConfigWithParams alertConfig, AlertTemplate
alertTemplate)
+ public boolean doAlert(AlertConfigParams alertConfig, AlertTemplate
alertTemplate)
throws AlertException {
AlertDingTalkParams dingTalkParams = alertConfig.getDingTalkParams();
try {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/EmailAlertNotifyServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/EmailAlertNotifyServiceImpl.java
index 39b310717..6a597beea 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/EmailAlertNotifyServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/EmailAlertNotifyServiceImpl.java
@@ -19,7 +19,7 @@ package org.apache.streampark.console.core.service.alert.impl;
import org.apache.streampark.console.base.exception.AlertException;
import org.apache.streampark.console.base.util.FreemarkerUtils;
-import org.apache.streampark.console.core.bean.AlertConfigWithParams;
+import org.apache.streampark.console.core.bean.AlertConfigParams;
import org.apache.streampark.console.core.bean.AlertTemplate;
import org.apache.streampark.console.core.bean.EmailConfig;
import org.apache.streampark.console.core.service.SettingService;
@@ -56,10 +56,10 @@ public class EmailAlertNotifyServiceImpl implements
AlertNotifyService {
}
@Override
- public boolean doAlert(AlertConfigWithParams alertConfig, AlertTemplate
template)
+ public boolean doAlert(AlertConfigParams alertConfig, AlertTemplate template)
throws AlertException {
EmailConfig emailConfig =
- Optional.ofNullable(settingService.getSenderEmail())
+ Optional.ofNullable(EmailConfig.fromSetting())
.orElseThrow(() -> new AlertException("Please configure first mail
sender"));
String contacts =
alertConfig.getEmailParams() == null ? null :
alertConfig.getEmailParams().getContacts();
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/HttpCallbackAlertNotifyServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/HttpCallbackAlertNotifyServiceImpl.java
index db80701bb..a71c2c4ab 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/HttpCallbackAlertNotifyServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/HttpCallbackAlertNotifyServiceImpl.java
@@ -19,7 +19,7 @@ package org.apache.streampark.console.core.service.alert.impl;
import org.apache.streampark.console.base.exception.AlertException;
import org.apache.streampark.console.base.util.FreemarkerUtils;
-import org.apache.streampark.console.core.bean.AlertConfigWithParams;
+import org.apache.streampark.console.core.bean.AlertConfigParams;
import org.apache.streampark.console.core.bean.AlertHttpCallbackParams;
import org.apache.streampark.console.core.bean.AlertTemplate;
import org.apache.streampark.console.core.service.alert.AlertNotifyService;
@@ -52,7 +52,7 @@ public class HttpCallbackAlertNotifyServiceImpl implements
AlertNotifyService {
@Autowired private ObjectMapper mapper;
@Override
- public boolean doAlert(AlertConfigWithParams alertConfig, AlertTemplate
alertTemplate)
+ public boolean doAlert(AlertConfigParams alertConfig, AlertTemplate
alertTemplate)
throws AlertException {
AlertHttpCallbackParams alertHttpCallbackParams =
alertConfig.getHttpCallbackParams();
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/LarkAlertNotifyServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/LarkAlertNotifyServiceImpl.java
index 2eae49b2c..a0025c7ef 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/LarkAlertNotifyServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/LarkAlertNotifyServiceImpl.java
@@ -19,7 +19,7 @@ package org.apache.streampark.console.core.service.alert.impl;
import org.apache.streampark.console.base.exception.AlertException;
import org.apache.streampark.console.base.util.FreemarkerUtils;
-import org.apache.streampark.console.core.bean.AlertConfigWithParams;
+import org.apache.streampark.console.core.bean.AlertConfigParams;
import org.apache.streampark.console.core.bean.AlertLarkParams;
import org.apache.streampark.console.core.bean.AlertLarkRobotResponse;
import org.apache.streampark.console.core.bean.AlertTemplate;
@@ -69,7 +69,7 @@ public class LarkAlertNotifyServiceImpl implements
AlertNotifyService {
}
@Override
- public boolean doAlert(AlertConfigWithParams alertConfig, AlertTemplate
alertTemplate)
+ public boolean doAlert(AlertConfigParams alertConfig, AlertTemplate
alertTemplate)
throws AlertException {
AlertLarkParams alertLarkParams = alertConfig.getLarkParams();
if (alertLarkParams.getIsAtAll()) {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/WeComAlertNotifyServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/WeComAlertNotifyServiceImpl.java
index 5d1daa268..350cf6092 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/WeComAlertNotifyServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/WeComAlertNotifyServiceImpl.java
@@ -19,7 +19,7 @@ package org.apache.streampark.console.core.service.alert.impl;
import org.apache.streampark.console.base.exception.AlertException;
import org.apache.streampark.console.base.util.FreemarkerUtils;
-import org.apache.streampark.console.core.bean.AlertConfigWithParams;
+import org.apache.streampark.console.core.bean.AlertConfigParams;
import org.apache.streampark.console.core.bean.AlertTemplate;
import org.apache.streampark.console.core.bean.AlertWeComParams;
import org.apache.streampark.console.core.bean.RobotResponse;
@@ -58,7 +58,7 @@ public class WeComAlertNotifyServiceImpl implements
AlertNotifyService {
}
@Override
- public boolean doAlert(AlertConfigWithParams alertConfig, AlertTemplate
alertTemplate)
+ public boolean doAlert(AlertConfigParams alertConfig, AlertTemplate
alertTemplate)
throws AlertException {
AlertWeComParams weComParams = alertConfig.getWeComParams();
try {
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/AppBuildPipeServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/AppBuildPipeServiceImpl.java
index fa410a99a..9adfc0e3e 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/AppBuildPipeServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/AppBuildPipeServiceImpl.java
@@ -30,6 +30,7 @@ import
org.apache.streampark.console.base.exception.ApiAlertException;
import org.apache.streampark.console.base.util.JacksonUtils;
import org.apache.streampark.console.base.util.WebUtils;
import org.apache.streampark.console.core.bean.Dependency;
+import org.apache.streampark.console.core.bean.DockerConfig;
import org.apache.streampark.console.core.entity.AppBuildPipeline;
import org.apache.streampark.console.core.entity.Application;
import org.apache.streampark.console.core.entity.ApplicationConfig;
@@ -475,6 +476,7 @@ public class AppBuildPipeServiceImpl
log.info("Submit params to building pipeline : {}",
k8sSessionBuildRequest);
return FlinkK8sSessionBuildPipeline.of(k8sSessionBuildRequest);
case KUBERNETES_NATIVE_APPLICATION:
+ DockerConfig dockerConfig = settingService.getDockerConfig();
FlinkK8sApplicationBuildRequest k8sApplicationBuildRequest =
new FlinkK8sApplicationBuildRequest(
app.getJobName(),
@@ -491,10 +493,10 @@ public class AppBuildPipeServiceImpl
app.getK8sPodTemplates(),
app.getK8sHadoopIntegration() != null ?
app.getK8sHadoopIntegration() : false,
DockerConf.of(
- settingService.getDockerRegisterAddress(),
- settingService.getDockerRegisterNamespace(),
- settingService.getDockerRegisterUser(),
- settingService.getDockerRegisterPassword()),
+ dockerConfig.getAddress(),
+ dockerConfig.getNamespace(),
+ dockerConfig.getUser(),
+ dockerConfig.getPassword()),
app.getIngressTemplate());
log.info("Submit params to building pipeline : {}",
k8sApplicationBuildRequest);
return FlinkK8sApplicationBuildPipeline.of(k8sApplicationBuildRequest);
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ResourceServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ResourceServiceImpl.java
index 8b900afe5..5e667d5b7 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ResourceServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ResourceServiceImpl.java
@@ -28,8 +28,8 @@ import
org.apache.streampark.console.base.mybatis.pager.MybatisPager;
import org.apache.streampark.console.base.util.JacksonUtils;
import org.apache.streampark.console.base.util.WebUtils;
import org.apache.streampark.console.core.bean.Dependency;
-import org.apache.streampark.console.core.bean.FlinkConnectorResource;
-import org.apache.streampark.console.core.bean.Pom;
+import org.apache.streampark.console.core.bean.FlinkConnector;
+import org.apache.streampark.console.core.bean.MavenPom;
import org.apache.streampark.console.core.entity.Application;
import org.apache.streampark.console.core.entity.FlinkSql;
import org.apache.streampark.console.core.entity.Resource;
@@ -123,7 +123,7 @@ public class ResourceServiceImpl extends
ServiceImpl<ResourceMapper, Resource>
// check
Dependency dependency = Dependency.toDependency(resourceStr);
List<String> jars = dependency.getJar();
- List<Pom> poms = dependency.getPom();
+ List<MavenPom> poms = dependency.getPom();
ApiAlertException.throwIfTrue(
jars.isEmpty() && poms.isEmpty(), "Please add pom or jar resource.");
@@ -140,8 +140,7 @@ public class ResourceServiceImpl extends
ServiceImpl<ResourceMapper, Resource>
} else {
String connector = resource.getConnector();
ApiAlertException.throwIfTrue(connector == null, "the flink connector is
null.");
- FlinkConnectorResource connectorResource =
- JacksonUtils.read(connector, FlinkConnectorResource.class);
+ FlinkConnector connectorResource = JacksonUtils.read(connector,
FlinkConnector.class);
resource.setResourceName(connectorResource.getFactoryIdentifier());
if (connectorResource.getRequiredOptions() != null) {
resource.setConnectorRequiredOptions(
@@ -298,7 +297,7 @@ public class ResourceServiceImpl extends
ServiceImpl<ResourceMapper, Resource>
return RestResponse.success().data(resp);
case CONNECTOR:
// 1) get connector id
- FlinkConnectorResource connectorResource;
+ FlinkConnector connectorResource;
ApiAlertException.throwIfFalse(
ResourceType.CONNECTOR.equals(resourceParam.getResourceType()),
@@ -384,7 +383,7 @@ public class ResourceServiceImpl extends
ServiceImpl<ResourceMapper, Resource>
return getBaseMapper().exists(lambdaQueryWrapper);
}
- private FlinkConnectorResource getConnectorResource(List<File> jars,
List<String> factories) {
+ private FlinkConnector getConnectorResource(List<File> jars, List<String>
factories) {
Class<Factory> className = Factory.class;
URL[] array =
jars.stream()
@@ -403,7 +402,7 @@ public class ResourceServiceImpl extends
ServiceImpl<ResourceMapper, Resource>
for (Factory factory : serviceLoader) {
String factoryClassName = factory.getClass().getName();
if (factories.contains(factoryClassName)) {
- FlinkConnectorResource connectorResource = new
FlinkConnectorResource();
+ FlinkConnector connectorResource = new FlinkConnector();
try {
connectorResource.setClassName(factoryClassName);
connectorResource.setFactoryIdentifier(factory.factoryIdentifier());
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SettingServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SettingServiceImpl.java
index c96d298e4..a2c47f3e4 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SettingServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SettingServiceImpl.java
@@ -17,7 +17,7 @@
package org.apache.streampark.console.core.service.impl;
-import org.apache.streampark.console.core.bean.EmailConfig;
+import org.apache.streampark.console.core.bean.DockerConfig;
import org.apache.streampark.console.core.bean.MavenConfig;
import org.apache.streampark.console.core.entity.Setting;
import org.apache.streampark.console.core.mapper.SettingMapper;
@@ -81,36 +81,13 @@ public class SettingServiceImpl extends
ServiceImpl<SettingMapper, Setting>
}
@Override
- public EmailConfig getSenderEmail() {
- return EmailConfig.fromSetting(SETTINGS);
- }
-
- @Override
- public String getDockerRegisterAddress() {
- return SETTINGS
- .getOrDefault(SettingService.KEY_DOCKER_REGISTER_ADDRESS, emptySetting)
- .getSettingValue();
- }
-
- @Override
- public String getDockerRegisterUser() {
- return SETTINGS
- .getOrDefault(SettingService.KEY_DOCKER_REGISTER_USER, emptySetting)
- .getSettingValue();
- }
-
- @Override
- public String getDockerRegisterPassword() {
- return SETTINGS
- .getOrDefault(SettingService.KEY_DOCKER_REGISTER_PASSWORD,
emptySetting)
- .getSettingValue();
+ public MavenConfig getMavenConfig() {
+ return MavenConfig.fromSetting();
}
@Override
- public String getDockerRegisterNamespace() {
- return SETTINGS
- .getOrDefault(SettingService.KEY_DOCKER_REGISTER_NAMESPACE,
emptySetting)
- .getSettingValue();
+ public DockerConfig getDockerConfig() {
+ return DockerConfig.fromSetting();
}
@Override
@@ -120,11 +97,6 @@ public class SettingServiceImpl extends
ServiceImpl<SettingMapper, Setting>
.getSettingValue();
}
- @Override
- public MavenConfig getMavenConfig() {
- return MavenConfig.fromSetting(SETTINGS);
- }
-
@Override
public String getIngressModeDefault() {
return SETTINGS
diff --git
a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/base/util/DependencyUtilsTest.java
b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/base/util/DependencyUtilsTest.java
index 10dc40ccb..99c0f51b3 100644
---
a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/base/util/DependencyUtilsTest.java
+++
b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/base/util/DependencyUtilsTest.java
@@ -19,7 +19,7 @@ package org.apache.streampark.console.base.util;
import org.apache.streampark.common.conf.CommonConfig;
import org.apache.streampark.common.conf.InternalConfigHolder;
-import org.apache.streampark.console.core.bean.FlinkConnectorResource;
+import org.apache.streampark.console.core.bean.FlinkConnector;
import org.apache.streampark.flink.packer.maven.Artifact;
import org.apache.streampark.flink.packer.maven.MavenTool;
@@ -83,12 +83,12 @@ class DependencyUtilsTest {
URLClassLoader urlClassLoader = URLClassLoader.newInstance(array);
ServiceLoader<Factory> serviceLoader = ServiceLoader.load(className,
urlClassLoader);
- List<FlinkConnectorResource> connectorResources = new ArrayList<>();
+ List<FlinkConnector> connectorResources = new ArrayList<>();
try {
for (Factory factory : serviceLoader) {
String factoryClassName = factory.getClass().getName();
if (factories.contains(factoryClassName)) {
- FlinkConnectorResource connectorResource = new
FlinkConnectorResource();
+ FlinkConnector connectorResource = new FlinkConnector();
connectorResource.setClassName(factoryClassName);
connectorResource.setFactoryIdentifier(factory.factoryIdentifier());
Map<String, String> requiredOptions = new HashMap<>(0);
diff --git
a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/alert/AlertServiceTest.java
b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/alert/AlertServiceTest.java
index 2bbf19c56..7b580b556 100644
---
a/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/alert/AlertServiceTest.java
+++
b/streampark-console/streampark-console-service/src/test/java/org/apache/streampark/console/core/service/alert/AlertServiceTest.java
@@ -20,7 +20,7 @@ package org.apache.streampark.console.core.service.alert;
import org.apache.streampark.common.util.DateUtils;
import org.apache.streampark.common.util.YarnUtils;
import org.apache.streampark.console.base.util.FreemarkerUtils;
-import org.apache.streampark.console.core.bean.AlertConfigWithParams;
+import org.apache.streampark.console.core.bean.AlertConfigParams;
import org.apache.streampark.console.core.bean.AlertDingTalkParams;
import org.apache.streampark.console.core.bean.AlertLarkParams;
import org.apache.streampark.console.core.bean.AlertTemplate;
@@ -53,7 +53,7 @@ import java.util.TimeZone;
@Disabled("These test cases can't be runnable due to external service is not
available.")
class AlertServiceTest {
AlertTemplate alertTemplate;
- AlertConfigWithParams params = new AlertConfigWithParams();
+ AlertConfigParams params = new AlertConfigParams();
ObjectMapper mapper = new ObjectMapper();
RestTemplate restTemplate = new RestTemplate();
private Template template;
