You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by he...@apache.org on 2022/06/05 08:40:14 UTC
[incubator-inlong] branch master updated: [INLONG-4508][Manager] Remove the config management of the DB and file servers (#4509)
This is an automated email from the ASF dual-hosted git repository.
healchow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 80ccd9ac8 [INLONG-4508][Manager] Remove the config management of the DB and file servers (#4509)
80ccd9ac8 is described below
commit 80ccd9ac8e42aca84850961f6f258eafb019fcbc
Author: healzhou <he...@gmail.com>
AuthorDate: Sun Jun 5 16:40:10 2022 +0800
[INLONG-4508][Manager] Remove the config management of the DB and file servers (#4509)
---
.../inlong/manager/common/enums/ErrorCodeEnum.java | 2 -
.../pojo/commonserver/CommonDbServerInfo.java | 108 ----
.../pojo/commonserver/CommonDbServerListVo.java | 61 ---
.../commonserver/CommonDbServerPageRequest.java | 46 --
.../pojo/commonserver/CommonFileServerInfo.java | 76 ---
.../pojo/commonserver/CommonFileServerListVo.java | 58 --
.../commonserver/CommonFileServerPageRequest.java | 46 --
.../manager/dao/entity/CommonDbServerEntity.java | 57 --
.../manager/dao/entity/CommonFileServerEntity.java | 48 --
.../dao/mapper/CommonDbServerEntityMapper.java | 51 --
.../dao/mapper/CommonFileServerEntityMapper.java | 48 --
.../mappers/CommonDbServerEntityMapper.xml | 389 -------------
.../mappers/CommonFileServerEntityMapper.xml | 282 ----------
.../service/core/CommonDBServerService.java | 113 ----
.../service/core/CommonFileServerService.java | 129 -----
.../core/impl/CommonDBServerServiceImpl.java | 576 -------------------
.../core/impl/CommonFileServerServiceImpl.java | 608 ---------------------
.../main/resources/sql/apache_inlong_manager.sql | 58 --
.../manager-web/sql/apache_inlong_manager.sql | 60 --
.../web/controller/CommonDBServerController.java | 293 ----------
.../web/controller/CommonFileServerController.java | 309 -----------
.../main/resources/common_db_server_template.csv | 2 -
.../main/resources/common_file_server_template.csv | 2 -
23 files changed, 3422 deletions(-)
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/ErrorCodeEnum.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/ErrorCodeEnum.java
index d56e3342a..284b656b5 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/ErrorCodeEnum.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/ErrorCodeEnum.java
@@ -112,8 +112,6 @@ public enum ErrorCodeEnum {
PULSAR_DLQ_DUPLICATED(2607, "DLQ topic already exists under the inlong group"),
PULSAR_RLQ_DUPLICATED(2608, "RLQ topic already exists under the inlong group"),
- COMMON_FILE_DOWNLOAD_FAIL(6001, "File download failed"),
- COMMON_FILE_UPLOAD_FAIL(6002, "File upload failed"),
;
private final int code;
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/commonserver/CommonDbServerInfo.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/commonserver/CommonDbServerInfo.java
deleted file mode 100644
index bb9e179c4..000000000
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/commonserver/CommonDbServerInfo.java
+++ /dev/null
@@ -1,108 +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.
- */
-
-package org.apache.inlong.manager.common.pojo.commonserver;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * Common database server info, including connetion name, database type, etc.
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@ApiModel("Common DB server info")
-public class CommonDbServerInfo {
-
- private Integer id;
-
- @ApiModelProperty("access type, support: Agent, DataProxy Client, LoadProxy")
- private String accessType;
-
- @ApiModelProperty("connection alias name")
- private String connectionName;
-
- @ApiModelProperty("DB type, like: MySQL, Oracle")
- private String dbType;
-
- @ApiModelProperty("DB Server IP")
- private String dbServerIp;
-
- @ApiModelProperty("DB Server port")
- private Integer port;
-
- @ApiModelProperty("target database name")
- private String dbName;
-
- @ApiModelProperty("Db server username")
- private String username;
-
- @ApiModelProperty("password")
- private String password;
-
- @ApiModelProperty("has select permission for DB, 0: no, 1: yes")
- private boolean hasSelect;
-
- @ApiModelProperty("has insert permission for DB, 0: no, 1: yes")
- private boolean hasInsert;
-
- @ApiModelProperty("has update permission for DB, 0: no, 1: yes")
- private boolean hasUpdate;
-
- @ApiModelProperty("has delete permission for DB, 0: no, 1: yes")
- private boolean hasDelete;
-
- @ApiModelProperty("DB in charges, separate with commas(\",\") when multiple")
- private String inCharges;
-
- @ApiModelProperty("description for DB")
- private String dbDescription;
-
- @ApiModelProperty("backup DB host IP")
- private String backupDbServerIp;
-
- @ApiModelProperty("backup DB host port")
- private Integer backupDbPort;
-
- @ApiModelProperty("status, 0: invalid, 1: normal")
- private Integer status;
-
- @ApiModelProperty("is deleted? 0: deleted, 1: not deleted")
- private Integer isDeleted;
-
- private String creator;
-
- private String modifier;
-
- private Date createTime;
-
- private Date modifyTime;
-
- @ApiModelProperty("visible person, separate with commas(\",\") when multiple")
- private String visiblePerson;
-
- @ApiModelProperty("visible group, separate with commas(\",\") when multiple")
- private String visibleGroup;
-
-}
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/commonserver/CommonDbServerListVo.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/commonserver/CommonDbServerListVo.java
deleted file mode 100644
index d44a1cf9e..000000000
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/commonserver/CommonDbServerListVo.java
+++ /dev/null
@@ -1,61 +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.
- */
-
-package org.apache.inlong.manager.common.pojo.commonserver;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-import lombok.Data;
-
-/**
- * File source list
- */
-@Data
-@ApiModel("File source list")
-public class CommonDbServerListVo {
-
- private Integer id;
-
- @ApiModelProperty("Collection type, Agent, DataProxy Client, LoadProxy")
- private String accessType;
-
- @ApiModelProperty("The name of the database connection")
- private String connectionName;
-
- @ApiModelProperty("DB type, such as MySQL, Oracle")
- private String dbType;
-
- @ApiModelProperty("DB Server IP")
- private String dbServerIp;
-
- @ApiModelProperty("Port Number")
- private Integer port;
-
- @ApiModelProperty("Target database name")
- private String dbName;
-
- @ApiModelProperty("DB description")
- private String dbDescription;
-
- @ApiModelProperty("Status, 0: normal, 1: invalid")
- private Integer status;
-
- private String modifier;
-
- private Date modifyTime;
-}
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/commonserver/CommonDbServerPageRequest.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/commonserver/CommonDbServerPageRequest.java
deleted file mode 100644
index b162b56f3..000000000
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/commonserver/CommonDbServerPageRequest.java
+++ /dev/null
@@ -1,46 +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.
- */
-
-package org.apache.inlong.manager.common.pojo.commonserver;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.List;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.apache.inlong.manager.common.beans.PageRequest;
-
-/**
- * DB source query conditions
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel("DB source query conditions")
-public class CommonDbServerPageRequest extends PageRequest {
-
- @ApiModelProperty(value = "DB Server IP")
- private String dbServerIp;
-
- @ApiModelProperty(value = "current user", hidden = true)
- private String currentUser;
-
- @ApiModelProperty(value = "Weather current user have admin role", hidden = true)
- private Boolean isAdminRole = false;
-
- @ApiModelProperty(value = "The group the current user belongs to")
- private List<String> userGroups;
-}
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/commonserver/CommonFileServerInfo.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/commonserver/CommonFileServerInfo.java
deleted file mode 100644
index bda892b30..000000000
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/commonserver/CommonFileServerInfo.java
+++ /dev/null
@@ -1,76 +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.
- */
-
-package org.apache.inlong.manager.common.pojo.commonserver;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * Common file server info
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@ApiModel("Common file server info")
-public class CommonFileServerInfo {
-
- private int id;
-
- @ApiModelProperty("access type, support: Agent, DataProxy Client, LoadProxy")
- private String accessType;
-
- private String ip;
-
- private int port;
-
- @ApiModelProperty("Issue type, support: SSH, TCS")
- private String issueType;
-
- @ApiModelProperty("File server username")
- private String username;
-
- @ApiModelProperty("password")
- private String password;
-
- @ApiModelProperty("Status, 0: invalid, 1: normal")
- private Integer status;
-
- @ApiModelProperty("is deleted? 0: deleted, 1: not deleted")
- private Integer isDeleted;
-
- private String creator;
-
- private String modifier;
-
- private Date createTime;
-
- private Date modifyTime;
-
- @ApiModelProperty("visible person, separate with commas(\",\") when multiple")
- private String visiblePerson;
-
- @ApiModelProperty("visible group, separate with commas(\",\") when multiple")
- private String visibleGroup;
-
-}
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/commonserver/CommonFileServerListVo.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/commonserver/CommonFileServerListVo.java
deleted file mode 100644
index 8a2454c0d..000000000
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/commonserver/CommonFileServerListVo.java
+++ /dev/null
@@ -1,58 +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.
- */
-
-package org.apache.inlong.manager.common.pojo.commonserver;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * The VO of common file server list.
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@ApiModel("Response of file source list")
-public class CommonFileServerListVo {
-
- private int id;
-
- @ApiModelProperty("access type, support: Agent, DataProxy Client, LoadProxy")
- private String accessType;
-
- @ApiModelProperty("source IP")
- private String ip;
-
- private int port;
-
- @ApiModelProperty("issue type, support: SSH, TCS")
- private String issueType;
-
- private String username;
-
- @ApiModelProperty("status, 0: Normal, 1: Invalid")
- private Integer status;
-
- private String modifier;
- private Date modifyTime;
-}
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/commonserver/CommonFileServerPageRequest.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/commonserver/CommonFileServerPageRequest.java
deleted file mode 100644
index dc7b59d9d..000000000
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/commonserver/CommonFileServerPageRequest.java
+++ /dev/null
@@ -1,46 +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.
- */
-
-package org.apache.inlong.manager.common.pojo.commonserver;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.List;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.apache.inlong.manager.common.beans.PageRequest;
-
-/**
- * File source query conditions
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel("File source query conditions")
-public class CommonFileServerPageRequest extends PageRequest {
-
- @ApiModelProperty(value = "Source IP")
- private String ip;
-
- @ApiModelProperty(value = "Status")
- private Integer status;
-
- @ApiModelProperty(value = "Current user")
- private String currentUser;
-
- @ApiModelProperty(value = "Current user's groups")
- private List<String> userGroups;
-}
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/CommonDbServerEntity.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/CommonDbServerEntity.java
deleted file mode 100644
index be2c8a190..000000000
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/CommonDbServerEntity.java
+++ /dev/null
@@ -1,57 +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.
- */
-
-package org.apache.inlong.manager.dao.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Data;
-
-/**
- * Common database server info, including connection name, username, password, etc.
- */
-@Data
-public class CommonDbServerEntity implements Serializable {
-
- private static final long serialVersionUID = 1L;
- private Integer id;
- private String accessType;
- private String connectionName;
- private String dbType;
- private String dbServerIp;
- private Integer port;
- private String dbName;
- private String username;
- private String password;
- private Boolean hasSelect;
- private Boolean hasInsert;
- private Boolean hasUpdate;
- private Boolean hasDelete;
- private String inCharges;
- private String dbDescription;
- private String backupDbServerIp;
- private Integer backupDbPort;
- private Integer status;
- private Integer isDeleted = 0;
- private String creator;
- private String modifier;
- private Date createTime;
- private Date modifyTime;
- private String visiblePerson;
- private String visibleGroup;
-
-}
\ No newline at end of file
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/CommonFileServerEntity.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/CommonFileServerEntity.java
deleted file mode 100644
index 22005b176..000000000
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/CommonFileServerEntity.java
+++ /dev/null
@@ -1,48 +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.
- */
-
-package org.apache.inlong.manager.dao.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Data;
-
-/**
- * Common file server entity, including ip, port, username, password, etc.
- */
-@Data
-public class CommonFileServerEntity implements Serializable {
-
- private static final long serialVersionUID = 1L;
- private Integer id;
- private String accessType;
- private String ip;
- private Integer port;
- private Boolean isInnerIp;
- private String issueType;
- private String username;
- private String password;
- private Integer status;
- private Integer isDeleted = 0;
- private String creator;
- private String modifier;
- private Date createTime;
- private Date modifyTime;
- private String visiblePerson;
- private String visibleGroup;
-
-}
\ No newline at end of file
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/CommonDbServerEntityMapper.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/CommonDbServerEntityMapper.java
deleted file mode 100644
index c9a607823..000000000
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/CommonDbServerEntityMapper.java
+++ /dev/null
@@ -1,51 +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.
- */
-
-package org.apache.inlong.manager.dao.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.apache.inlong.manager.common.pojo.commonserver.CommonDbServerPageRequest;
-import org.apache.inlong.manager.dao.entity.CommonDbServerEntity;
-import org.springframework.stereotype.Repository;
-
-@Deprecated
-@Repository
-public interface CommonDbServerEntityMapper {
-
- int deleteByPrimaryKey(Integer id);
-
- int insert(CommonDbServerEntity record);
-
- int insertSelective(CommonDbServerEntity record);
-
- CommonDbServerEntity selectByPrimaryKey(Integer id);
-
- int updateByPrimaryKeySelective(CommonDbServerEntity record);
-
- int updateByPrimaryKey(CommonDbServerEntity record);
-
- List<CommonDbServerEntity> selectByUsernameAndIpPort(@Param("username") String username,
- @Param("dbType") String dbType,
- @Param("dbServerIp") String dbServerIp,
- @Param("port") int port);
-
- List<CommonDbServerEntity> selectAll();
-
- List<CommonDbServerEntity> selectByCondition(CommonDbServerPageRequest request);
-}
\ No newline at end of file
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/CommonFileServerEntityMapper.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/CommonFileServerEntityMapper.java
deleted file mode 100644
index 6192420a0..000000000
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/CommonFileServerEntityMapper.java
+++ /dev/null
@@ -1,48 +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.
- */
-
-package org.apache.inlong.manager.dao.mapper;
-
-import org.apache.inlong.manager.common.pojo.commonserver.CommonFileServerPageRequest;
-import org.apache.inlong.manager.dao.entity.CommonFileServerEntity;
-
-import java.util.List;
-
-import org.springframework.stereotype.Repository;
-
-@Deprecated
-@Repository
-public interface CommonFileServerEntityMapper {
-
- int deleteByPrimaryKey(Integer id);
-
- int insert(CommonFileServerEntity record);
-
- int insertSelective(CommonFileServerEntity record);
-
- CommonFileServerEntity selectByPrimaryKey(Integer id);
-
- int updateByPrimaryKeySelective(CommonFileServerEntity record);
-
- int updateByPrimaryKey(CommonFileServerEntity record);
-
- List<CommonFileServerEntity> selectByUsernameAndIpPort(String username, String ip, int port);
-
- List<CommonFileServerEntity> selectAll();
-
- List<CommonFileServerEntity> selectByCondition(CommonFileServerPageRequest request);
-}
\ No newline at end of file
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/CommonDbServerEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/CommonDbServerEntityMapper.xml
deleted file mode 100644
index fc58e616e..000000000
--- a/inlong-manager/manager-dao/src/main/resources/mappers/CommonDbServerEntityMapper.xml
+++ /dev/null
@@ -1,389 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.apache.inlong.manager.dao.mapper.CommonDbServerEntityMapper">
- <resultMap id="BaseResultMap" type="org.apache.inlong.manager.dao.entity.CommonDbServerEntity">
- <id column="id" jdbcType="INTEGER" property="id"/>
- <result column="access_type" jdbcType="VARCHAR" property="accessType"/>
- <result column="connection_name" jdbcType="VARCHAR" property="connectionName"/>
- <result column="db_type" jdbcType="VARCHAR" property="dbType"/>
- <result column="db_server_ip" jdbcType="VARCHAR" property="dbServerIp"/>
- <result column="port" jdbcType="INTEGER" property="port"/>
- <result column="db_name" jdbcType="VARCHAR" property="dbName"/>
- <result column="username" jdbcType="VARCHAR" property="username"/>
- <result column="password" jdbcType="VARCHAR" property="password"/>
- <result column="has_select" jdbcType="BIT" property="hasSelect"/>
- <result column="has_insert" jdbcType="BIT" property="hasInsert"/>
- <result column="has_update" jdbcType="BIT" property="hasUpdate"/>
- <result column="has_delete" jdbcType="BIT" property="hasDelete"/>
- <result column="in_charges" jdbcType="VARCHAR" property="inCharges"/>
- <result column="db_description" jdbcType="VARCHAR" property="dbDescription"/>
- <result column="backup_db_server_ip" jdbcType="VARCHAR" property="backupDbServerIp"/>
- <result column="backup_db_port" jdbcType="INTEGER" property="backupDbPort"/>
- <result column="status" jdbcType="INTEGER" property="status"/>
- <result column="is_deleted" jdbcType="INTEGER" property="isDeleted"/>
- <result column="creator" jdbcType="VARCHAR" property="creator"/>
- <result column="modifier" jdbcType="VARCHAR" property="modifier"/>
- <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
- <result column="modify_time" jdbcType="TIMESTAMP" property="modifyTime"/>
- <result column="visible_person" jdbcType="VARCHAR" property="visiblePerson"/>
- <result column="visible_group" jdbcType="VARCHAR" property="visibleGroup"/>
- </resultMap>
- <sql id="Base_Column_List">
- id, access_type, connection_name, db_type, db_server_ip, port, db_name, username, password, has_select,
- has_insert, has_update, has_delete, in_charges, db_description, backup_db_server_ip,
- backup_db_port, status, is_deleted, creator, modifier, create_time, modify_time, visible_person, visible_group
- </sql>
- <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"/>
- from common_db_server
- where id = #{id,jdbcType=INTEGER}
- </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
- delete
- from common_db_server
- where id = #{id,jdbcType=INTEGER}
- </delete>
- <insert id="insert" useGeneratedKeys="true" keyProperty="id"
- parameterType="org.apache.inlong.manager.dao.entity.CommonDbServerEntity">
- insert into common_db_server (id, access_type, connection_name,
- db_type, db_server_ip, port,
- db_name, username, password,
- has_select, has_insert, has_update,
- has_delete, in_charges,
- db_description, backup_db_server_ip,
- backup_db_port, creator, modifier,
- create_time, modify_time, status,
- is_deleted, visible_person, visible_group)
- values (#{id,jdbcType=INTEGER}, #{accessType,jdbcType=VARCHAR}, #{connectionName,jdbcType=VARCHAR},
- #{dbType,jdbcType=VARCHAR}, #{dbServerIp,jdbcType=VARCHAR}, #{port,jdbcType=INTEGER},
- #{dbName,jdbcType=VARCHAR}, #{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR},
- #{hasSelect,jdbcType=INTEGER}, #{hasInsert,jdbcType=INTEGER}, #{hasUpdate,jdbcType=INTEGER},
- #{hasDelete,jdbcType=INTEGER}, #{inCharges,jdbcType=VARCHAR},
- #{dbDescription,jdbcType=VARCHAR}, #{backupDbServerIp,jdbcType=VARCHAR},
- #{backupDbPort,jdbcType=INTEGER}, #{creator,jdbcType=VARCHAR}, #{modifier,jdbcType=VARCHAR},
- #{createTime,jdbcType=TIMESTAMP}, #{modifyTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER},
- #{isDeleted,jdbcType=INTEGER}, #{visiblePerson,jdbcType=VARCHAR}, #{visibleGroup,jdbcType=VARCHAR})
- </insert>
- <insert id="insertSelective" parameterType="org.apache.inlong.manager.dao.entity.CommonDbServerEntity">
- insert into common_db_server
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">
- id,
- </if>
- <if test="accessType != null">
- access_type,
- </if>
- <if test="connectionName != null">
- connection_name,
- </if>
- <if test="dbType != null">
- db_type,
- </if>
- <if test="dbServerIp != null">
- db_server_ip,
- </if>
- <if test="port != null">
- port,
- </if>
- <if test="dbName != null">
- db_name,
- </if>
- <if test="username != null">
- username,
- </if>
- <if test="password != null">
- password,
- </if>
- <if test="hasSelect != null">
- has_select,
- </if>
- <if test="hasInsert != null">
- has_insert,
- </if>
- <if test="hasUpdate != null">
- has_update,
- </if>
- <if test="hasDelete != null">
- has_delete,
- </if>
- <if test="inCharges != null">
- in_charges,
- </if>
- <if test="dbDescription != null">
- db_description,
- </if>
- <if test="backupDbServerIp != null">
- backup_db_server_ip,
- </if>
- <if test="backupDbPort != null">
- backup_db_port,
- </if>
- <if test="status != null">
- status,
- </if>
- <if test="isDeleted != null">
- is_deleted,
- </if>
- <if test="creator != null">
- creator,
- </if>
- <if test="modifier != null">
- modifier,
- </if>
- <if test="createTime != null">
- create_time,
- </if>
- <if test="modifyTime != null">
- modify_time,
- </if>
- <if test="visiblePerson != null">
- visible_person,
- </if>
- <if test="visibleGroup != null">
- visible_group,
- </if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">
- #{id,jdbcType=INTEGER},
- </if>
- <if test="accessType != null">
- #{accessType,jdbcType=VARCHAR},
- </if>
- <if test="connectionName != null">
- #{connectionName,jdbcType=VARCHAR},
- </if>
- <if test="dbType != null">
- #{dbType,jdbcType=VARCHAR},
- </if>
- <if test="dbServerIp != null">
- #{dbServerIp,jdbcType=VARCHAR},
- </if>
- <if test="port != null">
- #{port,jdbcType=INTEGER},
- </if>
- <if test="dbName != null">
- #{dbName,jdbcType=VARCHAR},
- </if>
- <if test="username != null">
- #{username,jdbcType=VARCHAR},
- </if>
- <if test="password != null">
- #{password,jdbcType=VARCHAR},
- </if>
- <if test="hasSelect != null">
- #{hasSelect,jdbcType=INTEGER},
- </if>
- <if test="hasInsert != null">
- #{hasInsert,jdbcType=INTEGER},
- </if>
- <if test="hasUpdate != null">
- #{hasUpdate,jdbcType=INTEGER},
- </if>
- <if test="hasDelete != null">
- #{hasDelete,jdbcType=INTEGER},
- </if>
- <if test="inCharges != null">
- #{inCharges,jdbcType=VARCHAR},
- </if>
- <if test="dbDescription != null">
- #{dbDescription,jdbcType=VARCHAR},
- </if>
- <if test="backupDbServerIp != null">
- #{backupDbServerIp,jdbcType=VARCHAR},
- </if>
- <if test="backupDbPort != null">
- #{backupDbPort,jdbcType=INTEGER},
- </if>
- <if test="status != null">
- #{status,jdbcType=INTEGER},
- </if>
- <if test="isDeleted != null">
- #{isDeleted,jdbcType=INTEGER},
- </if>
- <if test="creator != null">
- #{creator,jdbcType=VARCHAR},
- </if>
- <if test="modifier != null">
- #{modifier,jdbcType=VARCHAR},
- </if>
- <if test="createTime != null">
- #{createTime,jdbcType=TIMESTAMP},
- </if>
- <if test="modifyTime != null">
- #{modifyTime,jdbcType=TIMESTAMP},
- </if>
- <if test="visiblePerson != null">
- #{visiblePerson,jdbcType=VARCHAR},
- </if>
- <if test="visibleGroup != null">
- #{visibleGroup,jdbcType=VARCHAR},
- </if>
- </trim>
- </insert>
- <update id="updateByPrimaryKeySelective" parameterType="org.apache.inlong.manager.dao.entity.CommonDbServerEntity">
- update common_db_server
- <set>
- <if test="accessType != null">
- access_type = #{accessType,jdbcType=VARCHAR},
- </if>
- <if test="connectionName != null">
- connection_name = #{connectionName,jdbcType=VARCHAR},
- </if>
- <if test="dbType != null">
- db_type = #{dbType,jdbcType=VARCHAR},
- </if>
- <if test="dbServerIp != null">
- db_server_ip = #{dbServerIp,jdbcType=VARCHAR},
- </if>
- <if test="port != null">
- port = #{port,jdbcType=INTEGER},
- </if>
- <if test="dbName != null">
- db_name = #{dbName,jdbcType=VARCHAR},
- </if>
- <if test="username != null">
- username = #{username,jdbcType=VARCHAR},
- </if>
- <if test="password != null">
- password = #{password,jdbcType=VARCHAR},
- </if>
- <if test="hasSelect != null">
- has_select = #{hasSelect,jdbcType=INTEGER},
- </if>
- <if test="hasInsert != null">
- has_insert = #{hasInsert,jdbcType=INTEGER},
- </if>
- <if test="hasUpdate != null">
- has_update = #{hasUpdate,jdbcType=INTEGER},
- </if>
- <if test="hasDelete != null">
- has_delete = #{hasDelete,jdbcType=INTEGER},
- </if>
- <if test="inCharges != null">
- in_charges = #{inCharges,jdbcType=VARCHAR},
- </if>
- <if test="dbDescription != null">
- db_description = #{dbDescription,jdbcType=VARCHAR},
- </if>
- <if test="backupDbServerIp != null">
- backup_db_server_ip = #{backupDbServerIp,jdbcType=VARCHAR},
- </if>
- <if test="backupDbPort != null">
- backup_db_port = #{backupDbPort,jdbcType=INTEGER},
- </if>
- <if test="status != null">
- status = #{status,jdbcType=INTEGER},
- </if>
- <if test="isDeleted != null">
- is_deleted = #{isDeleted,jdbcType=INTEGER},
- </if>
- <if test="creator != null">
- creator = #{creator,jdbcType=VARCHAR},
- </if>
- <if test="modifier != null">
- modifier = #{modifier,jdbcType=VARCHAR},
- </if>
- <if test="createTime != null">
- create_time = #{createTime,jdbcType=TIMESTAMP},
- </if>
- <if test="modifyTime != null">
- modify_time = #{modifyTime,jdbcType=TIMESTAMP},
- </if>
- <if test="visiblePerson != null">
- visible_person = #{visiblePerson,jdbcType=VARCHAR},
- </if>
- <if test="visibleGroup != null">
- visible_group = #{visibleGroup,jdbcType=VARCHAR},
- </if>
- </set>
- where id = #{id,jdbcType=INTEGER}
- </update>
- <update id="updateByPrimaryKey" parameterType="org.apache.inlong.manager.dao.entity.CommonDbServerEntity">
- update common_db_server
- set access_type = #{accessType,jdbcType=VARCHAR},
- connection_name = #{connectionName,jdbcType=VARCHAR},
- db_type = #{dbType,jdbcType=VARCHAR},
- db_server_ip = #{dbServerIp,jdbcType=VARCHAR},
- port = #{port,jdbcType=INTEGER},
- db_name = #{dbName,jdbcType=VARCHAR},
- username = #{username,jdbcType=VARCHAR},
- password = #{password,jdbcType=VARCHAR},
- has_select = #{hasSelect,jdbcType=INTEGER},
- has_insert = #{hasInsert,jdbcType=INTEGER},
- has_update = #{hasUpdate,jdbcType=INTEGER},
- has_delete = #{hasDelete,jdbcType=INTEGER},
- in_charges = #{inCharges,jdbcType=VARCHAR},
- db_description = #{dbDescription,jdbcType=VARCHAR},
- backup_db_server_ip = #{backupDbServerIp,jdbcType=VARCHAR},
- backup_db_port = #{backupDbPort,jdbcType=INTEGER},
- status = #{status,jdbcType=INTEGER},
- is_deleted = #{isDeleted,jdbcType=INTEGER},
- creator = #{creator,jdbcType=VARCHAR},
- modifier = #{modifier,jdbcType=VARCHAR},
- create_time = #{createTime,jdbcType=TIMESTAMP},
- modify_time = #{modifyTime,jdbcType=TIMESTAMP},
- visible_person = #{visiblePerson,jdbcType=VARCHAR},
- visible_group = #{visibleGroup,jdbcType=VARCHAR}
- where id = #{id,jdbcType=INTEGER}
- </update>
- <select id="selectAll" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"/>
- from common_db_server
- where is_deleted = 0
- </select>
- <select id="selectByUsernameAndIpPort" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"/>
- from common_db_server
- where username = #{username,jdbcType=VARCHAR}
- and db_type = #{dbType,jdbcType=VARCHAR}
- and db_server_ip = #{dbServerIp,jdbcType=VARCHAR}
- and port = #{port,jdbcType=INTEGER}
- and is_deleted = 0
- </select>
- <select id="selectByCondition" resultMap="BaseResultMap"
- parameterType="org.apache.inlong.manager.common.pojo.commonserver.CommonDbServerPageRequest">
- select
- <include refid="Base_Column_List"/>
- from common_db_server
- <where>
- is_deleted = 0
- <if test="isAdminRole == false">
- and (creator = #{currentUser,jdbcType=VARCHAR}
- or find_in_set(#{currentUser,jdbcType=VARCHAR},in_charges)
- or find_in_set(#{currentUser,jdbcType=VARCHAR},visible_person)
- <if test="userGroups!= null and userGroups.size() >0">
- <foreach collection="userGroups" item="group">
- or find_in_set(#{group,jdbcType=VARCHAR},visible_group)
- </foreach>
- </if>
- )
- </if>
- <if test="dbServerIp != null and dbServerIp != ''">
- and db_server_ip = #{dbServerIp, jdbcType=VARCHAR}
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/CommonFileServerEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/CommonFileServerEntityMapper.xml
deleted file mode 100644
index 5b43bb8c0..000000000
--- a/inlong-manager/manager-dao/src/main/resources/mappers/CommonFileServerEntityMapper.xml
+++ /dev/null
@@ -1,282 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.apache.inlong.manager.dao.mapper.CommonFileServerEntityMapper">
- <resultMap id="BaseResultMap" type="org.apache.inlong.manager.dao.entity.CommonFileServerEntity">
- <id column="id" jdbcType="INTEGER" property="id"/>
- <result column="access_type" jdbcType="VARCHAR" property="accessType"/>
- <result column="ip" jdbcType="VARCHAR" property="ip"/>
- <result column="port" jdbcType="INTEGER" property="port"/>
- <result column="is_inner_ip" jdbcType="BIT" property="isInnerIp"/>
- <result column="issue_type" jdbcType="VARCHAR" property="issueType"/>
- <result column="username" jdbcType="VARCHAR" property="username"/>
- <result column="password" jdbcType="VARCHAR" property="password"/>
- <result column="status" jdbcType="INTEGER" property="status"/>
- <result column="is_deleted" jdbcType="INTEGER" property="isDeleted"/>
- <result column="creator" jdbcType="VARCHAR" property="creator"/>
- <result column="modifier" jdbcType="VARCHAR" property="modifier"/>
- <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
- <result column="modify_time" jdbcType="TIMESTAMP" property="modifyTime"/>
- <result column="visible_person" jdbcType="VARCHAR" property="visiblePerson"/>
- <result column="visible_group" jdbcType="VARCHAR" property="visibleGroup"/>
- </resultMap>
- <sql id="Base_Column_List">
- id, access_type, ip, port, is_inner_ip, issue_type, username, password, status, is_deleted,
- creator, modifier, create_time, modify_time, visible_person, visible_group
- </sql>
- <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"/>
- from common_file_server
- where id = #{id,jdbcType=INTEGER}
- </select>
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
- delete
- from common_file_server
- where id = #{id,jdbcType=INTEGER}
- </delete>
- <insert id="insert" useGeneratedKeys="true" keyProperty="id"
- parameterType="org.apache.inlong.manager.dao.entity.CommonFileServerEntity">
- insert into common_file_server (id, access_type, ip, port,
- is_inner_ip, issue_type,
- username, password, status, is_deleted,
- creator, modifier, create_time,
- modify_time, visible_person, visible_group)
- values (#{id,jdbcType=INTEGER}, #{accessType,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR},
- #{port,jdbcType=INTEGER}, #{isInnerIp,jdbcType=INTEGER}, #{issueType,jdbcType=VARCHAR},
- #{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER},
- #{isDeleted,jdbcType=INTEGER}, #{creator,jdbcType=VARCHAR}, #{modifier,jdbcType=VARCHAR},
- #{createTime,jdbcType=TIMESTAMP}, #{modifyTime,jdbcType=TIMESTAMP}, #{visiblePerson,jdbcType=VARCHAR},
- #{visibleGroup,jdbcType=VARCHAR})
- </insert>
- <insert id="insertSelective" parameterType="org.apache.inlong.manager.dao.entity.CommonFileServerEntity">
- insert into common_file_server
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">
- id,
- </if>
- <if test="accessType != null">
- access_type,
- </if>
- <if test="ip != null">
- ip,
- </if>
- <if test="port != null">
- port,
- </if>
- <if test="isInnerIp != null">
- is_inner_ip,
- </if>
- <if test="issueType != null">
- issue_type,
- </if>
- <if test="username != null">
- username,
- </if>
- <if test="password != null">
- password,
- </if>
- <if test="status != null">
- status,
- </if>
- <if test="isDeleted != null">
- is_deleted,
- </if>
- <if test="creator != null">
- creator,
- </if>
- <if test="modifier != null">
- modifier,
- </if>
- <if test="createTime != null">
- create_time,
- </if>
- <if test="modifyTime != null">
- modify_time,
- </if>
- <if test="visiblePerson != null">
- visible_person,
- </if>
- <if test="visibleGroup != null">
- visible_group,
- </if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">
- #{id,jdbcType=INTEGER},
- </if>
- <if test="accessType != null">
- #{accessType,jdbcType=VARCHAR},
- </if>
- <if test="ip != null">
- #{ip,jdbcType=VARCHAR},
- </if>
- <if test="port != null">
- #{port,jdbcType=INTEGER},
- </if>
- <if test="isInnerIp != null">
- #{isInnerIp,jdbcType=INTEGER},
- </if>
- <if test="issueType != null">
- #{issueType,jdbcType=VARCHAR},
- </if>
- <if test="username != null">
- #{username,jdbcType=VARCHAR},
- </if>
- <if test="password != null">
- #{password,jdbcType=VARCHAR},
- </if>
- <if test="status != null">
- #{status,jdbcType=INTEGER},
- </if>
- <if test="isDeleted != null">
- #{isDeleted,jdbcType=INTEGER},
- </if>
- <if test="creator != null">
- #{creator,jdbcType=VARCHAR},
- </if>
- <if test="modifier != null">
- #{modifier,jdbcType=VARCHAR},
- </if>
- <if test="createTime != null">
- #{createTime,jdbcType=TIMESTAMP},
- </if>
- <if test="modifyTime != null">
- #{modifyTime,jdbcType=TIMESTAMP},
- </if>
- <if test="visiblePerson != null">
- #{visiblePerson,jdbcType=VARCHAR},
- </if>
- <if test="visibleGroup != null">
- #{visibleGroup,jdbcType=VARCHAR},
- </if>
- </trim>
- </insert>
- <update id="updateByPrimaryKeySelective"
- parameterType="org.apache.inlong.manager.dao.entity.CommonFileServerEntity">
- update common_file_server
- <set>
- <if test="accessType != null">
- access_type = #{accessType,jdbcType=VARCHAR},
- </if>
- <if test="ip != null">
- ip = #{ip,jdbcType=VARCHAR},
- </if>
- <if test="port != null">
- port = #{port,jdbcType=INTEGER},
- </if>
- <if test="isInnerIp != null">
- is_inner_ip = #{isInnerIp,jdbcType=INTEGER},
- </if>
- <if test="issueType != null">
- issue_type = #{issueType,jdbcType=VARCHAR},
- </if>
- <if test="username != null">
- username = #{username,jdbcType=VARCHAR},
- </if>
- <if test="password != null">
- password = #{password,jdbcType=VARCHAR},
- </if>
- <if test="status != null">
- status = #{status,jdbcType=INTEGER},
- </if>
- <if test="isDeleted != null">
- is_deleted = #{isDeleted,jdbcType=INTEGER},
- </if>
- <if test="creator != null">
- creator = #{creator,jdbcType=VARCHAR},
- </if>
- <if test="modifier != null">
- modifier = #{modifier,jdbcType=VARCHAR},
- </if>
- <if test="createTime != null">
- create_time = #{createTime,jdbcType=TIMESTAMP},
- </if>
- <if test="modifyTime != null">
- modify_time = #{modifyTime,jdbcType=TIMESTAMP},
- </if>
- <if test="visiblePerson != null">
- visible_person = #{visiblePerson,jdbcType=VARCHAR},
- </if>
- <if test="visibleGroup != null">
- visible_group = #{visibleGroup,jdbcType=VARCHAR},
- </if>
- </set>
- where id = #{id,jdbcType=INTEGER}
- </update>
- <update id="updateByPrimaryKey" parameterType="org.apache.inlong.manager.dao.entity.CommonFileServerEntity">
- update common_file_server
- set access_type = #{accessType,jdbcType=VARCHAR},
- ip = #{ip,jdbcType=VARCHAR},
- port = #{port,jdbcType=INTEGER},
- is_inner_ip = #{isInnerIp,jdbcType=INTEGER},
- issue_type = #{issueType,jdbcType=VARCHAR},
- username = #{username,jdbcType=VARCHAR},
- password = #{password,jdbcType=VARCHAR},
- status = #{status,jdbcType=INTEGER},
- is_deleted = #{isDeleted,jdbcType=INTEGER},
- creator = #{creator,jdbcType=VARCHAR},
- modifier = #{modifier,jdbcType=VARCHAR},
- create_time = #{createTime,jdbcType=TIMESTAMP},
- modify_time = #{modifyTime,jdbcType=TIMESTAMP},
- visible_person = #{visiblePerson,jdbcType=VARCHAR},
- visible_group = #{visibleGroup,jdbcType=VARCHAR}
- where id = #{id,jdbcType=INTEGER}
- </update>
- <select id="selectAll" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"/>
- from common_file_server
- where is_deleted = 0
- </select>
- <select id="selectByUsernameAndIpPort" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"/>
- from common_file_server
- where username = #{username,jdbcType=VARCHAR}
- and ip = #{ip,jdbcType=VARCHAR}
- and port = #{port,jdbcType=INTEGER}
- and is_deleted = 0
- </select>
- <select id="selectByCondition" resultMap="BaseResultMap"
- parameterType="org.apache.inlong.manager.common.pojo.commonserver.CommonFileServerPageRequest">
- select
- <include refid="Base_Column_List"/>
- from common_file_server
- <where>
- is_deleted = 0
- and (creator = #{currentUser,jdbcType=VARCHAR}
- or find_in_set(#{currentUser,jdbcType=VARCHAR},visible_person)
- <if test="userGroups!= null and userGroups.size() >0">
- <foreach collection="userGroups" item="group">
- or find_in_set(#{group,jdbcType=VARCHAR},visible_group)
- </foreach>
- </if>
- )
- <if test="ip != null and ip != ''">
- and ip = #{ip, jdbcType=VARCHAR}
- </if>
- <if test="status != null">
- and status = #{status,jdbcType=INTEGER}
- </if>
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/CommonDBServerService.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/CommonDBServerService.java
deleted file mode 100644
index 2f1bcb96e..000000000
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/CommonDBServerService.java
+++ /dev/null
@@ -1,113 +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.
- */
-
-package org.apache.inlong.manager.service.core;
-
-import com.github.pagehelper.PageInfo;
-import java.util.List;
-import org.apache.inlong.manager.common.pojo.commonserver.CommonDbServerInfo;
-import org.apache.inlong.manager.common.pojo.commonserver.CommonDbServerListVo;
-import org.apache.inlong.manager.common.pojo.commonserver.CommonDbServerPageRequest;
-
-/**
- * The service interface for common database server.
- */
-public interface CommonDBServerService {
-
- /**
- * Save common database server info.
- *
- * @param commonDbServerInfo common database server info.
- * @return the id of common database server info.
- */
- int save(CommonDbServerInfo commonDbServerInfo) throws Exception;
-
- /**
- * Get common database server info by id.
- *
- * @param id common database server info id.
- * @return the common database server info.
- */
- CommonDbServerInfo get(int id) throws Exception;
-
- /**
- * Delete common database server info by id.
- *
- * @param id common database server info id.
- */
- void delete(int id) throws Exception;
-
- /**
- * Update common database server info.
- *
- * @param commonDbServerInfo common database server info.
- * @return the updated common database server info .
- */
- CommonDbServerInfo update(CommonDbServerInfo commonDbServerInfo) throws Exception;
-
- /**
- * Get common database server info list by username.
- *
- * @param user the username of database.
- * @return common database server info list.
- */
- List<CommonDbServerInfo> getByUser(String user) throws Exception;
-
- /**
- * Add visible persion for common database server.
- *
- * @param id common database server info id.
- * @param visiblePerson the visible person of common database server.
- * @return the updated common database server info.
- */
- CommonDbServerInfo addVisiblePerson(Integer id, String visiblePerson);
-
- /**
- * Delete visible persion for common database server.
- *
- * @param id common database server info id.
- * @param visiblePerson the visiblePerson of common database server.
- * @return the updated common database server info.
- */
- CommonDbServerInfo deleteVisiblePerson(Integer id, String visiblePerson);
-
- /**
- * Add visible group for common database server.
- *
- * @param id common database server info id.
- * @param visibleGroup the visible group of common database server.
- * @return the updated common database server info.
- */
- CommonDbServerInfo addVisibleGroup(Integer id, String visibleGroup);
-
- /**
- * Delete visiable group for common database server.
- *
- * @param id common database server info id.
- * @param visibleGroup the visible group of common database server.
- * @return the updated common database server info.
- */
- CommonDbServerInfo deleteVisibleGroup(Integer id, String visibleGroup);
-
- /**
- * Query common database server for list by condition
- *
- * @param request The common database server request of query condition
- * @return The result of query
- */
- PageInfo<CommonDbServerListVo> listByCondition(CommonDbServerPageRequest request) throws Exception;
-}
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/CommonFileServerService.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/CommonFileServerService.java
deleted file mode 100644
index 6d78ebfb4..000000000
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/CommonFileServerService.java
+++ /dev/null
@@ -1,129 +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.
- */
-
-package org.apache.inlong.manager.service.core;
-
-import com.github.pagehelper.PageInfo;
-import java.util.List;
-import org.apache.inlong.manager.common.pojo.commonserver.CommonFileServerInfo;
-import org.apache.inlong.manager.common.pojo.commonserver.CommonFileServerListVo;
-import org.apache.inlong.manager.common.pojo.commonserver.CommonFileServerPageRequest;
-
-/**
- * The service interface for common file server.
- */
-public interface CommonFileServerService {
-
- /**
- * Create common file server.
- *
- * @param commonFileServerInfo common file server info.
- * @return the id of common file server info.
- */
- int create(CommonFileServerInfo commonFileServerInfo) throws Exception;
-
- /**
- * Get common file server info.
- *
- * @param id common file server info id.
- * @return the common file server info.
- */
- CommonFileServerInfo get(int id) throws Exception;
-
- /**
- * Delete common file server info by id.
- *
- * @param id common file server info id.
- */
- void delete(int id) throws Exception;
-
- /**
- * Update common file server info.
- *
- * @param commonFileServerInfo common file server info.
- * @return the updated common file server info .
- */
- CommonFileServerInfo update(CommonFileServerInfo commonFileServerInfo) throws Exception;
-
- /**
- * Freeze Common file server.
- *
- * @param id the id of common file server.
- * @return the updated common file server info.
- */
- CommonFileServerInfo freeze(int id);
-
- /**
- * Unfreeze Common file server.
- *
- * @param id the id of file.
- * @return the updated common file server info.
- */
- CommonFileServerInfo unfreeze(int id);
-
- /**
- * Get common file server info list by username.
- *
- * @param user the username for common file server.
- * @return common file server info list.
- */
- List<CommonFileServerInfo> getByUser(String user);
-
- /**
- * Add visible person for common file server.
- *
- * @param id common database server info id.
- * @param visiblePerson the visible persion of common file server.
- * @return the updated common file server info.
- */
- CommonFileServerInfo addVisiblePerson(Integer id, String visiblePerson);
-
- /**
- * Delete visible person for common file server.
- *
- * @param id common database server info id.
- * @param visiblePerson the visible person of common database server.
- * @return the updated common file server info.
- */
- CommonFileServerInfo deleteVisiblePerson(Integer id, String visiblePerson);
-
- /**
- * Add visible group for common file server.
- *
- * @param id common database server info id.
- * @param visibleGroup the visible group of common file server.
- * @return the updated common file server info.
- */
- CommonFileServerInfo addVisibleGroup(Integer id, String visibleGroup);
-
- /**
- * Delete visible group for common file server.
- *
- * @param id common file server info id.
- * @param visibleGroup the visible group of common file server.
- * @return the updated common file server info.
- */
- CommonFileServerInfo deleteVisibleGroup(Integer id, String visibleGroup);
-
- /**
- * Query common file server for list by condition
- *
- * @param request The common file server request of query condition
- * @return The result of query
- */
- PageInfo<CommonFileServerListVo> listByCondition(CommonFileServerPageRequest request) throws Exception;
-}
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/CommonDBServerServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/CommonDBServerServiceImpl.java
deleted file mode 100644
index 9c1f5c75c..000000000
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/CommonDBServerServiceImpl.java
+++ /dev/null
@@ -1,576 +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.
- */
-
-package org.apache.inlong.manager.service.core.impl;
-
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.google.common.base.Joiner;
-import com.google.common.base.Splitter;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.inlong.manager.common.enums.GlobalConstants;
-import org.apache.inlong.manager.common.pojo.commonserver.CommonDbServerInfo;
-import org.apache.inlong.manager.common.pojo.commonserver.CommonDbServerListVo;
-import org.apache.inlong.manager.common.pojo.commonserver.CommonDbServerPageRequest;
-import org.apache.inlong.manager.common.pojo.user.UserRoleCode;
-import org.apache.inlong.manager.common.util.CommonBeanUtils;
-import org.apache.inlong.manager.common.util.LoginUserUtils;
-import org.apache.inlong.manager.common.util.Preconditions;
-import org.apache.inlong.manager.dao.entity.CommonDbServerEntity;
-import org.apache.inlong.manager.dao.mapper.CommonDbServerEntityMapper;
-import org.apache.inlong.manager.service.core.CommonDBServerService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-
-/**
- * Common database server service layer implementation
- */
-@Slf4j
-@Service
-public class CommonDBServerServiceImpl implements CommonDBServerService {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(CommonDBServerServiceImpl.class);
-
- @Autowired
- private CommonDbServerEntityMapper commonDbServerMapper;
-
- /**
- * Check if the string length is right.
- *
- * @param text string.
- * @param maxLength max length for string.
- * @return true or false.
- */
- public static boolean checkStrLen(String text, int maxLength) {
- // too large.
- return text != null && text.length() > maxLength;
- }
-
- /**
- * Check if the IP string is valid.
- *
- * @param text IP string.
- * @return true or false.
- */
- public static boolean ipCheck(String text) {
- if (text != null && !text.isEmpty()) {
- // Define regular expression
- String regex = "^(1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\."
- + "(1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\."
- + "(1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\."
- + "(1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$";
- // Determine whether the ip address matches the regular expression
- return text.matches(regex);
- }
- return false;
- }
-
- @Override
- public int save(CommonDbServerInfo info) throws Exception {
- LOGGER.debug("create CommonDbServer info=[{}]", info);
-
- // Check validity
- checkValidity(info);
-
- // Check for duplicates based on username, dbType, dbServerIp and port
- List<CommonDbServerEntity> entities = commonDbServerMapper.selectByUsernameAndIpPort(
- info.getUsername(),
- info.getDbType(),
- info.getDbServerIp(),
- info.getPort());
- if (!CollectionUtils.isEmpty(entities)) {
- for (CommonDbServerEntity entry : entities) {
- // Have the same normal entry
- if (entry.getIsDeleted() == 0) {
- throw new IllegalArgumentException("Already have a CommonDbServer [" + entry.getId()
- + "] have the same username/dbType/dbServerIp/port = [" + entry.getUsername() + "/"
- + entry.getDbType() + "/" + entry.getDbServerIp() + "/" + entry.getPort()
- + "]");
- }
- }
- }
-
- CommonDbServerEntity record = CommonBeanUtils.copyProperties(info, CommonDbServerEntity::new);
- if (record.getAccessType() == null || record.getAccessType().isEmpty()) {
- record.setAccessType("Agent");
- }
- record.setStatus(0);
- String userName = LoginUserUtils.getLoginUserDetail().getUserName();
- record.setCreator(userName);
- record.setModifier(userName);
- Date now = new Date();
- record.setCreateTime(now);
- record.setModifyTime(now);
- record.setIsDeleted(GlobalConstants.UN_DELETED);
-
- int success = commonDbServerMapper.insert(record);
- Preconditions.checkTrue(success == 1, "insert into db failed");
- LOGGER.debug("success create CommonDbServer info=[{}] into db entry id={}", info, record.getId());
- return record.getId();
- }
-
- private void checkValidity(CommonDbServerInfo commonDbServerInfo) throws Exception {
- if (commonDbServerInfo.getId() != null && commonDbServerInfo.getId() > 0) {
- throw new IllegalArgumentException("CommonDbServer id [" + commonDbServerInfo.getId()
- + "] has already exists, please check");
- }
- if (!ipCheck(commonDbServerInfo.getDbServerIp())) {
- throw new IllegalArgumentException("CommonDbServer dbServerIp = [" + commonDbServerInfo.getDbServerIp()
- + "] is not valid ip, please check");
- }
- checkStrFieldLength(commonDbServerInfo);
- }
-
- private void checkStrFieldLength(CommonDbServerInfo commonDbServerInfo) throws Exception {
- if (checkStrLen(commonDbServerInfo.getConnectionName(), 128)) {
- throw new IllegalArgumentException(
- "CommonDbServerInfo connectionName = [" + commonDbServerInfo.getConnectionName()
- + "] length is " + commonDbServerInfo.getConnectionName().length() + " and too large, "
- + "The maximum size for the field length is 128.");
- }
- if (checkStrLen(commonDbServerInfo.getDbType(), 128)) {
- throw new IllegalArgumentException("CommonDbServerInfo dbType = [" + commonDbServerInfo.getDbType()
- + "] length is " + commonDbServerInfo.getDbType().length() + " and too large, "
- + "The maximum size for the field length is 128.");
- }
- if (checkStrLen(commonDbServerInfo.getDbName(), 128)) {
- throw new IllegalArgumentException("CommonDbServerInfo dbName = [" + commonDbServerInfo.getDbName()
- + "] length is " + commonDbServerInfo.getDbName().length() + " and too large, "
- + "The maximum size for the field length is 128.");
- }
- if (checkStrLen(commonDbServerInfo.getUsername(), 64)) {
- throw new IllegalArgumentException("CommonDbServerInfo username = [" + commonDbServerInfo.getUsername()
- + "] length is " + commonDbServerInfo.getUsername().length() + " and too large, "
- + "The maximum size for the field length is 64.");
- }
- if (checkStrLen(commonDbServerInfo.getPassword(), 64)) {
- throw new IllegalArgumentException("CommonDbServerInfo password = [" + commonDbServerInfo.getPassword()
- + "] length is " + commonDbServerInfo.getPassword().length() + " and too large, "
- + "The maximum size for the field length is 64.");
- }
- if (checkStrLen(commonDbServerInfo.getInCharges(), 512)) {
- throw new IllegalArgumentException("CommonDbServerInfo inCharges = [" + commonDbServerInfo.getInCharges()
- + "] length is " + commonDbServerInfo.getInCharges().length() + " and too large, "
- + "The maximum size for the field length is 512.");
- }
- if (checkStrLen(commonDbServerInfo.getDbDescription(), 256)) {
- throw new IllegalArgumentException(
- "CommonDbServerInfo dbDescription = [" + commonDbServerInfo.getDbDescription()
- + "] length is " + commonDbServerInfo.getDbDescription().length() + " and too large, "
- + "The maximum size for the field length is 256.");
- }
- if (checkStrLen(commonDbServerInfo.getVisiblePerson(), 1024)) {
- throw new IllegalArgumentException(
- "CommonDbServerInfo visiblePerson = [" + commonDbServerInfo.getVisiblePerson()
- + "] length is " + commonDbServerInfo.getVisiblePerson().length() + " and too large, "
- + "The maximum size for the field length is 1024.");
- }
- if (checkStrLen(commonDbServerInfo.getVisibleGroup(), 1024)) {
- throw new IllegalArgumentException(
- "CommonDbServerInfo visibleGroup = [" + commonDbServerInfo.getVisibleGroup()
- + "] length is " + commonDbServerInfo.getVisibleGroup().length() + " and too large, "
- + "The maximum size for the field length is 1024.");
- }
- }
-
- @Override
- public CommonDbServerInfo get(int id) throws Exception {
- CommonDbServerEntity entity = commonDbServerMapper.selectByPrimaryKey(id);
- Preconditions.checkNotNull(entity, "CommonDbServerEntity not found by id=" + id);
- Preconditions.checkTrue(entity.getIsDeleted() == 0, "CommonDbServerEntity has been deleted, id=" + id);
-
- String userName = LoginUserUtils.getLoginUserDetail().getUserName();
- if (checkVisible(userName, entity)) {
- return CommonBeanUtils.copyProperties(entity, CommonDbServerInfo::new);
- } else {
- throw new IllegalArgumentException(userName + " has no right to get id=" + id
- + ", please contact " + entity.getCreator());
- }
- }
-
- @Override
- public void delete(int id) throws Exception {
- String userName = LoginUserUtils.getLoginUserDetail().getUserName();
- LOGGER.info("user={} delete CommonDbServerInfo id=[{}]", userName, id);
-
- CommonDbServerEntity entity = commonDbServerMapper.selectByPrimaryKey(id);
- Preconditions.checkNotNull(entity, "CommonDbServerEntity not found by id=" + id);
- Preconditions.checkTrue(entity.getIsDeleted() == 0, "CommonDbServerEntity has been deleted, id=" + id);
-
- // TODO Check if it is quoted, only those that no one quotes can be deleted
-
- if (!checkCreator(userName, entity)) {
- throw new IllegalArgumentException(userName + " is not creator, has no right to delete id=" + id
- + ", please contact " + entity.getCreator());
- }
-
- // Mark deletion
- Date now = new Date();
- entity.setIsDeleted(1);
- entity.setModifier(userName);
- entity.setModifyTime(now);
-
- int success = commonDbServerMapper.updateByPrimaryKey(entity);
- Preconditions.checkTrue(success == 1, "DataBase delete id = " + id + " failed ");
- LOGGER.info("user={} success delete CommonDbServer id={}", userName, id);
- }
-
- @Override
- public CommonDbServerInfo update(CommonDbServerInfo serverInfo) throws Exception {
- String userName = LoginUserUtils.getLoginUserDetail().getUserName();
- LOGGER.info("user={} update CommonDbServerInfo info=[{}]", userName, serverInfo);
- CommonDbServerEntity entity = commonDbServerMapper.selectByPrimaryKey(serverInfo.getId());
- Preconditions.checkNotNull(entity, "CommonDbServerEntity not found by id=" + serverInfo.getId());
- Preconditions.checkTrue(entity.getIsDeleted() == 0,
- "CommonDbServerEntity has been deleted, id=" + serverInfo.getId());
-
- // can not update username + dbType + dbServerIp + port?
- if (serverInfo.getUsername() != null && !serverInfo.getUsername()
- .equals(entity.getUsername())) {
- throw new IllegalArgumentException(
- entity.getId() + " username=" + entity.getUsername() + " can not be updated.");
- }
- if (serverInfo.getDbType() != null && !serverInfo.getDbType()
- .equals(entity.getDbType())) {
- throw new IllegalArgumentException(
- entity.getId() + " dbType=" + entity.getDbType() + " can not be updated.");
- }
- if (serverInfo.getDbServerIp() != null && !serverInfo.getDbServerIp()
- .equals(entity.getDbServerIp())) {
- throw new IllegalArgumentException(
- entity.getId() + " dbServerIp=" + entity.getDbServerIp() + " can not be updated.");
- }
- if (serverInfo.getPort() != 0 && serverInfo.getPort() != entity.getPort()) {
- throw new IllegalArgumentException(entity.getId() + " port = " + entity.getPort() + " can not be updated.");
- }
- serverInfo.setPort(entity.getPort());
- checkStrFieldLength(serverInfo);
-
- if (!checkCreator(userName, entity)) {
- throw new IllegalArgumentException(userName + " is not creator, has no right to update id=" + entity.getId()
- + ", please contact " + entity.getCreator());
- }
-
- CommonDbServerEntity record = CommonBeanUtils.copyProperties(serverInfo, CommonDbServerEntity::new);
- record.setModifier(userName);
- record.setModifyTime(new Date());
-
- int success = commonDbServerMapper.updateByPrimaryKeySelective(record);
- Preconditions.checkTrue(success == 1, "Database update id = " + entity.getId() + " failed ");
- LOGGER.info("user={} success update CommonDbServer id={}", userName, entity.getId());
-
- return CommonBeanUtils.copyProperties(record, CommonDbServerInfo::new);
- }
-
- @Override
- public List<CommonDbServerInfo> getByUser(String user) throws Exception {
- List<CommonDbServerEntity> all = commonDbServerMapper.selectAll();
-
- // Get group information of user
- List<String> groups = getUserGroups(user);
-
- List<CommonDbServerInfo> results = new ArrayList<>();
-
- Splitter commaSplitter = Splitter.on(',');
- for (CommonDbServerEntity entity : all) {
- if (entity.getCreator().equals(user)) {
- results.add(CommonBeanUtils.copyProperties(entity, CommonDbServerInfo::new));
- continue;
- }
- // check user relative entry
- List<String> inChargeSplits = commaSplitter.splitToList(entity.getInCharges());
- List<String> vPersion = commaSplitter.splitToList(entity.getVisiblePerson());
- List<String> vGroup = commaSplitter.splitToList(entity.getVisibleGroup());
- if (checkUserVisible(user, groups, inChargeSplits, vPersion, vGroup)) {
- results.add(CommonBeanUtils.copyProperties(entity, CommonDbServerInfo::new));
- }
- }
- return results;
- }
-
- private boolean checkUserVisible(String user,
- List<String> groups,
- List<String> inCharges,
- List<String> vPersion,
- List<String> vGroup) {
- for (String entry : inCharges) {
- if (entry.equals(user)) {
- return true;
- }
- }
- for (String persion : vPersion) {
- if (persion.equals(user)) {
- return true;
- }
- }
- for (String group : vGroup) {
- for (String g : groups) {
- if (group.equals(g)) {
- return true;
- }
- }
- }
- return false;
- }
-
- @Override
- public CommonDbServerInfo addVisiblePerson(Integer id, String visiblePerson) {
- String username = LoginUserUtils.getLoginUserDetail().getUserName();
- LOGGER.info("user={}, add visible person, id={}, visible group={}", username, id, visiblePerson);
-
- CommonDbServerEntity entity = commonDbServerMapper.selectByPrimaryKey(id);
- Preconditions.checkNotNull(entity, "CommonDbServerEntity not found by id=" + id);
- Preconditions.checkTrue(entity.getIsDeleted() == 0, "CommonDbServerEntity has been deleted, id=" + id);
-
- if (!checkCreator(username, entity)) {
- throw new IllegalArgumentException(username + " is not creator, has no right to addVisiblePerson id="
- + entity.getId() + ", please contact " + entity.getCreator());
- }
-
- // add user to visiblePerson
- Splitter commaSplitter = Splitter.on(',').omitEmptyStrings().trimResults();
- List<String> adds = commaSplitter.splitToList(visiblePerson);
- List<String> alreadyExists = commaSplitter.splitToList(entity.getVisiblePerson());
- HashSet<String> all = new HashSet<>();
- all.addAll(alreadyExists);
- all.addAll(adds);
-
- Joiner joiner = Joiner.on(",").skipNulls();
- String result = joiner.join(all);
- entity.setVisiblePerson(result);
-
- if (checkStrLen(entity.getVisiblePerson(), 1024)) {
- throw new IllegalArgumentException("CommonFileServer visiblePerson = [" + entity.getVisiblePerson()
- + "] length is " + entity.getVisiblePerson().length() + " and too large, "
- + "The maximum size for the field length is 1024.");
- }
-
- Date now = new Date();
- entity.setModifier(username);
- entity.setModifyTime(now);
-
- int success = commonDbServerMapper.updateByPrimaryKey(entity);
- Preconditions.checkTrue(success == 1, "DataBase update for id = " + entity.getId() + " failed ");
- LOGGER.info("user={} success addVisiblePerson for CommonDbServer id={}", username, entity.getId());
-
- return CommonBeanUtils.copyProperties(entity, CommonDbServerInfo::new);
- }
-
- @Override
- public CommonDbServerInfo deleteVisiblePerson(Integer id, String visiblePerson) {
- String username = LoginUserUtils.getLoginUserDetail().getUserName();
- LOGGER.info("user={}, delete visible group, id={}, visible group={}", username, id, visiblePerson);
-
- CommonDbServerEntity entity = commonDbServerMapper.selectByPrimaryKey(id);
- Preconditions.checkNotNull(entity, "CommonDbServerEntity not found by id=" + id);
- Preconditions.checkTrue(entity.getIsDeleted() == 0, "CommonDbServerEntity has been deleted, id=" + id);
-
- if (!checkCreator(username, entity)) {
- throw new IllegalArgumentException(username + " is not creator, has no right to deleteVisiblePerson id="
- + entity.getId() + ", please contact " + entity.getCreator());
- }
-
- // delete user from visiblePerson
- Splitter commaSplitter = Splitter.on(',').omitEmptyStrings().trimResults();
- List<String> removes = commaSplitter.splitToList(visiblePerson);
- List<String> alreadyExists = commaSplitter.splitToList(entity.getVisiblePerson());
- HashSet<String> all = new HashSet<>(alreadyExists);
- removes.forEach(all::remove);
-
- Joiner joiner = Joiner.on(",").skipNulls();
- String result = joiner.join(all);
- entity.setVisiblePerson(result);
-
- Date now = new Date();
- entity.setModifier(username);
- entity.setModifyTime(now);
-
- int success = commonDbServerMapper.updateByPrimaryKey(entity);
- Preconditions.checkTrue(success == 1, "DataBase update for id = " + entity.getId() + " failed ");
- LOGGER.info("user={} success deleteVisiblePerson for CommonDbServer id={}", username, entity.getId());
-
- return CommonBeanUtils.copyProperties(entity, CommonDbServerInfo::new);
- }
-
- @Override
- public CommonDbServerInfo addVisibleGroup(Integer id, String visibleGroup) {
- String username = LoginUserUtils.getLoginUserDetail().getUserName();
- LOGGER.info("user={}, add visible group, id={}, visible group={}", username, id, visibleGroup);
-
- CommonDbServerEntity entity = commonDbServerMapper.selectByPrimaryKey(id);
- Preconditions.checkNotNull(entity, "CommonDbServerEntity not found by id=" + id);
- Preconditions.checkTrue(entity.getIsDeleted() == 0, "CommonDbServerEntity has been deleted, id=" + id);
-
- if (!checkCreator(username, entity)) {
- throw new IllegalArgumentException(username + " is not creator, has no right to addVisibleGroup id="
- + entity.getId() + ", please contact " + entity.getCreator());
- }
-
- // add group to visibleGroup
- Splitter commaSplitter = Splitter.on(',').omitEmptyStrings().trimResults();
- List<String> adds = commaSplitter.splitToList(visibleGroup);
- List<String> alreadyExists = commaSplitter.splitToList(entity.getVisibleGroup());
- HashSet<String> all = new HashSet<>();
- all.addAll(alreadyExists);
- all.addAll(adds);
-
- Joiner joiner = Joiner.on(",").skipNulls();
- String result = joiner.join(all);
- entity.setVisibleGroup(result);
-
- if (checkStrLen(entity.getVisibleGroup(), 1024)) {
- throw new IllegalArgumentException("CommonFileServer visibleGroup = [" + entity.getVisibleGroup()
- + "] length is " + entity.getVisibleGroup().length() + " and too large, "
- + "The maximum size for the field length is 1024.");
- }
-
- Date now = new Date();
- entity.setModifier(username);
- entity.setModifyTime(now);
-
- int success = commonDbServerMapper.updateByPrimaryKey(entity);
- Preconditions.checkTrue(success == 1, "DataBase update for id = " + entity.getId() + " failed ");
- LOGGER.info("user={} success addVisibleGroup for CommonDbServer id={}", username, entity.getId());
-
- return CommonBeanUtils.copyProperties(entity, CommonDbServerInfo::new);
- }
-
- @Override
- public CommonDbServerInfo deleteVisibleGroup(Integer id, String visibleGroup) {
- String username = LoginUserUtils.getLoginUserDetail().getUserName();
- LOGGER.info("user={}, delete visible group, id={}, visible group={}", username, id, visibleGroup);
-
- CommonDbServerEntity entity =
- commonDbServerMapper.selectByPrimaryKey(id);
- Preconditions.checkNotNull(entity, "CommonDbServerEntity not found by id=" + id);
- Preconditions.checkTrue(entity.getIsDeleted() == 0, "CommonDbServerEntity has been deleted, id=" + id);
-
- if (!checkCreator(username, entity)) {
- throw new IllegalArgumentException(username + " is not creator, has no right to deleteVisibleGroup id="
- + entity.getId() + ", please contact " + entity.getCreator());
- }
-
- // delete group from visibleGroup
- Splitter commaSplitter = Splitter.on(',').omitEmptyStrings().trimResults();
- List<String> removes = commaSplitter.splitToList(visibleGroup);
- List<String> alreadyExists = commaSplitter.splitToList(entity.getVisibleGroup());
- HashSet<String> all = new HashSet<>(alreadyExists);
- removes.forEach(all::remove);
-
- Joiner joiner = Joiner.on(",").skipNulls();
- String result = joiner.join(all);
- entity.setVisibleGroup(result);
-
- Date now = new Date();
- entity.setModifier(username);
- entity.setModifyTime(now);
- int success = commonDbServerMapper.updateByPrimaryKey(entity);
-
- Preconditions.checkTrue(success == 1, "DataBase update for id = " + entity.getId() + " failed ");
- LOGGER.info("user={} success deleteVisibleGroup for CommonDbServer id={}", username, entity.getId());
-
- return CommonBeanUtils.copyProperties(entity, CommonDbServerInfo::new);
- }
-
- @Override
- public PageInfo<CommonDbServerListVo> listByCondition(CommonDbServerPageRequest request)
- throws Exception {
- String username = LoginUserUtils.getLoginUserDetail().getUserName();
- request.setIsAdminRole(LoginUserUtils.getLoginUserDetail().getRoles().contains(UserRoleCode.ADMIN));
- LOGGER.debug("{} begin to list CommonDbServer info by {}", username, request);
- request.setCurrentUser(username);
-
- // Get groups info for user.
- List<String> groups = getUserGroups(username);
- request.setUserGroups(groups);
-
- PageHelper.startPage(request.getPageNum(), request.getPageSize());
- Page<CommonDbServerEntity> entityPage =
- (Page<CommonDbServerEntity>) commonDbServerMapper.selectByCondition(request);
- List<CommonDbServerListVo> dbServerList =
- CommonBeanUtils.copyListProperties(entityPage, CommonDbServerListVo::new);
- // Encapsulate the paging query results into the PageInfo object to obtain related paging information
- PageInfo<CommonDbServerListVo> page = new PageInfo<>(dbServerList);
- page.setTotal(entityPage.getTotal());
-
- LOGGER.info("success to list CommonFileServer info");
- return page;
- }
-
- private List<String> getUserGroups(String userName) {
- return new ArrayList<>();
- }
-
- private boolean checkVisible(String userName, CommonDbServerEntity entity) {
- boolean passed = false;
- // check creator
- passed = checkCreator(userName, entity);
- if (!passed) {
- // check visiblePerson
- passed = checkVisiblePerson(userName, entity);
- if (!passed) {
- // check visibleGroup
- passed = checkVisibleGroup(userName, entity);
- }
- }
- return passed;
- }
-
- private boolean checkCreator(String username, CommonDbServerEntity entity) {
- return entity.getCreator().equals(username);
- }
-
- private boolean checkVisiblePerson(String username, CommonDbServerEntity entity) {
- return contains(username, entity.getVisiblePerson());
- }
-
- private boolean contains(String name, String visibles) {
- if (visibles == null || visibles.isEmpty()) {
- return false;
- }
- Splitter commaSplitter = Splitter.on(',').omitEmptyStrings().trimResults();
- for (String entry : commaSplitter.split(visibles)) {
- if (entry.equals(name)) {
- return true;
- }
- }
- return false;
- }
-
- private boolean checkVisibleGroup(String username, CommonDbServerEntity entity) {
- String visibleGroup = entity.getVisibleGroup();
- if (visibleGroup == null || visibleGroup.isEmpty()) {
- return false;
- }
- List<String> groups = getUserGroups(username);
- for (String group : groups) {
- if (contains(group, visibleGroup)) {
- return true;
- }
- }
- return false;
- }
-}
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/CommonFileServerServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/CommonFileServerServiceImpl.java
deleted file mode 100644
index a1f930f53..000000000
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/CommonFileServerServiceImpl.java
+++ /dev/null
@@ -1,608 +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.
- */
-
-package org.apache.inlong.manager.service.core.impl;
-
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.google.common.base.Joiner;
-import com.google.common.base.Splitter;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.inlong.manager.common.enums.GlobalConstants;
-import org.apache.inlong.manager.common.pojo.commonserver.CommonFileServerInfo;
-import org.apache.inlong.manager.common.pojo.commonserver.CommonFileServerListVo;
-import org.apache.inlong.manager.common.pojo.commonserver.CommonFileServerPageRequest;
-import org.apache.inlong.manager.common.util.CommonBeanUtils;
-import org.apache.inlong.manager.common.util.LoginUserUtils;
-import org.apache.inlong.manager.common.util.Preconditions;
-import org.apache.inlong.manager.dao.entity.CommonFileServerEntity;
-import org.apache.inlong.manager.dao.mapper.CommonFileServerEntityMapper;
-import org.apache.inlong.manager.service.core.CommonFileServerService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-
-/**
- * Common file server service layer implementation
- */
-@Slf4j
-@Service
-public class CommonFileServerServiceImpl implements CommonFileServerService {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(CommonFileServerServiceImpl.class);
-
- @Autowired
- private CommonFileServerEntityMapper commonFileServerMapper;
-
- /**
- * Check if the string length is right.
- *
- * @param text string.
- * @param maxLength max length for string.
- * @return true or false.
- */
- public static boolean checkStrLen(String text, int maxLength) {
- // too large.
- return text != null && text.length() > maxLength;
- }
-
- /**
- * Check if the IP string is valid.
- *
- * @param text IP string.
- * @return true or false.
- */
- public static boolean ipCheck(String text) {
- if (text != null && !text.isEmpty()) {
- // Define regular expression
- String regex = "^(1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\."
- + "(1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\."
- + "(1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\."
- + "(1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$";
- // Determine whether the ip address matches the regular expression
- return text.matches(regex);
- }
- return false;
- }
-
- @Override
- public int create(CommonFileServerInfo info) throws Exception {
- LOGGER.debug("create CommonFileServer info={} ", info);
-
- // Check validity
- checkValidity(info);
-
- // Check for duplicates based on username,ip and port
- List<CommonFileServerEntity> entities = commonFileServerMapper.selectByUsernameAndIpPort(
- info.getUsername(),
- info.getIp(),
- info.getPort());
- if (CollectionUtils.isNotEmpty(entities)) {
- for (CommonFileServerEntity entry : entities) {
- // Have the same normal entry
- if (entry.getIsDeleted() == 0) {
- throw new IllegalArgumentException("Already have a CommonFileServer [" + entry.getId()
- + "] have the same username/ip/port = [" + entry.getUsername() + "/" + entry.getIp()
- + "/" + entry.getPort() + "]");
- }
- }
- }
-
- CommonFileServerEntity record = CommonBeanUtils.copyProperties(info, CommonFileServerEntity::new);
- if (record.getAccessType() == null || record.getAccessType().isEmpty()) {
- record.setAccessType("Agent");
- }
-
- String userName = LoginUserUtils.getLoginUserDetail().getUserName();
- record.setStatus(0);
- record.setCreator(userName);
- record.setModifier(userName);
- Date now = new Date();
- record.setCreateTime(now);
- record.setModifyTime(now);
- record.setIsDeleted(GlobalConstants.UN_DELETED);
-
- int success = commonFileServerMapper.insert(record);
- Preconditions.checkTrue(success == 1, "insert into db failed");
- LOGGER.debug("success create CommonFileServer info=[{}] into db entry id={}", info, record.getId());
- return record.getId();
- }
-
- private void checkValidity(CommonFileServerInfo commonFileServerInfo) {
- if (commonFileServerInfo.getId() > 0) {
- throw new IllegalArgumentException("CommonFileServer id = [" + commonFileServerInfo.getId()
- + "] has already exists, please check");
- }
- if (!ipCheck(commonFileServerInfo.getIp())) {
- throw new IllegalArgumentException("CommonFileServer ip = [" + commonFileServerInfo.getIp()
- + "] is not valid ip, please check");
- }
- checkStrFieldLength(commonFileServerInfo);
- }
-
- private void checkStrFieldLength(CommonFileServerInfo commonFileServerInfo) {
- if (checkStrLen(commonFileServerInfo.getAccessType(), 128)) {
- throw new IllegalArgumentException("CommonFileServer type = [" + commonFileServerInfo.getAccessType()
- + "] length is " + commonFileServerInfo.getAccessType().length() + " and too large, "
- + "The maximum size for the field length is 128.");
- }
- if (checkStrLen(commonFileServerInfo.getIssueType(), 128)) {
- throw new IllegalArgumentException("CommonFileServer issueType = [" + commonFileServerInfo.getIssueType()
- + "] length is " + commonFileServerInfo.getIssueType().length() + " and too large, "
- + "The maximum size for the field length is 128.");
- }
- if (checkStrLen(commonFileServerInfo.getUsername(), 64)) {
- throw new IllegalArgumentException("CommonFileServer username = [" + commonFileServerInfo.getUsername()
- + "] length is " + commonFileServerInfo.getUsername().length() + " and too large, "
- + "The maximum size for the field length is 64.");
- }
- if (checkStrLen(commonFileServerInfo.getPassword(), 64)) {
- throw new IllegalArgumentException("CommonFileServer password = [" + commonFileServerInfo.getPassword()
- + "] length is " + commonFileServerInfo.getPassword().length() + " and too large, "
- + "The maximum size for the field length is 64.");
- }
- if (checkStrLen(commonFileServerInfo.getVisiblePerson(), 1024)) {
- throw new IllegalArgumentException(
- "CommonFileServer visiblePerson = [" + commonFileServerInfo.getVisiblePerson()
- + "] length is " + commonFileServerInfo.getVisiblePerson().length() + " and too large, "
- + "The maximum size for the field length is 1024.");
- }
- if (checkStrLen(commonFileServerInfo.getVisibleGroup(), 1024)) {
- throw new IllegalArgumentException(
- "CommonFileServer visibleGroup = [" + commonFileServerInfo.getVisibleGroup()
- + "] length is " + commonFileServerInfo.getVisibleGroup().length() + " and too large, "
- + "The maximum size for the field length is 1024.");
- }
- }
-
- @Override
- public CommonFileServerInfo get(int id) throws Exception {
- CommonFileServerEntity entity = commonFileServerMapper.selectByPrimaryKey(id);
- Preconditions.checkNotNull(entity, "CommonFileServerEntity not found by id=" + id);
- Preconditions.checkTrue(entity.getIsDeleted() == 0, "CommonFileServerEntity has been deleted, id=" + id);
-
- String userName = LoginUserUtils.getLoginUserDetail().getUserName();
- if (checkVisible(userName, entity)) {
- return CommonBeanUtils.copyProperties(entity, CommonFileServerInfo::new);
- } else {
- throw new IllegalArgumentException(userName + " has no right to get id=" + id
- + ", please contact " + entity.getCreator());
- }
- }
-
- @Override
- public void delete(int id) throws Exception {
- String userName = LoginUserUtils.getLoginUserDetail().getUserName();
- LOGGER.info("user={} delete CommonFileServer id={} ", userName, id);
-
- CommonFileServerEntity entity = commonFileServerMapper.selectByPrimaryKey(id);
- Preconditions.checkNotNull(entity, "CommonFileServerEntity not found by id=" + id);
- Preconditions.checkTrue(entity.getIsDeleted() == 0, "CommonFileServerEntity has been deleted, id=" + id);
-
- if (!checkCreator(userName, entity)) {
- throw new IllegalArgumentException(userName + " is not creator, has no right to delete id=" + id
- + ", please contact " + entity.getCreator());
- }
-
- // Mark deletion
- Date now = new Date();
- entity.setIsDeleted(1);
- entity.setModifier(userName);
- entity.setModifyTime(now);
- int success = commonFileServerMapper.updateByPrimaryKey(entity);
- Preconditions.checkTrue(success == 1, "DataBase delete id = " + id + " failed ");
- LOGGER.info("user={} success delete CommonFileServer id={}", userName, id);
- }
-
- @Override
- public CommonFileServerInfo update(CommonFileServerInfo commonFileServerInfo)
- throws Exception {
- String userName = LoginUserUtils.getLoginUserDetail().getUserName();
- LOGGER.info("user={} update CommonFileServer info=[{}].", userName, commonFileServerInfo);
-
- CommonFileServerEntity entity =
- commonFileServerMapper.selectByPrimaryKey(commonFileServerInfo.getId());
- Preconditions.checkNotNull(entity, "CommonFileServerEntity not found by id=" + commonFileServerInfo.getId());
- Preconditions.checkTrue(entity.getIsDeleted() == 0,
- "CommonFileServerEntity has been deleted, id=" + commonFileServerInfo.getId());
-
- // can not update username + ip + port?
- if (commonFileServerInfo.getUsername() != null && !commonFileServerInfo.getUsername()
- .equals(entity.getUsername())) {
- throw new IllegalArgumentException(
- entity.getId() + " username=" + entity.getUsername() + " can not be updated.");
- }
- if (commonFileServerInfo.getIp() != null && !commonFileServerInfo.getIp()
- .equals(entity.getIp())) {
- throw new IllegalArgumentException(entity.getId() + " ip=" + entity.getIp() + " can not be updated.");
- }
- if (commonFileServerInfo.getPort() != 0 && commonFileServerInfo.getPort() != entity.getPort()) {
- throw new IllegalArgumentException(entity.getId() + " port = " + entity.getPort() + " can not be updated.");
- }
- commonFileServerInfo.setPort(entity.getPort());
- // Check length
- checkStrFieldLength(commonFileServerInfo);
-
- if (!checkCreator(userName, entity)) {
- throw new IllegalArgumentException(userName + " is not creator, has no right to update id=" + entity.getId()
- + ", please contact " + entity.getCreator());
- }
-
- CommonFileServerEntity record = new CommonFileServerEntity();
- BeanUtils.copyProperties(commonFileServerInfo, record);
- // can not update this fields.
- record.setIsDeleted(null);
- //record.setCreator(null);
- record.setCreateTime(null);
-
- Date now = new Date();
- record.setModifier(userName);
- record.setModifyTime(now);
-
- int success = commonFileServerMapper.updateByPrimaryKeySelective(record);
- Preconditions.checkTrue(success == 1, "Database update id = " + entity.getId() + " failed ");
- LOGGER.info("user={} success update CommonFileServer id={}", userName, entity.getId());
-
- return CommonBeanUtils.copyProperties(entity, CommonFileServerInfo::new);
- }
-
- @Override
- public CommonFileServerInfo freeze(int id) {
- String userName = LoginUserUtils.getLoginUserDetail().getUserName();
- LOGGER.info("user={} freeze CommonFileServer id=[{}].", userName, id);
-
- CommonFileServerEntity entity = commonFileServerMapper.selectByPrimaryKey(id);
- Preconditions.checkNotNull(entity, "CommonFileServerEntity not found by id=" + id);
- Preconditions.checkTrue(entity.getIsDeleted() == 0, "CommonFileServerEntity has been deleted, id=" + id);
-
- if (!checkCreator(userName, entity)) {
- throw new IllegalArgumentException(userName + " is not creator, has no right to freeze id=" + id
- + ", please contact " + entity.getCreator());
- }
-
- Date now = new Date();
-
- entity.setId(id);
- entity.setModifier(userName);
- entity.setModifyTime(now);
- entity.setStatus(1);
- int success = commonFileServerMapper.updateByPrimaryKey(entity);
- Preconditions.checkTrue(success == 1, "Database update id = " + entity.getId() + " failed ");
- LOGGER.info("user={} success freeze CommonFileServer id={}", userName, entity.getId());
-
- return CommonBeanUtils.copyProperties(entity, CommonFileServerInfo::new);
- }
-
- @Override
- public CommonFileServerInfo unfreeze(int id) {
- String userName = LoginUserUtils.getLoginUserDetail().getUserName();
- LOGGER.info("user={} unfreeze CommonFileServer id=[{}].", userName, id);
-
- CommonFileServerEntity entity = commonFileServerMapper.selectByPrimaryKey(id);
- Preconditions.checkNotNull(entity, "CommonFileServerEntity not found by id=" + id);
- Preconditions.checkTrue(entity.getIsDeleted() == 0, "CommonFileServerEntity has been deleted, id=" + id);
-
- // TODO There are other operations before thawing, such as starting the agent
-
- if (!checkCreator(userName, entity)) {
- throw new IllegalArgumentException(userName + " is not creator, has no right to unfreeze id=" + id
- + ", please contact " + entity.getCreator());
- }
-
- Date now = new Date();
-
- entity.setId(id);
- entity.setModifier(userName);
- entity.setModifyTime(now);
- entity.setStatus(0);
- int success = commonFileServerMapper.updateByPrimaryKey(entity);
- Preconditions.checkTrue(success == 1, "DataBase update id = " + entity.getId() + " failed ");
- LOGGER.info("user={} success unfreeze CommonFileServer id={}", userName, entity.getId());
-
- return CommonBeanUtils.copyProperties(entity, CommonFileServerInfo::new);
- }
-
- @Override
- public List<CommonFileServerInfo> getByUser(String user) {
- List<CommonFileServerEntity> all = commonFileServerMapper.selectAll();
-
- // Get group information of user
- List<String> groups = getUserGroups(user);
- //LOGGER.info("user = " + user + ", groups = " + groups);
-
- List<CommonFileServerInfo> results = new ArrayList<>();
-
- Splitter commaSplitter = Splitter.on(',');
- for (CommonFileServerEntity entity : all) {
- if (entity.getCreator().equals(user)) {
- results.add(CommonBeanUtils.copyProperties(entity, CommonFileServerInfo::new));
- continue;
- }
- // check user relative entry
- List<String> vPersion = commaSplitter.splitToList(entity.getVisiblePerson());
- List<String> vGroup = commaSplitter.splitToList(entity.getVisibleGroup());
- if (checkUserVisible(user, groups, vPersion, vGroup)) {
- results.add(CommonBeanUtils.copyProperties(entity, CommonFileServerInfo::new));
- }
- }
- return results;
- }
-
- private boolean checkUserVisible(String user, List<String> groups, List<String> vPersion,
- List<String> vGroup) {
- for (String persion : vPersion) {
- if (persion.equals(user)) {
- return true;
- }
- }
- for (String group : vGroup) {
- for (String g : groups) {
- if (group.equals(g)) {
- return true;
- }
- }
- }
- return false;
- }
-
- @Override
- public CommonFileServerInfo addVisiblePerson(Integer id, String visiblePerson) {
- String username = LoginUserUtils.getLoginUserDetail().getUserName();
- LOGGER.info("user={}, add visible person, id={}, visible group={}", username, id, visiblePerson);
-
- CommonFileServerEntity entity = commonFileServerMapper.selectByPrimaryKey(id);
- Preconditions.checkNotNull(entity, "CommonFileServerEntity not found by id=" + id);
- Preconditions.checkTrue(entity.getIsDeleted() == 0,
- "CommonFileServerEntity has been deleted, id=" + id);
-
- if (!checkCreator(username, entity)) {
- throw new IllegalArgumentException(username + " is not creator, has no right to addVisiblePerson id="
- + entity.getId() + ", please contact " + entity.getCreator());
- }
-
- // add user to visiblePerson
- Splitter commaSplitter = Splitter.on(',').omitEmptyStrings().trimResults();
- List<String> adds = commaSplitter.splitToList(visiblePerson);
- List<String> alreadyExists = commaSplitter.splitToList(entity.getVisiblePerson());
- HashSet<String> all = new HashSet<>();
- all.addAll(alreadyExists);
- all.addAll(adds);
-
- Joiner joiner = Joiner.on(",").skipNulls();
- String result = joiner.join(all);
- entity.setVisiblePerson(result);
-
- if (checkStrLen(entity.getVisiblePerson(), 1024)) {
- throw new IllegalArgumentException("CommonFileServer visiblePerson = [" + entity.getVisiblePerson()
- + "] length is " + entity.getVisiblePerson().length() + " and too large, "
- + "The maximum size for the field length is 1024.");
- }
-
- Date now = new Date();
- entity.setModifier(username);
- entity.setModifyTime(now);
-
- int success = commonFileServerMapper.updateByPrimaryKey(entity);
- Preconditions.checkTrue(success == 1, "DataBase update for id = " + entity.getId() + " failed ");
- LOGGER.info("user={} success addVisiblePerson for CommonFileServer id={}", username, entity.getId());
-
- return CommonBeanUtils.copyProperties(entity, CommonFileServerInfo::new);
- }
-
- @Override
- public CommonFileServerInfo deleteVisiblePerson(Integer id, String visiblePerson) {
- String username = LoginUserUtils.getLoginUserDetail().getUserName();
- LOGGER.info("user={}, delete visible person, id={}, visible group={}", username, id, visiblePerson);
-
- CommonFileServerEntity entity =
- commonFileServerMapper.selectByPrimaryKey(id);
- Preconditions.checkNotNull(entity, "CommonFileServerEntity not found by id=" + id);
- Preconditions.checkTrue(entity.getIsDeleted() == 0, "CommonFileServerEntity has been deleted, id=" + id);
-
- if (!checkCreator(username, entity)) {
- throw new IllegalArgumentException(
- username + " is not creator, has no right to deleteVisiblePerson id=" + entity.getId()
- + ", please contact " + entity.getCreator());
- }
-
- // delete user from visiblePerson
- Splitter commaSplitter = Splitter.on(',').omitEmptyStrings().trimResults();
- List<String> removes = commaSplitter.splitToList(visiblePerson);
- List<String> alreadyExists = commaSplitter.splitToList(entity.getVisiblePerson());
- HashSet<String> all = new HashSet<>(alreadyExists);
- removes.forEach(all::remove);
-
- Joiner joiner = Joiner.on(",").skipNulls();
- String result = joiner.join(all);
- entity.setVisiblePerson(result);
-
- Date now = new Date();
- entity.setModifier(username);
- entity.setModifyTime(now);
- int success = commonFileServerMapper.updateByPrimaryKey(entity);
-
- Preconditions.checkTrue(success == 1, "DataBase update for id = " + entity.getId() + " failed ");
- LOGGER.info("user={} success deleteVisiblePerson for CommonFileServer id={}", username, entity.getId());
-
- return CommonBeanUtils.copyProperties(entity, CommonFileServerInfo::new);
- }
-
- @Override
- public CommonFileServerInfo addVisibleGroup(Integer id, String visibleGroup) {
- String username = LoginUserUtils.getLoginUserDetail().getUserName();
- LOGGER.info("user={}, add visible group, id={}, visible group={}", username, id, visibleGroup);
-
- CommonFileServerEntity entity = commonFileServerMapper.selectByPrimaryKey(id);
- Preconditions.checkNotNull(entity, "CommonFileServerEntity not found by id=" + id);
- Preconditions.checkTrue(entity.getIsDeleted() == 0, "CommonFileServerEntity has been deleted, id=" + id);
-
- if (!checkCreator(username, entity)) {
- throw new IllegalArgumentException(username + " is not creator, has no right to addVisibleGroup id="
- + entity.getId() + ", please contact " + entity.getCreator());
- }
-
- // add group to visibleGroup
- Splitter commaSplitter = Splitter.on(',').omitEmptyStrings().trimResults();
- List<String> adds = commaSplitter.splitToList(visibleGroup);
- List<String> alreadyExists = commaSplitter.splitToList(entity.getVisibleGroup());
- HashSet<String> all = new HashSet<>();
- all.addAll(alreadyExists);
- all.addAll(adds);
-
- Joiner joiner = Joiner.on(",").skipNulls();
- String result = joiner.join(all);
- entity.setVisibleGroup(result);
-
- if (checkStrLen(entity.getVisibleGroup(), 1024)) {
- throw new IllegalArgumentException("CommonFileServer visibleGroup = [" + entity.getVisibleGroup()
- + "] length is " + entity.getVisibleGroup().length() + " and too large, "
- + "The maximum size for the field length is 1024.");
- }
-
- Date now = new Date();
- entity.setModifier(username);
- entity.setModifyTime(now);
- int success = commonFileServerMapper.updateByPrimaryKey(entity);
-
- Preconditions.checkTrue(success == 1, "DataBase update for id = " + entity.getId() + " failed ");
- LOGGER.info("user={} success addVisibleGroup for CommonFileServer id={}", username, entity.getId());
-
- return CommonBeanUtils.copyProperties(entity, CommonFileServerInfo::new);
- }
-
- @Override
- public CommonFileServerInfo deleteVisibleGroup(Integer id, String visibleGroup) {
- String username = LoginUserUtils.getLoginUserDetail().getUserName();
- LOGGER.info("user={}, delete visible group, id={}, visible group={}", username, id, visibleGroup);
-
- CommonFileServerEntity entity =
- commonFileServerMapper.selectByPrimaryKey(id);
- Preconditions.checkNotNull(entity, "CommonFileServerEntity not found by id=" + id);
- Preconditions.checkTrue(entity.getIsDeleted() == 0, "CommonFileServerEntity has been deleted, id=" + id);
-
- if (!checkCreator(username, entity)) {
- throw new IllegalArgumentException(username + " is not creator, has no right to deleteVisibleGroup id="
- + entity.getId() + ", please contact " + entity.getCreator());
- }
-
- // delete group from visibleGroup
- Splitter commaSplitter = Splitter.on(',').omitEmptyStrings().trimResults();
- List<String> removes = commaSplitter.splitToList(visibleGroup);
- List<String> alreadyExists = commaSplitter.splitToList(entity.getVisibleGroup());
- HashSet<String> all = new HashSet<>(alreadyExists);
- removes.forEach(all::remove);
-
- Joiner joiner = Joiner.on(",").skipNulls();
- String result = joiner.join(all);
- entity.setVisibleGroup(result);
-
- Date now = new Date();
- entity.setModifier(username);
- entity.setModifyTime(now);
- int success = commonFileServerMapper.updateByPrimaryKey(entity);
-
- Preconditions.checkTrue(success == 1, "DataBase update for id = " + entity.getId() + " failed ");
- LOGGER.info("user={} success deleteVisibleGroup for CommonFileServer id={}", username, entity.getId());
-
- return CommonBeanUtils.copyProperties(entity, CommonFileServerInfo::new);
- }
-
- @Override
- public PageInfo<CommonFileServerListVo> listByCondition(CommonFileServerPageRequest request)
- throws Exception {
- String username = LoginUserUtils.getLoginUserDetail().getUserName();
-
- request.setCurrentUser(username);
- LOGGER.debug("{} begin to list CommonFileServer info by {}", username, request);
-
- // Get groups info for user.
- List<String> groups = getUserGroups(username);
- request.setUserGroups(groups);
-
- PageHelper.startPage(request.getPageNum(), request.getPageSize());
- Page<CommonFileServerEntity> pageResult =
- (Page<CommonFileServerEntity>) commonFileServerMapper.selectByCondition(request);
- PageInfo<CommonFileServerListVo> pageInfo = pageResult.toPageInfo(
- entity -> CommonBeanUtils.copyProperties(entity, CommonFileServerListVo::new));
-
- pageInfo.setTotal(pageResult.getTotal());
- return pageInfo;
- }
-
- private List<String> getUserGroups(String userName) {
- return new ArrayList<>();
- }
-
- private boolean checkVisible(String userName, CommonFileServerEntity entity) {
- boolean passed = false;
- // check creator
- passed = checkCreator(userName, entity);
- if (!passed) {
- // check visiblePerson
- passed = checkVisiblePerson(userName, entity);
- if (!passed) {
- // check visibleGroup
- passed = checkVisibleGroup(userName, entity);
- }
- }
- return passed;
- }
-
- private boolean checkCreator(String username, CommonFileServerEntity entity) {
- return entity.getCreator().equals(username);
- }
-
- private boolean checkVisiblePerson(String username, CommonFileServerEntity entity) {
- return contains(username, entity.getVisiblePerson());
- }
-
- private boolean contains(String name, String visibles) {
- if (visibles == null || visibles.isEmpty()) {
- return false;
- }
- Splitter commaSplitter = Splitter.on(',').omitEmptyStrings().trimResults();
- for (String entry : commaSplitter.split(visibles)) {
- if (entry.equals(name)) {
- return true;
- }
- }
- return false;
- }
-
- private boolean checkVisibleGroup(String username, CommonFileServerEntity entity) {
- String visibleGroup = entity.getVisibleGroup();
- if (visibleGroup == null || visibleGroup.isEmpty()) {
- return false;
- }
- List<String> groups = getUserGroups(username);
- for (String group : groups) {
- if (contains(group, visibleGroup)) {
- return true;
- }
- }
- return false;
- }
-}
diff --git a/inlong-manager/manager-test/src/main/resources/sql/apache_inlong_manager.sql b/inlong-manager/manager-test/src/main/resources/sql/apache_inlong_manager.sql
index ac133bd38..b81b4c487 100644
--- a/inlong-manager/manager-test/src/main/resources/sql/apache_inlong_manager.sql
+++ b/inlong-manager/manager-test/src/main/resources/sql/apache_inlong_manager.sql
@@ -162,64 +162,6 @@ CREATE TABLE IF NOT EXISTS `third_party_cluster`
UNIQUE KEY `unique_cluster_name` (`name`, `is_deleted`)
);
--- ----------------------------
--- Table structure for common_db_server
--- ----------------------------
-CREATE TABLE IF NOT EXISTS `common_db_server`
-(
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
- `access_type` varchar(20) NOT NULL COMMENT 'Collection type, with Agent, DataProxy client, LoadProxy',
- `connection_name` varchar(128) NOT NULL COMMENT 'The name of the database connection',
- `db_type` varchar(128) DEFAULT 'MySQL' COMMENT 'DB type, such as MySQL, Oracle',
- `db_server_ip` varchar(64) NOT NULL COMMENT 'DB Server IP',
- `port` int(11) NOT NULL COMMENT 'Port number',
- `db_name` varchar(128) DEFAULT NULL COMMENT 'Target database name',
- `username` varchar(64) NOT NULL COMMENT 'Username',
- `password` varchar(64) NOT NULL COMMENT 'The password corresponding to the above user name',
- `has_select` tinyint(1) DEFAULT '0' COMMENT 'Is there DB permission select, 0: No, 1: Yes',
- `has_insert` tinyint(1) DEFAULT '0' COMMENT 'Is there DB permission to insert, 0: No, 1: Yes',
- `has_update` tinyint(1) DEFAULT '0' COMMENT 'Is there a DB permission update, 0: No, 1: Yes',
- `has_delete` tinyint(1) DEFAULT '0' COMMENT 'Is there a DB permission to delete, 0: No, 1: Yes',
- `in_charges` varchar(512) NOT NULL COMMENT 'DB person in charge, separated by a comma when there are multiple ones',
- `is_region_id` tinyint(1) DEFAULT '0' COMMENT 'Whether it contains a region ID, 0: No, 1: Yes',
- `db_description` varchar(256) DEFAULT NULL COMMENT 'DB description',
- `backup_db_server_ip` varchar(64) DEFAULT NULL COMMENT 'Backup DB HOST',
- `backup_db_port` int(11) DEFAULT NULL COMMENT 'Backup DB port',
- `status` int(4) DEFAULT '0' COMMENT 'status',
- `is_deleted` int(11) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, > 0: deleted',
- `creator` varchar(64) NOT NULL COMMENT 'Creator name',
- `modifier` varchar(64) DEFAULT NULL COMMENT 'Modifier name',
- `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Create time',
- `modify_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
- `visible_person` varchar(1024) DEFAULT NULL COMMENT 'List of visible persons, separated by commas',
- `visible_group` varchar(1024) DEFAULT NULL COMMENT 'List of visible groups, separated by commas',
- PRIMARY KEY (`id`)
-);
-
--- ----------------------------
--- Table structure for common_file_server
--- ----------------------------
-CREATE TABLE IF NOT EXISTS `common_file_server`
-(
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
- `access_type` varchar(20) NOT NULL COMMENT 'Collection type, with Agent, DataProxy, LoadProxy',
- `ip` varchar(64) NOT NULL COMMENT 'Data source IP',
- `port` int(11) NOT NULL COMMENT 'Port number',
- `is_inner_ip` tinyint(1) DEFAULT '0' COMMENT 'Whether it is intranet, 0: No, 1: Yes',
- `issue_type` varchar(128) DEFAULT NULL COMMENT 'Issuance method, such as SSH, TCS, etc.',
- `username` varchar(64) NOT NULL COMMENT 'User name of the data source IP host',
- `password` varchar(64) NOT NULL COMMENT 'The password corresponding to the above user name',
- `status` int(4) DEFAULT '0' COMMENT 'status',
- `is_deleted` int(11) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, > 0: deleted',
- `creator` varchar(64) NOT NULL COMMENT 'Creator name',
- `modifier` varchar(64) DEFAULT NULL COMMENT 'Modifier name',
- `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Create time',
- `modify_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
- `visible_person` varchar(1024) DEFAULT NULL COMMENT 'List of visible persons, separated by commas',
- `visible_group` varchar(1024) DEFAULT NULL COMMENT 'List of visible groups, separated by commas',
- PRIMARY KEY (`id`)
-);
-
-- ----------------------------
-- Table structure for consumption
-- ----------------------------
diff --git a/inlong-manager/manager-web/sql/apache_inlong_manager.sql b/inlong-manager/manager-web/sql/apache_inlong_manager.sql
index f0b9d3a44..7ce7c5fed 100644
--- a/inlong-manager/manager-web/sql/apache_inlong_manager.sql
+++ b/inlong-manager/manager-web/sql/apache_inlong_manager.sql
@@ -174,66 +174,6 @@ CREATE TABLE IF NOT EXISTS `third_party_cluster`
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4 COMMENT ='Cluster Information Table';
--- ----------------------------
--- Table structure for common_db_server
--- ----------------------------
-CREATE TABLE IF NOT EXISTS `common_db_server`
-(
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
- `access_type` varchar(20) NOT NULL COMMENT 'Collection type, with Agent, DataProxy client, LoadProxy',
- `connection_name` varchar(128) NOT NULL COMMENT 'The name of the database connection',
- `db_type` varchar(128) DEFAULT 'MySQL' COMMENT 'DB type, such as MySQL, Oracle',
- `db_server_ip` varchar(64) NOT NULL COMMENT 'DB Server IP',
- `port` int(11) NOT NULL COMMENT 'Port number',
- `db_name` varchar(128) DEFAULT NULL COMMENT 'Target database name',
- `username` varchar(64) NOT NULL COMMENT 'Username',
- `password` varchar(64) NOT NULL COMMENT 'The password corresponding to the above user name',
- `has_select` tinyint(1) DEFAULT '0' COMMENT 'Is there DB permission select, 0: No, 1: Yes',
- `has_insert` tinyint(1) DEFAULT '0' COMMENT 'Is there DB permission to insert, 0: No, 1: Yes',
- `has_update` tinyint(1) DEFAULT '0' COMMENT 'Is there a DB permission update, 0: No, 1: Yes',
- `has_delete` tinyint(1) DEFAULT '0' COMMENT 'Is there a DB permission to delete, 0: No, 1: Yes',
- `in_charges` varchar(512) NOT NULL COMMENT 'DB person in charge, separated by a comma when there are multiple ones',
- `is_region_id` tinyint(1) DEFAULT '0' COMMENT 'Whether it contains a region ID, 0: No, 1: Yes',
- `db_description` varchar(256) DEFAULT NULL COMMENT 'DB description',
- `backup_db_server_ip` varchar(64) DEFAULT NULL COMMENT 'Backup DB HOST',
- `backup_db_port` int(11) DEFAULT NULL COMMENT 'Backup DB port',
- `status` int(4) DEFAULT '0' COMMENT 'status',
- `is_deleted` int(11) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, > 0: deleted',
- `creator` varchar(64) NOT NULL COMMENT 'Creator name',
- `modifier` varchar(64) DEFAULT NULL COMMENT 'Modifier name',
- `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Create time',
- `modify_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
- `visible_person` varchar(1024) DEFAULT NULL COMMENT 'List of visible persons, separated by commas',
- `visible_group` varchar(1024) DEFAULT NULL COMMENT 'List of visible groups, separated by commas',
- PRIMARY KEY (`id`)
-) ENGINE = InnoDB
- DEFAULT CHARSET = utf8mb4 COMMENT ='Common Database Server Table';
-
--- ----------------------------
--- Table structure for common_file_server
--- ----------------------------
-CREATE TABLE IF NOT EXISTS `common_file_server`
-(
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key',
- `access_type` varchar(20) NOT NULL COMMENT 'Collection type, with Agent, DataProxy, LoadProxy',
- `ip` varchar(64) NOT NULL COMMENT 'Data source IP',
- `port` int(11) NOT NULL COMMENT 'Port number',
- `is_inner_ip` tinyint(1) DEFAULT '0' COMMENT 'Whether it is intranet, 0: No, 1: Yes',
- `issue_type` varchar(128) DEFAULT NULL COMMENT 'Issuance method, such as SSH, TCS, etc.',
- `username` varchar(64) NOT NULL COMMENT 'User name of the data source IP host',
- `password` varchar(64) NOT NULL COMMENT 'The password corresponding to the above user name',
- `status` int(4) DEFAULT '0' COMMENT 'status',
- `is_deleted` int(11) DEFAULT '0' COMMENT 'Whether to delete, 0: not deleted, > 0: deleted',
- `creator` varchar(64) NOT NULL COMMENT 'Creator name',
- `modifier` varchar(64) DEFAULT NULL COMMENT 'Modifier name',
- `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Create time',
- `modify_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Modify time',
- `visible_person` varchar(1024) DEFAULT NULL COMMENT 'List of visible persons, separated by commas',
- `visible_group` varchar(1024) DEFAULT NULL COMMENT 'List of visible groups, separated by commas',
- PRIMARY KEY (`id`)
-) ENGINE = InnoDB
- DEFAULT CHARSET = utf8mb4 COMMENT ='Common File Server Table';
-
-- ----------------------------
-- Table structure for consumption
-- ----------------------------
diff --git a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/CommonDBServerController.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/CommonDBServerController.java
deleted file mode 100644
index b465f2167..000000000
--- a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/CommonDBServerController.java
+++ /dev/null
@@ -1,293 +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.
- */
-
-package org.apache.inlong.manager.web.controller;
-
-import com.github.pagehelper.PageInfo;
-import com.opencsv.bean.ColumnPositionMappingStrategy;
-import com.opencsv.bean.CsvToBean;
-import com.opencsv.bean.CsvToBeanBuilder;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.inlong.manager.common.beans.Response;
-import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
-import org.apache.inlong.manager.common.exceptions.BusinessException;
-import org.apache.inlong.manager.common.pojo.commonserver.CommonDbServerInfo;
-import org.apache.inlong.manager.common.pojo.commonserver.CommonDbServerListVo;
-import org.apache.inlong.manager.common.pojo.commonserver.CommonDbServerPageRequest;
-import org.apache.inlong.manager.common.util.LoginUserUtils;
-import org.apache.inlong.manager.common.util.SmallTools;
-import org.apache.inlong.manager.service.core.CommonDBServerService;
-import org.apache.inlong.manager.common.util.Preconditions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.ClassUtils;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * Common database server controller.
- */
-@RestController
-@RequestMapping("commonserver/db")
-@Api(tags = "Common Server - DB")
-@Deprecated
-public class CommonDBServerController {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(CommonDBServerController.class);
-
- @Autowired
- CommonDBServerService commonDBServerService;
-
- @RequestMapping(value = "/create", method = RequestMethod.POST)
- @ApiOperation(value = "Create DB data source")
- public Response<Integer> create(@RequestBody CommonDbServerInfo commonDbServerInfo) throws Exception {
- int id = commonDBServerService.save(commonDbServerInfo);
- return Response.success(id);
- }
-
- @RequestMapping(value = "/getById/{id}", method = RequestMethod.GET)
- @ApiOperation(value = "Get DB data source")
- public Response<CommonDbServerInfo> get(@PathVariable int id) throws Exception {
- CommonDbServerInfo result = commonDBServerService.get(id);
- return Response.success(result);
- }
-
- @RequestMapping(value = "/deleteById/{id}", method = RequestMethod.DELETE)
- @ApiOperation(value = "Delete DB data source")
- public Response<CommonDbServerInfo> delete(@PathVariable int id) throws Exception {
- commonDBServerService.delete(id);
- return Response.success();
- }
-
- @RequestMapping(value = "/update", method = RequestMethod.POST)
- @ApiOperation(value = "Modify DB data source")
- public Response<CommonDbServerInfo> update(@RequestBody CommonDbServerInfo commonDbServerInfo) throws Exception {
- CommonDbServerInfo result = commonDBServerService.update(commonDbServerInfo);
- return Response.success(result);
- }
-
- @RequestMapping(value = "/getByUser/{username}", method = RequestMethod.GET)
- @ApiOperation(value = "Get DB data source by user")
- @ApiImplicitParam(name = "username", dataTypeClass = String.class, required = true)
- public Response<List<CommonDbServerInfo>> getByUser(@PathVariable String username) throws Exception {
- List<CommonDbServerInfo> result = commonDBServerService.getByUser(username);
- return Response.success(result);
- }
-
- @PostMapping("/addVisiblePerson/{id}")
- @ApiOperation(value = "Add visible Person")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "id", dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "visiblePerson", value = "Visible person list, separated by commas",
- dataTypeClass = String.class)
- })
- public Response<CommonDbServerInfo> addVisiblePerson(
- @PathVariable("id") Integer id, @RequestParam("visiblePerson") String visiblePerson) {
- CommonDbServerInfo entity = commonDBServerService.addVisiblePerson(id, visiblePerson);
- return Response.success(entity);
- }
-
- @PostMapping("/deleteVisiblePerson/{id}")
- @ApiOperation(value = "Delete visible Person")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "id", dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "visiblePerson", value = "Visible person list, separated by commas",
- dataTypeClass = String.class)
- })
- public Response<CommonDbServerInfo> deleteVisiblePerson(
- @PathVariable("id") Integer id, @RequestParam("visiblePerson") String visiblePerson) {
- CommonDbServerInfo entity = commonDBServerService.deleteVisiblePerson(id, visiblePerson);
- return Response.success(entity);
- }
-
- @PostMapping("/addVisibleGroup/{id}")
- @ApiOperation(value = "Add visible group")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "id", dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "visibleGroup", value = "Visible group list, separated by commas",
- dataTypeClass = String.class)
- })
- public Response<CommonDbServerInfo> addVisibleGroup(
- @PathVariable("id") Integer id, @RequestParam("visibleGroup") String visibleGroup) {
- CommonDbServerInfo entity = commonDBServerService.addVisibleGroup(id, visibleGroup);
- return Response.success(entity);
- }
-
- @PostMapping("/deleteVisibleGroup/{id}")
- @ApiOperation(value = "Delete visible group")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "id", dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "visibleGroup", value = "Visible group list, separated by commas",
- dataTypeClass = String.class)
- })
- public Response<CommonDbServerInfo> deleteVisibleGroup(
- @PathVariable("id") Integer id, @RequestParam("visibleGroup") String visibleGroup) {
- CommonDbServerInfo entity = commonDBServerService.deleteVisibleGroup(id, visibleGroup);
- return Response.success(entity);
- }
-
- @RequestMapping(value = "/list", method = RequestMethod.POST)
- @ApiOperation(value = "Query data source list based on conditions")
- public Response<PageInfo<CommonDbServerListVo>> listByCondition(CommonDbServerPageRequest request)
- throws Exception {
- return Response.success(commonDBServerService.listByCondition(request));
- }
-
- /**
- * Download import template
- */
- @RequestMapping(value = "/download", method = RequestMethod.GET)
- @ApiOperation(value = "Download import template")
- public String download(HttpServletResponse response) {
- String fileName = "common_db_server_template.csv";
- String realPath = new File("").getAbsolutePath();
- File file = new File(realPath, fileName);
- if (file.exists()) {
- try (FileInputStream fis = new FileInputStream(file);
- BufferedInputStream bis = new BufferedInputStream(fis)) {
- response.setContentType("application/force-download");
- // Set file name Support Chinese
- fileName = URLEncoder.encode(fileName, "UTF-8");
- response.addHeader("Content-Disposition", "attachment;fileName=" + fileName);
-
- byte[] buffer = new byte[1024];
- OutputStream os = response.getOutputStream();
- int i = bis.read(buffer);
- while (i != -1) {
- os.write(buffer, 0, i);
- i = bis.read(buffer);
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- return null;
- }
-
- /**
- * Batch import - upload import config
- */
- @RequestMapping(value = "/upload", method = RequestMethod.POST)
- @ApiOperation(value = "Batch Import - upload config")
- public String upload(@RequestParam("file") MultipartFile file) throws Exception {
- Preconditions.checkFalse(file.isEmpty(), "File cannot be empty");
- String fileName = file.getOriginalFilename();
- LOGGER.info("The name of the uploaded file is: " + fileName);
-
- String filePath = ClassUtils.getDefaultClassLoader().getResource("").getPath();
- File fileDir = new File(filePath, "common_server");
- if (!fileDir.exists()) {
- fileDir.mkdirs();
- }
-
- String username = LoginUserUtils.getLoginUserDetail().getUserName();
- String time = new SimpleDateFormat("yyyyMMdd-HHmmss").format(new Date());
- fileName = username + "_" + time + "_" + fileName;
-
- Path path = Paths.get(fileDir.getAbsolutePath(), fileName);
- if (Files.exists(path)) {
- throw new BusinessException(ErrorCodeEnum.COMMON_FILE_UPLOAD_FAIL,
- "The file [" + fileName + "] already exists, please try again later");
- }
-
- int count = 0;
- try {
- // Save files
- file.transferTo(path.toFile());
-
- try (BufferedReader br = Files.newBufferedReader(path, StandardCharsets.UTF_8)) {
- ColumnPositionMappingStrategy strategy = new ColumnPositionMappingStrategy();
- strategy.setType(CommonDbServerInfo.class);
- String[] fields = {"connectionName", "dbType", "dbServerIp", "port", "dbName", "username",
- "password", "hasSelect", "hasInsert", "hasUpdate", "hasDelete", "inCharges", "isRegionId",
- "dbDescription", "backupDbServerIp", "backupDbPort", "visiblePerson", "visibleGroup"};
- strategy.setColumnMapping(fields);
-
- CsvToBean csvToBean = new CsvToBeanBuilder(br)
- .withType(CommonDbServerInfo.class)
- .withMappingStrategy(strategy)
- .withIgnoreLeadingWhiteSpace(true)
- .withSeparator(',')
- .build();
-
- List<CommonDbServerInfo> dbServerInfos = csvToBean.parse();
- if (dbServerInfos.size() > 10000) {
- return "Failed, the number of data exceeds the upper limit [10000]";
- }
-
- StringBuilder sb = new StringBuilder();
- sb.append("csv format, The fields are connectionName, dbType, dbServerIp, port, dbName, "
- + "username, password, hasSelect, hasInsert, hasUpdate, hasDelete, inCharges, "
- + "isRegionId, dbDescription, backupDbServerIp, backupDbPort, visiblePerson, visibleGroup\n");
- sb.append("Incorrect data check\n");
- // check
- int i = 1;
- boolean passed = true;
- for (CommonDbServerInfo entry : dbServerInfos) {
- if (!SmallTools.ipCheck(entry.getDbServerIp())) {
- sb.append(i + " column, dbServerIp=[" + entry.getDbServerIp() + "]Incorrect check\n");
- passed = false;
- }
- if (!SmallTools.portCheck(entry.getPort())) {
- sb.append(i + " column, port=[" + entry.getPort() + "]Incorrect check\n");
- passed = false;
- }
- i++;
- }
- if (!passed) {
- return sb.toString();
- }
-
- for (CommonDbServerInfo entry : dbServerInfos) {
- commonDBServerService.save(entry);
- //System.out.println("entry = "+entry);
- count++;
- }
- }
-
- return "Overall success, a total of 2 " + count + "are written.";
- } catch (IllegalStateException | IOException e) {
- e.printStackTrace();
- }
- return "Overall failure, a total of 2 " + count + "are written.";
- }
-}
diff --git a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/CommonFileServerController.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/CommonFileServerController.java
deleted file mode 100644
index 16934e7cc..000000000
--- a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/CommonFileServerController.java
+++ /dev/null
@@ -1,309 +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.
- */
-
-package org.apache.inlong.manager.web.controller;
-
-import com.github.pagehelper.PageInfo;
-import com.opencsv.bean.ColumnPositionMappingStrategy;
-import com.opencsv.bean.CsvToBean;
-import com.opencsv.bean.CsvToBeanBuilder;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.inlong.manager.common.beans.Response;
-import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
-import org.apache.inlong.manager.common.exceptions.BusinessException;
-import org.apache.inlong.manager.common.pojo.commonserver.CommonFileServerInfo;
-import org.apache.inlong.manager.common.pojo.commonserver.CommonFileServerListVo;
-import org.apache.inlong.manager.common.pojo.commonserver.CommonFileServerPageRequest;
-import org.apache.inlong.manager.common.util.LoginUserUtils;
-import org.apache.inlong.manager.common.util.Preconditions;
-import org.apache.inlong.manager.common.util.SmallTools;
-import org.apache.inlong.manager.service.core.CommonFileServerService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.ClassUtils;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * Common file server controller.
- */
-@RestController
-@RequestMapping("commonserver/file")
-@Api(tags = "Common Server - File")
-@Deprecated
-public class CommonFileServerController {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(CommonFileServerController.class);
-
- @Autowired
- CommonFileServerService commonFileServerService;
-
- @PostMapping("/create")
- @ApiOperation(value = "Create a new file data source")
- public Response<Integer> create(@RequestBody CommonFileServerInfo commonFileServerInfo)
- throws Exception {
- int id = commonFileServerService.create(commonFileServerInfo);
- return Response.success(id);
- }
-
- @PostMapping("/freeze/{id}")
- @ApiOperation(value = "Freeze file data source")
- public Response<CommonFileServerInfo> freeze(@RequestBody @PathVariable int id) {
- CommonFileServerInfo result = commonFileServerService.freeze(id);
- return Response.success(result);
- }
-
- @PostMapping("/unfreeze/{id}")
- @ApiOperation(value = "Unfreeze file data source")
- public Response<CommonFileServerInfo> unfreeze(@RequestBody @PathVariable int id) {
- CommonFileServerInfo result = commonFileServerService.unfreeze(id);
- return Response.success(result);
- }
-
- @RequestMapping(value = "/deleteById/{id}", method = RequestMethod.DELETE)
- @ApiOperation(value = "Delete file data source")
- public Response<CommonFileServerInfo> delete(@RequestBody @PathVariable int id)
- throws Exception {
- commonFileServerService.delete(id);
- return Response.success();
- }
-
- @RequestMapping(value = "/getById/{id}", method = RequestMethod.GET)
- @ApiOperation(value = "Get file data source")
- public Response<CommonFileServerInfo> get(@RequestBody @PathVariable int id)
- throws Exception {
- CommonFileServerInfo result = commonFileServerService.get(id);
- return Response.success(result);
- }
-
- @PostMapping("/update")
- @ApiOperation(value = "Modify file data source")
- public Response<CommonFileServerInfo> update(
- @RequestBody CommonFileServerInfo commonFileServerInfo)
- throws Exception {
- CommonFileServerInfo result = commonFileServerService.update(commonFileServerInfo);
- return Response.success(result);
- }
-
- @RequestMapping(value = "/getByUser/{username}", method = RequestMethod.GET)
- @ApiOperation(value = "Get data source by user")
- @ApiImplicitParam(name = "username", dataTypeClass = String.class, required = true)
- public Response<List<CommonFileServerInfo>> getByUser(@PathVariable String username) {
- List<CommonFileServerInfo> result = commonFileServerService.getByUser(username);
- return Response.success(result);
- }
-
- @PostMapping("/addVisiblePerson/{id}")
- @ApiOperation(value = "Add visible Person")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "id", dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "visiblePerson", value = "Visible person list, separated by commas",
- dataTypeClass = String.class)
- })
- public Response<CommonFileServerInfo> addVisiblePerson(
- @PathVariable("id") Integer id, @RequestParam("visiblePerson") String visiblePerson) {
- CommonFileServerInfo result = commonFileServerService.addVisiblePerson(id, visiblePerson);
- return Response.success(result);
- }
-
- @PostMapping("/deleteVisiblePerson/{id}")
- @ApiOperation(value = "Delete visible person")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "id", dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "visiblePerson", value = "Visible person list, separated by commas",
- dataTypeClass = String.class)
- })
- public Response<CommonFileServerInfo> deleteVisiblePerson(
- @PathVariable("id") Integer id, @RequestParam("visiblePerson") String visiblePerson) {
- CommonFileServerInfo result = commonFileServerService.deleteVisiblePerson(id, visiblePerson);
- return Response.success(result);
- }
-
- @PostMapping("/addVisibleGroup/{id}")
- @ApiOperation(value = "Add visible group")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "id", dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "visibleGroup", value = "Visible group list, separated by commas",
- dataTypeClass = String.class)
- })
- public Response<CommonFileServerInfo> addVisibleGroup(
- @PathVariable("id") Integer id, @RequestParam("visibleGroup") String visibleGroup) {
- CommonFileServerInfo result = commonFileServerService.addVisibleGroup(id, visibleGroup);
- return Response.success(result);
- }
-
- @PostMapping("/deleteVisibleGroup/{id}")
- @ApiOperation(value = "Delete visible group")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "id", dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "visibleGroup", value = "Visible group list, separated by commas",
- dataTypeClass = String.class)
- })
- public Response<CommonFileServerInfo> deleteVisibleGroup(
- @PathVariable("id") Integer id, @RequestParam("visibleGroup") String visibleGroup) {
- CommonFileServerInfo result = commonFileServerService.deleteVisibleGroup(id, visibleGroup);
- return Response.success(result);
- }
-
- @RequestMapping(value = "/list", method = RequestMethod.POST)
- @ApiOperation(value = "Query data source list based on conditions")
- public Response<PageInfo<CommonFileServerListVo>> listByCondition(
- CommonFileServerPageRequest request) throws Exception {
- return Response.success(commonFileServerService.listByCondition(request));
- }
-
- /**
- * Download import template
- */
- @RequestMapping(value = "/download", method = RequestMethod.GET)
- @ApiOperation(value = "Download import module")
- public String download(HttpServletRequest request, HttpServletResponse response) throws Exception {
- String fileName = "common_file_server_template.csv";
- String realPath = new File("").getAbsolutePath();
- File file = new File(realPath, fileName);
- if (file.exists()) {
- try (FileInputStream fis = new FileInputStream(file);
- BufferedInputStream bis = new BufferedInputStream(fis)) {
- response.setContentType("application/force-download");
- // Set file name Support Chinese
- fileName = URLEncoder.encode(fileName, "UTF-8");
- response.addHeader("Content-Disposition", "attachment;fileName=" + fileName);
-
- byte[] buffer = new byte[1024];
- OutputStream os = response.getOutputStream();
- int i = bis.read(buffer);
- while (i != -1) {
- os.write(buffer, 0, i);
- i = bis.read(buffer);
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- return null;
- }
-
- /**
- * Batch import - upload import config
- */
- @RequestMapping(value = "/upload", method = RequestMethod.POST)
- @ApiOperation(value = "Batch Import - upload config")
- public String upload(@RequestParam("file") MultipartFile file) throws Exception {
- Preconditions.checkFalse(file.isEmpty(), "File cannot be empty");
- String fileName = file.getOriginalFilename();
- LOGGER.info("The name of the upload file is: " + fileName);
-
- String filePath = ClassUtils.getDefaultClassLoader().getResource("").getPath();
- File fileDir = new File(filePath, "common_server");
- if (!fileDir.exists()) {
- fileDir.mkdirs();
- }
-
- String username = LoginUserUtils.getLoginUserDetail().getUserName();
- String time = new SimpleDateFormat("yyyyMMdd-HHmmss").format(new Date());
- fileName = username + "_" + time + "_" + fileName;
-
- Path path = Paths.get(fileDir.getAbsolutePath(), fileName);
- if (Files.exists(path)) {
- throw new BusinessException(ErrorCodeEnum.COMMON_FILE_UPLOAD_FAIL,
- "The file [" + fileName + "] already exists, please try again later");
- }
-
- int count = 0;
- try {
- // Save files
- file.transferTo(path.toFile());
-
- try (BufferedReader br = Files.newBufferedReader(path, StandardCharsets.UTF_8)) {
- ColumnPositionMappingStrategy<CommonFileServerInfo> strategy = new ColumnPositionMappingStrategy<>();
- strategy.setType(CommonFileServerInfo.class);
- String[] fields = {"ip", "port", "type", "isInnerIp", "issueType", "username",
- "password", "visiblePerson", "visibleGroup"};
- strategy.setColumnMapping(fields);
-
- CsvToBean<CommonFileServerInfo> csvToBean = new CsvToBeanBuilder<CommonFileServerInfo>(br)
- .withType(CommonFileServerInfo.class)
- .withMappingStrategy(strategy)
- .withIgnoreLeadingWhiteSpace(true)
- .withSeparator(',')
- .build();
-
- List<CommonFileServerInfo> fileServerInfos = csvToBean.parse();
- if (fileServerInfos.size() > 10000) {
- return "Failed, the number of data exceeds the upper limit [10000]";
- }
- StringBuilder sb = new StringBuilder();
- sb.append("csv format, The fields are ip, port, type, isInnerIp, issueType, username, password, "
- + "visiblePerson, visibleGroup\n");
- sb.append("Incorrect data check\n");
- // check
- int i = 1;
- boolean passed = true;
- for (CommonFileServerInfo entry : fileServerInfos) {
- if (!SmallTools.ipCheck(entry.getIp())) {
- sb.append(i).append(" column, ip=[").append(entry.getIp()).append("]Incorrect check\n");
- passed = false;
- }
- if (!SmallTools.portCheck(entry.getPort())) {
- sb.append(i).append(" column, port=[").append(entry.getPort()).append("]Incorrect check\n");
- passed = false;
- }
- i++;
- }
- if (!passed) {
- return sb.toString();
- }
-
- for (CommonFileServerInfo entry : fileServerInfos) {
- commonFileServerService.create(entry);
- count++;
- }
- }
-
- return "success, a total of 2 " + count + "are written.";
- } catch (IllegalStateException | IOException e) {
- e.printStackTrace();
- }
- return "failure, a total of 2 " + count + "are written.";
- }
-}
diff --git a/inlong-manager/manager-web/src/main/resources/common_db_server_template.csv b/inlong-manager/manager-web/src/main/resources/common_db_server_template.csv
deleted file mode 100644
index 00a89d852..000000000
--- a/inlong-manager/manager-web/src/main/resources/common_db_server_template.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-connection_name , db_type , db_server_ip, port , db_name , username, password , has_select , has_insert , has_update , has_delete , in_charges , is_region_id , db_description, backup_db_server_ip, backup_db_port , visible_person , visible_group
-The name of the database connection, "DB type，such as MySQL、Oracle", DB Server IP, port, target database name, username, The password corresponding to the above user name, "Is there DB permission select, 0: No, 1: Yes", "Is there a DB permission insert, 0: No, 1: Yes", "Is there a DB permission update, 0: No, 1: Yes", "Is there a DB permission delete, 0: No, 1: Yes", "DB person in charge, separated by a comma when multiple", "Whether it contains a region ID, 0: No, 1: Yes", DB descriptio [...]
diff --git a/inlong-manager/manager-web/src/main/resources/common_file_server_template.csv b/inlong-manager/manager-web/src/main/resources/common_file_server_template.csv
deleted file mode 100644
index 5949091d0..000000000
--- a/inlong-manager/manager-web/src/main/resources/common_file_server_template.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-ip , port , type , is_inner_ip , issue_type , username , password , visible_person , visible_group
-DataSource IP, port, "type，such as DataProxy client, LoadProxy, etc.", "Intranet or not,0: No,1: Yes","Distribution mode, such as SSH, TCS, etc", The user name of the data source IP host, the password corresponding to the above user name, "List of visible people, separated by commas", "List of visible groups, separated by commas"