diff --git a/src/common/network/connection.ts b/src/common/network/connection.ts
index 750f40736..c9effe20d 100644
--- a/src/common/network/connection.ts
+++ b/src/common/network/connection.ts
@@ -46,6 +46,7 @@ function generateConnectionParams(formData: Partial<IConnectionFormData>, isHide
     name: formData.name,
     username: formData.username,
     password: encrypt(formData.password),
+    projectId: formData?.projectId,
     sysTenantUsername: formData?.useSys ? formData.sysTenantUsername : null,
     sslConfig: formData.sslConfig || { enabled: false },
     /**
@@ -53,7 +54,7 @@ function generateConnectionParams(formData: Partial<IConnectionFormData>, isHide
      */
     sysTenantPassword: formData?.useSys ? encrypt(formData.sysTenantPassword) : null,
     queryTimeoutSeconds: formData.queryTimeoutSeconds,
-    properties: formData.properties,
+    properties: formData.properties || null,
     passwordSaved: formData.passwordSaved,
     environmentId: formData.environmentId,
     jdbcUrlParameters: formData.jdbcUrlParameters || {},
diff --git a/src/component/Action/Group.tsx b/src/component/Action/Group.tsx
index 8a0327c61..11f3bbe16 100644
--- a/src/component/Action/Group.tsx
+++ b/src/component/Action/Group.tsx
@@ -76,7 +76,7 @@ export default ({
       })
     : [children];
 
-  const visibleActionsSort = visibleActions.slice(0);
+  const visibleActionsSort = visibleActions.slice(0).filter(Boolean);
 
   visibleActionsSort.sort((a, b) => {
     const orderA = getOrder(a.props);
@@ -86,7 +86,7 @@ export default ({
   });
 
   const fixedSize = visibleActionsSort.filter(
-    (action) => action.props.type === 'primary' || action.props.fixed,
+    (action) => action?.props.type === 'primary' || action?.props.fixed,
   ).length;
   const realSize = max([fixedSize, size]);
 
diff --git a/src/d.ts/index.ts b/src/d.ts/index.ts
index 282973eab..4f7ba6c54 100644
--- a/src/d.ts/index.ts
+++ b/src/d.ts/index.ts
@@ -713,6 +713,8 @@ export interface IConnection {
   jdbcUrlParameters?: Record<string, string>;
   sessionInitScript?: string;
   defaultSchema?: string;
+  projectId?: number;
+  readonly projectName?: string;
 }
 
 export interface IConnectionLabel {
diff --git a/src/page/Datasource/Datasource/NewDatasourceDrawer/Form/ProjectItem/ProjectSelect.tsx b/src/page/Datasource/Datasource/NewDatasourceDrawer/Form/ProjectItem/ProjectSelect.tsx
new file mode 100644
index 000000000..6a6342b76
--- /dev/null
+++ b/src/page/Datasource/Datasource/NewDatasourceDrawer/Form/ProjectItem/ProjectSelect.tsx
@@ -0,0 +1,21 @@
+import { Select, SelectProps } from 'antd';
+
+export default function ProjectSelect({ value, onChange, options, ...rest }: SelectProps) {
+  value = value || -999;
+  options = []
+    .concat([
+      {
+        label: '不绑定项目',
+        value: -999,
+      },
+    ])
+    .concat(options || []);
+  function _onChange(v, option) {
+    if (v === -999) {
+      onChange(null, option);
+    } else {
+      onChange(v, option);
+    }
+  }
+  return <Select value={value} onChange={_onChange} options={options} {...rest} />;
+}
diff --git a/src/page/Datasource/Datasource/NewDatasourceDrawer/Form/ProjectItem/index.tsx b/src/page/Datasource/Datasource/NewDatasourceDrawer/Form/ProjectItem/index.tsx
new file mode 100644
index 000000000..2ab3eab0f
--- /dev/null
+++ b/src/page/Datasource/Datasource/NewDatasourceDrawer/Form/ProjectItem/index.tsx
@@ -0,0 +1,103 @@
+import { listProjects } from '@/common/network/project';
+import { useRequest } from 'ahooks';
+import { Alert, Form, Space, Tooltip } from 'antd';
+import React, { useContext, useMemo } from 'react';
+import DatasourceFormContext from '../context';
+import ProjectSelect from './ProjectSelect';
+import { ProjectRole } from '@/d.ts/project';
+import { ExclamationCircleFilled } from '@ant-design/icons';
+
+interface IProps {}
+
+const ProjectItem: React.FC<IProps> = function () {
+  const context = useContext(DatasourceFormContext);
+  const projectId = Form.useWatch('projectId', context.form);
+  const { data, loading } = useRequest(listProjects, {
+    defaultParams: [null, 1, 9999, false],
+  });
+  const extra = useMemo(() => {
+    if (
+      !context?.isEdit ||
+      !context?.originDatasource?.projectId ||
+      context?.originDatasource?.projectId === projectId
+    ) {
+      return null;
+    }
+    const icon = <ExclamationCircleFilled />;
+    if (projectId) {
+      return (
+        <Alert
+          showIcon
+          icon={icon}
+          type="error"
+          message="修改项目后，此数据源下的所有数据库将绑定新的项目"
+        />
+      );
+    }
+    return (
+      <Alert
+        showIcon
+        icon={icon}
+        type="error"
+        message="不绑定项目后，此数据源下的所有数据库将从原项目中移出"
+      />
+    );
+  }, [context?.isEdit, context?.originDatasource, projectId]);
+  const options = useMemo(() => {
+    const base = [];
+    if (context?.isEdit && context?.originDatasource?.projectId) {
+      base.push({
+        label: context?.originDatasource?.projectName,
+        value: context?.originDatasource?.projectId,
+      });
+    }
+    return base
+      .concat(
+        data?.contents?.map((item) => {
+          if (item.id === context?.originDatasource?.projectId) {
+            return null;
+          }
+          let disabledInfo: string = null;
+          if (
+            !item.currentUserResourceRoles?.includes(ProjectRole.DBA) &&
+            !item.currentUserResourceRoles?.includes(ProjectRole.OWNER)
+          ) {
+            disabledInfo = '非项目管理员或 DBA，无法将数据源加入此项目';
+          }
+          return {
+            label: (
+              <Tooltip title={disabledInfo}>
+                <div>{item.name}</div>
+              </Tooltip>
+            ),
+            value: item.id,
+            disabled: !!disabledInfo,
+          };
+        }),
+      )
+      .filter(Boolean);
+  }, [data, context?.originDatasource, context?.isEdit]);
+  return (
+    <Space direction="vertical" size={1}>
+      <Form.Item
+        name={'projectId'}
+        label="项目"
+        requiredMark={false}
+        extra={'绑定项目后，数据源内的所有数据库将移入此项目'}
+      >
+        <ProjectSelect
+          loading={loading}
+          options={options}
+          showSearch
+          optionFilterProp="children"
+          style={{
+            width: 208,
+          }}
+        />
+      </Form.Item>
+      {extra}
+    </Space>
+  );
+};
+
+export default ProjectItem;
diff --git a/src/page/Datasource/Datasource/NewDatasourceDrawer/Form/index.tsx b/src/page/Datasource/Datasource/NewDatasourceDrawer/Form/index.tsx
index 4f96f6804..573092d3e 100644
--- a/src/page/Datasource/Datasource/NewDatasourceDrawer/Form/index.tsx
+++ b/src/page/Datasource/Datasource/NewDatasourceDrawer/Form/index.tsx
@@ -17,7 +17,7 @@
 import { testConnection } from '@/common/network/connection';
 import { listEnvironments } from '@/common/network/env';
 import { IDataSourceType, IDatasource } from '@/d.ts/datasource';
-import { AccountType, ConnectType, ConnectionMode, IConnectionTestErrorType } from '@/d.ts';
+import { AccountType, ConnectType, IConnectionTestErrorType } from '@/d.ts';
 import { haveOCP } from '@/util/env';
 import { formatMessage } from '@/util/intl';
 import { useRequest } from 'ahooks';
@@ -27,10 +27,7 @@ import { forwardRef, useImperativeHandle, useState } from 'react';
 import Account from './Account';
 import AddressItems from './AddressItems';
 import DatasourceFormContext from './context';
-import DBTypeItem from './DBTypeItem';
 import ParseURLItem from './ParseURLItem';
-import SSLItem from './SSLItem';
-import SysForm from './SysForm';
 import { ConnectTypeText } from '@/constant/label';
 import {
   getAllConnectTypes,
@@ -39,8 +36,9 @@ import {
   getDsByConnectType,
 } from '@/common/datasource';
 import ExtraConfig from './ExtraConfig';
-import JDBCParamsItem from './JDBCParamsItem';
 import RiskLevelLabel from '@/component/RiskLevelLabel';
+import ProjectItem from './ProjectItem';
+import login from '@/store/login';
 const Option = Select.Option;
 export interface IFormRef {
   form: FormInstance<IDatasource>;
@@ -292,6 +290,7 @@ export default forwardRef<IFormRef, IProps>(function DatasourceForm(
                     })}
                   </Select>
                 </Form.Item>
+                {!login.isPrivateSpace() && <ProjectItem />}
                 {!haveOCP() && <ExtraConfig />}
               </>
             );
diff --git a/src/page/Datasource/Datasource/NewDatasourceDrawer/index.tsx b/src/page/Datasource/Datasource/NewDatasourceDrawer/index.tsx
index a46f86f10..cd1673d2a 100644
--- a/src/page/Datasource/Datasource/NewDatasourceDrawer/index.tsx
+++ b/src/page/Datasource/Datasource/NewDatasourceDrawer/index.tsx
@@ -60,7 +60,15 @@ export default function NewDatasourceDrawer({
 
   function getOriginDatasource(data: IConnection, isCopy: boolean) {
     return isCopy
-      ? { ...data, id: null, creatorId: null, name: null, password: '', sysTenantPassword: '' }
+      ? {
+          ...data,
+          id: null,
+          creatorId: null,
+          name: null,
+          password: '',
+          sysTenantPassword: '',
+          projectId: null,
+        }
       : data;
   }
 
diff --git a/src/page/Datasource/Info/ChangeProjectModal/ProjectSelect.tsx b/src/page/Datasource/Info/ChangeProjectModal/ProjectSelect.tsx
index 6a158ac45..5e0dbc2a7 100644
--- a/src/page/Datasource/Info/ChangeProjectModal/ProjectSelect.tsx
+++ b/src/page/Datasource/Info/ChangeProjectModal/ProjectSelect.tsx
@@ -23,11 +23,18 @@ import { isNull } from 'lodash';
 interface IProps {
   value?: any;
   onChange?: (v: any) => void;
+  disabled?: boolean;
   projects: IProject[];
   currentDatabase: IDatabase;
 }
 
-export default function ProjectSelect({ projects, value, currentDatabase, onChange }: IProps) {
+export default function ProjectSelect({
+  projects,
+  value,
+  disabled,
+  currentDatabase,
+  onChange,
+}: IProps) {
   const isProjectNotFound = !projects?.find((item) => item.id === currentDatabase?.project?.id);
   const _isNull = isNull(value);
   return (
@@ -38,7 +45,7 @@ export default function ProjectSelect({ projects, value, currentDatabase, onChan
         onChange={(v) => {
           onChange(v);
         }}
-        disabled={_isNull}
+        disabled={_isNull || disabled}
       >
         {projects?.map((item) => {
           return (
@@ -55,6 +62,7 @@ export default function ProjectSelect({ projects, value, currentDatabase, onChan
       </Select>
       <Checkbox
         checked={_isNull}
+        disabled={disabled}
         onChange={(e) => (e.target.checked ? onChange(null) : onChange(undefined))}
       >
         {
diff --git a/src/page/Datasource/Info/NewDataBaseButton/index.tsx b/src/page/Datasource/Info/NewDataBaseButton/index.tsx
index 1d9a7362b..39ac11cba 100644
--- a/src/page/Datasource/Info/NewDataBaseButton/index.tsx
+++ b/src/page/Datasource/Info/NewDataBaseButton/index.tsx
@@ -27,11 +27,19 @@ import ProjectSelect from '../ChangeProjectModal/ProjectSelect';
 
 interface IProps {
   dataSourceId: string;
+  projectId: number;
+  projectName: string;
   onSuccess: () => void;
   mode: ConnectionMode;
 }
 
-export default function NewDataBaseButton({ dataSourceId, onSuccess, mode }: IProps) {
+export default function NewDataBaseButton({
+  dataSourceId,
+  projectId,
+  projectName,
+  onSuccess,
+  mode,
+}: IProps) {
   const [open, setOpen] = useState<boolean>(false);
   const [form] = Form.useForm<
     Pick<IDatabase, 'name' | 'collationName' | 'charsetName'> & { projectId: number }
@@ -53,6 +61,11 @@ export default function NewDataBaseButton({ dataSourceId, onSuccess, mode }: IPr
   useEffect(() => {
     if (open) {
       form.resetFields();
+      if (projectId) {
+        form.setFieldsValue({
+          projectId: projectId,
+        });
+      }
     }
     switch (mode) {
       case ConnectionMode.OB_MYSQL:
@@ -152,7 +165,11 @@ export default function NewDataBaseButton({ dataSourceId, onSuccess, mode }: IPr
             name={'projectId'}
             label={formatMessage({ id: 'odc.Info.NewDataBaseButton.Project' })} /*所属项目*/
           >
-            <ProjectSelect projects={project?.contents} currentDatabase={null} />
+            <ProjectSelect
+              disabled={!!projectId}
+              projects={project?.contents}
+              currentDatabase={null}
+            />
           </Form.Item>
         </Form>
       </Modal>
diff --git a/src/page/Datasource/Info/index.tsx b/src/page/Datasource/Info/index.tsx
index 2e1f4227f..5a5e0215d 100644
--- a/src/page/Datasource/Info/index.tsx
+++ b/src/page/Datasource/Info/index.tsx
@@ -27,9 +27,10 @@ import { IDatasource } from '@/d.ts/datasource';
 import { formatMessage } from '@/util/intl';
 import { getLocalFormatDateTime } from '@/util/utils';
 import { useRequest } from 'ahooks';
-import { Button, Input, message, Popconfirm, Space } from 'antd';
+import { Button, Input, message, Popconfirm, Space, Tooltip } from 'antd';
 import { toInteger } from 'lodash';
 import React, { useRef, useState } from 'react';
+import Icon, { EditOutlined } from '@ant-design/icons';
 import ChangeProjectModal from './ChangeProjectModal';
 import NewDataBaseButton from './NewDataBaseButton';
 interface IProps {
@@ -105,6 +106,8 @@ const Info: React.FC<IProps> = ({ id, datasource }) => {
               mode={datasource?.dialectType}
               onSuccess={() => reload()}
               dataSourceId={id}
+              projectId={datasource?.projectId}
+              projectName={datasource?.projectName}
             />
 
             <Button loading={syncLoading} onClick={sync}>
@@ -165,6 +168,50 @@ const Info: React.FC<IProps> = ({ id, datasource }) => {
             title: formatMessage({ id: 'odc.Datasource.Info.Project' }), //所属项目
             dataIndex: ['project', 'name'],
             width: 160,
+            render(value, record, index) {
+              const bindProjectName = record.dataSource?.projectName;
+              let tip = null;
+              if (bindProjectName) {
+                tip = `当前数据源所属项目 ${bindProjectName}，无法修改。可通过编辑数据源修改所属项目`;
+              } else if (!canUpdate) {
+                tip = '无当前数据源权限';
+              }
+              return (
+                <div
+                  style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}
+                >
+                  <div
+                    style={{
+                      color: value ? null : 'var(--text-color-hint)',
+                      flex: 1,
+                      overflow: 'hidden',
+                      textOverflow: 'ellipsis',
+                      whiteSpace: 'nowrap',
+                    }}
+                  >
+                    {value || '未分配项目'}
+                  </div>
+                  <Tooltip title={tip}>
+                    <a
+                      style={{
+                        flexShrink: 0,
+                        flexGrow: 0,
+                        color: tip ? 'var(--text-color-hint)' : null,
+                      }}
+                      onClick={() => {
+                        if (tip) {
+                          return;
+                        }
+                        setVisible(true);
+                        setDatabase(record);
+                      }}
+                    >
+                      <Icon component={EditOutlined} style={{ fontSize: 14 }} />
+                    </a>
+                  </Tooltip>
+                </div>
+              );
+            },
           },
           {
             title: formatMessage({ id: 'odc.Datasource.Info.LastSynchronizationTime' }), //最近一次同步时间
@@ -181,19 +228,6 @@ const Info: React.FC<IProps> = ({ id, datasource }) => {
             render(_, record) {
               return (
                 <Action.Group size={3}>
-                  {canUpdate && (
-                    <Action.Link
-                      disabled={!record.existed}
-                      onClick={() => {
-                        setVisible(true);
-                        setDatabase(record);
-                      }}
-                      key={'transfer'}
-                    >
-                      {formatMessage({ id: 'odc.Datasource.Info.TransferProject' }) /*转移项目*/}
-                    </Action.Link>
-                  )}
-
                   {canDelete && (
                     <Popconfirm
                       title={formatMessage({
diff --git a/src/page/Gateway/customConnect.ts b/src/page/Gateway/customConnect.ts
index 993afb8ae..b6962d9d1 100644
--- a/src/page/Gateway/customConnect.ts
+++ b/src/page/Gateway/customConnect.ts
@@ -15,7 +15,7 @@
  */
 
 import { decrypt } from '@/common/network/other';
-import { IRemoteCustomConnectionData } from '@/d.ts';
+import { AccountType, IRemoteCustomConnectionData } from '@/d.ts';
 import { resolveUnionDbUser } from '@/util/connection';
 import { isClient } from '@/util/env';
 import { formatMessage } from '@/util/intl';
@@ -28,15 +28,16 @@ import login from '@/store/login';
 import { SpaceType } from '@/d.ts/_index';
 import { IDatasource } from '@/d.ts/datasource';
 import { listEnvironments } from '@/common/network/env';
-import { createConnection } from '@/common/network/connection';
+import { createConnection, testConnection, testExsitConnection } from '@/common/network/connection';
 import { gotoSQLWorkspace } from '@/util/route';
 import { listDatabases } from '@/common/network/database';
+import { listProjects } from '@/common/network/project';
 
 async function getDefaultSchema(dsId: number, userName: string) {
   const res = await listDatabases(null, dsId, 1, 999);
   const databases = res?.contents;
-  const informationSchema = databases.find((d) => d.name === 'information_schema');
-  const sameName = databases.find((d) => d.name?.toLowerCase() === userName?.toLowerCase());
+  const informationSchema = databases?.find((d) => d.name === 'information_schema');
+  const sameName = databases?.find((d) => d.name?.toLowerCase() === userName?.toLowerCase());
   return informationSchema?.id || sameName?.id || databases?.[0]?.id;
 }
 
@@ -155,18 +156,40 @@ export const action = async (config: ICustomConnectAction) => {
   if (!login.organizations?.length) {
     return 'Get User Failed';
   }
-  const personalOrganization = login.organizations?.find((item) => item.type === SpaceType.PRIVATE);
-  if (!personalOrganization) {
+  const org = login.organizations?.find((item) => item.type === SpaceType.SYNERGY);
+  if (!org) {
     return formatMessage({ id: 'odc.page.Gateway.newCloudConnection.PersonalSpaceDoesNotExist' }); //个人空间不存在！
   }
-  const isSuccess = await login.switchCurrentOrganization(personalOrganization?.id);
+  const isSuccess = await login.switchCurrentOrganization(org?.id);
   if (!isSuccess) {
     return 'Switch Organization Failed';
   }
+  /**
+   * get default project
+   */
+
+  const projectName = login.user?.accountName;
+
+  const project = (await listProjects(projectName, 1, 20))?.contents?.[0];
+
+  if (!project || project?.name !== projectName) {
+    return 'User Project Not Fount';
+  }
 
   const params = resolveRemoteData({
     ...(data as IRemoteCustomConnectionData),
+    projectId: project?.id,
   });
+  /**
+   * test connection
+   * 失败的链接不会展示在数据源列表中，必须提前test
+   */
+
+  const res = await testConnection(params, AccountType.MAIN, false);
+  const isTestSuccess = res?.data?.active;
+  if (!isTestSuccess) {
+    return 'Connection Test Failed';
+  }
   const createResult = await newConnection(params);
 
   if (createResult) {
diff --git a/src/page/Project/Database/AddDataBaseButton/index.tsx b/src/page/Project/Database/AddDataBaseButton/index.tsx
index d77b25e9d..da4a4f21b 100644
--- a/src/page/Project/Database/AddDataBaseButton/index.tsx
+++ b/src/page/Project/Database/AddDataBaseButton/index.tsx
@@ -19,8 +19,8 @@ import { listDatabases, updateDataBase } from '@/common/network/database';
 import RiskLevelLabel from '@/component/RiskLevelLabel';
 import { formatMessage } from '@/util/intl';
 import { useRequest } from 'ahooks';
-import { Button, Col, Form, message, Modal, Row, Select, Space, Tag } from 'antd';
 import { useContext, useState } from 'react';
+import { Button, Col, Form, message, Modal, Row, Select, Tooltip } from 'antd';
 import Icon from '@ant-design/icons';
 import { getDataSourceStyle, getDataSourceStyleByConnectType } from '@/common/datasource';
 import ProjectContext from '../../ProjectContext';
@@ -127,13 +127,19 @@ export default function AddDataBaseButton({ projectId, onSuccess }: IProps) {
                 >
                   {dataSourceList?.contents?.map((item) => {
                     const icon = getDataSourceStyleByConnectType(item.type);
+                    const isDisabled = !!item?.projectId;
+
                     return (
-                      <Select.Option key={item.id}>
-                        <Icon
-                          component={icon?.icon?.component}
-                          style={{ color: icon?.icon?.color, fontSize: 16, marginRight: 4 }}
-                        />
-                        {item.name}
+                      <Select.Option key={item.id} disabled={isDisabled}>
+                        <Tooltip
+                          title={isDisabled ? `该数据源已绑定项目：${item?.projectName}` : null}
+                        >
+                          <Icon
+                            component={icon?.icon?.component}
+                            style={{ color: icon?.icon?.color, fontSize: 16, marginRight: 4 }}
+                          />
+                          {item.name}
+                        </Tooltip>
                       </Select.Option>
                     );
                   })}
diff --git a/src/page/Project/Database/index.tsx b/src/page/Project/Database/index.tsx
index 734c784f5..5b2768577 100644
--- a/src/page/Project/Database/index.tsx
+++ b/src/page/Project/Database/index.tsx
@@ -34,7 +34,7 @@ import { formatMessage } from '@/util/intl';
 import { gotoSQLWorkspace } from '@/util/route';
 import { getLocalFormatDateTime } from '@/util/utils';
 import { useRequest } from 'ahooks';
-import { Input, Space, Tag } from 'antd';
+import { Input, Space, Tag, Tooltip } from 'antd';
 import { toInteger } from 'lodash';
 import React, { useContext, useEffect, useRef, useState } from 'react';
 import AddDataBaseButton from './AddDataBaseButton';
@@ -306,9 +306,17 @@ const Database: React.FC<IProps> = ({ id }) => {
                       setVisible(true);
                       setDatabase(record);
                     }}
-                    disabled={disabled}
+                    disabled={disabled || !!record?.dataSource?.projectId}
                   >
-                    {formatMessage({ id: 'odc.Project.Database.TransferProject' }) /*转移项目*/}
+                    <Tooltip
+                      title={
+                        !!record?.dataSource?.projectId
+                          ? `所属的数据源已关联当前项目，无法修改。可通过编辑数据源修改所属项目`
+                          : null
+                      }
+                    >
+                      修改所属项目
+                    </Tooltip>
                   </Action.Link>
                 </Action.Group>
               );