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/03/21 01:33:16 UTC
[incubator-inlong] branch master updated: [INLONG-3257][Manager][Dashboard] Fix create common DB server return 404 (#3258)
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 f6a9335 [INLONG-3257][Manager][Dashboard] Fix create common DB server return 404 (#3258)
f6a9335 is described below
commit f6a933537dd37f51005bb23918c33cb021f4d9c1
Author: xuesongxs <54...@users.noreply.github.com>
AuthorDate: Mon Mar 21 09:33:13 2022 +0800
[INLONG-3257][Manager][Dashboard] Fix create common DB server return 404 (#3258)
---
inlong-dashboard/src/pages/DataSources/CreateModal.tsx | 4 ++--
inlong-dashboard/src/pages/DataSources/DbConfig.tsx | 14 +++++++-------
inlong-dashboard/src/pages/DataSources/index.tsx | 4 ++--
.../manager/dao/mapper/CommonDbServerEntityMapper.java | 7 ++++++-
.../service/core/impl/CommonDBServerServiceImpl.java | 3 +++
5 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/inlong-dashboard/src/pages/DataSources/CreateModal.tsx b/inlong-dashboard/src/pages/DataSources/CreateModal.tsx
index d160f99..c3d95fe 100644
--- a/inlong-dashboard/src/pages/DataSources/CreateModal.tsx
+++ b/inlong-dashboard/src/pages/DataSources/CreateModal.tsx
@@ -56,7 +56,7 @@ const Comp: React.FC<Props> = ({ type, id, ...modalProps }) => {
submitData.inCharges = values.inCharges.join(',');
}
await request({
- url: `/commonserver/${isUpdate ? 'update' : 'save'}`,
+ url: `/commonserver/db/${isUpdate ? 'update' : 'create'}`,
method: 'POST',
data: submitData,
});
@@ -78,7 +78,7 @@ const Comp: React.FC<Props> = ({ type, id, ...modalProps }) => {
const { data, run: getData } = useRequest(
id => ({
- url: `/commonserver/get/${id}`,
+ url: `/commonserver/db/get/${id}`,
params: {
serverType: type,
},
diff --git a/inlong-dashboard/src/pages/DataSources/DbConfig.tsx b/inlong-dashboard/src/pages/DataSources/DbConfig.tsx
index 79a12c1..a764ea0 100644
--- a/inlong-dashboard/src/pages/DataSources/DbConfig.tsx
+++ b/inlong-dashboard/src/pages/DataSources/DbConfig.tsx
@@ -28,7 +28,7 @@ export const getCreateFormContent = (defaultValues = {}) => {
{
type: 'input',
label: i18n.t('pages.Datasources.DbConfig.ServerName'),
- name: 'serverName',
+ name: 'connectionName',
rules: [{ required: true }],
props: {
maxLength: 128,
@@ -55,7 +55,7 @@ export const getCreateFormContent = (defaultValues = {}) => {
{
type: 'input',
label: 'DB IP',
- name: 'dbIp',
+ name: 'dbServerIp',
rules: [
{ required: true },
{
@@ -67,7 +67,7 @@ export const getCreateFormContent = (defaultValues = {}) => {
{
type: 'inputnumber',
label: i18n.t('pages.Datasources.DbConfig.Port'),
- name: 'dbPort',
+ name: 'port',
rules: [
{ required: true },
{
@@ -79,7 +79,7 @@ export const getCreateFormContent = (defaultValues = {}) => {
{
type: 'input',
label: i18n.t('pages.Datasources.DbConfig.BackupDbIp'),
- name: 'backupDbIp',
+ name: 'backupDbServerIp',
rules: [
{
pattern: rulesPattern.ip,
@@ -137,7 +137,7 @@ export const getCreateFormContent = (defaultValues = {}) => {
export const tableColumns: ColumnsType = [
{
title: i18n.t('pages.Datasources.DbConfig.ServerName'),
- dataIndex: 'serverName',
+ dataIndex: 'connectionName',
},
{
title: i18n.t('pages.Datasources.DbConfig.Type'),
@@ -145,11 +145,11 @@ export const tableColumns: ColumnsType = [
},
{
title: 'DB IP',
- dataIndex: 'dbIp',
+ dataIndex: 'dbServerIp',
},
{
title: i18n.t('pages.Datasources.DbConfig.Port'),
- dataIndex: 'dbPort',
+ dataIndex: 'port',
},
{
title: i18n.t('pages.Datasources.DbConfig.DbName'),
diff --git a/inlong-dashboard/src/pages/DataSources/index.tsx b/inlong-dashboard/src/pages/DataSources/index.tsx
index 88b94a3..1355088 100644
--- a/inlong-dashboard/src/pages/DataSources/index.tsx
+++ b/inlong-dashboard/src/pages/DataSources/index.tsx
@@ -71,7 +71,7 @@ const Comp: React.FC = () => {
const { data, loading, run: getList } = useRequest(
{
- url: `/commonserver/list`,
+ url: `/commonserver/db/list`,
method: 'POST',
params: {
...options,
@@ -93,7 +93,7 @@ const Comp: React.FC = () => {
title: i18n.t('basic.DeleteConfirm'),
onOk: async () => {
await request({
- url: `/commonserver/delete/${id}`,
+ url: `/commonserver/db/delete/${id}`,
method: 'DELETE',
params: {
serverType: options.type,
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
index 910c4c6..95f3827 100644
--- 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
@@ -18,6 +18,8 @@
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;
@@ -37,7 +39,10 @@ public interface CommonDbServerEntityMapper {
int updateByPrimaryKey(CommonDbServerEntity record);
- List<CommonDbServerEntity> selectByUsernameAndIpPort(String username, String dbType, String dbServerIp, int port);
+ List<CommonDbServerEntity> selectByUsernameAndIpPort(@Param("username") String username,
+ @Param("dbType") String dbType,
+ @Param("dbServerIp") String dbServerIp,
+ @Param("port") int port);
List<CommonDbServerEntity> selectAll();
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
index a5bdf7e..eab427a 100644
--- 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
@@ -102,6 +102,9 @@ public class CommonDBServerServiceImpl implements CommonDBServerService {
}
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);