From 56b7b5ca311c73a0189bfbb71272c37e6d8ab57e Mon Sep 17 00:00:00 2001
From: bailongsen <bailongsen@xinxuan.net>
Date: Wed, 8 Nov 2023 15:04:43 +0800
Subject: [PATCH 01/24] =?UTF-8?q?fix:=20=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=B8=B2=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scaleph-ui-react/src/app.tsx                  | 68 ++++++++++++++-----
 scaleph-ui-react/src/icon.ts                  | 15 ++++
 .../src/pages/User/Login/index.tsx            | 66 +++++++++---------
 scaleph-ui-react/src/services/auth.ts         |  6 +-
 4 files changed, 103 insertions(+), 52 deletions(-)
 create mode 100644 scaleph-ui-react/src/icon.ts

diff --git a/scaleph-ui-react/src/app.tsx b/scaleph-ui-react/src/app.tsx
index d92baeecb..ac7770f92 100644
--- a/scaleph-ui-react/src/app.tsx
+++ b/scaleph-ui-react/src/app.tsx
@@ -1,19 +1,20 @@
 import Footer from '@/components/Footer';
 import RightContent from '@/components/RightContent';
-import {LinkOutlined} from '@ant-design/icons';
-import {Settings as LayoutSettings} from '@ant-design/pro-components';
-import type {RunTimeLayoutConfig} from '@umijs/max';
-import {message, notification} from 'antd';
-import {history, Link, RequestConfig} from 'umi';
+import { LinkOutlined } from '@ant-design/icons';
+import { Settings as LayoutSettings } from '@ant-design/pro-components';
+import type { RunTimeLayoutConfig } from '@umijs/max';
+import { message, notification, Space } from 'antd';
+import { useEffect, useState } from 'react';
+import { history, Link, RequestConfig } from 'umi';
 import defaultSettings from '../config/defaultSettings';
-import {OnlineUserInfo, ResponseBody} from './app.d';
-import {USER_AUTH} from './constant';
-import {UserService} from './services/admin/user.service';
-import {AuthService} from './services/auth';
+import { OnlineUserInfo, ResponseBody } from './app.d';
+import { USER_AUTH } from './constant';
+import Icon from './icon';
+import { UserService } from './services/admin/user.service';
+import { AuthService } from './services/auth';
 
 const isDev = process.env.NODE_ENV === 'development';
 const whiteList: string[] = ['login', 'register'];
-
 /**
  * @see  https://umijs.org/zh-CN/plugins/plugin-initial-state
  * */
@@ -36,14 +37,26 @@ export async function getInitialState(): Promise<{
 }
 
 // ProLayout 支持的api https://procomponents.ant.design/components/layout
-export const layout: RunTimeLayoutConfig = ({initialState, setInitialState}) => {
+export const layout: RunTimeLayoutConfig = ({ initialState, setInitialState }) => {
+  const [defaultMenus, setDefaultMenus] = useState<{}[]>([]);
+
+  useEffect(() => {
+    const fetchData = async () => {
+      const dataList: ResponseBody<any> = await AuthService.menuRoutes();
+      if (dataList) {
+        setDefaultMenus(dataList);
+      }
+    };
+
+    fetchData();
+  }, []);
   return {
-    rightContentRender: () => <RightContent/>,
+    rightContentRender: () => <RightContent />,
     disableContentMargin: false,
-    contentStyle: {margin: 12},
-    footerRender: () => <Footer/>,
+    contentStyle: { margin: 12 },
+    footerRender: () => <Footer />,
     onPageChange: () => {
-      const {location} = history;
+      const { location } = history;
       const token = localStorage.getItem(USER_AUTH.token);
       if (!token && !whiteList.includes(location.pathname)) {
         localStorage.clear();
@@ -59,6 +72,24 @@ export const layout: RunTimeLayoutConfig = ({initialState, setInitialState}) =>
         }
       }
     },
+    // menuItemRender: (props, dom) => {
+    //   return (
+    //     <div>
+    //       <Space align="end" size={5}>
+    //         <Icon icon={props.icon} />
+    //         <span>{props.name}</span>
+    //       </Space>
+    //     </div>
+    //   );
+    // },
+    menuItemRender: (menuItemProps: any, defaultDom: any) => {
+      return (
+        <Space align="end" size={5}>
+          {menuItemProps.icon && <Icon icon={menuItemProps.icon} />}
+          <a onClick={() => history.push(menuItemProps.path)}>{menuItemProps?.name}</a>
+        </Space>
+      );
+    },
     layoutBgImgList: [
       {
         src: 'https://mdn.alipayobjects.com/yuyan_qk0oxh/afts/img/D2LWSqNny4sAAAAAAAAAAAAAFl94AQBr',
@@ -81,11 +112,12 @@ export const layout: RunTimeLayoutConfig = ({initialState, setInitialState}) =>
     ],
     links: [
       <Link key="api" to="/scaleph/doc.html" target="_blank">
-        <LinkOutlined/>
+        <LinkOutlined />
         <span>API 文档</span>
       </Link>,
     ],
     menuHeaderRender: undefined,
+    menuDataRender: () => defaultMenus,
     // 自定义 403 页面
     // unAccessible: <div>unAccessible</div>,
     // 增加一个 loading 的状态
@@ -121,7 +153,7 @@ const requestHeaderInterceptor: any = (url: string, options: RequestConfig) => {
   };
   return {
     url: `${url}`,
-    options: {...options, interceptors: true, headers: headers},
+    options: { ...options, interceptors: true, headers: headers },
   };
 };
 
@@ -164,7 +196,7 @@ const handleError = (
   } else if (showType == '2') {
     message.error(errorMessage, 2);
   } else if (showType == '4') {
-    notification.error({message: 'Error:' + errorCode, description: errorMessage, duration: 3});
+    notification.error({ message: 'Error:' + errorCode, description: errorMessage, duration: 3 });
   }
 };
 
diff --git a/scaleph-ui-react/src/icon.ts b/scaleph-ui-react/src/icon.ts
new file mode 100644
index 000000000..30a3430de
--- /dev/null
+++ b/scaleph-ui-react/src/icon.ts
@@ -0,0 +1,15 @@
+import * as icons from '@ant-design/icons';
+import React from 'react';
+
+const Icon = (props: { icon: string }) => {
+  const { icon } = props;
+  const antIcon: { [key: string]: any } = icons;
+
+  if (!antIcon[icon]) {
+    return null;
+  }
+
+  return React.createElement(antIcon[icon]);
+};
+
+export default Icon;
diff --git a/scaleph-ui-react/src/pages/User/Login/index.tsx b/scaleph-ui-react/src/pages/User/Login/index.tsx
index e9c1fb5f8..526937122 100644
--- a/scaleph-ui-react/src/pages/User/Login/index.tsx
+++ b/scaleph-ui-react/src/pages/User/Login/index.tsx
@@ -1,11 +1,11 @@
-import {AuthCode, LoginInfo} from '@/app.d';
+import { AuthCode, LoginInfo } from '@/app.d';
 import Footer from '@/components/Footer';
-import {USER_AUTH} from '@/constant';
-import {AuthService} from '@/services/auth';
-import {Button, Checkbox, Col, Form, Input, message, Row} from 'antd';
-import React, {useEffect, useState} from 'react';
-import {useNavigate} from 'react-router-dom';
-import {SelectLang, useIntl, useModel} from 'umi';
+import { USER_AUTH } from '@/constant';
+import { AuthService } from '@/services/auth';
+import { Button, Checkbox, Col, Form, Input, message, Row } from 'antd';
+import React, { useEffect, useState } from 'react';
+import { useNavigate } from 'react-router-dom';
+import { SelectLang, useIntl, useModel } from 'umi';
 import styles from './index.less';
 
 const Login: React.FC = () => {
@@ -13,19 +13,19 @@ const Login: React.FC = () => {
   const [form] = Form.useForm();
   const navigate = useNavigate();
   const [authCode, setAuthCode] = useState<AuthCode>();
-  const {refresh} = useModel('@@initialState');
+  const { refresh } = useModel('@@initialState');
   const [initialValues, setInitialValues] = useState({
     remember: true,
   });
   const handleSubmit = async () => {
     try {
       form.validateFields().then((values: any) => {
-        const params: LoginInfo = {...values, uuid: authCode?.uuid};
+        const params: LoginInfo = { ...values, uuid: authCode?.uuid };
         AuthService.login(params).then(async (d) => {
           if (d.success) {
             localStorage.setItem(USER_AUTH.token, d.data);
             refresh();
-            const msg = intl.formatMessage({id: 'pages.user.login.success'});
+            const msg = intl.formatMessage({ id: 'pages.user.login.success' });
             message.success(msg);
             setTimeout(() => {
               navigate('/');
@@ -36,7 +36,7 @@ const Login: React.FC = () => {
         });
       });
     } catch (error) {
-      const defaultLoginFailureMessage = intl.formatMessage({id: 'pages.user.login.failure'});
+      const defaultLoginFailureMessage = intl.formatMessage({ id: 'pages.user.login.failure' });
       message.error(defaultLoginFailureMessage);
     }
   };
@@ -51,41 +51,41 @@ const Login: React.FC = () => {
     setAuthCode(data);
   };
 
-  const publicPath = process.env.REACT_APP_ENV === 'dist' ? '/scaleph/ui' : ''
+  const publicPath = process.env.REACT_APP_ENV === 'dist' ? '/scaleph/ui' : '';
 
   return (
     <div className={styles.container}>
       <div className={styles.lang} data-lang>
-        {SelectLang && <SelectLang/>}
+        {SelectLang && <SelectLang />}
       </div>
       <div className={styles.content}>
         <div className={styles.logoInfo}>
-          <img className={styles.logo} alt="logo" src={`${publicPath}/scaleph.svg`}/>
+          <img className={styles.logo} alt="logo" src={`${publicPath}/scaleph.svg`} />
           <span className={styles.title}>Scaleph</span>
         </div>
         <div className={styles.loginForm}>
           <Form form={form} initialValues={initialValues} layout="vertical">
             <Form.Item
-              label={intl.formatMessage({id: 'pages.user.login.userName'})}
+              label={intl.formatMessage({ id: 'pages.user.login.userName' })}
               name="userName"
-              rules={[{required: true, min: 5, max: 30}]}
+              rules={[{ required: true, min: 5, max: 30 }]}
             >
               <Input
-                placeholder={intl.formatMessage({id: 'pages.user.login.userName.placeholder'})}
+                placeholder={intl.formatMessage({ id: 'pages.user.login.userName.placeholder' })}
               />
             </Form.Item>
             <Form.Item
-              label={intl.formatMessage({id: 'pages.user.login.password'})}
+              label={intl.formatMessage({ id: 'pages.user.login.password' })}
               name="password"
-              rules={[{required: true, min: 6, max: 32}]}
+              rules={[{ required: true, min: 6, max: 32 }]}
             >
               <Input.Password
-                placeholder={intl.formatMessage({id: 'pages.user.login.password.placeholder'})}
+                placeholder={intl.formatMessage({ id: 'pages.user.login.password.placeholder' })}
               />
             </Form.Item>
             <Form.Item
-              label={intl.formatMessage({id: 'pages.user.login.authCode'})}
-              rules={[{required: true, len: 5}]}
+              label={intl.formatMessage({ id: 'pages.user.login.authCode' })}
+              rules={[{ required: true, len: 5 }]}
               name="authCode"
             >
               <Row gutter={[16, 0]}>
@@ -101,40 +101,40 @@ const Login: React.FC = () => {
                 <Col span={9}>
                   <img
                     src={authCode?.img}
-                    alt={intl.formatMessage({id: 'pages.user.login.authCode'})}
+                    alt={intl.formatMessage({ id: 'pages.user.login.authCode' })}
                     onClick={refreshAuthCode}
                   />
                 </Col>
               </Row>
             </Form.Item>
-            <Form.Item style={{marginBottom: '12px'}}>
+            <Form.Item style={{ marginBottom: '12px' }}>
               <Form.Item noStyle name="remember" valuePropName="checked">
-                <Checkbox>{intl.formatMessage({id: 'pages.user.login.remember'})}</Checkbox>
+                <Checkbox>{intl.formatMessage({ id: 'pages.user.login.remember' })}</Checkbox>
               </Form.Item>
-              <div style={{float: 'right'}}>
-                <a>{intl.formatMessage({id: 'pages.user.login.forget'})}</a>
+              <div style={{ float: 'right' }}>
+                <a>{intl.formatMessage({ id: 'pages.user.login.forget' })}</a>
               </div>
             </Form.Item>
-            <Form.Item style={{marginBottom: '6px'}}>
+            <Form.Item style={{ marginBottom: '6px' }}>
               <Button
                 type="primary"
                 size="large"
                 htmlType="submit"
-                style={{width: '100%'}}
+                style={{ width: '100%' }}
                 onClick={handleSubmit}
               >
-                {intl.formatMessage({id: 'pages.user.login.login'})}
+                {intl.formatMessage({ id: 'pages.user.login.login' })}
               </Button>
             </Form.Item>
             <Form.Item>
-              <a href="/register" style={{float: 'right'}}>
-                {intl.formatMessage({id: 'pages.user.login.register'})}
+              <a href="/register" style={{ float: 'right' }}>
+                {intl.formatMessage({ id: 'pages.user.login.register' })}
               </a>
             </Form.Item>
           </Form>
         </div>
       </div>
-      <Footer/>
+      <Footer />
     </div>
   );
 };
diff --git a/scaleph-ui-react/src/services/auth.ts b/scaleph-ui-react/src/services/auth.ts
index b75ede57b..b8425839e 100644
--- a/scaleph-ui-react/src/services/auth.ts
+++ b/scaleph-ui-react/src/services/auth.ts
@@ -9,7 +9,11 @@ export const AuthService = {
       data: loginInfo,
     });
   },
-
+  menuRoutes: async () => {
+    return request<ResponseBody<any>>('/api/admin/authorize/routes', {
+      method: 'GET',
+    });
+  },
   refreshAuthImage: async () => {
     return request<AuthCode>('/api/authCode', {
       method: 'GET',

From 8db1ae8cf9cbb5226de97c11a547344422b8d785 Mon Sep 17 00:00:00 2001
From: bailongsen <bailongsen@xinxuan.net>
Date: Wed, 15 Nov 2023 16:14:40 +0800
Subject: [PATCH 02/24] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scaleph-ui-react/src/app.tsx                  |  18 +-
 .../src/components/Footer/index.tsx           |   1 +
 scaleph-ui-react/src/global.less              |   4 +
 .../src/pages/Admin/Resource/Web/index.tsx    | 168 ++++++++++--------
 .../Artifact/Sql/CodeEditor/index.less        |   2 +-
 5 files changed, 105 insertions(+), 88 deletions(-)

diff --git a/scaleph-ui-react/src/app.tsx b/scaleph-ui-react/src/app.tsx
index ac7770f92..fcf97636e 100644
--- a/scaleph-ui-react/src/app.tsx
+++ b/scaleph-ui-react/src/app.tsx
@@ -72,16 +72,14 @@ export const layout: RunTimeLayoutConfig = ({ initialState, setInitialState }) =
         }
       }
     },
-    // menuItemRender: (props, dom) => {
-    //   return (
-    //     <div>
-    //       <Space align="end" size={5}>
-    //         <Icon icon={props.icon} />
-    //         <span>{props.name}</span>
-    //       </Space>
-    //     </div>
-    //   );
-    // },
+    subMenuItemRender: (menuItemProps: any, defaultDom: any) => {
+      return (
+        <Space align="end" size={5}>
+          {menuItemProps.icon && <Icon icon={menuItemProps.icon} />}
+          <span>{menuItemProps?.name}</span>
+        </Space>
+      );
+    },
     menuItemRender: (menuItemProps: any, defaultDom: any) => {
       return (
         <Space align="end" size={5}>
diff --git a/scaleph-ui-react/src/components/Footer/index.tsx b/scaleph-ui-react/src/components/Footer/index.tsx
index d044c94fb..4eb2a6b30 100644
--- a/scaleph-ui-react/src/components/Footer/index.tsx
+++ b/scaleph-ui-react/src/components/Footer/index.tsx
@@ -6,6 +6,7 @@ const Footer: React.FC = () => {
     <DefaultFooter
       style={{
         background: 'none',
+        height: '30px', //添加布局底部高度
       }}
       links={[
         {
diff --git a/scaleph-ui-react/src/global.less b/scaleph-ui-react/src/global.less
index 4e57a5b98..9b52af62d 100644
--- a/scaleph-ui-react/src/global.less
+++ b/scaleph-ui-react/src/global.less
@@ -63,3 +63,7 @@ ol {
     width: 100%;
   }
 }
+//调整布局底部高度
+.ant-pro-global-footer{
+  margin-block-start:auto
+}
\ No newline at end of file
diff --git a/scaleph-ui-react/src/pages/Admin/Resource/Web/index.tsx b/scaleph-ui-react/src/pages/Admin/Resource/Web/index.tsx
index 94cdda218..d50592fe2 100644
--- a/scaleph-ui-react/src/pages/Admin/Resource/Web/index.tsx
+++ b/scaleph-ui-react/src/pages/Admin/Resource/Web/index.tsx
@@ -1,14 +1,14 @@
-import {useAccess, useIntl} from "umi";
-import React, {useRef, useState} from "react";
-import {Button, message, Modal, Space, Tag, Tooltip} from "antd";
-import {DeleteOutlined, EditOutlined, PlusOutlined} from "@ant-design/icons";
-import {ActionType, ProColumns, ProFormInstance, ProTable} from "@ant-design/pro-components";
-import {isEmpty} from "lodash";
-import {PRIVILEGE_CODE} from "@/constant";
-import {SecResourceWeb} from "@/services/admin/typings";
-import {PrivilegeService} from "@/services/admin/privilege.service";
-import WebResourceForm from "@/pages/Admin/Resource/Web/components/WebResourceForm";
-import {ResourceWebService} from "@/services/admin/resourceWeb.service";
+import { PRIVILEGE_CODE } from '@/constant';
+import WebResourceForm from '@/pages/Admin/Resource/Web/components/WebResourceForm';
+import { PrivilegeService } from '@/services/admin/privilege.service';
+import { ResourceWebService } from '@/services/admin/resourceWeb.service';
+import { SecResourceWeb } from '@/services/admin/typings';
+import { DeleteOutlined, EditOutlined, PlusOutlined } from '@ant-design/icons';
+import { ActionType, ProColumns, ProFormInstance, ProTable } from '@ant-design/pro-components';
+import { Button, message, Modal, Space, Tag, Tooltip } from 'antd';
+import { isEmpty } from 'lodash';
+import React, { useRef, useState } from 'react';
+import { useAccess, useIntl } from 'umi';
 
 const WebResourceWeb: React.FC = () => {
   const intl = useIntl();
@@ -20,73 +20,75 @@ const WebResourceWeb: React.FC = () => {
     visiable: boolean;
     parent: SecResourceWeb;
     data: SecResourceWeb;
-  }>({visiable: false, parent: {}, data: {}});
+  }>({ visiable: false, parent: {}, data: {} });
 
   const onExpand = (expanded: boolean, record: SecResourceWeb) => {
     if (expanded && record.children && isEmpty(record.children)) {
       PrivilegeService.listByPid(record.id).then((response) => {
-        record.children = response.data
-      })
+        record.children = response.data;
+      });
     }
-  }
+  };
 
   const tableColumns: ProColumns<SecResourceWeb>[] = [
     {
-      title: intl.formatMessage({id: 'pages.admin.resource.type'}),
+      title: intl.formatMessage({ id: 'pages.admin.resource.type' }),
       dataIndex: 'type',
+      width: 120,
       render: (dom, entity) => {
-        return (<Tag>{entity.type?.label}</Tag>)
+        return <Tag>{entity.type?.label}</Tag>;
       },
-      hideInSearch: true
+      fixed: 'left',
+      hideInSearch: true,
     },
     {
-      title: intl.formatMessage({id: 'pages.admin.resource.web.name'}),
-      dataIndex: 'name'
+      title: intl.formatMessage({ id: 'pages.admin.resource.web.name' }),
+      dataIndex: 'name',
     },
     {
-      title: intl.formatMessage({id: 'pages.admin.resource.web.path'}),
+      title: intl.formatMessage({ id: 'pages.admin.resource.web.path' }),
       dataIndex: 'path',
-      hideInSearch: true
+      hideInSearch: true,
     },
     {
-      title: intl.formatMessage({id: 'pages.admin.resource.web.redirect'}),
+      title: intl.formatMessage({ id: 'pages.admin.resource.web.redirect' }),
       dataIndex: 'redirect',
-      hideInSearch: true
-    },
-    {
-      title: intl.formatMessage({id: 'pages.admin.resource.web.layout'}),
-      dataIndex: 'layout',
-      hideInSearch: true
+      hideInSearch: true,
     },
+    // {
+    //   title: intl.formatMessage({id: 'pages.admin.resource.web.layout'}),
+    //   dataIndex: 'layout',
+    //   hideInSearch: true
+    // },
     {
-      title: intl.formatMessage({id: 'pages.admin.resource.web.icon'}),
+      title: intl.formatMessage({ id: 'pages.admin.resource.web.icon' }),
       dataIndex: 'icon',
-      hideInSearch: true
+      hideInSearch: true,
     },
     {
-      title: intl.formatMessage({id: 'pages.admin.resource.web.component'}),
+      title: intl.formatMessage({ id: 'pages.admin.resource.web.component' }),
       dataIndex: 'component',
-      hideInSearch: true
-    },
-    {
-      title: intl.formatMessage({id: 'app.common.data.remark'}),
-      dataIndex: 'remark',
-      hideInSearch: true
-    },
-    {
-      title: intl.formatMessage({id: 'app.common.data.createTime'}),
-      dataIndex: 'createTime',
       hideInSearch: true,
-      width: 180,
     },
     {
-      title: intl.formatMessage({id: 'app.common.data.updateTime'}),
-      dataIndex: 'updateTime',
+      title: intl.formatMessage({ id: 'app.common.data.remark' }),
+      dataIndex: 'remark',
       hideInSearch: true,
-      width: 180,
     },
+    // {
+    //   title: intl.formatMessage({id: 'app.common.data.createTime'}),
+    //   dataIndex: 'createTime',
+    //   hideInSearch: true,
+    //   width: 180,
+    // },
+    // {
+    //   title: intl.formatMessage({id: 'app.common.data.updateTime'}),
+    //   dataIndex: 'updateTime',
+    //   hideInSearch: true,
+    //   width: 180,
+    // },
     {
-      title: intl.formatMessage({id: 'app.common.operate.label'}),
+      title: intl.formatMessage({ id: 'app.common.operate.label' }),
       dataIndex: 'actions',
       align: 'center',
       width: 120,
@@ -96,42 +98,50 @@ const WebResourceWeb: React.FC = () => {
         <>
           <Space>
             {access.canAccess(PRIVILEGE_CODE.datadevProjectEdit) && (
-              <Tooltip title={intl.formatMessage({id: 'app.common.operate.new.label'})}>
+              <Tooltip title={intl.formatMessage({ id: 'app.common.operate.new.label' })}>
                 <Button
                   shape="default"
                   type="link"
-                  icon={<PlusOutlined/>}
-                  onClick={() => setWebResourceFormData({visiable: true, parent: record, data: {}})}
+                  icon={<PlusOutlined />}
+                  onClick={() =>
+                    setWebResourceFormData({ visiable: true, parent: record, data: {} })
+                  }
                 />
               </Tooltip>
             )}
             {access.canAccess(PRIVILEGE_CODE.datadevProjectEdit) && (
-              <Tooltip title={intl.formatMessage({id: 'app.common.operate.edit.label'})}>
+              <Tooltip title={intl.formatMessage({ id: 'app.common.operate.edit.label' })}>
                 <Button
                   shape="default"
                   type="link"
-                  icon={<EditOutlined/>}
-                  onClick={() => setWebResourceFormData({visiable: true, parent: {}, data: record})}
+                  icon={<EditOutlined />}
+                  onClick={() =>
+                    setWebResourceFormData({ visiable: true, parent: {}, data: record })
+                  }
                 ></Button>
               </Tooltip>
             )}
             {access.canAccess(PRIVILEGE_CODE.datadevResourceDelete) && (
-              <Tooltip title={intl.formatMessage({id: 'app.common.operate.delete.label'})}>
+              <Tooltip title={intl.formatMessage({ id: 'app.common.operate.delete.label' })}>
                 <Button
                   shape="default"
                   type="link"
-                  icon={<DeleteOutlined/>}
+                  icon={<DeleteOutlined />}
                   onClick={() => {
                     Modal.confirm({
-                      title: intl.formatMessage({id: 'app.common.operate.delete.confirm.title'}),
-                      content: intl.formatMessage({id: 'app.common.operate.delete.confirm.content'}),
-                      okText: intl.formatMessage({id: 'app.common.operate.confirm.label'}),
-                      okButtonProps: {danger: true},
-                      cancelText: intl.formatMessage({id: 'app.common.operate.cancel.label'}),
+                      title: intl.formatMessage({ id: 'app.common.operate.delete.confirm.title' }),
+                      content: intl.formatMessage({
+                        id: 'app.common.operate.delete.confirm.content',
+                      }),
+                      okText: intl.formatMessage({ id: 'app.common.operate.confirm.label' }),
+                      okButtonProps: { danger: true },
+                      cancelText: intl.formatMessage({ id: 'app.common.operate.cancel.label' }),
                       onOk() {
                         ResourceWebService.deleteOne(record).then((d) => {
                           if (d.success) {
-                            message.success(intl.formatMessage({id: 'app.common.operate.delete.success'}));
+                            message.success(
+                              intl.formatMessage({ id: 'app.common.operate.delete.success' }),
+                            );
                             actionRef.current?.reload();
                           }
                         });
@@ -152,7 +162,7 @@ const WebResourceWeb: React.FC = () => {
       <ProTable<SecResourceWeb>
         search={{
           labelWidth: 'auto',
-          span: {xs: 24, sm: 12, md: 8, lg: 6, xl: 6, xxl: 4},
+          span: { xs: 24, sm: 12, md: 8, lg: 6, xl: 6, xxl: 4 },
         }}
         rowKey="id"
         actionRef={actionRef}
@@ -160,7 +170,7 @@ const WebResourceWeb: React.FC = () => {
         options={false}
         columns={tableColumns}
         request={(params, sorter, filter) => {
-          return ResourceWebService.listByPage({...params, pid: 0})
+          return ResourceWebService.listByPage({ ...params, pid: 0 });
         }}
         toolbar={{
           actions: [
@@ -168,9 +178,9 @@ const WebResourceWeb: React.FC = () => {
               <Button
                 key="new"
                 type="primary"
-                onClick={() => setWebResourceFormData({visiable: true, parent: null, data: {}})}
+                onClick={() => setWebResourceFormData({ visiable: true, parent: null, data: {} })}
               >
-                {intl.formatMessage({id: 'app.common.operate.new.label'})}
+                {intl.formatMessage({ id: 'app.common.operate.new.label' })}
               </Button>
             ),
             access.canAccess(PRIVILEGE_CODE.datadevResourceDelete) && (
@@ -180,15 +190,19 @@ const WebResourceWeb: React.FC = () => {
                 disabled={selectedRows.length < 1}
                 onClick={() => {
                   Modal.confirm({
-                    title: intl.formatMessage({id: 'app.common.operate.delete.confirm.title'}),
-                    content: intl.formatMessage({id: 'app.common.operate.delete.confirm.content'}),
-                    okText: intl.formatMessage({id: 'app.common.operate.confirm.label'}),
-                    okButtonProps: {danger: true},
-                    cancelText: intl.formatMessage({id: 'app.common.operate.cancel.label'}),
+                    title: intl.formatMessage({ id: 'app.common.operate.delete.confirm.title' }),
+                    content: intl.formatMessage({
+                      id: 'app.common.operate.delete.confirm.content',
+                    }),
+                    okText: intl.formatMessage({ id: 'app.common.operate.confirm.label' }),
+                    okButtonProps: { danger: true },
+                    cancelText: intl.formatMessage({ id: 'app.common.operate.cancel.label' }),
                     onOk() {
                       ResourceWebService.deleteBatch(selectedRows).then((d) => {
                         if (d.success) {
-                          message.success(intl.formatMessage({id: 'app.common.operate.delete.success'}));
+                          message.success(
+                            intl.formatMessage({ id: 'app.common.operate.delete.success' }),
+                          );
                           actionRef.current?.reload();
                         }
                       });
@@ -196,25 +210,26 @@ const WebResourceWeb: React.FC = () => {
                   });
                 }}
               >
-                {intl.formatMessage({id: 'app.common.operate.delete.label'})}
+                {intl.formatMessage({ id: 'app.common.operate.delete.label' })}
               </Button>
             ),
           ],
         }}
-        pagination={{showQuickJumper: true, showSizeChanger: true, defaultPageSize: 10}}
+        pagination={{ showQuickJumper: true, showSizeChanger: true, defaultPageSize: 10 }}
         rowSelection={{
           fixed: true,
           onChange: (selectedRowKeys, selectedRows, info) => setSelectedRows(selectedRows),
         }}
         tableAlertRender={false}
         tableAlertOptionRender={false}
+        scroll={{ x: 1500, y: 'calc( 100vh - 385px )' }}
       />
       {webResourceFormData.visiable && (
         <WebResourceForm
           visible={webResourceFormData.visiable}
-          onCancel={() => setWebResourceFormData({visiable: false, parent: {}, data: {}})}
+          onCancel={() => setWebResourceFormData({ visiable: false, parent: {}, data: {} })}
           onVisibleChange={(visiable) => {
-            setWebResourceFormData({visiable: visiable, parent: {}, data: {}});
+            setWebResourceFormData({ visiable: visiable, parent: {}, data: {} });
             actionRef.current?.reload();
           }}
           parent={webResourceFormData.parent}
@@ -223,7 +238,6 @@ const WebResourceWeb: React.FC = () => {
       )}
     </div>
   );
-
-}
+};
 
 export default WebResourceWeb;
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Artifact/Sql/CodeEditor/index.less b/scaleph-ui-react/src/pages/Project/Workspace/Artifact/Sql/CodeEditor/index.less
index 2c49929fc..a34570a8e 100644
--- a/scaleph-ui-react/src/pages/Project/Workspace/Artifact/Sql/CodeEditor/index.less
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Artifact/Sql/CodeEditor/index.less
@@ -1,5 +1,5 @@
 .split-horizontal {
-  height: calc(100vh - 175px);
+  height: calc(100vh - 110px);
   // overflow-x: hidden;
   // overflow-y: auto;
 }

From ab949142d8e5efeb9bb2ab0a0e9496a8e1234387 Mon Sep 17 00:00:00 2001
From: bailongsen <bailongsen@xinxuan.net>
Date: Mon, 27 Nov 2023 18:44:24 +0800
Subject: [PATCH 03/24] =?UTF-8?q?fix:=20=E8=B0=83=E8=AF=95=E5=88=86?=
 =?UTF-8?q?=E9=85=8D=E6=9D=83=E9=99=90=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/locales/zh-CN/pages/base.ts           |   3 +
 scaleph-ui-react/src/models/useMainSize.ts    |  26 +++
 .../Resource/Web/components/TransferTable.tsx |  56 ++++++
 .../Web/components/WebAssugnRoles.tsx         | 174 ++++++++++++++++++
 .../src/pages/Admin/Resource/Web/index.tsx    |  35 +++-
 .../Admin/Role/components/WebAssugnRoles.tsx  | 174 ++++++++++++++++++
 .../src/pages/Admin/Role/index.tsx            | 160 ++++++++++------
 scaleph-ui-react/src/services/auth.ts         |  53 ++++++
 scaleph-ui-react/src/typings.d.ts             |   1 +
 9 files changed, 626 insertions(+), 56 deletions(-)
 create mode 100644 scaleph-ui-react/src/models/useMainSize.ts
 create mode 100644 scaleph-ui-react/src/pages/Admin/Resource/Web/components/TransferTable.tsx
 create mode 100644 scaleph-ui-react/src/pages/Admin/Resource/Web/components/WebAssugnRoles.tsx
 create mode 100644 scaleph-ui-react/src/pages/Admin/Role/components/WebAssugnRoles.tsx

diff --git a/scaleph-ui-react/src/locales/zh-CN/pages/base.ts b/scaleph-ui-react/src/locales/zh-CN/pages/base.ts
index 2ff2fae0e..6ec3f0ea6 100644
--- a/scaleph-ui-react/src/locales/zh-CN/pages/base.ts
+++ b/scaleph-ui-react/src/locales/zh-CN/pages/base.ts
@@ -14,6 +14,9 @@ export default {
   'app.common.operate.label': '操作',
   'app.common.operate.success': '操作成功',
   'app.common.operate.new.label': '新增',
+  'app.common.operate.new.roles': '分配角色',
+  'app.common.operate.new.user': '用户配置',
+  'app.common.operate.new.assets': '权限配置',
   'app.common.operate.new.success': '新增成功',
   'app.common.operate.new.failure': '新增失败',
   'app.common.operate.new.directive': '没有？去创建',
diff --git a/scaleph-ui-react/src/models/useMainSize.ts b/scaleph-ui-react/src/models/useMainSize.ts
new file mode 100644
index 000000000..07436b494
--- /dev/null
+++ b/scaleph-ui-react/src/models/useMainSize.ts
@@ -0,0 +1,26 @@
+import { useLayoutEffect, useState } from "react";
+import { throttle } from "lodash";
+
+export default (mainCl = ".ant-pro-basicLayout-content") => {
+  const [container, setContainer] = useState<{ height: number; width: number }>({
+    width: 100,
+    height: 100
+  });
+  // const mainCl = '.ant-pro-basicLayout-content';
+  useLayoutEffect(() => {
+    const handler = throttle(() => {
+      const rt = document.querySelector(mainCl)?.getBoundingClientRect();
+      setContainer({
+        height: rt?.height,
+        width: rt?.width
+      });
+    }, 100);
+    handler();
+    window.addEventListener("resize", handler, false);
+    return () => {
+      window.removeEventListener("resize", handler, false);
+    };
+  }, []);
+
+  return container;
+};
diff --git a/scaleph-ui-react/src/pages/Admin/Resource/Web/components/TransferTable.tsx b/scaleph-ui-react/src/pages/Admin/Resource/Web/components/TransferTable.tsx
new file mode 100644
index 000000000..2ae7fb9a3
--- /dev/null
+++ b/scaleph-ui-react/src/pages/Admin/Resource/Web/components/TransferTable.tsx
@@ -0,0 +1,56 @@
+import { Table, Transfer } from 'antd';
+import { difference } from 'lodash'; // 注意这里改为大写的Difference
+import React from 'react';
+
+// 定义组件的Props类型
+interface Props {
+  leftColumns: any[]; // 左侧表格列配置数组
+  rightColumns: any[]; // 右侧表格列配置数组
+  containerHeight: number; // 容器高度
+}
+
+// 使用React.FC声明函数组件，并传入Props类型
+const TableTransfer: React.FC<Props> = ({ leftColumns, rightColumns, ...restProps }) => (
+  <Transfer {...restProps}>
+    {({
+      direction,
+      filteredItems,
+      onItemSelectAll,
+      onItemSelect,
+      selectedKeys: listSelectedKeys,
+      disabled: listDisabled,
+    }) => {
+      const columns = direction === 'left' ? leftColumns : rightColumns;
+      // 表格行选择配置
+      const rowSelection = {
+        onSelectAll(selected: boolean, selectedRows: any[]) {
+          const treeSelectedKeys = selectedRows.map(({ key }) => key);
+          const diffKeys = selected
+            ? difference(treeSelectedKeys, listSelectedKeys)
+            : difference(listSelectedKeys, treeSelectedKeys);
+          onItemSelectAll(diffKeys, selected);
+        },
+        onSelect: ({ id }: { id: string }, selected: boolean) => {
+          onItemSelect(id, selected);
+        },
+        selectedRowKeys: listSelectedKeys,
+      };
+
+      return (
+        <Table
+          scroll={{ y: restProps.containerHeight - 380 }}
+          rowSelection={rowSelection}
+          columns={columns}
+          dataSource={filteredItems}
+          size="small"
+          rowKey="id"
+          pagination={{
+            defaultPageSize: 20,
+          }}
+          style={{ pointerEvents: listDisabled ? 'none' : null }}
+        />
+      );
+    }}
+  </Transfer>
+);
+export default React.memo(TableTransfer);
diff --git a/scaleph-ui-react/src/pages/Admin/Resource/Web/components/WebAssugnRoles.tsx b/scaleph-ui-react/src/pages/Admin/Resource/Web/components/WebAssugnRoles.tsx
new file mode 100644
index 000000000..c167d21ef
--- /dev/null
+++ b/scaleph-ui-react/src/pages/Admin/Resource/Web/components/WebAssugnRoles.tsx
@@ -0,0 +1,174 @@
+import mainHeight from '@/models/useMainSize';
+import { SecResourceWeb } from '@/services/admin/typings';
+import { AuthService } from '@/services/auth';
+import { Button, Card, Form, message, Modal, Space } from 'antd';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { useIntl } from 'umi';
+import TableTransfer from './TransferTable';
+
+// 定义组件 Props 类型
+interface ModalFormParentProps<T> {
+  data: T;
+  visible: boolean;
+  onVisibleChange?: (visible: boolean) => void;
+  onCancel: () => void;
+  onOK?: (values: any) => void;
+}
+
+const WebResourceForm: React.FC<ModalFormParentProps<SecResourceWeb>> = ({
+  data,
+  visible,
+  onVisibleChange,
+  onCancel,
+}) => {
+  const intl = useIntl();
+  const [form] = Form.useForm();
+  const containerInfo = mainHeight('.ant-layout-content');
+  const [roleLists, setRoleLists] = useState<Role[]>([]);
+
+  // 角色表格列配置
+  const tableColumns = [
+    {
+      dataIndex: 'name',
+      title: '角色名称',
+      width: 300,
+    },
+    {
+      dataIndex: 'desc',
+      title: '描述',
+      width: 300,
+    },
+  ];
+
+  // 角色类型定义
+  interface Role {
+    id: string;
+    name: string;
+    resourceAuthorized: number;
+    checkOut?: number;
+  }
+
+  // 合并数组
+  function mergeArrays(array1: Role[], array2: Role[]): Role[] {
+    array1.forEach((obj, index) => {
+      obj.checkOut = 0;
+    });
+    array2.forEach((obj, index) => {
+      obj.checkOut = 1;
+    });
+    return [...array1, ...array2];
+  }
+
+  // 异步获取数据
+  const fetchData = useCallback(async () => {
+    try {
+      const res1 = await AuthService.unauthorizedRoles({ resourceWebId: data?.id });
+      const res2 = await AuthService.authorizedRoles({ resourceWebId: data?.id });
+      if (res1?.records && res2?.records) {
+        const mergedArray = mergeArrays(res1.records, res2.records);
+        setRoleLists(mergedArray);
+      }
+    } catch (error) {
+      console.error(error);
+    }
+  }, [data]);
+
+  useEffect(() => {
+    if (data) {
+      fetchData();
+    }
+  }, [data, fetchData]);
+
+  // 页面标题
+  const returnTitle = useMemo(() => {
+    return (
+      <Space direction="vertical">
+        <span>{` ${intl.formatMessage({ id: `menu.${data?.name}` })}-资源分配详情`}</span>
+      </Space>
+    );
+  }, [data, intl]);
+
+  // 获取选中角色的 id 数组
+  const originTargetKeys = useMemo(() => {
+    return roleLists?.filter((item) => item.checkOut === 1).map((item) => item.id);
+  }, [roleLists]);
+
+  // 过滤方法
+  const handleFilter = useCallback((inputValue, item) => {
+    return item?.name.indexOf(inputValue) !== -1;
+  }, []);
+
+  // 角色转移事件处理
+  const handleChange = useCallback(
+    async (targetKeys, direction, moveKeys) => {
+      const roleIds =
+        direction === 'right'
+          ? targetKeys.map((item: string | number) => +item)
+          : moveKeys.map((item: string | number) => +item);
+
+      const params = {
+        resourceWebId: data?.id,
+        roleIds: roleIds,
+      };
+      if (direction === 'right') {
+        // 绑定角色资源
+        await AuthService.resourceWebRoles(params).then((res) => {
+          if (res?.success) {
+            message.success(intl.formatMessage({ id: 'app.common.operate.edit.success' }), 2);
+          }
+        });
+      } else {
+        // 删除绑定的角色资源
+        await AuthService.resourceWebRolesDelete(params).then((res) => {
+          message.success(intl.formatMessage({ id: 'app.common.operate.edit.success' }), 2);
+        });
+      }
+      fetchData();
+    },
+    [data, fetchData, intl],
+  );
+
+  return (
+    <Modal
+      open={visible}
+      title={data.id ? intl.formatMessage({ id: 'app.common.operate.new.roles' }) : ''}
+      width={1100}
+      destroyOnClose={true}
+      onCancel={onCancel}
+      cancelText="关闭"
+      centered
+      footer={[
+        <Button type="primary" onClick={onCancel}>
+          关闭
+        </Button>,
+      ]}
+    >
+      <div>
+        <Card
+          bodyStyle={{
+            minHeight: `${containerInfo.height - 200}px`,
+          }}
+          title={returnTitle}
+        >
+          <TableTransfer
+            containerHeight={containerInfo.height}
+            titles={['未授权角色', '已授权角色']}
+            dataSource={roleLists}
+            targetKeys={originTargetKeys}
+            showSearch={true}
+            rowKey={(record: { id: any }) => record.id}
+            onChange={handleChange}
+            filterOption={handleFilter}
+            listStyle={{
+              width: 500,
+            }}
+            leftColumns={tableColumns}
+            rightColumns={tableColumns}
+          />
+        </Card>
+      </div>
+    </Modal>
+  );
+};
+
+export default WebResourceForm;
diff --git a/scaleph-ui-react/src/pages/Admin/Resource/Web/index.tsx b/scaleph-ui-react/src/pages/Admin/Resource/Web/index.tsx
index d50592fe2..c3b2ecae6 100644
--- a/scaleph-ui-react/src/pages/Admin/Resource/Web/index.tsx
+++ b/scaleph-ui-react/src/pages/Admin/Resource/Web/index.tsx
@@ -1,9 +1,10 @@
 import { PRIVILEGE_CODE } from '@/constant';
+import WebAssugnRoles from '@/pages/Admin/Resource/Web/components/WebAssugnRoles';
 import WebResourceForm from '@/pages/Admin/Resource/Web/components/WebResourceForm';
 import { PrivilegeService } from '@/services/admin/privilege.service';
 import { ResourceWebService } from '@/services/admin/resourceWeb.service';
 import { SecResourceWeb } from '@/services/admin/typings';
-import { DeleteOutlined, EditOutlined, PlusOutlined } from '@ant-design/icons';
+import { DeleteOutlined, EditOutlined, FormOutlined, PlusOutlined } from '@ant-design/icons';
 import { ActionType, ProColumns, ProFormInstance, ProTable } from '@ant-design/pro-components';
 import { Button, message, Modal, Space, Tag, Tooltip } from 'antd';
 import { isEmpty } from 'lodash';
@@ -22,6 +23,11 @@ const WebResourceWeb: React.FC = () => {
     data: SecResourceWeb;
   }>({ visiable: false, parent: {}, data: {} });
 
+  const [webAssignRoles, setWebAssignRoles] = useState<{
+    visiable: boolean;
+    data: SecResourceWeb;
+  }>({ visiable: false, parent: {}, data: {} });
+
   const onExpand = (expanded: boolean, record: SecResourceWeb) => {
     if (expanded && record.children && isEmpty(record.children)) {
       PrivilegeService.listByPid(record.id).then((response) => {
@@ -44,6 +50,9 @@ const WebResourceWeb: React.FC = () => {
     {
       title: intl.formatMessage({ id: 'pages.admin.resource.web.name' }),
       dataIndex: 'name',
+      // render: (dom, entity) => {
+      //   return intl.formatMessage({ id: `menu.${entity?.name}` });
+      // },
     },
     {
       title: intl.formatMessage({ id: 'pages.admin.resource.web.path' }),
@@ -91,12 +100,22 @@ const WebResourceWeb: React.FC = () => {
       title: intl.formatMessage({ id: 'app.common.operate.label' }),
       dataIndex: 'actions',
       align: 'center',
-      width: 120,
+      width: 160,
       fixed: 'right',
       valueType: 'option',
       render: (_, record) => (
         <>
           <Space>
+            {access.canAccess(PRIVILEGE_CODE.datadevProjectEdit) && (
+              <Tooltip title={intl.formatMessage({ id: 'app.common.operate.new.roles' })}>
+                <Button
+                  shape="default"
+                  type="link"
+                  icon={<FormOutlined />}
+                  onClick={() => setWebAssignRoles({ visiable: true, data: record })}
+                />
+              </Tooltip>
+            )}
             {access.canAccess(PRIVILEGE_CODE.datadevProjectEdit) && (
               <Tooltip title={intl.formatMessage({ id: 'app.common.operate.new.label' })}>
                 <Button
@@ -236,6 +255,18 @@ const WebResourceWeb: React.FC = () => {
           data={webResourceFormData.data}
         />
       )}
+
+      {webAssignRoles.visiable && (
+        <WebAssugnRoles
+          visible={webAssignRoles.visiable}
+          onCancel={() => setWebAssignRoles({ visiable: false, data: {} })}
+          onVisibleChange={(visiable) => {
+            setWebAssignRoles({ visiable: visiable, data: {} });
+            actionRef.current?.reload();
+          }}
+          data={webAssignRoles.data}
+        />
+      )}
     </div>
   );
 };
diff --git a/scaleph-ui-react/src/pages/Admin/Role/components/WebAssugnRoles.tsx b/scaleph-ui-react/src/pages/Admin/Role/components/WebAssugnRoles.tsx
new file mode 100644
index 000000000..37fb3a29a
--- /dev/null
+++ b/scaleph-ui-react/src/pages/Admin/Role/components/WebAssugnRoles.tsx
@@ -0,0 +1,174 @@
+import mainHeight from '@/models/useMainSize';
+import TableTransfer from '@/pages/Admin/Resource/Web/components/TransferTable';
+import { SecResourceWeb } from '@/services/admin/typings';
+import { AuthService } from '@/services/auth';
+import { Button, Card, Form, message, Modal, Space } from 'antd';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { useIntl } from 'umi';
+
+// 定义组件 Props 类型
+interface ModalFormParentProps<T> {
+  data: T;
+  visible: boolean;
+  onVisibleChange?: (visible: boolean) => void;
+  onCancel: () => void;
+  onOK?: (values: any) => void;
+}
+
+const WebResourceForm: React.FC<ModalFormParentProps<SecResourceWeb>> = ({
+  data,
+  visible,
+  onVisibleChange,
+  onCancel,
+}) => {
+  const intl = useIntl();
+  const [form] = Form.useForm();
+  const containerInfo = mainHeight('.ant-layout-content');
+  const [roleLists, setRoleLists] = useState<Role[]>([]);
+
+  // 角色表格列配置
+  const tableColumns = [
+    {
+      dataIndex: 'userName',
+      title: '用户名',
+      width: 300,
+    },
+    {
+      dataIndex: 'summary',
+      title: '自我介绍',
+      width: 300,
+    },
+  ];
+
+  // 角色类型定义
+  interface Role {
+    id: string;
+    name: string;
+    resourceAuthorized: number;
+    checkOut?: number;
+  }
+
+  // 合并数组
+  function mergeArrays(array1: Role[], array2: Role[]): Role[] {
+    array1.forEach((obj, index) => {
+      obj.checkOut = 0;
+    });
+    array2.forEach((obj, index) => {
+      obj.checkOut = 1;
+    });
+    return [...array1, ...array2];
+  }
+
+  // 异步获取数据
+  const fetchData = useCallback(async () => {
+    try {
+      const res1 = await AuthService.requestAuthorizedUsers({ roleId: data?.id });
+      const res2 = await AuthService.requestUnauthorizedUsers({ roleId: data?.id });
+      if (res1?.records && res2?.records) {
+        const mergedArray = mergeArrays(res1.records, res2.records);
+        setRoleLists(mergedArray);
+      }
+    } catch (error) {
+      console.error(error);
+    }
+  }, [data]);
+
+  useEffect(() => {
+    if (data) {
+      fetchData();
+    }
+  }, [data, fetchData]);
+
+  // 页面标题
+  const returnTitle = useMemo(() => {
+    return (
+      <Space direction="vertical">
+        <span>{` ${intl.formatMessage({ id: `menu.${data?.name}` })}-资源分配详情`}</span>
+      </Space>
+    );
+  }, [data, intl]);
+
+  // 获取选中角色的 id 数组
+  const originTargetKeys = useMemo(() => {
+    return roleLists?.filter((item) => item.checkOut === 1).map((item) => item.id);
+  }, [roleLists]);
+
+  // 过滤方法
+  const handleFilter = useCallback((inputValue, item) => {
+    return item?.name.indexOf(inputValue) !== -1;
+  }, []);
+
+  // 角色转移事件处理
+  const handleChange = useCallback(
+    async (targetKeys, direction, moveKeys) => {
+      const roleIds =
+        direction === 'right'
+          ? targetKeys.map((item: string | number) => +item)
+          : moveKeys.map((item: string | number) => +item);
+
+      const params = {
+        roleId: data?.id,
+        userIds: roleIds,
+      };
+      if (direction === 'right') {
+        // 批量为角色绑定用户
+        await AuthService.rolesUser(params).then((res) => {
+          if (res?.success) {
+            message.success(intl.formatMessage({ id: 'app.common.operate.edit.success' }), 2);
+          }
+        });
+      } else {
+        // 批量为角色解除用户绑定
+        await AuthService.deleteRolesUser(params).then((res) => {
+          message.success(intl.formatMessage({ id: 'app.common.operate.edit.success' }), 2);
+        });
+      }
+      fetchData();
+    },
+    [data, fetchData, intl],
+  );
+
+  return (
+    <Modal
+      open={visible}
+      title={data.id ? intl.formatMessage({ id: 'app.common.operate.new.roles' }) : ''}
+      width={1100}
+      destroyOnClose={true}
+      onCancel={onCancel}
+      cancelText="关闭"
+      centered
+      footer={[
+        <Button type="primary" onClick={onCancel}>
+          关闭
+        </Button>,
+      ]}
+    >
+      <div>
+        <Card
+          bodyStyle={{
+            minHeight: `${containerInfo.height - 200}px`,
+          }}
+          title={returnTitle}
+        >
+          <TableTransfer
+            containerHeight={containerInfo.height}
+            titles={['未授权人员', '已授权人员']}
+            dataSource={roleLists}
+            targetKeys={originTargetKeys}
+            showSearch={true}
+            rowKey={(record: { id: any }) => record.id}
+            onChange={handleChange}
+            filterOption={handleFilter}
+            listStyle={{
+              width: 500,
+            }}
+            leftColumns={tableColumns}
+            rightColumns={tableColumns}
+          />
+        </Card>
+      </div>
+    </Modal>
+  );
+};
+
+export default WebResourceForm;
diff --git a/scaleph-ui-react/src/pages/Admin/Role/index.tsx b/scaleph-ui-react/src/pages/Admin/Role/index.tsx
index 5b34a7ab9..411c1a1a4 100644
--- a/scaleph-ui-react/src/pages/Admin/Role/index.tsx
+++ b/scaleph-ui-react/src/pages/Admin/Role/index.tsx
@@ -1,13 +1,20 @@
-import {useAccess, useIntl} from "umi";
-import React, {useRef, useState} from "react";
-import {Button, message, Modal, Space, Tag, Tooltip} from "antd";
-import {DeleteOutlined, EditOutlined} from "@ant-design/icons";
-import {ActionType, ProColumns, ProFormInstance, ProFormSelect, ProTable} from "@ant-design/pro-components";
-import {DICT_TYPE, PRIVILEGE_CODE} from "@/constant";
-import {SecRole} from "@/services/admin/typings";
-import {RoleService} from "@/services/admin/role.service";
-import RoleForm from "@/pages/Admin/Role/components/RoleForm";
-import {DictDataService} from "@/services/admin/dictData.service";
+import { DICT_TYPE, PRIVILEGE_CODE } from '@/constant';
+import RoleForm from '@/pages/Admin/Role/components/RoleForm';
+import { DictDataService } from '@/services/admin/dictData.service';
+import { RoleService } from '@/services/admin/role.service';
+import { SecRole } from '@/services/admin/typings';
+import { DeleteOutlined, EditOutlined, FormOutlined } from '@ant-design/icons';
+import {
+  ActionType,
+  ProColumns,
+  ProFormInstance,
+  ProFormSelect,
+  ProTable,
+} from '@ant-design/pro-components';
+import { Button, message, Modal, Space, Tag, Tooltip } from 'antd';
+import React, { useRef, useState } from 'react';
+import { useAccess, useIntl } from 'umi';
+import WebAssugnRoles from './components/WebAssugnRoles';
 
 const RoleWeb: React.FC = () => {
   const intl = useIntl();
@@ -18,27 +25,32 @@ const RoleWeb: React.FC = () => {
   const [roleFormData, setRoleFormData] = useState<{
     visiable: boolean;
     data: SecRole;
-  }>({visiable: false, data: {}});
+  }>({ visiable: false, data: {} });
+
+  const [webAssignRoles, setWebAssignRoles] = useState<{
+    visiable: boolean;
+    data: SecRole;
+  }>({ visiable: false, parent: {}, data: {} });
 
   const tableColumns: ProColumns<SecRole>[] = [
     {
-      title: intl.formatMessage({id: 'pages.admin.role.name'}),
+      title: intl.formatMessage({ id: 'pages.admin.role.name' }),
       dataIndex: 'name',
-      width: 200
+      width: 200,
     },
     {
-      title: intl.formatMessage({id: 'pages.admin.role.code'}),
+      title: intl.formatMessage({ id: 'pages.admin.role.code' }),
       dataIndex: 'code',
       hideInSearch: true,
-      width: 200
+      width: 200,
     },
     {
-      title: intl.formatMessage({id: 'pages.admin.role.type'}),
+      title: intl.formatMessage({ id: 'pages.admin.role.type' }),
       dataIndex: 'type',
       render: (dom, entity) => {
-        return (<Tag>{entity.type?.label}</Tag>)
+        return <Tag>{entity.type?.label}</Tag>;
       },
-      renderFormItem: (item, {defaultRender, ...rest}, form) => {
+      renderFormItem: (item, { defaultRender, ...rest }, form) => {
         return (
           <ProFormSelect
             showSearch={false}
@@ -47,15 +59,15 @@ const RoleWeb: React.FC = () => {
           />
         );
       },
-      width: 200
+      width: 200,
     },
     {
-      title: intl.formatMessage({id: 'pages.admin.role.status'}),
+      title: intl.formatMessage({ id: 'pages.admin.role.status' }),
       dataIndex: 'status',
       render: (dom, entity) => {
-        return (<Tag>{entity.status?.label}</Tag>)
+        return <Tag>{entity.status?.label}</Tag>;
       },
-      renderFormItem: (item, {defaultRender, ...rest}, form) => {
+      renderFormItem: (item, { defaultRender, ...rest }, form) => {
         return (
           <ProFormSelect
             showSearch={false}
@@ -64,28 +76,28 @@ const RoleWeb: React.FC = () => {
           />
         );
       },
-      width: 200
+      width: 200,
     },
     {
-      title: intl.formatMessage({id: 'app.common.data.remark'}),
+      title: intl.formatMessage({ id: 'app.common.data.remark' }),
       dataIndex: 'remark',
       hideInSearch: true,
       width: 180,
     },
     {
-      title: intl.formatMessage({id: 'app.common.data.createTime'}),
+      title: intl.formatMessage({ id: 'app.common.data.createTime' }),
       dataIndex: 'createTime',
       hideInSearch: true,
       width: 180,
     },
     {
-      title: intl.formatMessage({id: 'app.common.data.updateTime'}),
+      title: intl.formatMessage({ id: 'app.common.data.updateTime' }),
       dataIndex: 'updateTime',
       hideInSearch: true,
       width: 180,
     },
     {
-      title: intl.formatMessage({id: 'app.common.operate.label'}),
+      title: intl.formatMessage({ id: 'app.common.operate.label' }),
       dataIndex: 'actions',
       align: 'center',
       width: 120,
@@ -94,34 +106,60 @@ const RoleWeb: React.FC = () => {
       render: (_, record) => (
         <>
           <Space>
+            {access.canAccess(PRIVILEGE_CODE.datadevProjectEdit) && (
+              <Tooltip title={intl.formatMessage({ id: 'app.common.operate.new.user' })}>
+                <Button
+                  shape="default"
+                  type="link"
+                  icon={<FormOutlined />}
+                  onClick={() => setWebAssignRoles({ visiable: true, data: record })}
+                />
+              </Tooltip>
+            )}
+            {access.canAccess(PRIVILEGE_CODE.datadevProjectEdit) && (
+              <Tooltip title={intl.formatMessage({ id: 'app.common.operate.new.assets' })}>
+                <Button
+                  shape="default"
+                  type="link"
+                  icon={<FormOutlined />}
+                  onClick={() => setWebAssignRoles({ visiable: true, data: record })}
+                />
+              </Tooltip>
+            )}
             {access.canAccess(PRIVILEGE_CODE.roleEdit) && (
-              <Tooltip title={intl.formatMessage({id: 'app.common.operate.edit.label'})}>
+              <Tooltip title={intl.formatMessage({ id: 'app.common.operate.edit.label' })}>
                 <Button
                   shape="default"
                   type="link"
-                  icon={<EditOutlined/>}
+                  icon={<EditOutlined />}
                   disabled={record.type.value == '01'}
-                  onClick={() => setRoleFormData({visiable: true, data: record})}
+                  onClick={() => setRoleFormData({ visiable: true, data: record })}
                 ></Button>
               </Tooltip>
             )}
             {access.canAccess(PRIVILEGE_CODE.roleDelete) && (
-              <Tooltip title={intl.formatMessage({id: 'app.common.operate.delete.label'})}>
+              <Tooltip title={intl.formatMessage({ id: 'app.common.operate.delete.label' })}>
                 <Button
                   shape="default"
                   type="link"
-                  icon={<DeleteOutlined/>}
+                  icon={<DeleteOutlined />}
                   onClick={() => {
                     Modal.confirm({
-                      title: intl.formatMessage({id: 'app.common.operate.delete.confirm.title'}),
-                      content: intl.formatMessage({id: 'app.common.operate.delete.confirm.content'}),
-                      okText: intl.formatMessage({id: 'app.common.operate.confirm.label'}),
-                      okButtonProps: {danger: true},
-                      cancelText: intl.formatMessage({id: 'app.common.operate.cancel.label'}),
+                      title: intl.formatMessage({
+                        id: 'app.common.operate.delete.confirm.title',
+                      }),
+                      content: intl.formatMessage({
+                        id: 'app.common.operate.delete.confirm.content',
+                      }),
+                      okText: intl.formatMessage({ id: 'app.common.operate.confirm.label' }),
+                      okButtonProps: { danger: true },
+                      cancelText: intl.formatMessage({ id: 'app.common.operate.cancel.label' }),
                       onOk() {
                         RoleService.deleteRole(record).then((d) => {
                           if (d.success) {
-                            message.success(intl.formatMessage({id: 'app.common.operate.delete.success'}));
+                            message.success(
+                              intl.formatMessage({ id: 'app.common.operate.delete.success' }),
+                            );
                             actionRef.current?.reload();
                           }
                         });
@@ -142,7 +180,7 @@ const RoleWeb: React.FC = () => {
       <ProTable<SecRole>
         search={{
           labelWidth: 'auto',
-          span: {xs: 24, sm: 12, md: 8, lg: 6, xl: 6, xxl: 4},
+          span: { xs: 24, sm: 12, md: 8, lg: 6, xl: 6, xxl: 4 },
         }}
         rowKey="id"
         actionRef={actionRef}
@@ -150,7 +188,7 @@ const RoleWeb: React.FC = () => {
         options={false}
         columns={tableColumns}
         request={(params, sorter, filter) => {
-          return RoleService.listByPage({...params})
+          return RoleService.listByPage({ ...params });
         }}
         toolbar={{
           actions: [
@@ -158,9 +196,9 @@ const RoleWeb: React.FC = () => {
               <Button
                 key="new"
                 type="primary"
-                onClick={() => setRoleFormData({visiable: true, data: {}})}
+                onClick={() => setRoleFormData({ visiable: true, data: {} })}
               >
-                {intl.formatMessage({id: 'app.common.operate.new.label'})}
+                {intl.formatMessage({ id: 'app.common.operate.new.label' })}
               </Button>
             ),
             access.canAccess(PRIVILEGE_CODE.roleDelete) && (
@@ -170,15 +208,19 @@ const RoleWeb: React.FC = () => {
                 disabled={selectedRows.length < 1}
                 onClick={() => {
                   Modal.confirm({
-                    title: intl.formatMessage({id: 'app.common.operate.delete.confirm.title'}),
-                    content: intl.formatMessage({id: 'app.common.operate.delete.confirm.content'}),
-                    okText: intl.formatMessage({id: 'app.common.operate.confirm.label'}),
-                    okButtonProps: {danger: true},
-                    cancelText: intl.formatMessage({id: 'app.common.operate.cancel.label'}),
+                    title: intl.formatMessage({ id: 'app.common.operate.delete.confirm.title' }),
+                    content: intl.formatMessage({
+                      id: 'app.common.operate.delete.confirm.content',
+                    }),
+                    okText: intl.formatMessage({ id: 'app.common.operate.confirm.label' }),
+                    okButtonProps: { danger: true },
+                    cancelText: intl.formatMessage({ id: 'app.common.operate.cancel.label' }),
                     onOk() {
                       RoleService.deleteBatch(selectedRows).then((d) => {
                         if (d.success) {
-                          message.success(intl.formatMessage({id: 'app.common.operate.delete.success'}));
+                          message.success(
+                            intl.formatMessage({ id: 'app.common.operate.delete.success' }),
+                          );
                           actionRef.current?.reload();
                         }
                       });
@@ -186,12 +228,12 @@ const RoleWeb: React.FC = () => {
                   });
                 }}
               >
-                {intl.formatMessage({id: 'app.common.operate.delete.label'})}
+                {intl.formatMessage({ id: 'app.common.operate.delete.label' })}
               </Button>
             ),
           ],
         }}
-        pagination={{showQuickJumper: true, showSizeChanger: true, defaultPageSize: 10}}
+        pagination={{ showQuickJumper: true, showSizeChanger: true, defaultPageSize: 10 }}
         rowSelection={{
           fixed: true,
           onChange: (selectedRowKeys, selectedRows, info) => setSelectedRows(selectedRows),
@@ -202,17 +244,27 @@ const RoleWeb: React.FC = () => {
       {roleFormData.visiable && (
         <RoleForm
           visible={roleFormData.visiable}
-          onCancel={() => setRoleFormData({visiable: false, data: {}})}
+          onCancel={() => setRoleFormData({ visiable: false, data: {} })}
           onVisibleChange={(visiable) => {
-            setRoleFormData({visiable: visiable, data: {}});
+            setRoleFormData({ visiable: visiable, data: {} });
             actionRef.current?.reload();
           }}
           data={roleFormData.data}
         />
       )}
+      {webAssignRoles.visiable && (
+        <WebAssugnRoles
+          visible={webAssignRoles.visiable}
+          onCancel={() => setWebAssignRoles({ visiable: false, data: {} })}
+          onVisibleChange={(visiable) => {
+            setWebAssignRoles({ visiable: visiable, data: {} });
+            actionRef.current?.reload();
+          }}
+          data={webAssignRoles.data}
+        />
+      )}
     </div>
   );
-
-}
+};
 
 export default RoleWeb;
diff --git a/scaleph-ui-react/src/services/auth.ts b/scaleph-ui-react/src/services/auth.ts
index b8425839e..1b1d4b52e 100644
--- a/scaleph-ui-react/src/services/auth.ts
+++ b/scaleph-ui-react/src/services/auth.ts
@@ -63,4 +63,57 @@ export const AuthService = {
       params: { token: token },
     });
   },
+
+  unauthorizedRoles: async (param: any) => {
+    return request<ResponseBody<any>>('/api/admin/authorize/resource-web/unauthorized-roles', {
+      method: 'GET',
+      params: param,
+    });
+  },
+  authorizedRoles: async (param: any) => {
+    return request<ResponseBody<any>>('/api/admin/authorize/resource-web/authorized-roles', {
+      method: 'GET',
+      params: param,
+    });
+  },
+  resourceWebRoles: async (param: any) => {
+    return request<ResponseBody<any>>('/api/admin/authorize/resource-web/roles', {
+      method: 'PUT',
+      data: param,
+    });
+  },
+  resourceWebRolesDelete: async (param: any) => {
+    return request<ResponseBody<any>>('/api/admin/authorize/resource-web/roles', {
+      method: 'DELETE',
+      data: param,
+    });
+  },
+  //查询角色绑定用户列表
+  requestAuthorizedUsers: async (param: any) => {
+    return request<ResponseBody<any>>('/api/admin/authorize/role/authorized-users', {
+      method: 'GET',
+      params: param,
+    });
+  },
+  //查询角色未绑定用户列表
+  requestUnauthorizedUsers: async (param: any) => {
+    return request<ResponseBody<any>>('/api/admin/authorize/role/unauthorized-users', {
+      method: 'GET',
+      params: param,
+    });
+  },
+  //批量为角色绑定用户
+  rolesUser: async (param: any) => {
+    return request<ResponseBody<any>>('/api/admin/authorize/role/users', {
+      method: 'PUT',
+      data: param,
+    });
+  },
+  //批量为角色解除用户绑定
+  deleteRolesUser: async (param: any) => {
+    return request<ResponseBody<any>>('/api/admin/authorize/role/users', {
+      method: 'DELETE',
+      data: param,
+    });
+  },
 };
diff --git a/scaleph-ui-react/src/typings.d.ts b/scaleph-ui-react/src/typings.d.ts
index cb2b0295f..73f1ad1a6 100644
--- a/scaleph-ui-react/src/typings.d.ts
+++ b/scaleph-ui-react/src/typings.d.ts
@@ -22,3 +22,4 @@ declare module 'bizcharts-plugin-slider';
 declare let ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION: 'site' | undefined;
 
 declare const REACT_APP_ENV: 'test' | 'dev' | 'pre' | 'dist' | false;
+declare module 'monaco-editor/esm/vs/basic-languages/sql/sql';

From 4c7f38891c9be63a13695042e217831b3530e123 Mon Sep 17 00:00:00 2001
From: bailongsen <bailongsen@xinxuan.net>
Date: Tue, 28 Nov 2023 21:37:40 +0800
Subject: [PATCH 04/24] =?UTF-8?q?fix:=20=E8=B0=83=E8=AF=95=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E5=88=86=E9=85=8D=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scaleph-ui-react/src/locales/zh-CN/pages/base.ts     |  1 +
 .../Admin/Resource/Web/components/WebAssugnRoles.tsx |  6 +-----
 .../pages/Admin/Role/components/WebAssugnRoles.tsx   | 12 ++++--------
 scaleph-ui-react/src/pages/Admin/Role/index.tsx      | 10 ----------
 4 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/scaleph-ui-react/src/locales/zh-CN/pages/base.ts b/scaleph-ui-react/src/locales/zh-CN/pages/base.ts
index 6ec3f0ea6..8d9bbf1df 100644
--- a/scaleph-ui-react/src/locales/zh-CN/pages/base.ts
+++ b/scaleph-ui-react/src/locales/zh-CN/pages/base.ts
@@ -15,6 +15,7 @@ export default {
   'app.common.operate.success': '操作成功',
   'app.common.operate.new.label': '新增',
   'app.common.operate.new.roles': '分配角色',
+  'app.common.operate.new.rolesUser': '角色分配用户',
   'app.common.operate.new.user': '用户配置',
   'app.common.operate.new.assets': '权限配置',
   'app.common.operate.new.success': '新增成功',
diff --git a/scaleph-ui-react/src/pages/Admin/Resource/Web/components/WebAssugnRoles.tsx b/scaleph-ui-react/src/pages/Admin/Resource/Web/components/WebAssugnRoles.tsx
index c167d21ef..b73a9df16 100644
--- a/scaleph-ui-react/src/pages/Admin/Resource/Web/components/WebAssugnRoles.tsx
+++ b/scaleph-ui-react/src/pages/Admin/Resource/Web/components/WebAssugnRoles.tsx
@@ -101,11 +101,7 @@ const WebResourceForm: React.FC<ModalFormParentProps<SecResourceWeb>> = ({
   // 角色转移事件处理
   const handleChange = useCallback(
     async (targetKeys, direction, moveKeys) => {
-      const roleIds =
-        direction === 'right'
-          ? targetKeys.map((item: string | number) => +item)
-          : moveKeys.map((item: string | number) => +item);
-
+      const roleIds = moveKeys.map((item: string | number) => +item);
       const params = {
         resourceWebId: data?.id,
         roleIds: roleIds,
diff --git a/scaleph-ui-react/src/pages/Admin/Role/components/WebAssugnRoles.tsx b/scaleph-ui-react/src/pages/Admin/Role/components/WebAssugnRoles.tsx
index 37fb3a29a..dc6b7949b 100644
--- a/scaleph-ui-react/src/pages/Admin/Role/components/WebAssugnRoles.tsx
+++ b/scaleph-ui-react/src/pages/Admin/Role/components/WebAssugnRoles.tsx
@@ -62,8 +62,8 @@ const WebResourceForm: React.FC<ModalFormParentProps<SecResourceWeb>> = ({
   // 异步获取数据
   const fetchData = useCallback(async () => {
     try {
-      const res1 = await AuthService.requestAuthorizedUsers({ roleId: data?.id });
-      const res2 = await AuthService.requestUnauthorizedUsers({ roleId: data?.id });
+      const res1 = await AuthService.requestUnauthorizedUsers({ roleId: data?.id });
+      const res2 = await AuthService.requestAuthorizedUsers({ roleId: data?.id });
       if (res1?.records && res2?.records) {
         const mergedArray = mergeArrays(res1.records, res2.records);
         setRoleLists(mergedArray);
@@ -101,11 +101,7 @@ const WebResourceForm: React.FC<ModalFormParentProps<SecResourceWeb>> = ({
   // 角色转移事件处理
   const handleChange = useCallback(
     async (targetKeys, direction, moveKeys) => {
-      const roleIds =
-        direction === 'right'
-          ? targetKeys.map((item: string | number) => +item)
-          : moveKeys.map((item: string | number) => +item);
-
+      const roleIds = moveKeys.map((item: string | number) => +item);
       const params = {
         roleId: data?.id,
         userIds: roleIds,
@@ -131,7 +127,7 @@ const WebResourceForm: React.FC<ModalFormParentProps<SecResourceWeb>> = ({
   return (
     <Modal
       open={visible}
-      title={data.id ? intl.formatMessage({ id: 'app.common.operate.new.roles' }) : ''}
+      title={data.id ? intl.formatMessage({ id: 'app.common.operate.new.rolesUser' }) : ''}
       width={1100}
       destroyOnClose={true}
       onCancel={onCancel}
diff --git a/scaleph-ui-react/src/pages/Admin/Role/index.tsx b/scaleph-ui-react/src/pages/Admin/Role/index.tsx
index 411c1a1a4..d2f4d10e0 100644
--- a/scaleph-ui-react/src/pages/Admin/Role/index.tsx
+++ b/scaleph-ui-react/src/pages/Admin/Role/index.tsx
@@ -116,16 +116,6 @@ const RoleWeb: React.FC = () => {
                 />
               </Tooltip>
             )}
-            {access.canAccess(PRIVILEGE_CODE.datadevProjectEdit) && (
-              <Tooltip title={intl.formatMessage({ id: 'app.common.operate.new.assets' })}>
-                <Button
-                  shape="default"
-                  type="link"
-                  icon={<FormOutlined />}
-                  onClick={() => setWebAssignRoles({ visiable: true, data: record })}
-                />
-              </Tooltip>
-            )}
             {access.canAccess(PRIVILEGE_CODE.roleEdit) && (
               <Tooltip title={intl.formatMessage({ id: 'app.common.operate.edit.label' })}>
                 <Button

From 05f5fdfaa3b7f9f7ac9f689b923b643b9bc35f33 Mon Sep 17 00:00:00 2001
From: bailongsen <bailongsen@xinxuan.net>
Date: Sat, 2 Dec 2023 14:52:40 +0800
Subject: [PATCH 05/24] feat: The role assigned to a user is added

---
 .../Web/components/WebAssugnRoles.tsx         |   4 +-
 .../Admin/Role/components/WebAssugnRoles.tsx  |   6 +-
 .../pages/Admin/User/components/UserRoles.tsx | 172 ++++++++++++++++++
 .../src/pages/Admin/User/index.tsx            | 169 +++++++++--------
 scaleph-ui-react/src/services/auth.ts         |  31 ++++
 5 files changed, 306 insertions(+), 76 deletions(-)
 create mode 100644 scaleph-ui-react/src/pages/Admin/User/components/UserRoles.tsx

diff --git a/scaleph-ui-react/src/pages/Admin/Resource/Web/components/WebAssugnRoles.tsx b/scaleph-ui-react/src/pages/Admin/Resource/Web/components/WebAssugnRoles.tsx
index b73a9df16..48ac5e148 100644
--- a/scaleph-ui-react/src/pages/Admin/Resource/Web/components/WebAssugnRoles.tsx
+++ b/scaleph-ui-react/src/pages/Admin/Resource/Web/components/WebAssugnRoles.tsx
@@ -131,11 +131,11 @@ const WebResourceForm: React.FC<ModalFormParentProps<SecResourceWeb>> = ({
       width={1100}
       destroyOnClose={true}
       onCancel={onCancel}
-      cancelText="关闭"
+      cancelText={intl.formatMessage({ id: 'app.common.operate.close.label' })}
       centered
       footer={[
         <Button type="primary" onClick={onCancel}>
-          关闭
+          {intl.formatMessage({ id: 'app.common.operate.close.label' })}
         </Button>,
       ]}
     >
diff --git a/scaleph-ui-react/src/pages/Admin/Role/components/WebAssugnRoles.tsx b/scaleph-ui-react/src/pages/Admin/Role/components/WebAssugnRoles.tsx
index dc6b7949b..f4c5dacba 100644
--- a/scaleph-ui-react/src/pages/Admin/Role/components/WebAssugnRoles.tsx
+++ b/scaleph-ui-react/src/pages/Admin/Role/components/WebAssugnRoles.tsx
@@ -83,7 +83,7 @@ const WebResourceForm: React.FC<ModalFormParentProps<SecResourceWeb>> = ({
   const returnTitle = useMemo(() => {
     return (
       <Space direction="vertical">
-        <span>{` ${intl.formatMessage({ id: `menu.${data?.name}` })}-资源分配详情`}</span>
+        <span>{` ${intl.formatMessage({ id: `menu.${data?.name}` })}-${intl.formatMessage({ id: 'app.common.operate.new.rolesUser' })}`}</span>
       </Space>
     );
   }, [data, intl]);
@@ -131,11 +131,11 @@ const WebResourceForm: React.FC<ModalFormParentProps<SecResourceWeb>> = ({
       width={1100}
       destroyOnClose={true}
       onCancel={onCancel}
-      cancelText="关闭"
+      cancelText={intl.formatMessage({ id: 'app.common.operate.close.label' })}
       centered
       footer={[
         <Button type="primary" onClick={onCancel}>
-          关闭
+          {intl.formatMessage({ id: 'app.common.operate.close.label' })}
         </Button>,
       ]}
     >
diff --git a/scaleph-ui-react/src/pages/Admin/User/components/UserRoles.tsx b/scaleph-ui-react/src/pages/Admin/User/components/UserRoles.tsx
new file mode 100644
index 000000000..e0b44ed97
--- /dev/null
+++ b/scaleph-ui-react/src/pages/Admin/User/components/UserRoles.tsx
@@ -0,0 +1,172 @@
+import mainHeight from '@/models/useMainSize';
+import TableTransfer from '@/pages/Admin/Resource/Web/components/TransferTable';
+import { SecResourceWeb } from '@/services/admin/typings';
+import { AuthService } from '@/services/auth';
+import { Button, Card, Form, message, Modal, Space } from 'antd';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { useIntl } from 'umi';
+
+// 定义组件 Props 类型
+interface ModalFormParentProps<T> {
+  data: T;
+  visible: boolean;
+  onVisibleChange?: (visible: boolean) => void;
+  onCancel: () => void;
+  onOK?: (values: any) => void;
+}
+
+const WebResourceForm: React.FC<ModalFormParentProps<SecResourceWeb>> = ({
+  data,
+  visible,
+  onVisibleChange,
+  onCancel,
+}) => {
+  const intl = useIntl();
+  const [form] = Form.useForm();
+  const containerInfo = mainHeight('.ant-layout-content');
+  const [roleLists, setRoleLists] = useState<Role[]>([]);
+
+  // 角色表格列配置
+  const tableColumns = [
+    {
+      dataIndex: 'name',
+      title: '角色名称',
+      width: 300,
+    },
+    {
+      dataIndex: 'status.label',
+      title: '角色状态',
+      width: 300,
+      render: (text: any, record: { status: { label: boolean | React.ReactChild | React.ReactFragment | React.ReactPortal | null | undefined; }; }) => (
+        <span>{record.status.label}</span>
+      ),
+    },
+  ];
+
+  // 角色类型定义
+  interface Role {
+    id: string;
+    name: string;
+    resourceAuthorized: number;
+    checkOut?: number;
+  }
+
+  // 合并数组
+  function mergeArrays(array1: any, array2: any): any {
+    array1.forEach((obj: { checkOut: number; }, index: any) => {
+      obj.checkOut = 0;
+    });
+    array2.forEach((obj: { checkOut: number; }, index: any) => {
+      obj.checkOut = 1;
+    });
+    return [...array1, ...array2];
+  }
+  // 异步获取数据
+  const fetchData = useCallback(async () => {
+    try {
+      const res1 = await AuthService.requestUnauthorizedRoles({ userId: data?.id });
+      const res2 = await AuthService.requestUserAuthorizedRoles({ userId: data?.id });
+      if (res1 && res2) {
+        const mergedArray = mergeArrays(res1, res2);
+        setRoleLists(mergedArray);
+      }
+    } catch (error) {
+      console.error(error);
+    }
+  }, [data]);
+
+  useEffect(() => {
+    if (data) {
+      fetchData();
+    }
+  }, [data, fetchData]);
+
+  // 页面标题
+  const returnTitle = useMemo(() => {
+    return (
+      <Space direction="vertical">
+        <span>{` ${intl.formatMessage({ id: `menu.${data?.userName}` })}-${intl.formatMessage({ id: 'app.common.operate.new.roles' })}`}</span>
+      </Space>
+    );
+  }, [data, intl]);
+
+  // 获取选中角色的 id 数组
+  const originTargetKeys = useMemo(() => {
+    return roleLists?.filter((item) => item.checkOut === 1).map((item) => item.id);
+  }, [roleLists]);
+
+  // 过滤方法
+  const handleFilter = useCallback((inputValue, item) => {
+    return item?.name.indexOf(inputValue) !== -1;
+  }, []);
+
+  // 角色转移事件处理
+  const handleChange = useCallback(
+    async (targetKeys, direction, moveKeys) => {
+      const roleIds = moveKeys.map((item: string | number) => +item);
+      const params = {
+        userId: data?.id,
+        roleIds: roleIds,
+      };
+      if (direction === 'right') {
+        // 批量为角色绑定用户
+        await AuthService.requestUserRoles(params).then((res) => {
+          if (res?.success) {
+            message.success(intl.formatMessage({ id: 'app.common.operate.edit.success' }), 2);
+          }
+        });
+      } else {
+        // 批量为角色解除用户绑定
+        await AuthService.requestDeleteUserRoles(params).then((res) => {
+          message.success(intl.formatMessage({ id: 'app.common.operate.edit.success' }), 2);
+        });
+      }
+      fetchData();
+    },
+    [data, fetchData, intl],
+  );
+
+  return (
+    <Modal
+      open={visible}
+      title={data.id ? intl.formatMessage({ id: 'app.common.operate.new.rolesUser' }) : ''}
+      width={1100}
+      destroyOnClose={true}
+      onCancel={onCancel}
+      cancelText={intl.formatMessage({ id: 'app.common.operate.close.label' })}
+      centered
+      footer={[
+        <Button type="primary" onClick={onCancel}>
+          {intl.formatMessage({ id: 'app.common.operate.close.label' })}
+        </Button>,
+      ]}
+    >
+      <div>
+        <Card
+          bodyStyle={{
+            minHeight: `${containerInfo.height - 200}px`,
+          }}
+          title={returnTitle}
+        >
+          <TableTransfer
+            containerHeight={containerInfo.height}
+            titles={['未授权角色', '已授权角色']}
+            dataSource={roleLists}
+            targetKeys={originTargetKeys}
+            showSearch={true}
+            rowKey={(record: { id: any }) => record.id}
+            onChange={handleChange}
+            filterOption={handleFilter}
+            listStyle={{
+              width: 500,
+            }}
+            leftColumns={tableColumns}
+            rightColumns={tableColumns}
+          />
+        </Card>
+      </div>
+    </Modal>
+  );
+};
+
+export default WebResourceForm;
diff --git a/scaleph-ui-react/src/pages/Admin/User/index.tsx b/scaleph-ui-react/src/pages/Admin/User/index.tsx
index 6dcb4247c..3166099e8 100644
--- a/scaleph-ui-react/src/pages/Admin/User/index.tsx
+++ b/scaleph-ui-react/src/pages/Admin/User/index.tsx
@@ -1,19 +1,20 @@
-import {useAccess, useIntl} from 'umi';
-import React, {useEffect, useRef, useState} from 'react';
-import {Button, Card, Col, Input, List, message, Modal, Row, Space, Tabs, Tag, Tooltip, Tree, Typography,} from 'antd';
-import {EditOutlined, RedoOutlined, StopOutlined, UserSwitchOutlined,} from '@ant-design/icons';
-import {ActionType, ProColumns, ProFormInstance, ProFormSelect, ProTable} from '@ant-design/pro-components';
-import {TreeNode} from '@/app.d';
-import {DICT_TYPE, PRIVILEGE_CODE} from '@/constant';
-import {DeptService} from '@/services/admin/dept.service';
-import {DictDataService} from '@/services/admin/dictData.service';
-import {RoleService} from '@/services/admin/role.service';
-import {SecDept, SecRole, SecUser} from '@/services/admin/typings';
-import {UserService} from '@/services/admin/user.service';
+import { useAccess, useIntl } from 'umi';
+import React, { useEffect, useRef, useState } from 'react';
+import { Button, Card, Col, Input, List, message, Modal, Row, Space, Tabs, Tag, Tooltip, Tree, Typography, } from 'antd';
+import { EditOutlined, RedoOutlined, StopOutlined, UserSwitchOutlined, FormOutlined } from '@ant-design/icons';
+import { ActionType, ProColumns, ProFormInstance, ProFormSelect, ProTable } from '@ant-design/pro-components';
+import { TreeNode } from '@/app.d';
+import { DICT_TYPE, PRIVILEGE_CODE } from '@/constant';
+import { DeptService } from '@/services/admin/dept.service';
+import { DictDataService } from '@/services/admin/dictData.service';
+import { RoleService } from '@/services/admin/role.service';
+import { SecDept, SecRole, SecUser } from '@/services/admin/typings';
+import { UserService } from '@/services/admin/user.service';
 import DeptGrant from './components/DeptGrant';
 import RoleForm from './components/RoleForm';
 import RoleGrant from './components/RoleGrant';
 import UserForm from './components/UserForm';
+import UserRoles from './components/UserRoles';
 import styles from './index.less';
 
 const User: React.FC = () => {
@@ -47,15 +48,19 @@ const User: React.FC = () => {
     visible: false,
     data: {},
   });
+  const [webAssignRoles, setWebAssignRoles] = useState<{
+    visiable: boolean;
+    data: SecRole;
+  }>({ visiable: false, parent: {}, data: {} });
 
   const tableColumns: ProColumns<SecUser>[] = [
     {
-      title: intl.formatMessage({id: 'pages.admin.user.type'}),
+      title: intl.formatMessage({ id: 'pages.admin.user.type' }),
       dataIndex: 'type',
       render: (dom, entity) => {
         return (<Tag>{entity.type?.label}</Tag>)
       },
-      renderFormItem: (item, {defaultRender, ...rest}, form) => {
+      renderFormItem: (item, { defaultRender, ...rest }, form) => {
         return (
           <ProFormSelect
             showSearch={false}
@@ -67,25 +72,25 @@ const User: React.FC = () => {
       width: 200
     },
     {
-      title: intl.formatMessage({id: 'pages.admin.user.userName'}),
+      title: intl.formatMessage({ id: 'pages.admin.user.userName' }),
       dataIndex: 'userName',
     },
     {
-      title: intl.formatMessage({id: 'pages.admin.user.nickName'}),
+      title: intl.formatMessage({ id: 'pages.admin.user.nickName' }),
       dataIndex: 'nickName',
     },
     {
-      title: intl.formatMessage({id: 'pages.admin.user.email'}),
+      title: intl.formatMessage({ id: 'pages.admin.user.email' }),
       dataIndex: 'email',
       hideInSearch: true
     },
     {
-      title: intl.formatMessage({id: 'pages.admin.user.phone'}),
+      title: intl.formatMessage({ id: 'pages.admin.user.phone' }),
       dataIndex: 'phone',
       hideInSearch: true
     },
     {
-      title: intl.formatMessage({id: 'pages.admin.user.gender'}),
+      title: intl.formatMessage({ id: 'pages.admin.user.gender' }),
       dataIndex: 'gender',
       hideInSearch: true,
       render: (text, record, index) => {
@@ -93,12 +98,12 @@ const User: React.FC = () => {
       },
     },
     {
-      title: intl.formatMessage({id: 'pages.admin.user.status'}),
+      title: intl.formatMessage({ id: 'pages.admin.user.status' }),
       dataIndex: 'userStatus',
       render: (text, record, index) => {
         return (<Tag>{record.status?.label}</Tag>)
       },
-      renderFormItem: (item, {defaultRender, ...rest}, form) => {
+      renderFormItem: (item, { defaultRender, ...rest }, form) => {
         return (
           <ProFormSelect
             showSearch={false}
@@ -109,7 +114,7 @@ const User: React.FC = () => {
       }
     },
     {
-      title: intl.formatMessage({id: 'app.common.operate.label'}),
+      title: intl.formatMessage({ id: 'app.common.operate.label' }),
       dataIndex: 'actions',
       align: 'center',
       width: 120,
@@ -118,15 +123,26 @@ const User: React.FC = () => {
       render: (_, record) => (
         <>
           <Space>
+            {access.canAccess(PRIVILEGE_CODE.datadevProjectEdit) && (
+              <Tooltip title={intl.formatMessage({ id: 'app.common.operate.new.user' })}>
+                <Button
+                  shape="default"
+                  type="link"
+                  icon={<FormOutlined />}
+                  onClick={() => setWebAssignRoles({ visiable: true, data: record })}
+                />
+              </Tooltip>
+            )}
+
             {access.canAccess(PRIVILEGE_CODE.userEdit) && (
-              <Tooltip title={intl.formatMessage({id: 'app.common.operate.edit.label'})}>
+              <Tooltip title={intl.formatMessage({ id: 'app.common.operate.edit.label' })}>
                 <Button
                   shape="default"
                   type="link"
-                  icon={<EditOutlined/>}
+                  icon={<EditOutlined />}
                   disabled={record.type.value == '0' || record.status.value == '2'}
                   onClick={() => {
-                    setUserFormData({visible: true, data: record});
+                    setUserFormData({ visible: true, data: record });
                   }}
                 ></Button>
               </Tooltip>
@@ -134,23 +150,23 @@ const User: React.FC = () => {
 
             {record.userStatus?.value?.substring(0, 1) != '9' &&
               access.canAccess(PRIVILEGE_CODE.userDelete) && (
-                <Tooltip title={intl.formatMessage({id: 'app.common.operate.forbid.label'})}>
+                <Tooltip title={intl.formatMessage({ id: 'app.common.operate.forbid.label' })}>
                   <Button
                     shape="default"
                     type="link"
-                    icon={<StopOutlined/>}
+                    icon={<StopOutlined />}
                     disabled={record.type.value == '0' || record.status.value == '2'}
                     onClick={() => {
                       Modal.confirm({
-                        title: intl.formatMessage({id: 'app.common.operate.forbid.confirm.title'}),
-                        content: intl.formatMessage({id: 'app.common.operate.forbid.confirm.content'}),
-                        okText: intl.formatMessage({id: 'app.common.operate.confirm.label'}),
-                        okButtonProps: {danger: true},
-                        cancelText: intl.formatMessage({id: 'app.common.operate.cancel.label'}),
+                        title: intl.formatMessage({ id: 'app.common.operate.forbid.confirm.title' }),
+                        content: intl.formatMessage({ id: 'app.common.operate.forbid.confirm.content' }),
+                        okText: intl.formatMessage({ id: 'app.common.operate.confirm.label' }),
+                        okButtonProps: { danger: true },
+                        cancelText: intl.formatMessage({ id: 'app.common.operate.cancel.label' }),
                         onOk() {
                           UserService.deleteUserRow(record).then((d) => {
                             if (d.success) {
-                              message.success(intl.formatMessage({id: 'app.common.operate.forbid.success'}));
+                              message.success(intl.formatMessage({ id: 'app.common.operate.forbid.success' }));
                               actionRef.current?.reload();
                             }
                           });
@@ -162,21 +178,21 @@ const User: React.FC = () => {
               )}
             {record.userStatus?.value?.substring(0, 1) == '9' &&
               access.canAccess(PRIVILEGE_CODE.userDelete) && (
-                <Tooltip title={intl.formatMessage({id: 'app.common.operate.enable.label'})}>
+                <Tooltip title={intl.formatMessage({ id: 'app.common.operate.enable.label' })}>
                   <Button
                     shape="default"
                     type="link"
-                    icon={<RedoOutlined/>}
+                    icon={<RedoOutlined />}
                     onClick={() => {
                       let user: SecUser = {
                         userName: record.userName,
                         id: record.id,
-                        userStatus: {value: '10', label: ''},
+                        userStatus: { value: '10', label: '' },
                         email: record.email,
                       };
                       UserService.updateUser(user).then((resp) => {
                         if (resp.success) {
-                          message.success(intl.formatMessage({id: 'app.common.operate.success'}));
+                          message.success(intl.formatMessage({ id: 'app.common.operate.success' }));
                           actionRef.current?.reload();
                         }
                       });
@@ -245,7 +261,7 @@ const User: React.FC = () => {
             }}
           >
             {access.canAccess(PRIVILEGE_CODE.roleSelect) && (
-              <Tabs.TabPane tab={intl.formatMessage({id: 'pages.admin.user.role'})} key={roleTab}>
+              <Tabs.TabPane tab={intl.formatMessage({ id: 'pages.admin.user.role' })} key={roleTab}>
                 <List
                   bordered={false}
                   dataSource={roleList}
@@ -267,20 +283,20 @@ const User: React.FC = () => {
                         actionRef.current?.reload();
                       }}
                     >
-                      <Typography.Text style={{paddingRight: 12}}>
+                      <Typography.Text style={{ paddingRight: 12 }}>
                         {item.name}
                       </Typography.Text>
                       {item.showOpIcon && (
                         <Space size={2}>
                           {access.canAccess(PRIVILEGE_CODE.roleGrant) && (
-                            <Tooltip title={intl.formatMessage({id: 'app.common.operate.grant.label'})}>
+                            <Tooltip title={intl.formatMessage({ id: 'app.common.operate.grant.label' })}>
                               <Button
                                 shape="default"
                                 type="text"
                                 size="small"
-                                icon={<UserSwitchOutlined/>}
+                                icon={<UserSwitchOutlined />}
                                 onClick={() => {
-                                  setRoleGrantData({visible: true, data: item});
+                                  setRoleGrantData({ visible: true, data: item });
                                 }}
                               ></Button>
                             </Tooltip>
@@ -293,16 +309,16 @@ const User: React.FC = () => {
               </Tabs.TabPane>
             )}
             {access.canAccess(PRIVILEGE_CODE.deptSelect) && (
-              <Tabs.TabPane tab={intl.formatMessage({id: 'pages.admin.user.dept'})} key={deptTab}>
+              <Tabs.TabPane tab={intl.formatMessage({ id: 'pages.admin.user.dept' })} key={deptTab}>
                 <Input.Search
-                  style={{marginBottom: 8}}
+                  style={{ marginBottom: 8 }}
                   allowClear={true}
                   onSearch={searchDeptTree}
-                  placeholder={intl.formatMessage({id: 'app.common.operate.search.label'})}
+                  placeholder={intl.formatMessage({ id: 'app.common.operate.search.label' })}
                 ></Input.Search>
                 <Tree
                   treeData={deptTreeList}
-                  showLine={{showLeafIcon: false}}
+                  showLine={{ showLeafIcon: false }}
                   blockNode={true}
                   showIcon={false}
                   height={680}
@@ -338,20 +354,20 @@ const User: React.FC = () => {
                             setDeptTreeList([...deptTreeList]);
                           }}
                         >
-                          <Typography.Text style={{paddingRight: 12}}>
+                          <Typography.Text style={{ paddingRight: 12 }}>
                             {node.title}
                           </Typography.Text>
                           {node.showOpIcon && (
                             <Space size={2}>
                               {access.canAccess(PRIVILEGE_CODE.deptGrant) && (
-                                <Tooltip title={intl.formatMessage({id: 'app.common.operate.grant.label'})}>
+                                <Tooltip title={intl.formatMessage({ id: 'app.common.operate.grant.label' })}>
                                   <Button
                                     shape="default"
                                     type="text"
                                     size="small"
-                                    icon={<UserSwitchOutlined/>}
+                                    icon={<UserSwitchOutlined />}
                                     onClick={() => {
-                                      setDeptGrantData({visible: true, data: node.origin});
+                                      setDeptGrantData({ visible: true, data: node.origin });
                                     }}
                                   ></Button>
                                 </Tooltip>
@@ -370,12 +386,12 @@ const User: React.FC = () => {
       </Col>
       <Col span={19}>
         <ProTable<SecUser>
-          headerTitle={intl.formatMessage({id: 'pages.admin.user'})}
+          headerTitle={intl.formatMessage({ id: 'pages.admin.user' })}
           search={{
             labelWidth: 'auto',
-            span: {xs: 24, sm: 12, md: 8, lg: 6, xl: 6, xxl: 4},
+            span: { xs: 24, sm: 12, md: 8, lg: 6, xl: 6, xxl: 4 },
           }}
-          scroll={{x: 800}}
+          scroll={{ x: 800 }}
           rowKey="id"
           actionRef={actionRef}
           formRef={formRef}
@@ -387,10 +403,10 @@ const User: React.FC = () => {
                   key="new"
                   type="primary"
                   onClick={() => {
-                    setUserFormData({visible: true, data: {}});
+                    setUserFormData({ visible: true, data: {} });
                   }}
                 >
-                  {intl.formatMessage({id: 'app.common.operate.new.label'})}
+                  {intl.formatMessage({ id: 'app.common.operate.new.label' })}
                 </Button>
               ),
               access.canAccess(PRIVILEGE_CODE.userDelete) && (
@@ -400,15 +416,15 @@ const User: React.FC = () => {
                   disabled={selectedRows.length < 1}
                   onClick={() => {
                     Modal.confirm({
-                      title: intl.formatMessage({id: 'app.common.operate.forbid.confirm.title'}),
-                      content: intl.formatMessage({id: 'app.common.operate.forbid.confirm.content'}),
-                      okText: intl.formatMessage({id: 'app.common.operate.confirm.label'}),
-                      okButtonProps: {danger: true},
-                      cancelText: intl.formatMessage({id: 'app.common.operate.cancel.label'}),
+                      title: intl.formatMessage({ id: 'app.common.operate.forbid.confirm.title' }),
+                      content: intl.formatMessage({ id: 'app.common.operate.forbid.confirm.content' }),
+                      okText: intl.formatMessage({ id: 'app.common.operate.confirm.label' }),
+                      okButtonProps: { danger: true },
+                      cancelText: intl.formatMessage({ id: 'app.common.operate.cancel.label' }),
                       onOk() {
                         UserService.deleteUserBatch(selectedRows).then((d) => {
                           if (d.success) {
-                            message.success(intl.formatMessage({id: 'app.common.operate.forbid.success'}));
+                            message.success(intl.formatMessage({ id: 'app.common.operate.forbid.success' }));
                             actionRef.current?.reload();
                           }
                         });
@@ -416,7 +432,7 @@ const User: React.FC = () => {
                     });
                   }}
                 >
-                  {intl.formatMessage({id: 'app.common.operate.forbid.label'})}
+                  {intl.formatMessage({ id: 'app.common.operate.forbid.label' })}
                 </Button>
               ),
             ],
@@ -429,7 +445,7 @@ const User: React.FC = () => {
               roleId: selectRole,
             });
           }}
-          pagination={{showQuickJumper: true, showSizeChanger: true, defaultPageSize: 10}}
+          pagination={{ showQuickJumper: true, showSizeChanger: true, defaultPageSize: 10 }}
           rowSelection={{
             fixed: true,
             onChange(selectedRowKeys, selectedRows, info) {
@@ -444,10 +460,10 @@ const User: React.FC = () => {
         <RoleForm
           visible={roleFormData.visible}
           onCancel={() => {
-            setRoleFormData({visible: false, data: {}});
+            setRoleFormData({ visible: false, data: {} });
           }}
           onVisibleChange={(visible) => {
-            setRoleFormData({visible: visible, data: {}});
+            setRoleFormData({ visible: visible, data: {} });
             refreshRoles();
           }}
           data={roleFormData.data}
@@ -457,10 +473,10 @@ const User: React.FC = () => {
         <RoleGrant
           visible={roleGrantData.visible}
           onCancel={() => {
-            setRoleGrantData({visible: false, data: {}});
+            setRoleGrantData({ visible: false, data: {} });
           }}
           onVisibleChange={(visible) => {
-            setRoleGrantData({visible: visible, data: {}});
+            setRoleGrantData({ visible: visible, data: {} });
           }}
           data={roleGrantData.data}
         ></RoleGrant>
@@ -469,10 +485,10 @@ const User: React.FC = () => {
         <DeptGrant
           visible={deptGrantData.visible}
           onCancel={() => {
-            setDeptGrantData({visible: false, data: {}});
+            setDeptGrantData({ visible: false, data: {} });
           }}
           onVisibleChange={(visible) => {
-            setDeptGrantData({visible: visible, data: {}});
+            setDeptGrantData({ visible: visible, data: {} });
           }}
           data={deptGrantData.data}
         />
@@ -481,15 +497,26 @@ const User: React.FC = () => {
         <UserForm
           visible={userFormData.visible}
           onCancel={() => {
-            setUserFormData({visible: false, data: {}});
+            setUserFormData({ visible: false, data: {} });
           }}
           onVisibleChange={(visible) => {
-            setUserFormData({visible: visible, data: {}});
+            setUserFormData({ visible: visible, data: {} });
             actionRef.current?.reload();
           }}
           data={userFormData.data}
         ></UserForm>
       ) : null}
+      {webAssignRoles.visiable && (
+        <UserRoles
+          visible={webAssignRoles.visiable}
+          onCancel={() => setWebAssignRoles({ visiable: false, data: {} })}
+          onVisibleChange={(visiable) => {
+            setWebAssignRoles({ visiable: visiable, data: {} });
+            actionRef.current?.reload();
+          }}
+          data={webAssignRoles.data}
+        />
+      )}
     </Row>
   );
 };
diff --git a/scaleph-ui-react/src/services/auth.ts b/scaleph-ui-react/src/services/auth.ts
index 1b1d4b52e..a5a869f9a 100644
--- a/scaleph-ui-react/src/services/auth.ts
+++ b/scaleph-ui-react/src/services/auth.ts
@@ -116,4 +116,35 @@ export const AuthService = {
       data: param,
     });
   },
+
+  //查询用户未绑定角色列表
+  requestUnauthorizedRoles: async (param: any) => {
+    return request<ResponseBody<any>>('/api/admin/authorize/user/unauthorized-roles', {
+      method: 'GET',
+      params: param,
+    });
+  },
+  //查询角色绑定用户列表
+  requestUserAuthorizedRoles: async (param: any) => {
+    return request<ResponseBody<any>>('/api/admin/authorize/user/authorized-roles', {
+      method: 'GET',
+      params: param,
+    });
+  },
+
+  //批量为用户绑定角色
+  requestUserRoles: async (param: any) => {
+    return request<ResponseBody<any>>('/api/admin/authorize/user/roles', {
+      method: 'PUT',
+      data: param,
+    });
+  },
+
+  //批量为用户解除角色绑定
+  requestDeleteUserRoles: async (param: any) => {
+    return request<ResponseBody<any>>('/api/admin/authorize/user/roles', {
+      method: 'DELETE',
+      data: param,
+    });
+  },
 };

From 266884da9fb8920ead27e2c1c9366ceb043cd507 Mon Sep 17 00:00:00 2001
From: bailongsen <bailongsen@xinxuan.net>
Date: Tue, 5 Dec 2023 17:31:26 +0800
Subject: [PATCH 06/24] feat:Added a resource configuration role

---
 .../src/locales/zh-CN/pages/base.ts           |   8 +-
 .../Web/components/WebAssugnRoles.tsx         |   2 +-
 .../Admin/Role/components/ResourceWebs.tsx    | 155 ++++++++++++++++++
 .../Admin/Role/components/WebAssugnRoles.tsx  |   2 +-
 .../src/pages/Admin/Role/index.tsx            |  29 +++-
 .../pages/Admin/User/components/UserRoles.tsx |   2 +-
 scaleph-ui-react/src/services/auth.ts         |  24 +++
 7 files changed, 217 insertions(+), 5 deletions(-)
 create mode 100644 scaleph-ui-react/src/pages/Admin/Role/components/ResourceWebs.tsx

diff --git a/scaleph-ui-react/src/locales/zh-CN/pages/base.ts b/scaleph-ui-react/src/locales/zh-CN/pages/base.ts
index 8d9bbf1df..a7bc0531b 100644
--- a/scaleph-ui-react/src/locales/zh-CN/pages/base.ts
+++ b/scaleph-ui-react/src/locales/zh-CN/pages/base.ts
@@ -16,7 +16,13 @@ export default {
   'app.common.operate.new.label': '新增',
   'app.common.operate.new.roles': '分配角色',
   'app.common.operate.new.rolesUser': '角色分配用户',
-  'app.common.operate.new.user': '用户配置',
+  'app.common.operate.new.rolesWeb': '角色配置web资源',
+  'app.common.operate.new.user': '配置用户',
+  'app.common.operate.new.webs': '配置web资源',
+  'app.common.operate.new.accreditUser': '已授权用户',
+  'app.common.operate.new.accreditRoles': '已授权角色',
+  'app.common.operate.new.notAccreditUser': '未授权用户',
+  'app.common.operate.new.notAccreditRoles': '未授权角色',
   'app.common.operate.new.assets': '权限配置',
   'app.common.operate.new.success': '新增成功',
   'app.common.operate.new.failure': '新增失败',
diff --git a/scaleph-ui-react/src/pages/Admin/Resource/Web/components/WebAssugnRoles.tsx b/scaleph-ui-react/src/pages/Admin/Resource/Web/components/WebAssugnRoles.tsx
index 48ac5e148..7550f0aef 100644
--- a/scaleph-ui-react/src/pages/Admin/Resource/Web/components/WebAssugnRoles.tsx
+++ b/scaleph-ui-react/src/pages/Admin/Resource/Web/components/WebAssugnRoles.tsx
@@ -148,7 +148,7 @@ const WebResourceForm: React.FC<ModalFormParentProps<SecResourceWeb>> = ({
         >
           <TableTransfer
             containerHeight={containerInfo.height}
-            titles={['未授权角色', '已授权角色']}
+            titles={[intl.formatMessage({ id: 'app.common.operate.new.notAccreditRoles' }), intl.formatMessage({ id: 'app.common.operate.new.accreditRoles' })]}
             dataSource={roleLists}
             targetKeys={originTargetKeys}
             showSearch={true}
diff --git a/scaleph-ui-react/src/pages/Admin/Role/components/ResourceWebs.tsx b/scaleph-ui-react/src/pages/Admin/Role/components/ResourceWebs.tsx
new file mode 100644
index 000000000..3edad9b40
--- /dev/null
+++ b/scaleph-ui-react/src/pages/Admin/Role/components/ResourceWebs.tsx
@@ -0,0 +1,155 @@
+import { ResponseBody } from '@/app';
+import { SecResourceWeb } from '@/services/admin/typings';
+import { AuthService } from '@/services/auth';
+import { message, Modal, Tree } from 'antd';
+import type { TreeProps } from 'antd/es/tree';
+import React, { useCallback, useEffect, useState } from 'react';
+import { useIntl } from 'umi';
+
+// 定义组件 Props 类型
+interface ModalFormParentProps<T> {
+  data: T;
+  visible: boolean;
+  onVisibleChange?: (visible: boolean) => void;
+  onCancel: () => void;
+  onOK?: (values: any) => void;
+}
+
+// WebResourceForm 组件
+const WebResourceForm: React.FC<ModalFormParentProps<SecResourceWeb>> = ({
+  data,
+  visible,
+  onCancel,
+}) => {
+  const intl = useIntl();
+  const [roleLists, setRoleLists] = useState<any[]>([]);
+  const [menuId, setMenuId] = useState<number[]>([]);
+  const [menuIdTotal, setMenuIdTotal] = useState<number[]>([]);
+
+  // 数据转换函数
+  function convertData(data: any[] | ResponseBody<any>): any[] {
+    return data.map((item) => {
+      const newItem = {
+        title: item.name,
+        key: String(item.id),
+        authorized: item.authorized.value,
+      };
+      if (item.children && item.children.length > 0) {
+        newItem.children = convertData(item.children);
+      }
+      return newItem;
+    });
+  }
+
+  // 树节点类型
+  interface TreeNode {
+    title: string;
+    key: number;
+    authorized: boolean;
+    children?: TreeNode[];
+  }
+
+  // 根据权限值查找节点的键
+  function findKeysByAuthorized(data: TreeNode[], authorizedValue: boolean): number[] {
+    const result: number[] = [];
+    function traverse(node: TreeNode) {
+      if (node.authorized === authorizedValue) {
+        result.push(+node.key);
+      }
+      if (node.children) {
+        node.children.forEach((child) => traverse(child));
+      }
+    }
+    data.forEach((item) => traverse(item));
+    return result;
+  }
+
+  // 异步获取数据
+  const fetchData = useCallback(async () => {
+    try {
+      const res1 = await AuthService.requestResourceWebs({ roleId: data?.id });
+      const treeData = convertData(res1);
+      const filteredIds = findKeysByAuthorized(treeData, '1');
+      setRoleLists(res1 || []);
+      setMenuId(filteredIds || []);
+      setMenuIdTotal(filteredIds || []);
+    } catch (error) {
+      console.error(error);
+    }
+  }, [data]);
+
+  useEffect(() => {
+    if (data) {
+      fetchData();
+    }
+  }, [data, fetchData]);
+
+  // 处理勾选事件
+  const onCheck: TreeProps['onCheck'] = (checkedKeys, info) => {
+    setMenuId(checkedKeys);
+  };
+
+  // 提交操作
+  const submit = async () => {
+    const diffValues = menuIdTotal.filter((item) => !menuId.includes(item)); // 批量为角色解除
+    const extraValues = menuId.filter((item) => !menuIdTotal.includes(item)); // 批量为角色绑定
+
+    if (diffValues.length !== 0) {
+      await AuthService.requestDeleteRoleResourceWebs({
+        roleId: data?.id,
+        resourceWebIds: diffValues,
+      }).then((res) => {
+        if (res?.success) {
+          message.success(intl.formatMessage({ id: 'app.common.operate.edit.success' }), 2);
+        }
+      });
+    }
+
+    if (extraValues.length !== 0) {
+      await AuthService.requestRoleResourceWebs({
+        roleId: data?.id,
+        resourceWebIds: extraValues,
+      }).then((res) => {
+        if (res?.success) {
+          message.success(intl.formatMessage({ id: 'app.common.operate.edit.success' }), 2);
+        }
+      });
+    }
+    onCancel();
+  };
+
+  return (
+    <Modal
+      open={visible}
+      title={data.id ? intl.formatMessage({ id: 'app.common.operate.new.rolesWeb' }) : ''}
+      width={500}
+      destroyOnClose={true}
+      onCancel={onCancel}
+      cancelText={intl.formatMessage({ id: 'app.common.operate.close.label' })}
+      centered
+      onOk={submit}
+    >
+      <div
+        style={{
+          maxHeight: '450px',
+          overflow: 'auto',
+        }}
+      >
+        <Tree
+          checkable
+          onCheck={onCheck}
+          checkedKeys={menuId}
+          treeData={roleLists}
+          defaultExpandAll
+          fieldNames={{
+            title: 'name',
+            key: 'id',
+            children: 'children',
+          }}
+        />
+      </div>
+    </Modal>
+  );
+};
+
+export default WebResourceForm;
diff --git a/scaleph-ui-react/src/pages/Admin/Role/components/WebAssugnRoles.tsx b/scaleph-ui-react/src/pages/Admin/Role/components/WebAssugnRoles.tsx
index f4c5dacba..7b34ca1bf 100644
--- a/scaleph-ui-react/src/pages/Admin/Role/components/WebAssugnRoles.tsx
+++ b/scaleph-ui-react/src/pages/Admin/Role/components/WebAssugnRoles.tsx
@@ -148,7 +148,7 @@ const WebResourceForm: React.FC<ModalFormParentProps<SecResourceWeb>> = ({
         >
           <TableTransfer
             containerHeight={containerInfo.height}
-            titles={['未授权人员', '已授权人员']}
+            titles={[intl.formatMessage({ id: 'app.common.operate.new.accreditUser' }), intl.formatMessage({ id: 'app.common.operate.new.notAccreditUser' })]}
             dataSource={roleLists}
             targetKeys={originTargetKeys}
             showSearch={true}
diff --git a/scaleph-ui-react/src/pages/Admin/Role/index.tsx b/scaleph-ui-react/src/pages/Admin/Role/index.tsx
index d2f4d10e0..e1b98455d 100644
--- a/scaleph-ui-react/src/pages/Admin/Role/index.tsx
+++ b/scaleph-ui-react/src/pages/Admin/Role/index.tsx
@@ -3,7 +3,7 @@ import RoleForm from '@/pages/Admin/Role/components/RoleForm';
 import { DictDataService } from '@/services/admin/dictData.service';
 import { RoleService } from '@/services/admin/role.service';
 import { SecRole } from '@/services/admin/typings';
-import { DeleteOutlined, EditOutlined, FormOutlined } from '@ant-design/icons';
+import { DeleteOutlined, EditOutlined, FormOutlined, SelectOutlined } from '@ant-design/icons';
 import {
   ActionType,
   ProColumns,
@@ -15,6 +15,7 @@ import { Button, message, Modal, Space, Tag, Tooltip } from 'antd';
 import React, { useRef, useState } from 'react';
 import { useAccess, useIntl } from 'umi';
 import WebAssugnRoles from './components/WebAssugnRoles';
+import ResourceWebs from './components/ResourceWebs';
 
 const RoleWeb: React.FC = () => {
   const intl = useIntl();
@@ -32,6 +33,11 @@ const RoleWeb: React.FC = () => {
     data: SecRole;
   }>({ visiable: false, parent: {}, data: {} });
 
+  const [resourceWebs, setResourceWebs] = useState<{
+    visiable: boolean;
+    data: SecRole;
+  }>({ visiable: false, parent: {}, data: {} });
+
   const tableColumns: ProColumns<SecRole>[] = [
     {
       title: intl.formatMessage({ id: 'pages.admin.role.name' }),
@@ -116,6 +122,16 @@ const RoleWeb: React.FC = () => {
                 />
               </Tooltip>
             )}
+            {access.canAccess(PRIVILEGE_CODE.datadevProjectEdit) && (
+              <Tooltip title={intl.formatMessage({ id: 'app.common.operate.new.webs' })}>
+                <Button
+                  shape="default"
+                  type="link"
+                  icon={<SelectOutlined />}
+                  onClick={() => setResourceWebs({ visiable: true, data: record })}
+                />
+              </Tooltip>
+            )}
             {access.canAccess(PRIVILEGE_CODE.roleEdit) && (
               <Tooltip title={intl.formatMessage({ id: 'app.common.operate.edit.label' })}>
                 <Button
@@ -253,6 +269,17 @@ const RoleWeb: React.FC = () => {
           data={webAssignRoles.data}
         />
       )}
+      {resourceWebs.visiable && (
+        <ResourceWebs
+          visible={resourceWebs.visiable}
+          onCancel={() => setResourceWebs({ visiable: false, data: {} })}
+          onVisibleChange={(visiable) => {
+            setResourceWebs({ visiable: visiable, data: {} });
+            actionRef.current?.reload();
+          }}
+          data={resourceWebs.data}
+        />
+      )}
     </div>
   );
 };
diff --git a/scaleph-ui-react/src/pages/Admin/User/components/UserRoles.tsx b/scaleph-ui-react/src/pages/Admin/User/components/UserRoles.tsx
index e0b44ed97..09f8369fb 100644
--- a/scaleph-ui-react/src/pages/Admin/User/components/UserRoles.tsx
+++ b/scaleph-ui-react/src/pages/Admin/User/components/UserRoles.tsx
@@ -150,7 +150,7 @@ const WebResourceForm: React.FC<ModalFormParentProps<SecResourceWeb>> = ({
         >
           <TableTransfer
             containerHeight={containerInfo.height}
-            titles={['未授权角色', '已授权角色']}
+            titles={[intl.formatMessage({ id: 'app.common.operate.new.notAccreditRoles' }), intl.formatMessage({ id: 'app.common.operate.new.accreditRoles' })]}
             dataSource={roleLists}
             targetKeys={originTargetKeys}
             showSearch={true}
diff --git a/scaleph-ui-react/src/services/auth.ts b/scaleph-ui-react/src/services/auth.ts
index a5a869f9a..07d3ae4db 100644
--- a/scaleph-ui-react/src/services/auth.ts
+++ b/scaleph-ui-react/src/services/auth.ts
@@ -147,4 +147,28 @@ export const AuthService = {
       data: param,
     });
   },
+
+  //查询所有 资源-web 和指定角色绑定状态
+  requestResourceWebs: async (param: any) => {
+    return request<ResponseBody<any>>('/api/admin/authorize/role/resource-webs', {
+      method: 'GET',
+      params: param,
+    });
+  },
+
+  //批量为角色绑定 资源-web
+  requestRoleResourceWebs: async (param: any) => {
+    return request<ResponseBody<any>>('/api/admin/authorize/role/resource-webs', {
+      method: 'PUT',
+      data: param,
+    });
+  },
+
+  //批量为角色解除 资源-web 绑定
+  requestDeleteRoleResourceWebs: async (param: any) => {
+    return request<ResponseBody<any>>('/api/admin/authorize/role/resource-webs', {
+      method: 'DELETE',
+      data: param,
+    });
+  },
 };

From bf2b6a3472f6641dfec13758073a6a38b3e66ee9 Mon Sep 17 00:00:00 2001
From: kalencaya <1942460489@qq.com>
Date: Tue, 7 Nov 2023 19:59:12 +0800
Subject: [PATCH 07/24] [Bug][scaleph-security] fix web resource child routes
 error (#637)

fix: child routes error
---
 .../service/impl/SecAuthorizeServiceImpl.java | 35 +++++++++----------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/impl/SecAuthorizeServiceImpl.java b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/impl/SecAuthorizeServiceImpl.java
index 5142a8032..63a37fba3 100644
--- a/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/impl/SecAuthorizeServiceImpl.java
+++ b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/impl/SecAuthorizeServiceImpl.java
@@ -40,28 +40,25 @@ public class SecAuthorizeServiceImpl implements SecAuthorizeService {
      */
     @Override
     public List<UmiRoute> getWebRoute() {
-        List<SecResourceWebDTO> secResourceWebDTOS = secResourceWebService.listByPid(0L, null);
-        List<UmiRoute> routes = new ArrayList<>(secResourceWebDTOS.size());
-        for (SecResourceWebDTO secResourceWebDTO : secResourceWebDTOS) {
-            routes.add(buildRoute(secResourceWebDTO));
-        }
-        return routes;
+        return buildRouteByPid(0L);
     }
 
-    private UmiRoute buildRoute(SecResourceWebDTO secResourceWebDTO) {
-        UmiRoute route = new UmiRoute();
-        route.setName(secResourceWebDTO.getName());
-        route.setPath(secResourceWebDTO.getPath());
-        route.setRedirect(secResourceWebDTO.getRedirect());
-        route.setIcon(secResourceWebDTO.getIcon());
-        route.setComponent(secResourceWebDTO.getComponent());
-        if (CollectionUtils.isEmpty(secResourceWebDTO.getChildren()) == false) {
-            List<UmiRoute> routes = new ArrayList<>(secResourceWebDTO.getChildren().size());
-            for (SecResourceWebDTO child : secResourceWebDTO.getChildren()) {
-                routes.add(buildRoute(child));
+    private List<UmiRoute> buildRouteByPid(Long pid) {
+        List<SecResourceWebDTO> secResourceWebDTOS = secResourceWebService.listByPid(pid, null);
+        List<UmiRoute> routes = new ArrayList<>(secResourceWebDTOS.size());
+        for (SecResourceWebDTO secResourceWebDTO : secResourceWebDTOS) {
+            UmiRoute route = new UmiRoute();
+            route.setName(secResourceWebDTO.getName());
+            route.setPath(secResourceWebDTO.getPath());
+            route.setRedirect(secResourceWebDTO.getRedirect());
+            route.setIcon(secResourceWebDTO.getIcon());
+            route.setComponent(secResourceWebDTO.getComponent());
+            List<UmiRoute> childRoutes = buildRouteByPid(secResourceWebDTO.getId());
+            if (CollectionUtils.isEmpty(childRoutes) == false) {
+                route.setRoutes(childRoutes);
             }
-            route.setRoutes(routes);
+            routes.add(route);
         }
-        return route;
+        return routes;
     }
 }

From 46286f72c682631da7e445b802ddfc5b654aab94 Mon Sep 17 00:00:00 2001
From: kalencaya <1942460489@qq.com>
Date: Tue, 14 Nov 2023 21:36:21 +0800
Subject: [PATCH 08/24] [Bug][docker] fix scaleph-seatunnel image error (#638)

* feature: add doris operator

* feature: add web-resource and role relation table

* feature: add web-resource and role relation mapper

* feature: add web-resource and role relation mapper

* fix: seatunnel base image
---
 pom.xml                                       |   5 +
 scaleph-api/pom.xml                           |   6 +-
 .../master/security/SecResourceWebRole.java   |  42 ++++++
 .../security/SecResourceWebRoleMapper.java    |  53 +++++++
 .../mapper/master/security/SecRoleMapper.java |   7 +-
 .../security/SecResourceWebRoleMapper.xml     |  78 ++++++++++
 .../mapper/master/security/SecRoleMapper.xml  |   3 +-
 scaleph-engine/pom.xml                        |   1 +
 scaleph-engine/scaleph-engine-doris/pom.xml   |  43 ++++++
 .../engine/doris/operator/DorisCluster.java   |  36 +++++
 .../engine/doris/operator/spec/AdminUser.java |  28 ++++
 .../operator/spec/AutoScalerVersion.java      |  23 +++
 .../operator/spec/AutoScalingPolicy.java      |  52 +++++++
 .../engine/doris/operator/spec/BaseSpec.java  | 133 ++++++++++++++++++
 .../engine/doris/operator/spec/BeSpec.java    |  29 ++++
 .../doris/operator/spec/BrokerSpec.java       |  33 +++++
 .../engine/doris/operator/spec/CnSpec.java    |  33 +++++
 .../doris/operator/spec/ConfigMapInfo.java    |  35 +++++
 .../doris/operator/spec/DorisClusterSpec.java |  31 ++++
 .../doris/operator/spec/DorisServicePort.java |  31 ++++
 .../engine/doris/operator/spec/Endpoints.java |  40 ++++++
 .../doris/operator/spec/ExportService.java    |  37 +++++
 .../engine/doris/operator/spec/FeAddress.java |  39 +++++
 .../engine/doris/operator/spec/FeSpec.java    |  25 ++++
 .../engine/doris/operator/spec/HPAPolicy.java |  40 ++++++
 .../doris/operator/spec/HPAScalingRules.java  |  27 ++++
 .../spec/HorizontalPodAutoscalerBehavior.java |  42 ++++++
 .../doris/operator/spec/HorizontalScaler.java |  35 +++++
 .../doris/operator/spec/MetricIdentifier.java |  42 ++++++
 .../doris/operator/spec/MetricSourceType.java |  51 +++++++
 .../doris/operator/spec/MetricSpec.java       |  56 ++++++++
 .../doris/operator/spec/MetricTarget.java     |  54 +++++++
 .../doris/operator/spec/MetricTargetType.java |  40 ++++++
 .../operator/spec/ObjectMetricSource.java     |  43 ++++++
 .../doris/operator/spec/PersistentVolume.java |  44 ++++++
 .../doris/operator/spec/PodsMetricSource.java |  38 +++++
 .../operator/spec/ResourceMetricSource.java   |  41 ++++++
 .../operator/spec/ScalingPolicySelect.java    |  40 ++++++
 .../doris/operator/spec/ServiceRole.java      |  24 ++++
 .../operator/spec/SystemInitialization.java   |  42 ++++++
 .../doris/operator/status/CnStatus.java       |  25 ++++
 .../operator/status/DorisClusterStatus.java   |  22 +++
 .../generator/MybatisPlusGenerator.java       |   2 +-
 .../docker/build/scaleph-seatunnel/Dockerfile |  18 +--
 .../build/scaleph-seatunnel/Dockerfile_backup |  55 ++++++++
 .../build/scaleph-seatunnel/Dockerfile_single |  38 +++++
 .../mysql/init.d/scaleph-security-mysql.sql   |  15 ++
 47 files changed, 1657 insertions(+), 20 deletions(-)
 create mode 100644 scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecResourceWebRole.java
 create mode 100644 scaleph-dao/src/main/java/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebRoleMapper.java
 create mode 100644 scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebRoleMapper.xml
 create mode 100644 scaleph-engine/scaleph-engine-doris/pom.xml
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/DorisCluster.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/AdminUser.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/AutoScalerVersion.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/AutoScalingPolicy.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/BaseSpec.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/BeSpec.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/BrokerSpec.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/CnSpec.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ConfigMapInfo.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/DorisClusterSpec.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/DorisServicePort.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/Endpoints.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ExportService.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/FeAddress.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/FeSpec.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HPAPolicy.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HPAScalingRules.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HorizontalPodAutoscalerBehavior.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HorizontalScaler.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/MetricIdentifier.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/MetricSourceType.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/MetricSpec.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/MetricTarget.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/MetricTargetType.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ObjectMetricSource.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/PersistentVolume.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/PodsMetricSource.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ResourceMetricSource.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ScalingPolicySelect.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ServiceRole.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/SystemInitialization.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/status/CnStatus.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/status/DorisClusterStatus.java
 create mode 100644 tools/docker/build/scaleph-seatunnel/Dockerfile_backup
 create mode 100644 tools/docker/build/scaleph-seatunnel/Dockerfile_single

diff --git a/pom.xml b/pom.xml
index 9cf76e8a7..b7ce5da37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -268,6 +268,11 @@
                 <artifactId>scaleph-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>scaleph-engine-doris</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>scaleph-engine-flink-client</artifactId>
diff --git a/scaleph-api/pom.xml b/scaleph-api/pom.xml
index 87012c16e..00e64f01f 100644
--- a/scaleph-api/pom.xml
+++ b/scaleph-api/pom.xml
@@ -29,7 +29,11 @@
 
     <dependencies>
         <dependency>
-            <groupId>cn.sliew</groupId>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>scaleph-engine-doris</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
             <artifactId>scaleph-engine-sql-gateway</artifactId>
         </dependency>
         <dependency>
diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecResourceWebRole.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecResourceWebRole.java
new file mode 100644
index 000000000..b3bb64a86
--- /dev/null
+++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecResourceWebRole.java
@@ -0,0 +1,42 @@
+/*
+ * 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 cn.sliew.scaleph.dao.entity.master.security;
+
+import cn.sliew.scaleph.dao.entity.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 资源-web与角色关联表
+ */
+@Data
+@TableName("sec_resource_web_role")
+@Schema(name = "SecResourceWebRole对象", description = "资源-web与角色关联表")
+public class SecResourceWebRole extends BaseDO {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField("resource_web_id")
+    private Long resourceWebId;
+
+    @TableField("role_id")
+    private Long roleId;
+}
diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebRoleMapper.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebRoleMapper.java
new file mode 100644
index 000000000..e9b883fd8
--- /dev/null
+++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebRoleMapper.java
@@ -0,0 +1,53 @@
+/*
+ * 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 cn.sliew.scaleph.dao.mapper.master.security;
+
+import cn.sliew.scaleph.common.dict.security.RoleStatus;
+import cn.sliew.scaleph.dao.entity.master.security.SecResourceWeb;
+import cn.sliew.scaleph.dao.entity.master.security.SecResourceWebRole;
+import cn.sliew.scaleph.dao.entity.master.security.SecRole;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 资源-web与角色关联表 Mapper 接口
+ */
+@Repository
+public interface SecResourceWebRoleMapper extends BaseMapper<SecResourceWebRole> {
+
+    /**
+     * 查询 资源-web 关联的角色
+     */
+    Page<SecRole> selectRelatedRolesByWebResource(Page page,
+                                                  @Param("resourceWebId") Long resourceWebId,
+                                                  @Param("status") RoleStatus status,
+                                                  @Param("name") String name);
+
+    /**
+     * 查询 资源-web 未关联的角色
+     */
+    Page<SecRole> selectUnrelatedRolesByWebResource(Page page,
+                                                    @Param("resourceWebId") Long resourceWebId,
+                                                    @Param("status") RoleStatus status,
+                                                    @Param("name") String name);
+
+    Page<SecResourceWeb> selectAllResourceWebWithAuthorizeStatus(@Param("roleId") Long roleId);
+}
diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/mapper/master/security/SecRoleMapper.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/mapper/master/security/SecRoleMapper.java
index 61bae8237..cff382e6d 100644
--- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/mapper/master/security/SecRoleMapper.java
+++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/mapper/master/security/SecRoleMapper.java
@@ -18,14 +18,14 @@
 
 package cn.sliew.scaleph.dao.mapper.master.security;
 
-import java.io.Serializable;
-import java.util.List;
-
 import cn.sliew.scaleph.dao.entity.master.security.SecRole;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.io.Serializable;
+import java.util.List;
+
 /**
  * <p>
  * 角色表 Mapper 接口
@@ -36,6 +36,7 @@
  */
 @Repository
 public interface SecRoleMapper extends BaseMapper<SecRole> {
+
     /**
      * 查询部门对应的角色信息
      *
diff --git a/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebRoleMapper.xml b/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebRoleMapper.xml
new file mode 100644
index 000000000..fdb65d1b7
--- /dev/null
+++ b/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebRoleMapper.xml
@@ -0,0 +1,78 @@
+<?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="cn.sliew.scaleph.dao.mapper.master.security.SecResourceWebRoleMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.sliew.scaleph.dao.entity.master.security.SecResourceWebRole">
+        <result column="id" property="id" />
+        <result column="creator" property="creator" />
+        <result column="create_time" property="createTime" />
+        <result column="editor" property="editor" />
+        <result column="update_time" property="updateTime" />
+        <result column="resource_web_id" property="resourceWebId" />
+        <result column="role_id" property="roleId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,
+        creator,
+        create_time,
+        editor,
+        update_time,
+        resource_web_id, role_id
+    </sql>
+
+    <select id="selectRelatedRolesByWebResource" resultMap="cn.sliew.scaleph.dao.mapper.master.security.SecRoleMapper.SecRoleMap">
+        SELECT
+        t1.*
+        FROM
+        sec_role t1
+        JOIN sec_resource_web_role t2 ON t1.id = t2.role_id
+        WHERE
+        t2.resource_web_id = #{resourceWebId}
+        <if test="status != null">
+            AND t1.`status` = #{status}
+        </if>
+        <if test="name != null and name != ''">
+            AND t1.`name` like concat('%',#{name},'%')
+        </if>
+        ORDER BY
+        t1.`code`
+    </select>
+
+    <select id="selectUnrelatedRolesByWebResource" resultMap="cn.sliew.scaleph.dao.mapper.master.security.SecRoleMapper.SecRoleMap">
+        SELECT
+        t1.*
+        FROM
+        sec_role t1
+        WHERE
+        <if test="status != null">
+            AND t1.`status` = #{status}
+        </if>
+        <if test="name != null and name != ''">
+            AND t1.`name` like concat('%',#{name},'%')
+        </if>
+        AND NOT EXISTS ( SELECT * FROM sec_resource_web_role t2 WHERE t1.id = t2.role_id AND t2.resource_web_id = #{resourceWebId} )
+        ORDER BY
+        t1.`code`
+    </select>
+
+</mapper>
diff --git a/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecRoleMapper.xml b/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecRoleMapper.xml
index 8878c2139..08f4470ff 100644
--- a/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecRoleMapper.xml
+++ b/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecRoleMapper.xml
@@ -86,7 +86,6 @@
                 </otherwise>
             </choose>
         </where>
-
-
     </select>
+
 </mapper>
diff --git a/scaleph-engine/pom.xml b/scaleph-engine/pom.xml
index c0cd9c712..2b38fcbc0 100644
--- a/scaleph-engine/pom.xml
+++ b/scaleph-engine/pom.xml
@@ -30,6 +30,7 @@
     <packaging>pom</packaging>
 
     <modules>
+        <module>scaleph-engine-doris</module>
         <module>scaleph-engine-flink-client</module>
         <module>scaleph-engine-seatunnel</module>
         <module>scaleph-engine-flink</module>
diff --git a/scaleph-engine/scaleph-engine-doris/pom.xml b/scaleph-engine/scaleph-engine-doris/pom.xml
new file mode 100644
index 000000000..547e50507
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/pom.xml
@@ -0,0 +1,43 @@
+<?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.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>cn.sliew</groupId>
+        <artifactId>scaleph</artifactId>
+        <version>1.0.5-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>scaleph-engine-doris</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>scaleph-project</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>kubernetes-client</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/DorisCluster.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/DorisCluster.java
new file mode 100644
index 000000000..40df42f32
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/DorisCluster.java
@@ -0,0 +1,36 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator;
+
+import cn.sliew.scaleph.engine.doris.operator.spec.DorisClusterSpec;
+import cn.sliew.scaleph.engine.doris.operator.status.DorisClusterStatus;
+import io.fabric8.kubernetes.api.model.Namespaced;
+import io.fabric8.kubernetes.client.CustomResource;
+import io.fabric8.kubernetes.model.annotation.Group;
+import io.fabric8.kubernetes.model.annotation.Kind;
+import io.fabric8.kubernetes.model.annotation.Version;
+
+@Version("v1")
+@Group("doris.selectdb.com")
+@Kind("DorisCluster")
+public class DorisCluster extends CustomResource<DorisClusterSpec, DorisClusterStatus> implements Namespaced {
+
+
+
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/AdminUser.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/AdminUser.java
new file mode 100644
index 000000000..c6903ad6b
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/AdminUser.java
@@ -0,0 +1,28 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+import lombok.Data;
+
+@Data
+public class AdminUser extends BaseSpec {
+
+    private String name;
+    private String password;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/AutoScalerVersion.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/AutoScalerVersion.java
new file mode 100644
index 000000000..81cd489f7
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/AutoScalerVersion.java
@@ -0,0 +1,23 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+public enum AutoScalerVersion {
+    v1, v2;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/AutoScalingPolicy.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/AutoScalingPolicy.java
new file mode 100644
index 000000000..8fe2b5dfc
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/AutoScalingPolicy.java
@@ -0,0 +1,52 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+import lombok.Data;
+
+import javax.annotation.Nullable;
+
+/**
+ * AutoScalingPolicy defines the auto scale
+ */
+@Data
+public class AutoScalingPolicy {
+
+    /**
+     * the policy of cn autoscale. operator use autoscaling v2.
+     */
+    private Object hpaPolicy;
+
+    /**
+     * version represents the autoscaler version for cn service. only support v1,,v2
+     */
+    private AutoScalerVersion version;
+
+    /**
+     * the min numbers of target.
+     */
+    @Nullable
+    private Integer minReplicas;
+
+    /**
+     * the max numbers of target.
+     */
+    @Nullable
+    private Integer maxReplicas;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/BaseSpec.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/BaseSpec.java
new file mode 100644
index 000000000..14ca0963a
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/BaseSpec.java
@@ -0,0 +1,133 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+import io.fabric8.kubernetes.api.model.*;
+import lombok.Data;
+
+import javax.annotation.Nullable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * BaseSpec describe the foundation spec of pod about doris components.
+ */
+@Data
+public class BaseSpec {
+
+    /**
+     * annotation for fe pods. user can config monitor annotation for collect to monitor system.
+     */
+    private Map<String, String> annotations;
+
+    /**
+     * (Optional) If specified, the pod’s nodeSelector，displayName=“Map of nodeSelectors to match when scheduling pods on nodes”
+     */
+    @Nullable
+    private Map<String, String> nodeSelector;
+
+    /**
+     * podLabels for user selector or classify pods
+     */
+    @Nullable
+    private Map<String, String> podLabels;
+
+    /**
+     * Image for a doris cn deployment.
+     */
+    private String image;
+
+    /**
+     * ImagePullSecrets is an optional list of references to secrets in the same namespace to use for pulling any of the images used by this PodSpec. If specified, these secrets will be passed to individual puller implementations for them to use. More info: https://kubernetes.io/docs/concepts/containers/images#specifying-imagepullsecrets-on-a-pod
+     */
+    @Nullable
+    private List<LocalObjectReference> imagePullSecrets;
+
+    /**
+     * serviceAccount for cn access cloud service.
+     */
+    private String serviceAccount;
+
+    /**
+     * Replicas is the number of desired cn Pod.
+     */
+    @Nullable
+    private Integer replicas;
+
+    /**
+     * fixme 错误
+     * (Members of ResourceRequirements are embedded into this type.)
+     */
+    private ResourceRequirements ResourceRequirements;
+
+    /**
+     * (Optional) Tolerations for scheduling pods onto some dedicated nodes
+     */
+    @Nullable
+    private List<Toleration> tolerations;
+
+    /**
+     * the reference for cn configMap.
+     */
+    @Nullable
+    private ConfigMapInfo configMapInfo;
+
+    /**
+     cnEnvVars is a slice of environment variables that are added to the pods, the default is empty.
+     */
+    @Nullable
+    private List<EnvVar> envVars;
+
+    /**
+     * SystemInitialization for fe, be and cn setting system parameters.
+     */
+    private SystemInitialization systemInitialization;
+
+    /**
+     *
+     */
+    private List<PersistentVolume> persistentVolumes;
+
+    /**
+     * If specified, the pod’s scheduling constraints.
+     */
+    @Nullable
+    private Affinity affinity;
+
+    /**
+     * HostAliases is an optional list of hosts and IPs that will be injected into the pod’s hosts file if specified. This is only valid for non-hostNetwork pods.
+     */
+    @Nullable
+    private List<HostAlias> hostAliases;
+
+    /**
+     * expose the be listen ports
+     */
+    private ExportService service;
+
+    /**
+     * specify register fe addresses
+     */
+    private FeAddress feAddress;
+
+    /**
+     * A special supplemental group that applies to all containers in a pod. Some volume types allow the Kubelet to change the ownership of that volume to be owned by the pod:
+     */
+    private Long fsGroup;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/BeSpec.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/BeSpec.java
new file mode 100644
index 000000000..648748b1f
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/BeSpec.java
@@ -0,0 +1,29 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+import lombok.Data;
+
+/**
+ * BeSpec describes a template for creating copies of a be software service.
+ */
+@Data
+public class BeSpec extends BaseSpec {
+
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/BrokerSpec.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/BrokerSpec.java
new file mode 100644
index 000000000..952ea2ee8
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/BrokerSpec.java
@@ -0,0 +1,33 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+import lombok.Data;
+
+/**
+ * BrokerSpec describes a template for creating copies of a broker software service, if deploy broker we recommend you add affinity for deploy with be pod.
+ */
+@Data
+public class BrokerSpec extends BaseSpec {
+
+    /**
+     * expose the cn listen ports
+     */
+    private ExportService service;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/CnSpec.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/CnSpec.java
new file mode 100644
index 000000000..e757abd9e
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/CnSpec.java
@@ -0,0 +1,33 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+import lombok.Data;
+
+/**
+ * CnSpec describes a template for creating copies of a cn software service. cn, the service for external table.
+ */
+@Data
+public class CnSpec extends BaseSpec {
+
+    /**
+     * AutoScalingPolicy auto scaling strategy
+     */
+    private AutoScalingPolicy autoScalingPolicy;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ConfigMapInfo.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ConfigMapInfo.java
new file mode 100644
index 000000000..f827e02ae
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ConfigMapInfo.java
@@ -0,0 +1,35 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+import lombok.Data;
+
+@Data
+public class ConfigMapInfo {
+
+    /**
+     * the config info for start progress.
+     */
+    private String configMapName;
+
+    /**
+     * the config response key in configmap.
+     */
+    private String resolveKey;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/DorisClusterSpec.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/DorisClusterSpec.java
new file mode 100644
index 000000000..c8c9c7561
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/DorisClusterSpec.java
@@ -0,0 +1,31 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+import lombok.Data;
+
+@Data
+public class DorisClusterSpec {
+
+    private FeSpec feSpec;
+    private BeSpec beSpec;
+    private CnSpec cnSpec;
+    private BrokerSpec brokerSpec;
+    private AdminUser adminUser;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/DorisServicePort.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/DorisServicePort.java
new file mode 100644
index 000000000..2c2bf7dc6
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/DorisServicePort.java
@@ -0,0 +1,31 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+import lombok.Data;
+
+/**
+ * 仅在 NodeType 场景起作用
+ */
+@Data
+public class DorisServicePort {
+
+    private Integer nodePort;
+    private Integer targetPort;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/Endpoints.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/Endpoints.java
new file mode 100644
index 000000000..2ad045413
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/Endpoints.java
@@ -0,0 +1,40 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Endpoints describe the address outside k8s.
+ */
+@Data
+public class Endpoints {
+
+    /**
+     * the ip or domain array.
+     */
+    private List<String> address;
+
+    /**
+     * the fe port that for query. the field query_port defines in fe config.
+     */
+    private Integer port;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ExportService.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ExportService.java
new file mode 100644
index 000000000..24a068412
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ExportService.java
@@ -0,0 +1,37 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+import cn.sliew.scaleph.common.dict.flink.ServiceExposedType;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ExportService {
+
+    /**
+     * fixme k8s 的 type
+     * https://github.com/selectdb/doris-operator/blob/master/doc/api.md#exportservice
+     */
+    private ServiceExposedType type;
+    private List<DorisServicePort> servicePorts;
+    private String loadBalancerIP;
+
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/FeAddress.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/FeAddress.java
new file mode 100644
index 000000000..19a8a2341
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/FeAddress.java
@@ -0,0 +1,39 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+import lombok.Data;
+
+/**
+ * FeAddress specify the fe address, please set it when you deploy fe outside k8s or deploy components use crd except fe, if not set .
+ */
+@Data
+public class FeAddress {
+
+    /**
+     * the service name that proxy fe on k8s. the service must in same namespace with fe.
+     */
+    private String serviceName;
+
+    /**
+     * the fe addresses if not deploy by crd, user can use k8s deploy fe observer.
+     */
+    private Endpoints endpoints;
+
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/FeSpec.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/FeSpec.java
new file mode 100644
index 000000000..30b332c6b
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/FeSpec.java
@@ -0,0 +1,25 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+import lombok.Data;
+
+@Data
+public class FeSpec extends BaseSpec {
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HPAPolicy.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HPAPolicy.java
new file mode 100644
index 000000000..e65538a13
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HPAPolicy.java
@@ -0,0 +1,40 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+import lombok.Data;
+
+import javax.annotation.Nullable;
+import java.util.List;
+
+@Data
+public class HPAPolicy {
+
+    /**
+     * Metrics specifies how to scale based on a single metric the struct copy from k8s.io/api/autoscaling/v2beta2/types.go. the redundancy code will hide the restriction about HorizontalPodAutoscaler version and kubernetes releases matching issue. the splice will have unsafe.Pointer convert, so be careful to edit the struct fileds.
+     */
+    @Nullable
+    private List<Object> metrics;
+
+    /**
+     * HorizontalPodAutoscalerBehavior configures the scaling behavior of the target. the struct copy from k8s.io/api/autoscaling/v2beta2/types.go. the redundancy code will hide the restriction about HorizontalPodAutoscaler version and kubernetes releases matching issue. the
+     */
+    @Nullable
+    private Object behavior;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HPAScalingRules.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HPAScalingRules.java
new file mode 100644
index 000000000..94c83fcd9
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HPAScalingRules.java
@@ -0,0 +1,27 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+import lombok.Data;
+
+@Data
+public class HPAScalingRules {
+
+
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HorizontalPodAutoscalerBehavior.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HorizontalPodAutoscalerBehavior.java
new file mode 100644
index 000000000..ea4b44956
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HorizontalPodAutoscalerBehavior.java
@@ -0,0 +1,42 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+import lombok.Data;
+
+import javax.annotation.Nullable;
+
+/**
+ * HorizontalPodAutoscalerBehavior configures the scaling behavior of the target in both Up and Down directions (scaleUp and scaleDown fields respectively).
+ */
+@Data
+public class HorizontalPodAutoscalerBehavior {
+
+    /**
+     * scaleUp is scaling policy for scaling Up. If not set, the default value is the higher of: * increase no more than 4 pods per 60 seconds * double the number of pods per 60 seconds No stabilization is used.
+     */
+    @Nullable
+    private Object scaleUp;
+
+    /**
+     * scaleDown is scaling policy for scaling Down. If not set, the default value is to allow to scale down to minReplicas pods, with a 300 second stabilization window (i.e., the highest recommendation for the last 300sec is used).
+     */
+    @Nullable
+    private Object scaleDown;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HorizontalScaler.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HorizontalScaler.java
new file mode 100644
index 000000000..c018f9909
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HorizontalScaler.java
@@ -0,0 +1,35 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+import lombok.Data;
+
+@Data
+public class HorizontalScaler {
+
+    /**
+     * the deploy horizontal scaler name
+     */
+    private String name;
+
+    /**
+     * the deploy horizontal version.
+     */
+    private AutoScalerVersion version;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/MetricIdentifier.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/MetricIdentifier.java
new file mode 100644
index 000000000..f4563ed56
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/MetricIdentifier.java
@@ -0,0 +1,42 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+import io.fabric8.kubernetes.api.model.LabelSelector;
+import lombok.Data;
+
+import javax.annotation.Nullable;
+
+/**
+ * MetricIdentifier defines the name and optionally selector for a metric
+ */
+@Data
+public class MetricIdentifier {
+
+    /**
+     * name is the name of the given metric
+     */
+    private String name;
+
+    /**
+     * selector is the string-encoded form of a standard kubernetes label selector for the given metric When set, it is passed as an additional parameter to the metrics server for more specific metrics scoping. When unset, just the metricName will be used to gather metrics.
+     */
+    @Nullable
+    private LabelSelector selector;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/MetricSourceType.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/MetricSourceType.java
new file mode 100644
index 000000000..d77ea44b6
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/MetricSourceType.java
@@ -0,0 +1,51 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+/**
+ * MetricSourceType indicates the type of metric.
+ */
+public enum MetricSourceType {
+
+    /**
+     * ObjectMetricSourceType is a metric describing a kubernetes object (for example, hits-per-second on an Ingress object).
+     */
+    Object,
+
+    /**
+     * PodsMetricSourceType is a metric describing each pod in the current scale target (for example, transactions-processed-per-second). The values will be averaged together before being compared to the target value.
+     */
+    Pods,
+
+    /**
+     * ResourceMetricSourceType is a resource metric known to Kubernetes, as specified in requests and limits, describing each pod in the current scale target (e.g. CPU or memory). Such metrics are built in to Kubernetes, and have special scaling options on top of those available to normal per-pod metrics (the “pods” source).
+     */
+    Resource,
+
+    /**
+     * ContainerResourceMetricSourceType is a resource metric known to Kubernetes, as specified in requests and limits, describing a single container in each pod in the current scale target (e.g. CPU or memory). Such metrics are built in to Kubernetes, and have special scaling options on top of those available to normal per-pod metrics (the “pods” source).
+     */
+    ContainerResource,
+
+    /**
+     * ExternalMetricSourceType is a global metric that is not associated with any Kubernetes object. It allows autoscaling based on information coming from components running outside of cluster (for example length of queue in cloud messaging service, or QPS from loadbalancer running outside of cluster).
+     */
+    External,
+
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/MetricSpec.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/MetricSpec.java
new file mode 100644
index 000000000..3a962b868
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/MetricSpec.java
@@ -0,0 +1,56 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+import lombok.Data;
+
+import javax.annotation.Nullable;
+
+@Data
+public class MetricSpec {
+
+    /**
+     * type is the type of metric source. It should be one of “ContainerResource”, “External”, “Object”, “Pods” or “Resource”, each mapping to a matching field in the object. Note: “ContainerResource” type is available on when the feature-gate HPAContainerMetrics is enabled
+     */
+    private MetricSourceType type;
+
+    /**
+     * pods refers to a metric describing each pod in the current scale target (for example, transactions-processed-per-second). The values will be averaged together before being compared to the target value.
+     */
+    @Nullable
+    private ObjectMetricSource object;
+
+    /**
+     * resource refers to a resource metric (such as those specified in requests and limits) known to Kubernetes describing each pod in the current scale target (e.g. CPU or memory). Such metrics are built in to Kubernetes, and have special scaling options on top of those available to normal per-pod metrics using the “pods” source.
+     */
+    @Nullable
+    private ResourceMetricSource resource;
+
+    /**
+     * container resource refers to a resource metric (such as those specified in requests and limits) known to Kubernetes describing a single container in each pod of the current scale target (e.g. CPU or memory). Such metrics are built in to Kubernetes, and have special scaling options on top of those available to normal per-pod metrics using the “pods” source. This is an alpha feature and can be enabled by the HPAContainerMetrics feature flag.
+     */
+    @Nullable
+    private Object containerResource;
+
+    /**
+     * external refers to a global metric that is not associated with any Kubernetes object. It allows autoscaling based on information coming from components running outside of cluster (for example length of queue in cloud messaging service, or QPS from loadbalancer running outside of cluster).
+     */
+    @Nullable
+    private Object external;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/MetricTarget.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/MetricTarget.java
new file mode 100644
index 000000000..80b71def6
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/MetricTarget.java
@@ -0,0 +1,54 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+import io.fabric8.kubernetes.api.model.Quantity;
+import lombok.Data;
+
+import javax.annotation.Nullable;
+
+/**
+ * MetricTarget defines the target value, average value, or average utilization of a specific metric
+ */
+@Data
+public class MetricTarget {
+
+    /**
+     * type represents whether the metric type is Utilization, Value, or AverageValue
+     */
+    private MetricTargetType type;
+
+    /**
+     * value is the target value of the metric (as a quantity).
+     */
+    @Nullable
+    private Quantity value;
+
+    /**
+     * averageValue is the target value of the average of the metric across all relevant pods (as a quantity)
+     */
+    @Nullable
+    private Quantity averageValue;
+
+    /**
+     * averageUtilization is the target value of the average of the resource metric across all relevant pods, represented as a percentage of the requested value of the resource for the pods. Currently only valid for Resource metric source type
+     */
+    @Nullable
+    private Integer averageUtilization;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/MetricTargetType.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/MetricTargetType.java
new file mode 100644
index 000000000..b4f146c78
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/MetricTargetType.java
@@ -0,0 +1,40 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+/**
+ * MetricTargetType specifies the type of metric being targeted, and should be either “Value”, “AverageValue”, or “Utilization”
+ */
+public enum MetricTargetType {
+
+    /**
+     * AverageValueMetricType declares a MetricTarget is an
+     */
+    AverageValue,
+
+    /**
+     * UtilizationMetricType declares a MetricTarget is an AverageUtilization value
+     */
+    Utilization,
+
+    /**
+     * ValueMetricType declares a MetricTarget is a raw value
+     */
+    Value;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ObjectMetricSource.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ObjectMetricSource.java
new file mode 100644
index 000000000..1be52f7ba
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ObjectMetricSource.java
@@ -0,0 +1,43 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+import lombok.Data;
+
+/**
+ * ObjectMetricSource indicates how to scale on a metric describing a kubernetes object (for example, hits-per-second on an Ingress object).
+ */
+@Data
+public class ObjectMetricSource {
+
+    /**
+     *
+     */
+    private Object describedObject;
+
+    /**
+     * metric identifies the target metric by name and selector
+     */
+    private Object metric;
+
+    /**
+     * target specifies the target value for the given metric
+     */
+    private MetricTarget target;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/PersistentVolume.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/PersistentVolume.java
new file mode 100644
index 000000000..4dd8ccc11
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/PersistentVolume.java
@@ -0,0 +1,44 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
+import lombok.Data;
+
+/**
+ * PersistentVolume defines volume information and container mount information.
+ */
+@Data
+public class PersistentVolume {
+
+    /**
+     * PersistentVolumeClaimSpec is a list of claim spec about storage that pods are required.
+     */
+    private PersistentVolumeClaim persistentVolumeClaimSpec;
+
+    /**
+     * the mount path for component service.
+     */
+    private String mountPath;
+
+    /**
+     * the volume name associate with
+     */
+    private String name;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/PodsMetricSource.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/PodsMetricSource.java
new file mode 100644
index 000000000..2d1c5040d
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/PodsMetricSource.java
@@ -0,0 +1,38 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+import lombok.Data;
+
+/**
+ * PodsMetricSource indicates how to scale on a metric describing each pod in the current scale target (for example, transactions-processed-per-second). The values will be averaged together before being compared to the target value.
+ */
+@Data
+public class PodsMetricSource {
+
+    /**
+     * metric identifies the target metric by name and selector
+     */
+    private Object metric;
+
+    /**
+     * target specifies the target value for the given metric
+     */
+    private MetricTarget target;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ResourceMetricSource.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ResourceMetricSource.java
new file mode 100644
index 000000000..d0605b557
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ResourceMetricSource.java
@@ -0,0 +1,41 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+import lombok.Data;
+
+/**
+ * ResourceMetricSource indicates how to scale on a resource metric known to Kubernetes, as specified in requests and limits, describing each pod in the current scale target (e.g. CPU or memory).
+ * The values will be averaged together before being compared to the target.
+ * Such metrics are built in to Kubernetes, and have special scaling options on top of those available to normal per-pod metrics using the “pods” source.
+ * Only one “target” type should be set.
+ */
+@Data
+public class ResourceMetricSource {
+
+    /**
+     * name is the name of the resource in question.
+     */
+    private Object name;
+
+    /**
+     * target specifies the target value for the given metric
+     */
+    private MetricTarget target;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ScalingPolicySelect.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ScalingPolicySelect.java
new file mode 100644
index 000000000..e21d0b7e0
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ScalingPolicySelect.java
@@ -0,0 +1,40 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+/**
+ * ScalingPolicySelect is used to specify which policy should be used while scaling in a certain direction
+ */
+public enum ScalingPolicySelect {
+
+    /**
+     * DisabledPolicySelect disables the scaling in this direction.
+     */
+    Disabled,
+
+    /**
+     * MaxPolicySelect selects the policy with the highest possible change.
+     */
+    Max,
+
+    /**
+     * MinPolicySelect selects the policy with the lowest possible change.
+     */
+    Min;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ServiceRole.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ServiceRole.java
new file mode 100644
index 000000000..45a4fca33
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ServiceRole.java
@@ -0,0 +1,24 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+public enum ServiceRole {
+
+    access, internal;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/SystemInitialization.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/SystemInitialization.java
new file mode 100644
index 000000000..46c1bcc2f
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/SystemInitialization.java
@@ -0,0 +1,42 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SystemInitialization {
+
+    /**
+     * Image for doris initialization, default is alpine:latest.
+     */
+    private String initImage;
+
+    /**
+     * Entrypoint array. Not executed within a shell.
+     */
+    private List<String> command;
+
+    /**
+     * Arguments to the entrypoint.
+     */
+    private List<String> args;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/status/CnStatus.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/status/CnStatus.java
new file mode 100644
index 000000000..a32f3111d
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/status/CnStatus.java
@@ -0,0 +1,25 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.status;
+
+import lombok.Data;
+
+@Data
+public class CnStatus {
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/status/DorisClusterStatus.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/status/DorisClusterStatus.java
new file mode 100644
index 000000000..a9de661a2
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/status/DorisClusterStatus.java
@@ -0,0 +1,22 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.status;
+
+public class DorisClusterStatus {
+}
diff --git a/scaleph-support/scaleph-generator/src/main/java/cn/sliew/scaleph/generator/MybatisPlusGenerator.java b/scaleph-support/scaleph-generator/src/main/java/cn/sliew/scaleph/generator/MybatisPlusGenerator.java
index 8b5e07689..12a505942 100644
--- a/scaleph-support/scaleph-generator/src/main/java/cn/sliew/scaleph/generator/MybatisPlusGenerator.java
+++ b/scaleph-support/scaleph-generator/src/main/java/cn/sliew/scaleph/generator/MybatisPlusGenerator.java
@@ -54,7 +54,7 @@ public class MybatisPlusGenerator {
     /**
      * just add table names here and run the {@link #main(String[])} method.
      */
-    private static final String[] TABLES = {"sec_resource_web"};
+    private static final String[] TABLES = {"sec_resource_web_role"};
 
     public static void main(String[] args) {
         //自动生成配置
diff --git a/tools/docker/build/scaleph-seatunnel/Dockerfile b/tools/docker/build/scaleph-seatunnel/Dockerfile
index 9f0c21a4c..2733d60e7 100644
--- a/tools/docker/build/scaleph-seatunnel/Dockerfile
+++ b/tools/docker/build/scaleph-seatunnel/Dockerfile
@@ -19,30 +19,22 @@ ARG BASE_RELEASE_IMAGE=flink:${FLINK_VERSION}
 FROM maven:3.8-eclipse-temurin-11 as build
 
 ARG SEATUNNEL_VERSION=2.3.3
+ARG TAR_FILE=apache-seatunnel-${SEATUNNEL_VERSION}-bin.tar.gz
 
 ENV SEATUNNEL_HOME=/opt/seatunnel
-
 RUN mkdir -p $SEATUNNEL_HOME
 
-ARG TAR_FILE=apache-seatunnel-${SEATUNNEL_VERSION}-bin.tar.gz
-
-#COPY $TAR_FILE $SEATUNNEL_HOME/$TAR_FILE
-#RUN cd $SEATUNNEL_HOME ; \
-#    tar -zxf $TAR_FILE --strip 1 -C $SEATUNNEL_HOME \
-
-# forked from seatunnel k8s quick start
-RUN wget https://archive.apache.org/dist/seatunnel/${SEATUNNEL_VERSION}/$TAR_FILE ; \
+RUN wget https://dlcdn.apache.org/seatunnel/${SEATUNNEL_VERSION}/$TAR_FILE ; \
     tar -zxf $TAR_FILE --strip 1 -C $SEATUNNEL_HOME
 
 # strange behavior: replace mvnw by mvn on install-plugin.sh, remove useless comment on plugin_config
 RUN rm $SEATUNNEL_HOME/config/plugin_config
 COPY tools/docker/build/scaleph-seatunnel/plugin_config $SEATUNNEL_HOME/config
 
-RUN rm $SEATUNNEL_HOME/bin/install-plugin.sh
-COPY tools/docker/build/scaleph-seatunnel/install-plugin.sh $SEATUNNEL_HOME/bin
+#RUN rm $SEATUNNEL_HOME/bin/install-plugin.sh
+#COPY tools/docker/build/scaleph-seatunnel/install-plugin.sh $SEATUNNEL_HOME/bin
 
-RUN cd $SEATUNNEL_HOME ; \
-    sh -x bin/install-plugin.sh ${SEATUNNEL_VERSION}
+RUN cd ${SEATUNNEL_HOME}|| sh bin/install-plugin.sh ${SEATUNNEL_VERSION}
 
 # BASE_RELEASE_IMAGE argument must be defined twice
 ARG FLINK_VERSION=1.15
diff --git a/tools/docker/build/scaleph-seatunnel/Dockerfile_backup b/tools/docker/build/scaleph-seatunnel/Dockerfile_backup
new file mode 100644
index 000000000..f69818614
--- /dev/null
+++ b/tools/docker/build/scaleph-seatunnel/Dockerfile_backup
@@ -0,0 +1,55 @@
+# 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.
+
+ARG FLINK_VERSION=1.15
+ARG BASE_RELEASE_IMAGE=flink:${FLINK_VERSION}
+FROM maven:3.8-eclipse-temurin-11 as build
+
+ARG SEATUNNEL_VERSION=2.3.3
+
+ENV SEATUNNEL_HOME=/opt/seatunnel
+
+RUN mkdir -p $SEATUNNEL_HOME
+
+ARG TAR_FILE=apache-seatunnel-${SEATUNNEL_VERSION}-bin.tar.gz
+
+#COPY $TAR_FILE $SEATUNNEL_HOME/$TAR_FILE
+#RUN cd $SEATUNNEL_HOME ; \
+#    tar -zxf $TAR_FILE --strip 1 -C $SEATUNNEL_HOME \
+
+# forked from seatunnel k8s quick start
+RUN wget https://archive.apache.org/dist/seatunnel/${SEATUNNEL_VERSION}/$TAR_FILE ; \
+    tar -zxf $TAR_FILE --strip 1 -C $SEATUNNEL_HOME
+
+# strange behavior: replace mvnw by mvn on install-plugin.sh, remove useless comment on plugin_config
+RUN rm $SEATUNNEL_HOME/config/plugin_config
+COPY tools/docker/build/scaleph-seatunnel/plugin_config $SEATUNNEL_HOME/config
+
+#RUN rm $SEATUNNEL_HOME/bin/install-plugin.sh
+#COPY tools/docker/build/scaleph-seatunnel/install-plugin.sh $SEATUNNEL_HOME/bin
+
+RUN cd ${SEATUNNEL_HOME}|| sh bin/install-plugin.sh ${SEATUNNEL_VERSION}
+
+# BASE_RELEASE_IMAGE argument must be defined twice
+ARG FLINK_VERSION=1.15
+ARG BASE_RELEASE_IMAGE=flink:${FLINK_VERSION}
+FROM $BASE_RELEASE_IMAGE as release
+
+ENV SEATUNNEL_HOME=/opt/seatunnel
+
+RUN mkdir -p $SEATUNNEL_HOME
+
+COPY --from=build $SCALEPH_HOME $SCALEPH_HOME/
diff --git a/tools/docker/build/scaleph-seatunnel/Dockerfile_single b/tools/docker/build/scaleph-seatunnel/Dockerfile_single
new file mode 100644
index 000000000..6474c835b
--- /dev/null
+++ b/tools/docker/build/scaleph-seatunnel/Dockerfile_single
@@ -0,0 +1,38 @@
+# 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.
+
+ARG FLINK_VERSION=1.15
+ARG BASE_RELEASE_IMAGE=flink:${FLINK_VERSION}
+FROM $BASE_RELEASE_IMAGE as release
+
+ARG SEATUNNEL_VERSION=2.3.3
+
+ENV SEATUNNEL_HOME=/opt/seatunnel
+
+RUN mkdir -p $SEATUNNEL_HOME
+
+ARG TAR_FILE=apache-seatunnel-${SEATUNNEL_VERSION}-bin.tar.gz
+
+# forked from seatunnel k8s quick start
+RUN wget https://dlcdn.apache.org/seatunnel/${SEATUNNEL_VERSION}/$TAR_FILE ;
+RUN tar -xzvf $TAR_FILE --strip 1 -C $SEATUNNEL_HOME
+
+
+#RUN wget https://dlcdn.apache.org/seatunnel/${SEATUNNEL_VERSION}/apache-seatunnel-${SEATUNNEL_VERSION}-bin.tar.gz
+#RUN tar -xzvf apache-seatunnel-${SEATUNNEL_VERSION}-bin.tar.gz
+#RUN mv apache-seatunnel-${SEATUNNEL_VERSION} ${SEATUNNEL_HOME}
+
+RUN cd ${SEATUNNEL_HOME}||sh bin/install-plugin.sh ${SEATUNNEL_VERSION}
\ No newline at end of file
diff --git a/tools/docker/mysql/init.d/scaleph-security-mysql.sql b/tools/docker/mysql/init.d/scaleph-security-mysql.sql
index ad086b3d5..6d99e6db8 100644
--- a/tools/docker/mysql/init.d/scaleph-security-mysql.sql
+++ b/tools/docker/mysql/init.d/scaleph-security-mysql.sql
@@ -517,6 +517,21 @@ INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`,
                                `creator`, `editor`)
 VALUES (63, '2', 51, 'setting', '/admin/setting', NULL, NULL, 'setting', './Admin/Setting', NULL, 'sys', 'sys');
 
+
+drop table if exists sec_resource_web_role;
+create table sec_resource_web_role
+(
+    id              bigint   not null auto_increment comment '自增主键',
+    resource_web_id bigint   not null,
+    role_id         bigint   not null,
+    creator         varchar(32) comment '创建人',
+    create_time     datetime not null default current_timestamp comment '创建时间',
+    editor          varchar(32) comment '修改人',
+    update_time     datetime not null default current_timestamp on update current_timestamp comment '修改时间',
+    primary key (id),
+    unique key (resource_web_id, role_id)
+) engine = innodb comment = '资源-web与角色关联表';
+
 /* 部门表 */
 drop table if exists sec_dept;
 create table sec_dept

From e6ca12e610e8545a1d7a457fba7d8d2d09d26be3 Mon Sep 17 00:00:00 2001
From: kalencaya <1942460489@qq.com>
Date: Tue, 14 Nov 2023 21:53:35 +0800
Subject: [PATCH 09/24] [Bug][docker] fix scaleph-seatunnel image error (#639)

fix: seatunnel base image
---
 tools/docker/build/scaleph-seatunnel/Dockerfile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tools/docker/build/scaleph-seatunnel/Dockerfile b/tools/docker/build/scaleph-seatunnel/Dockerfile
index 2733d60e7..d5723f39c 100644
--- a/tools/docker/build/scaleph-seatunnel/Dockerfile
+++ b/tools/docker/build/scaleph-seatunnel/Dockerfile
@@ -24,17 +24,20 @@ ARG TAR_FILE=apache-seatunnel-${SEATUNNEL_VERSION}-bin.tar.gz
 ENV SEATUNNEL_HOME=/opt/seatunnel
 RUN mkdir -p $SEATUNNEL_HOME
 
-RUN wget https://dlcdn.apache.org/seatunnel/${SEATUNNEL_VERSION}/$TAR_FILE ; \
+RUN wget https://archive.apache.org/dist/seatunnel/${SEATUNNEL_VERSION}/$TAR_FILE ; \
     tar -zxf $TAR_FILE --strip 1 -C $SEATUNNEL_HOME
 
 # strange behavior: replace mvnw by mvn on install-plugin.sh, remove useless comment on plugin_config
 RUN rm $SEATUNNEL_HOME/config/plugin_config
 COPY tools/docker/build/scaleph-seatunnel/plugin_config $SEATUNNEL_HOME/config
 
-#RUN rm $SEATUNNEL_HOME/bin/install-plugin.sh
-#COPY tools/docker/build/scaleph-seatunnel/install-plugin.sh $SEATUNNEL_HOME/bin
+RUN rm $SEATUNNEL_HOME/bin/install-plugin.sh
+COPY tools/docker/build/scaleph-seatunnel/install-plugin.sh $SEATUNNEL_HOME/bin
 
-RUN cd ${SEATUNNEL_HOME}|| sh bin/install-plugin.sh ${SEATUNNEL_VERSION}
+RUN cd $SEATUNNEL_HOME ; \
+    sh -x bin/install-plugin.sh ${SEATUNNEL_VERSION}
+
+#RUN cd ${SEATUNNEL_HOME}||sh bin/install-plugin.sh ${SEATUNNEL_VERSION}
 
 # BASE_RELEASE_IMAGE argument must be defined twice
 ARG FLINK_VERSION=1.15

From 09bf25d9b6d6b8bd3b99e026e2baf8f7d635e236 Mon Sep 17 00:00:00 2001
From: kalencaya <1942460489@qq.com>
Date: Wed, 15 Nov 2023 11:45:16 +0800
Subject: [PATCH 10/24] [Bug][docker] fix scaleph-seatunnel image error (#640)

fix: seatunnel base image
---
 .../docker/build/scaleph-seatunnel/Dockerfile | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/tools/docker/build/scaleph-seatunnel/Dockerfile b/tools/docker/build/scaleph-seatunnel/Dockerfile
index d5723f39c..c156a3306 100644
--- a/tools/docker/build/scaleph-seatunnel/Dockerfile
+++ b/tools/docker/build/scaleph-seatunnel/Dockerfile
@@ -16,7 +16,7 @@
 
 ARG FLINK_VERSION=1.15
 ARG BASE_RELEASE_IMAGE=flink:${FLINK_VERSION}
-FROM maven:3.8-eclipse-temurin-11 as build
+FROM $BASE_RELEASE_IMAGE as release
 
 ARG SEATUNNEL_VERSION=2.3.3
 ARG TAR_FILE=apache-seatunnel-${SEATUNNEL_VERSION}-bin.tar.gz
@@ -25,27 +25,28 @@ ENV SEATUNNEL_HOME=/opt/seatunnel
 RUN mkdir -p $SEATUNNEL_HOME
 
 RUN wget https://archive.apache.org/dist/seatunnel/${SEATUNNEL_VERSION}/$TAR_FILE ; \
-    tar -zxf $TAR_FILE --strip 1 -C $SEATUNNEL_HOME
+    tar -zxf $TAR_FILE --strip 1 -C $SEATUNNEL_HOME ; \
+    rm $TAR_FILE
 
 # strange behavior: replace mvnw by mvn on install-plugin.sh, remove useless comment on plugin_config
 RUN rm $SEATUNNEL_HOME/config/plugin_config
 COPY tools/docker/build/scaleph-seatunnel/plugin_config $SEATUNNEL_HOME/config
 
-RUN rm $SEATUNNEL_HOME/bin/install-plugin.sh
-COPY tools/docker/build/scaleph-seatunnel/install-plugin.sh $SEATUNNEL_HOME/bin
+#RUN rm $SEATUNNEL_HOME/bin/install-plugin.sh
+#COPY tools/docker/build/scaleph-seatunnel/install-plugin.sh $SEATUNNEL_HOME/bin
 
-RUN cd $SEATUNNEL_HOME ; \
-    sh -x bin/install-plugin.sh ${SEATUNNEL_VERSION}
+#RUN cd $SEATUNNEL_HOME ; \
+#    sh -x bin/install-plugin.sh ${SEATUNNEL_VERSION}
 
-#RUN cd ${SEATUNNEL_HOME}||sh bin/install-plugin.sh ${SEATUNNEL_VERSION}
+RUN cd ${SEATUNNEL_HOME}||sh bin/install-plugin.sh ${SEATUNNEL_VERSION}
 
 # BASE_RELEASE_IMAGE argument must be defined twice
-ARG FLINK_VERSION=1.15
-ARG BASE_RELEASE_IMAGE=flink:${FLINK_VERSION}
-FROM $BASE_RELEASE_IMAGE as release
-
-ENV SEATUNNEL_HOME=/opt/seatunnel
-
-RUN mkdir -p $SEATUNNEL_HOME
-
-COPY --from=build $SCALEPH_HOME $SCALEPH_HOME/
+#ARG FLINK_VERSION=1.15
+#ARG BASE_RELEASE_IMAGE=flink:${FLINK_VERSION}
+#FROM $BASE_RELEASE_IMAGE as release
+#
+#ENV SEATUNNEL_HOME=/opt/seatunnel
+#
+#RUN mkdir -p $SEATUNNEL_HOME
+#
+#COPY --from=build $SCALEPH_HOME $SCALEPH_HOME/

From 70476c97e31a5044c9cc02ef5bd326b1701bd6f7 Mon Sep 17 00:00:00 2001
From: kalencaya <1942460489@qq.com>
Date: Wed, 15 Nov 2023 11:56:30 +0800
Subject: [PATCH 11/24] [Bug][docker] fix scaleph-seatunnel image error (#641)

fix: seatunnel base image
---
 tools/docker/build/scaleph-seatunnel/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/docker/build/scaleph-seatunnel/Dockerfile b/tools/docker/build/scaleph-seatunnel/Dockerfile
index c156a3306..0884cdf28 100644
--- a/tools/docker/build/scaleph-seatunnel/Dockerfile
+++ b/tools/docker/build/scaleph-seatunnel/Dockerfile
@@ -35,10 +35,10 @@ COPY tools/docker/build/scaleph-seatunnel/plugin_config $SEATUNNEL_HOME/config
 #RUN rm $SEATUNNEL_HOME/bin/install-plugin.sh
 #COPY tools/docker/build/scaleph-seatunnel/install-plugin.sh $SEATUNNEL_HOME/bin
 
-#RUN cd $SEATUNNEL_HOME ; \
-#    sh -x bin/install-plugin.sh ${SEATUNNEL_VERSION}
+RUN cd $SEATUNNEL_HOME ; \
+    sh -x bin/install-plugin.sh ${SEATUNNEL_VERSION}
 
-RUN cd ${SEATUNNEL_HOME}||sh bin/install-plugin.sh ${SEATUNNEL_VERSION}
+# RUN cd ${SEATUNNEL_HOME}||sh bin/install-plugin.sh ${SEATUNNEL_VERSION}
 
 # BASE_RELEASE_IMAGE argument must be defined twice
 #ARG FLINK_VERSION=1.15

From b99881b1339c42d05cd8793b165dfcdfdb93e184 Mon Sep 17 00:00:00 2001
From: kalencaya <1942460489@qq.com>
Date: Wed, 15 Nov 2023 13:51:03 +0800
Subject: [PATCH 12/24] [Bug][docker] fix scaleph-seatunnel image error (#642)

* fix: seatunnel base image

* fix: seatunnel base image
---
 tools/docker/build/scaleph-seatunnel/Dockerfile        | 4 ++--
 tools/docker/build/scaleph-seatunnel/install-plugin.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/docker/build/scaleph-seatunnel/Dockerfile b/tools/docker/build/scaleph-seatunnel/Dockerfile
index 0884cdf28..994123c46 100644
--- a/tools/docker/build/scaleph-seatunnel/Dockerfile
+++ b/tools/docker/build/scaleph-seatunnel/Dockerfile
@@ -32,8 +32,8 @@ RUN wget https://archive.apache.org/dist/seatunnel/${SEATUNNEL_VERSION}/$TAR_FIL
 RUN rm $SEATUNNEL_HOME/config/plugin_config
 COPY tools/docker/build/scaleph-seatunnel/plugin_config $SEATUNNEL_HOME/config
 
-#RUN rm $SEATUNNEL_HOME/bin/install-plugin.sh
-#COPY tools/docker/build/scaleph-seatunnel/install-plugin.sh $SEATUNNEL_HOME/bin
+RUN rm $SEATUNNEL_HOME/bin/install-plugin.sh
+COPY tools/docker/build/scaleph-seatunnel/install-plugin.sh $SEATUNNEL_HOME/bin
 
 RUN cd $SEATUNNEL_HOME ; \
     sh -x bin/install-plugin.sh ${SEATUNNEL_VERSION}
diff --git a/tools/docker/build/scaleph-seatunnel/install-plugin.sh b/tools/docker/build/scaleph-seatunnel/install-plugin.sh
index 01fe8259b..d80ad7742 100755
--- a/tools/docker/build/scaleph-seatunnel/install-plugin.sh
+++ b/tools/docker/build/scaleph-seatunnel/install-plugin.sh
@@ -32,7 +32,7 @@ fi
 
 echo "Install hadoop shade jar, usage version is ${version}"
 
-mvn dependency:get -DgroupId=org.apache.seatunnel -Dclassifier=optional -DartifactId=seatunnel-hadoop3-3.1.4-uber -Dversion=${version} -Ddest=${SEATUNNEL_HOME}/lib
+${SEATUNNEL_HOME}/mvnw dependency:get -DgroupId=org.apache.seatunnel -Dclassifier=optional -DartifactId=seatunnel-hadoop3-3.1.4-uber -Dversion=${version} -Ddest=${SEATUNNEL_HOME}/lib
 
 echo "Install SeaTunnel connectors plugins, usage version is ${version}"
 
@@ -54,7 +54,7 @@ while read line; do
 #    if  [ ${line:0:1} != "-" ] && [ ${line:0:1} != "#" ]
 #      	then
       		echo "install connector : " $line
-      		mvn dependency:get -DgroupId=org.apache.seatunnel -DartifactId=${line} -Dversion=${version} -Ddest=${SEATUNNEL_HOME}/connectors/seatunnel
+      		${SEATUNNEL_HOME}/mvnw dependency:get -DgroupId=org.apache.seatunnel -DartifactId=${line} -Dversion=${version} -Ddest=${SEATUNNEL_HOME}/connectors/seatunnel
 #    fi
 
 done < ${SEATUNNEL_HOME}/config/plugin_config
\ No newline at end of file

From 1280b36e93749ae203f1dd11bd0979f76e7ac5b1 Mon Sep 17 00:00:00 2001
From: kalencaya <1942460489@qq.com>
Date: Wed, 15 Nov 2023 19:25:07 +0800
Subject: [PATCH 13/24] [Feature][scaleph-security] add security web resource
 and role relation api (#644)

* fix: seatunnel base image

* feature: add resource-web and role relation api
---
 .../admin/SecAuthorizeController.java         | 70 ++++++++++++-
 .../master/security/SecResourceWebVO.java     | 27 +++++
 .../security/SecResourceWebRoleMapper.java    |  9 +-
 .../master/security/SecResourceWebMapper.xml  | 35 ++++---
 .../security/SecResourceWebRoleMapper.xml     | 34 ++++---
 .../security/service/SecAuthorizeService.java | 50 ++++++++++
 .../SecResourceWebWithAuthorizeConvert.java   | 46 +++++++++
 .../dto/SecResourceWebWithAuthorizeDTO.java   | 70 +++++++++++++
 .../service/impl/SecAuthorizeServiceImpl.java | 98 +++++++++++++++++++
 ...ResourceWebBatchAuthorizeForRoleParam.java | 38 +++++++
 .../param/SecResourceWebListByRoleParam.java  | 32 ++++++
 ...RoleBatchAuthorizeForResourceWebParam.java | 38 +++++++
 .../param/SecRoleListByResourceWebParam.java  | 40 ++++++++
 13 files changed, 555 insertions(+), 32 deletions(-)
 create mode 100644 scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecResourceWebVO.java
 create mode 100644 scaleph-security/src/main/java/cn/sliew/scaleph/security/service/convert/SecResourceWebWithAuthorizeConvert.java
 create mode 100644 scaleph-security/src/main/java/cn/sliew/scaleph/security/service/dto/SecResourceWebWithAuthorizeDTO.java
 create mode 100644 scaleph-security/src/main/java/cn/sliew/scaleph/security/service/param/SecResourceWebBatchAuthorizeForRoleParam.java
 create mode 100644 scaleph-security/src/main/java/cn/sliew/scaleph/security/service/param/SecResourceWebListByRoleParam.java
 create mode 100644 scaleph-security/src/main/java/cn/sliew/scaleph/security/service/param/SecRoleBatchAuthorizeForResourceWebParam.java
 create mode 100644 scaleph-security/src/main/java/cn/sliew/scaleph/security/service/param/SecRoleListByResourceWebParam.java

diff --git a/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/admin/SecAuthorizeController.java b/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/admin/SecAuthorizeController.java
index ac1c26d29..b475864b2 100644
--- a/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/admin/SecAuthorizeController.java
+++ b/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/admin/SecAuthorizeController.java
@@ -20,16 +20,23 @@
 
 import cn.sliew.scaleph.api.annotation.Logging;
 import cn.sliew.scaleph.security.service.SecAuthorizeService;
+import cn.sliew.scaleph.security.service.dto.SecResourceWebWithAuthorizeDTO;
+import cn.sliew.scaleph.security.service.dto.SecRoleDTO;
 import cn.sliew.scaleph.security.service.dto.UmiRoute;
+import cn.sliew.scaleph.security.service.param.SecResourceWebBatchAuthorizeForRoleParam;
+import cn.sliew.scaleph.security.service.param.SecResourceWebListByRoleParam;
+import cn.sliew.scaleph.security.service.param.SecRoleBatchAuthorizeForResourceWebParam;
+import cn.sliew.scaleph.security.service.param.SecRoleListByResourceWebParam;
+import cn.sliew.scaleph.system.model.ResponseVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.List;
 
 @RestController
@@ -47,4 +54,61 @@ public ResponseEntity<List<UmiRoute>> getUmiRoutes() {
         List<UmiRoute> routes = secAuthorizeService.getWebRoute();
         return new ResponseEntity<>(routes, HttpStatus.OK);
     }
+
+    @Logging
+    @GetMapping("resource-web/authorized-roles")
+    @Operation(summary = "查询 资源-web 绑定角色列表", description = "查询 资源-web 绑定角色列表")
+    public ResponseEntity<Page<SecRoleDTO>> listAuthorizedRolesByResourceWebId(@Valid SecRoleListByResourceWebParam param) {
+        Page<SecRoleDTO> result = secAuthorizeService.listAuthorizedRolesByResourceWebId(param);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
+    @Logging
+    @GetMapping("resource-web/unauthorized-roles")
+    @Operation(summary = "查询 资源-web 未绑定角色列表", description = "查询 资源-web 未绑定角色列表")
+    public ResponseEntity<Page<SecRoleDTO>> listUnauthorizedRolesByResourceWebId(@Valid SecRoleListByResourceWebParam param) {
+        Page<SecRoleDTO> result = secAuthorizeService.listUnauthorizedRolesByResourceWebId(param);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
+    @Logging
+    @PutMapping("resource-web/roles")
+    @Operation(summary = "批量为 资源-web 绑定角色", description = "批量为 资源-web 绑定角色")
+    public ResponseEntity<ResponseVO> authorize(@Valid @RequestBody SecRoleBatchAuthorizeForResourceWebParam param) {
+        secAuthorizeService.authorize(param);
+        return new ResponseEntity<>(ResponseVO.success(), HttpStatus.OK);
+    }
+
+    @Logging
+    @DeleteMapping("resource-web/roles")
+    @Operation(summary = "批量为 资源-web 解除角色绑定", description = "批量为 资源-web 解除角色绑定")
+    public ResponseEntity<ResponseVO> unauthorize(@Valid @RequestBody SecRoleBatchAuthorizeForResourceWebParam param) {
+        secAuthorizeService.unauthorize(param);
+        return new ResponseEntity<>(ResponseVO.success(), HttpStatus.OK);
+    }
+
+    @Logging
+    @GetMapping("role/resource-webs")
+    @Operation(summary = "查询所有 资源-web 和指定角色绑定状态", description = "查询所有 资源-web 和指定角色绑定状态")
+    public ResponseEntity<List<SecResourceWebWithAuthorizeDTO>> listResourceWebsByRole(@Valid SecResourceWebListByRoleParam param) {
+        List<SecResourceWebWithAuthorizeDTO> result = secAuthorizeService.listResourceWebsByRoleId(param);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
+    @Logging
+    @PutMapping("role/resource-webs")
+    @Operation(summary = "批量为角色绑定 资源-web", description = "批量为角色绑定 资源-web")
+    public ResponseEntity<ResponseVO> authorize(@Valid @RequestBody SecResourceWebBatchAuthorizeForRoleParam param) {
+        secAuthorizeService.authorize(param);
+        return new ResponseEntity<>(ResponseVO.success(), HttpStatus.OK);
+    }
+
+    @Logging
+    @DeleteMapping("role/resource-webs")
+    @Operation(summary = "批量为角色解除 资源-web 绑定", description = "批量为角色解除 资源-web 绑定")
+    public ResponseEntity<ResponseVO> unauthorize(@Valid @RequestBody SecResourceWebBatchAuthorizeForRoleParam param) {
+        secAuthorizeService.unauthorize(param);
+        return new ResponseEntity<>(ResponseVO.success(), HttpStatus.OK);
+    }
+
 }
diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecResourceWebVO.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecResourceWebVO.java
new file mode 100644
index 000000000..3c4fa6c4b
--- /dev/null
+++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/security/SecResourceWebVO.java
@@ -0,0 +1,27 @@
+/*
+ * 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 cn.sliew.scaleph.dao.entity.master.security;
+
+import lombok.Data;
+
+@Data
+public class SecResourceWebVO extends SecResourceWeb {
+
+    private Long roleId;
+}
diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebRoleMapper.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebRoleMapper.java
index e9b883fd8..b68f0fe38 100644
--- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebRoleMapper.java
+++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebRoleMapper.java
@@ -19,14 +19,16 @@
 package cn.sliew.scaleph.dao.mapper.master.security;
 
 import cn.sliew.scaleph.common.dict.security.RoleStatus;
-import cn.sliew.scaleph.dao.entity.master.security.SecResourceWeb;
 import cn.sliew.scaleph.dao.entity.master.security.SecResourceWebRole;
+import cn.sliew.scaleph.dao.entity.master.security.SecResourceWebVO;
 import cn.sliew.scaleph.dao.entity.master.security.SecRole;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * 资源-web与角色关联表 Mapper 接口
  */
@@ -49,5 +51,8 @@ Page<SecRole> selectUnrelatedRolesByWebResource(Page page,
                                                     @Param("status") RoleStatus status,
                                                     @Param("name") String name);
 
-    Page<SecResourceWeb> selectAllResourceWebWithAuthorizeStatus(@Param("roleId") Long roleId);
+    /**
+     * 查询所有 资源-web，包含角色关联信息
+     */
+    List<SecResourceWebVO> selectAllResourceWebWithAuthorizeStatus(@Param("roleId") Long roleId, @Param("pid") Long pid);
 }
diff --git a/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebMapper.xml b/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebMapper.xml
index 803e97ed0..2f0d9bbff 100644
--- a/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebMapper.xml
+++ b/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebMapper.xml
@@ -18,23 +18,27 @@
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.sliew.scaleph.dao.mapper.master.security.SecResourceWebMapper">
-
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="cn.sliew.scaleph.dao.entity.master.security.SecResourceWeb">
-        <result column="id" property="id" />
-        <result column="creator" property="creator" />
-        <result column="create_time" property="createTime" />
-        <result column="editor" property="editor" />
-        <result column="update_time" property="updateTime" />
-        <result column="type" property="type" />
-        <result column="pid" property="pid" />
-        <result column="name" property="name" />
-        <result column="path" property="path" />
-        <result column="redirect" property="redirect" />
-        <result column="layout" property="layout" />
-        <result column="icon" property="icon" />
-        <result column="component" property="component" />
-        <result column="remark" property="remark" />
+        <result column="id" property="id"/>
+        <result column="creator" property="creator"/>
+        <result column="create_time" property="createTime"/>
+        <result column="editor" property="editor"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="type" property="type"/>
+        <result column="pid" property="pid"/>
+        <result column="name" property="name"/>
+        <result column="path" property="path"/>
+        <result column="redirect" property="redirect"/>
+        <result column="layout" property="layout"/>
+        <result column="icon" property="icon"/>
+        <result column="component" property="component"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+
+    <resultMap id="SecResourceWebVOMap" type="cn.sliew.scaleph.dao.entity.master.security.SecResourceWebVO"
+               extends="BaseResultMap">
+        <result column="role_id" property="roleId"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -46,5 +50,4 @@
         update_time,
         `type`, pid, `name`, `path`, redirect, layout, icon, `component`, remark
     </sql>
-
 </mapper>
diff --git a/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebRoleMapper.xml b/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebRoleMapper.xml
index fdb65d1b7..637d22134 100644
--- a/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebRoleMapper.xml
+++ b/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebRoleMapper.xml
@@ -18,16 +18,15 @@
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.sliew.scaleph.dao.mapper.master.security.SecResourceWebRoleMapper">
-
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="cn.sliew.scaleph.dao.entity.master.security.SecResourceWebRole">
-        <result column="id" property="id" />
-        <result column="creator" property="creator" />
-        <result column="create_time" property="createTime" />
-        <result column="editor" property="editor" />
-        <result column="update_time" property="updateTime" />
-        <result column="resource_web_id" property="resourceWebId" />
-        <result column="role_id" property="roleId" />
+        <result column="id" property="id"/>
+        <result column="creator" property="creator"/>
+        <result column="create_time" property="createTime"/>
+        <result column="editor" property="editor"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="resource_web_id" property="resourceWebId"/>
+        <result column="role_id" property="roleId"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -40,7 +39,8 @@
         resource_web_id, role_id
     </sql>
 
-    <select id="selectRelatedRolesByWebResource" resultMap="cn.sliew.scaleph.dao.mapper.master.security.SecRoleMapper.SecRoleMap">
+    <select id="selectRelatedRolesByWebResource"
+            resultMap="cn.sliew.scaleph.dao.mapper.master.security.SecRoleMapper.SecRoleMap">
         SELECT
         t1.*
         FROM
@@ -58,7 +58,8 @@
         t1.`code`
     </select>
 
-    <select id="selectUnrelatedRolesByWebResource" resultMap="cn.sliew.scaleph.dao.mapper.master.security.SecRoleMapper.SecRoleMap">
+    <select id="selectUnrelatedRolesByWebResource"
+            resultMap="cn.sliew.scaleph.dao.mapper.master.security.SecRoleMapper.SecRoleMap">
         SELECT
         t1.*
         FROM
@@ -70,9 +71,20 @@
         <if test="name != null and name != ''">
             AND t1.`name` like concat('%',#{name},'%')
         </if>
-        AND NOT EXISTS ( SELECT * FROM sec_resource_web_role t2 WHERE t1.id = t2.role_id AND t2.resource_web_id = #{resourceWebId} )
+        AND NOT EXISTS ( SELECT * FROM sec_resource_web_role t2 WHERE t1.id = t2.role_id AND t2.resource_web_id =
+        #{resourceWebId} )
         ORDER BY
         t1.`code`
     </select>
 
+    <select id="selectAllResourceWebWithAuthorizeStatus"
+            resultMap="cn.sliew.scaleph.dao.mapper.master.security.SecResourceWebMapper.SecResourceWebVOMap">
+        SELECT t1.*,
+               t2.role_id
+        FROM sec_resource_web t1
+                 LEFT JOIN sec_resource_web_role t2 ON t1.id = t2.resource_web_id
+            AND t2.role_id = #{roleId}
+        WHERE
+            t1.pid = #{pid}
+    </select>
 </mapper>
diff --git a/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/SecAuthorizeService.java b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/SecAuthorizeService.java
index e5d42f2fb..c38cd1c82 100644
--- a/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/SecAuthorizeService.java
+++ b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/SecAuthorizeService.java
@@ -18,7 +18,14 @@
 
 package cn.sliew.scaleph.security.service;
 
+import cn.sliew.scaleph.security.service.dto.SecResourceWebWithAuthorizeDTO;
+import cn.sliew.scaleph.security.service.dto.SecRoleDTO;
 import cn.sliew.scaleph.security.service.dto.UmiRoute;
+import cn.sliew.scaleph.security.service.param.SecResourceWebBatchAuthorizeForRoleParam;
+import cn.sliew.scaleph.security.service.param.SecResourceWebListByRoleParam;
+import cn.sliew.scaleph.security.service.param.SecRoleBatchAuthorizeForResourceWebParam;
+import cn.sliew.scaleph.security.service.param.SecRoleListByResourceWebParam;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.List;
 
@@ -28,4 +35,47 @@ public interface SecAuthorizeService {
      * 将用户拥有的前端资源转化为 umi.js 的 route 配置
      */
     List<UmiRoute> getWebRoute();
+
+    // -------------------------------------------------------------------------------------------
+    // resource-web -> role
+    // -------------------------------------------------------------------------------------------
+
+    /**
+     * 查询 资源-web 绑定角色列表
+     */
+    Page<SecRoleDTO> listAuthorizedRolesByResourceWebId(SecRoleListByResourceWebParam param);
+
+    /**
+     * 查询 资源-web 未绑定角色列表
+     */
+    Page<SecRoleDTO> listUnauthorizedRolesByResourceWebId(SecRoleListByResourceWebParam param);
+
+    /**
+     * 批量为 资源-web 绑定角色
+     */
+    void authorize(SecRoleBatchAuthorizeForResourceWebParam param);
+
+    /**
+     * 批量为 资源-web 解除角色绑定
+     */
+    void unauthorize(SecRoleBatchAuthorizeForResourceWebParam param);
+
+    // -------------------------------------------------------------------------------------------
+    // role -> resource-web
+    // -------------------------------------------------------------------------------------------
+    /**
+     * 查询所有 资源-web 和指定角色绑定状态
+     */
+    List<SecResourceWebWithAuthorizeDTO> listResourceWebsByRoleId(SecResourceWebListByRoleParam param);
+
+    /**
+     * 批量为角色绑定 资源-web
+     */
+    void authorize(SecResourceWebBatchAuthorizeForRoleParam param);
+
+    /**
+     * 批量为角色解除 资源-web 绑定
+     */
+    void unauthorize(SecResourceWebBatchAuthorizeForRoleParam param);
+
 }
diff --git a/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/convert/SecResourceWebWithAuthorizeConvert.java b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/convert/SecResourceWebWithAuthorizeConvert.java
new file mode 100644
index 000000000..6234c42f9
--- /dev/null
+++ b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/convert/SecResourceWebWithAuthorizeConvert.java
@@ -0,0 +1,46 @@
+/*
+ * 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 cn.sliew.scaleph.security.service.convert;
+
+import cn.sliew.scaleph.common.convert.BaseConvert;
+import cn.sliew.scaleph.common.dict.common.YesOrNo;
+import cn.sliew.scaleph.dao.entity.master.security.SecResourceWebVO;
+import cn.sliew.scaleph.security.service.dto.SecResourceWebWithAuthorizeDTO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+import org.springframework.beans.BeanUtils;
+
+@Mapper
+public interface SecResourceWebWithAuthorizeConvert extends BaseConvert<SecResourceWebVO, SecResourceWebWithAuthorizeDTO> {
+
+    SecResourceWebWithAuthorizeConvert INSTANCE = Mappers.getMapper(SecResourceWebWithAuthorizeConvert.class);
+
+    @Override
+    default SecResourceWebVO toDo(SecResourceWebWithAuthorizeDTO dto) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    default SecResourceWebWithAuthorizeDTO toDto(SecResourceWebVO entity) {
+        SecResourceWebWithAuthorizeDTO dto = new SecResourceWebWithAuthorizeDTO();
+        BeanUtils.copyProperties(SecResourceWebConvert.INSTANCE.toDto(entity), dto);
+        dto.setAuthorized(entity.getRoleId() != null ? YesOrNo.YES : YesOrNo.NO);
+        return dto;
+    }
+}
diff --git a/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/dto/SecResourceWebWithAuthorizeDTO.java b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/dto/SecResourceWebWithAuthorizeDTO.java
new file mode 100644
index 000000000..d1067e36e
--- /dev/null
+++ b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/dto/SecResourceWebWithAuthorizeDTO.java
@@ -0,0 +1,70 @@
+/*
+ * 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 cn.sliew.scaleph.security.service.dto;
+
+import cn.sliew.scaleph.common.dict.common.YesOrNo;
+import cn.sliew.scaleph.common.dict.security.ResourceType;
+import cn.sliew.scaleph.system.model.BaseDTO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 资源-web
+ */
+@Data
+@Schema(name = "SecResourceWebWithAuthorize对象", description = "资源-web 相关授权状态")
+public class SecResourceWebWithAuthorizeDTO extends BaseDTO {
+
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "资源类型。导航，菜单，页面，按钮")
+    private ResourceType type;
+
+    @Schema(description = "上级资源id")
+    private Long pid;
+
+    @Schema(description = "前端名称")
+    private String name;
+
+    @Schema(description = "前端路由路径")
+    private String path;
+
+    @Schema(description = "前端重定向路径")
+    private String redirect;
+
+    @Schema(description = "前端全局布局显示。只在一级生效")
+    private Boolean layout;
+
+    @Schema(description = "前端 icon")
+    private String icon;
+
+    @Schema(description = "前端组件")
+    private String component;
+
+    @Schema(description = "备注")
+    private String remark;
+
+    @Schema(description = "下级资源")
+    private List<SecResourceWebWithAuthorizeDTO> children;
+
+    @Schema(description = "授权状态")
+    private YesOrNo authorized;
+}
diff --git a/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/impl/SecAuthorizeServiceImpl.java b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/impl/SecAuthorizeServiceImpl.java
index 63a37fba3..935857fc0 100644
--- a/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/impl/SecAuthorizeServiceImpl.java
+++ b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/impl/SecAuthorizeServiceImpl.java
@@ -18,10 +18,25 @@
 
 package cn.sliew.scaleph.security.service.impl;
 
+import cn.sliew.scaleph.dao.entity.master.security.SecResourceWebRole;
+import cn.sliew.scaleph.dao.entity.master.security.SecResourceWebVO;
+import cn.sliew.scaleph.dao.entity.master.security.SecRole;
+import cn.sliew.scaleph.dao.mapper.master.security.SecResourceWebRoleMapper;
 import cn.sliew.scaleph.security.service.SecAuthorizeService;
 import cn.sliew.scaleph.security.service.SecResourceWebService;
+import cn.sliew.scaleph.security.service.convert.SecResourceWebWithAuthorizeConvert;
+import cn.sliew.scaleph.security.service.convert.SecRoleConvert;
 import cn.sliew.scaleph.security.service.dto.SecResourceWebDTO;
+import cn.sliew.scaleph.security.service.dto.SecResourceWebWithAuthorizeDTO;
+import cn.sliew.scaleph.security.service.dto.SecRoleDTO;
 import cn.sliew.scaleph.security.service.dto.UmiRoute;
+import cn.sliew.scaleph.security.service.param.SecResourceWebBatchAuthorizeForRoleParam;
+import cn.sliew.scaleph.security.service.param.SecResourceWebListByRoleParam;
+import cn.sliew.scaleph.security.service.param.SecRoleBatchAuthorizeForResourceWebParam;
+import cn.sliew.scaleph.security.service.param.SecRoleListByResourceWebParam;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -34,6 +49,8 @@ public class SecAuthorizeServiceImpl implements SecAuthorizeService {
 
     @Autowired
     private SecResourceWebService secResourceWebService;
+    @Autowired
+    private SecResourceWebRoleMapper secResourceWebRoleMapper;
 
     /**
      * fixme 这里没有获取用户自己的资源，先获取的所有资源
@@ -61,4 +78,85 @@ private List<UmiRoute> buildRouteByPid(Long pid) {
         }
         return routes;
     }
+
+    @Override
+    public Page<SecRoleDTO> listAuthorizedRolesByResourceWebId(SecRoleListByResourceWebParam param) {
+        Page page = new Page(param.getCurrent(), param.getPageSize());
+        Page<SecRole> secRolePage = secResourceWebRoleMapper.selectRelatedRolesByWebResource(page, param.getResourceWebId(), param.getStatus(), param.getName());
+        Page<SecRoleDTO> result = new Page<>(secRolePage.getCurrent(), secRolePage.getSize(), secRolePage.getTotal());
+        List<SecRoleDTO> secRoleDTOS = SecRoleConvert.INSTANCE.toDto(secRolePage.getRecords());
+        result.setRecords(secRoleDTOS);
+        return result;
+    }
+
+    @Override
+    public Page<SecRoleDTO> listUnauthorizedRolesByResourceWebId(SecRoleListByResourceWebParam param) {
+        Page page = new Page(param.getCurrent(), param.getPageSize());
+        Page<SecRole> secRolePage = secResourceWebRoleMapper.selectUnrelatedRolesByWebResource(page, param.getResourceWebId(), param.getStatus(), param.getName());
+        Page<SecRoleDTO> result = new Page<>(secRolePage.getCurrent(), secRolePage.getSize(), secRolePage.getTotal());
+        List<SecRoleDTO> secRoleDTOS = SecRoleConvert.INSTANCE.toDto(secRolePage.getRecords());
+        result.setRecords(secRoleDTOS);
+        return result;
+    }
+
+    @Override
+    public void authorize(SecRoleBatchAuthorizeForResourceWebParam param) {
+        for (Long roleId : param.getRoleIds()) {
+            SecResourceWebRole record = new SecResourceWebRole();
+            record.setResourceWebId(param.getResourceWebId());
+            record.setRoleId(roleId);
+            secResourceWebRoleMapper.insert(record);
+        }
+    }
+
+    @Override
+    public void unauthorize(SecRoleBatchAuthorizeForResourceWebParam param) {
+        for (Long roleId : param.getRoleIds()) {
+            LambdaQueryWrapper<SecResourceWebRole> queryWrapper = Wrappers.lambdaQuery(SecResourceWebRole.class)
+                    .eq(SecResourceWebRole::getResourceWebId, param.getResourceWebId())
+                    .eq(SecResourceWebRole::getRoleId, roleId);
+            secResourceWebRoleMapper.delete(queryWrapper);
+        }
+    }
+
+    @Override
+    public List<SecResourceWebWithAuthorizeDTO> listResourceWebsByRoleId(SecResourceWebListByRoleParam param) {
+        List<SecResourceWebVO> secResourceWebVOS = secResourceWebRoleMapper.selectAllResourceWebWithAuthorizeStatus(param.getRoleId(), 0L);
+        List<SecResourceWebWithAuthorizeDTO> result = SecResourceWebWithAuthorizeConvert.INSTANCE.toDto(secResourceWebVOS);
+        result.forEach(dto -> recurse(param.getRoleId(), dto));
+        return result;
+    }
+
+    private void recurse(Long roleId, SecResourceWebWithAuthorizeDTO resourceWebDTO) {
+        List<SecResourceWebWithAuthorizeDTO> children = listResourceWebsByRoleIdAndPid(roleId, resourceWebDTO.getId());
+        if (CollectionUtils.isEmpty(children) == false) {
+            resourceWebDTO.setChildren(children);
+            children.forEach(child -> recurse(roleId, child));
+        }
+    }
+
+    private List<SecResourceWebWithAuthorizeDTO> listResourceWebsByRoleIdAndPid(Long roleId, Long pid) {
+        List<SecResourceWebVO> secResourceWebVOS = secResourceWebRoleMapper.selectAllResourceWebWithAuthorizeStatus(roleId, pid);
+        return SecResourceWebWithAuthorizeConvert.INSTANCE.toDto(secResourceWebVOS);
+    }
+
+    @Override
+    public void authorize(SecResourceWebBatchAuthorizeForRoleParam param) {
+        for (Long resourceWebId : param.getResourceWebIds()) {
+            SecResourceWebRole record = new SecResourceWebRole();
+            record.setResourceWebId(resourceWebId);
+            record.setRoleId(param.getRoleId());
+            secResourceWebRoleMapper.insert(record);
+        }
+    }
+
+    @Override
+    public void unauthorize(SecResourceWebBatchAuthorizeForRoleParam param) {
+        for (Long resourceWebId : param.getResourceWebIds()) {
+            LambdaQueryWrapper<SecResourceWebRole> queryWrapper = Wrappers.lambdaQuery(SecResourceWebRole.class)
+                    .eq(SecResourceWebRole::getResourceWebId, resourceWebId)
+                    .eq(SecResourceWebRole::getRoleId, param.getRoleId());
+            secResourceWebRoleMapper.delete(queryWrapper);
+        }
+    }
 }
diff --git a/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/param/SecResourceWebBatchAuthorizeForRoleParam.java b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/param/SecResourceWebBatchAuthorizeForRoleParam.java
new file mode 100644
index 000000000..da436bf0e
--- /dev/null
+++ b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/param/SecResourceWebBatchAuthorizeForRoleParam.java
@@ -0,0 +1,38 @@
+/*
+ * 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 cn.sliew.scaleph.security.service.param;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+public class SecResourceWebBatchAuthorizeForRoleParam {
+
+    @NotNull
+    @Schema(description = "角色 id")
+    private Long roleId;
+
+    @NotEmpty
+    @Schema(description = "待授权/取消授权 资源-web id 列表")
+    private List<Long> resourceWebIds;
+}
diff --git a/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/param/SecResourceWebListByRoleParam.java b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/param/SecResourceWebListByRoleParam.java
new file mode 100644
index 000000000..129740061
--- /dev/null
+++ b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/param/SecResourceWebListByRoleParam.java
@@ -0,0 +1,32 @@
+/*
+ * 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 cn.sliew.scaleph.security.service.param;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class SecResourceWebListByRoleParam {
+
+    @NotNull
+    @Schema(description = "角色 id")
+    private Long roleId;
+}
diff --git a/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/param/SecRoleBatchAuthorizeForResourceWebParam.java b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/param/SecRoleBatchAuthorizeForResourceWebParam.java
new file mode 100644
index 000000000..486ae8062
--- /dev/null
+++ b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/param/SecRoleBatchAuthorizeForResourceWebParam.java
@@ -0,0 +1,38 @@
+/*
+ * 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 cn.sliew.scaleph.security.service.param;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+public class SecRoleBatchAuthorizeForResourceWebParam {
+
+    @NotNull
+    @Schema(description = "资源-web id")
+    private Long resourceWebId;
+
+    @NotEmpty
+    @Schema(description = "待授权/取消授权角色 id 列表")
+    private List<Long> roleIds;
+}
diff --git a/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/param/SecRoleListByResourceWebParam.java b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/param/SecRoleListByResourceWebParam.java
new file mode 100644
index 000000000..d835a3dea
--- /dev/null
+++ b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/param/SecRoleListByResourceWebParam.java
@@ -0,0 +1,40 @@
+/*
+ * 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 cn.sliew.scaleph.security.service.param;
+
+import cn.sliew.scaleph.common.dict.security.RoleStatus;
+import cn.sliew.scaleph.system.model.PaginationParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class SecRoleListByResourceWebParam extends PaginationParam {
+
+    @NotNull
+    @Schema(description = "资源-web id")
+    private Long resourceWebId;
+
+    @Schema(description = "角色状态")
+    private RoleStatus status;
+
+    @Schema(description = "角色名称。支持搜索")
+    private String name;
+}

From 018fd4872f1466eb37fddb981caf3514c089e7da Mon Sep 17 00:00:00 2001
From: kalencaya <1942460489@qq.com>
Date: Mon, 20 Nov 2023 17:13:29 +0800
Subject: [PATCH 14/24] [Feature][scaleph-security] add user and role relation
 api (#645)

* feature: add user and role relation api

* feature: add user and role relation api
---
 .../admin/SecAuthorizeController.java         |  70 +++++++++++-
 .../master/security/SecUserRoleMapper.java    |  37 +++++++
 .../master/security/SecUserRoleMapper.xml     |  72 +++++++++++++
 .../security/service/SecAuthorizeService.java |  55 +++++++++-
 .../service/impl/SecAuthorizeServiceImpl.java | 100 ++++++++++++++++--
 .../SecRoleBatchAuthorizeForUserParam.java    |  38 +++++++
 .../service/param/SecRoleListByUserParam.java |  41 +++++++
 .../SecUserBatchAuthorizeForRoleParam.java    |  38 +++++++
 .../service/param/SecUserListByRoleParam.java |  40 +++++++
 .../scaleph/security/util/SecurityUtil.java   |  16 +++
 .../mysql/init.d/scaleph-security-mysql.sql   |   1 +
 11 files changed, 489 insertions(+), 19 deletions(-)
 create mode 100644 scaleph-security/src/main/java/cn/sliew/scaleph/security/service/param/SecRoleBatchAuthorizeForUserParam.java
 create mode 100644 scaleph-security/src/main/java/cn/sliew/scaleph/security/service/param/SecRoleListByUserParam.java
 create mode 100644 scaleph-security/src/main/java/cn/sliew/scaleph/security/service/param/SecUserBatchAuthorizeForRoleParam.java
 create mode 100644 scaleph-security/src/main/java/cn/sliew/scaleph/security/service/param/SecUserListByRoleParam.java

diff --git a/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/admin/SecAuthorizeController.java b/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/admin/SecAuthorizeController.java
index b475864b2..b0cec2efb 100644
--- a/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/admin/SecAuthorizeController.java
+++ b/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/admin/SecAuthorizeController.java
@@ -22,11 +22,9 @@
 import cn.sliew.scaleph.security.service.SecAuthorizeService;
 import cn.sliew.scaleph.security.service.dto.SecResourceWebWithAuthorizeDTO;
 import cn.sliew.scaleph.security.service.dto.SecRoleDTO;
+import cn.sliew.scaleph.security.service.dto.SecUserDTO;
 import cn.sliew.scaleph.security.service.dto.UmiRoute;
-import cn.sliew.scaleph.security.service.param.SecResourceWebBatchAuthorizeForRoleParam;
-import cn.sliew.scaleph.security.service.param.SecResourceWebListByRoleParam;
-import cn.sliew.scaleph.security.service.param.SecRoleBatchAuthorizeForResourceWebParam;
-import cn.sliew.scaleph.security.service.param.SecRoleListByResourceWebParam;
+import cn.sliew.scaleph.security.service.param.*;
 import cn.sliew.scaleph.system.model.ResponseVO;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.v3.oas.annotations.Operation;
@@ -111,4 +109,68 @@ public ResponseEntity<ResponseVO> unauthorize(@Valid @RequestBody SecResourceWeb
         return new ResponseEntity<>(ResponseVO.success(), HttpStatus.OK);
     }
 
+    @Logging
+    @GetMapping("role/authorized-users")
+    @Operation(summary = "查询角色绑定用户列表", description = "查询角色绑定用户列表")
+    public ResponseEntity<Page<SecUserDTO>> listAuthorizedUsersByRoleId(@Valid SecUserListByRoleParam param) {
+        Page<SecUserDTO> result = secAuthorizeService.listAuthorizedUsersByRoleId(param);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
+    @Logging
+    @GetMapping("role/unauthorized-users")
+    @Operation(summary = "查询角色未绑定用户列表", description = "查询角色未绑定用户列表")
+    public ResponseEntity<Page<SecUserDTO>> listUnauthorizedUsersByRoleId(@Valid SecUserListByRoleParam param) {
+        Page<SecUserDTO> result = secAuthorizeService.listUnauthorizedUsersByRoleId(param);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
+    @Logging
+    @PutMapping("role/users")
+    @Operation(summary = "批量为角色绑定用户", description = "批量为角色绑定用户")
+    public ResponseEntity<ResponseVO> authorize(@Valid @RequestBody SecUserBatchAuthorizeForRoleParam param) {
+        secAuthorizeService.authorize(param);
+        return new ResponseEntity<>(ResponseVO.success(), HttpStatus.OK);
+    }
+
+    @Logging
+    @DeleteMapping("role/users")
+    @Operation(summary = "批量为角色解除用户绑定", description = "批量为角色解除用户绑定")
+    public ResponseEntity<ResponseVO> unauthorize(@Valid @RequestBody SecUserBatchAuthorizeForRoleParam param) {
+        secAuthorizeService.unauthorize(param);
+        return new ResponseEntity<>(ResponseVO.success(), HttpStatus.OK);
+    }
+
+    @Logging
+    @GetMapping("user/authorized-roles")
+    @Operation(summary = "查询用户绑定角色列表", description = "查询用户绑定角色列表")
+    public ResponseEntity<List<SecRoleDTO>> listAuthorizedRolesByUserId(@Valid SecRoleListByUserParam param) {
+        List<SecRoleDTO> result = secAuthorizeService.listAuthorizedRolesByUserId(param);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
+    @Logging
+    @GetMapping("user/unauthorized-roles")
+    @Operation(summary = "查询用户未绑定角色列表", description = "查询用户未绑定角色列表")
+    public ResponseEntity<List<SecRoleDTO>> listUnauthorizedRolesByUserId(@Valid SecRoleListByUserParam param) {
+        List<SecRoleDTO> result = secAuthorizeService.listUnauthorizedRolesByUserId(param);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
+    @Logging
+    @PutMapping("user/roles")
+    @Operation(summary = "批量为用户绑定角色", description = "批量为用户绑定角色")
+    public ResponseEntity<ResponseVO> authorize(@Valid @RequestBody SecRoleBatchAuthorizeForUserParam param) {
+        secAuthorizeService.authorize(param);
+        return new ResponseEntity<>(ResponseVO.success(), HttpStatus.OK);
+    }
+
+    @Logging
+    @DeleteMapping("user/roles")
+    @Operation(summary = "批量为用户解除角色绑定", description = "批量为用户解除角色绑定")
+    public ResponseEntity<ResponseVO> unauthorize(@Valid @RequestBody SecRoleBatchAuthorizeForUserParam param) {
+        secAuthorizeService.unauthorize(param);
+        return new ResponseEntity<>(ResponseVO.success(), HttpStatus.OK);
+    }
+
 }
diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/mapper/master/security/SecUserRoleMapper.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/mapper/master/security/SecUserRoleMapper.java
index b1d044580..4cc877770 100644
--- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/mapper/master/security/SecUserRoleMapper.java
+++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/mapper/master/security/SecUserRoleMapper.java
@@ -18,10 +18,18 @@
 
 package cn.sliew.scaleph.dao.mapper.master.security;
 
+import cn.sliew.scaleph.common.dict.security.RoleStatus;
+import cn.sliew.scaleph.common.dict.security.UserStatus;
+import cn.sliew.scaleph.dao.entity.master.security.SecRole;
+import cn.sliew.scaleph.dao.entity.master.security.SecUser;
 import cn.sliew.scaleph.dao.entity.master.security.SecUserRole;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户角色关联表 Mapper 接口
@@ -33,4 +41,33 @@
 @Repository
 public interface SecUserRoleMapper extends BaseMapper<SecUserRole> {
 
+    /**
+     * 查询角色关联的用户
+     */
+    Page<SecUser> selectRelatedUsersByRole(Page page,
+                                           @Param("roleId") Long roleId,
+                                           @Param("status") UserStatus status,
+                                           @Param("userName") String userName);
+
+    /**
+     * 查询角色未关联的用户
+     */
+    Page<SecUser> selectUnrelatedUsersByRole(Page page,
+                                             @Param("roleId") Long roleId,
+                                             @Param("status") UserStatus status,
+                                             @Param("userName") String userName);
+
+    /**
+     * 查询用户关联的角色
+     */
+    List<SecRole> selectRelatedRolesByUser(@Param("userId") Long userId,
+                                           @Param("status") RoleStatus status,
+                                           @Param("name") String name);
+
+    /**
+     * 查询用户未关联的角色
+     */
+    List<SecRole> selectUnrelatedRolesByUser(@Param("userId") Long userId,
+                                             @Param("status") RoleStatus status,
+                                             @Param("name") String name);
 }
diff --git a/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecUserRoleMapper.xml b/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecUserRoleMapper.xml
index 900ded863..614cfd678 100644
--- a/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecUserRoleMapper.xml
+++ b/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecUserRoleMapper.xml
@@ -30,4 +30,76 @@
         <result column="role_id" property="roleId"/>
     </resultMap>
 
+    <select id="selectRelatedUsersByRole" resultMap="cn.sliew.scaleph.dao.mapper.master.security.SecUserMapper.BaseResultMap">
+        SELECT
+            t1.*
+        FROM
+            sec_user t1
+                JOIN sec_user_role t2 ON t1.id = t2.user_id
+        WHERE
+            t2.role_id = 1
+        <if test="status != null">
+            AND t1.`status` = #{status}
+        </if>
+        <if test="userName != null and userName != ''">
+            AND t1.`userName` like concat('%',#{userName},'%')
+        </if>
+        ORDER BY
+            t1.id
+    </select>
+
+    <select id="selectUnrelatedUsersByRole" resultMap="cn.sliew.scaleph.dao.mapper.master.security.SecUserMapper.BaseResultMap">
+        SELECT
+        t1.*
+        FROM
+        sec_user t1
+        <where>
+            <if test="status != null">
+                AND t1.`status` = #{status}
+            </if>
+            <if test="userName != null and userName != ''">
+                AND t1.`userName` like concat('%',#{userName},'%')
+            </if>
+            AND NOT EXISTS ( SELECT * FROM sec_user_role t2 WHERE t1.id = t2.user_id AND t2.role_id = #{roleId} )
+        </where>
+        ORDER BY
+        t1.id
+    </select>
+
+    <select id="selectRelatedRolesByUser" resultMap="cn.sliew.scaleph.dao.mapper.master.security.SecRoleMapper.SecRoleMap">
+        SELECT
+            t1.*
+        FROM
+            sec_role t1
+                JOIN sec_user_role t2 ON t1.id = t2.role_id
+        WHERE
+            t2.user_id = #{userId}
+        <if test="status != null">
+            AND t1.`status` = #{status}
+        </if>
+        <if test="name != null and name != ''">
+            AND t1.`name` like concat('%',#{name},'%')
+        </if>
+        ORDER BY
+            t1.id
+    </select>
+
+    <select id="selectUnrelatedRolesByUser" resultMap="cn.sliew.scaleph.dao.mapper.master.security.SecRoleMapper.SecRoleMap">
+        SELECT
+        t1.*
+        FROM
+        sec_role t1
+        <where>
+            <if test="status != null">
+                AND t1.`status` = #{status}
+            </if>
+            <if test="name != null and name != ''">
+                AND t1.`name` like concat('%',#{name},'%')
+            </if>
+            AND NOT EXISTS ( SELECT * FROM sec_user_role t2 WHERE t1.id = t2.role_id AND t2.user_id = #{userId} )
+        </where>
+        ORDER BY
+        t1.id
+    </select>
+
 </mapper>
diff --git a/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/SecAuthorizeService.java b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/SecAuthorizeService.java
index c38cd1c82..418d9ab52 100644
--- a/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/SecAuthorizeService.java
+++ b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/SecAuthorizeService.java
@@ -20,11 +20,9 @@
 
 import cn.sliew.scaleph.security.service.dto.SecResourceWebWithAuthorizeDTO;
 import cn.sliew.scaleph.security.service.dto.SecRoleDTO;
+import cn.sliew.scaleph.security.service.dto.SecUserDTO;
 import cn.sliew.scaleph.security.service.dto.UmiRoute;
-import cn.sliew.scaleph.security.service.param.SecResourceWebBatchAuthorizeForRoleParam;
-import cn.sliew.scaleph.security.service.param.SecResourceWebListByRoleParam;
-import cn.sliew.scaleph.security.service.param.SecRoleBatchAuthorizeForResourceWebParam;
-import cn.sliew.scaleph.security.service.param.SecRoleListByResourceWebParam;
+import cn.sliew.scaleph.security.service.param.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.List;
@@ -63,6 +61,7 @@ public interface SecAuthorizeService {
     // -------------------------------------------------------------------------------------------
     // role -> resource-web
     // -------------------------------------------------------------------------------------------
+
     /**
      * 查询所有 资源-web 和指定角色绑定状态
      */
@@ -78,4 +77,52 @@ public interface SecAuthorizeService {
      */
     void unauthorize(SecResourceWebBatchAuthorizeForRoleParam param);
 
+    // -------------------------------------------------------------------------------------------
+    // role -> user
+    // -------------------------------------------------------------------------------------------
+
+    /**
+     * 查询角色绑定用户列表
+     */
+    Page<SecUserDTO> listAuthorizedUsersByRoleId(SecUserListByRoleParam param);
+
+    /**
+     * 查询角色未绑定用户列表
+     */
+    Page<SecUserDTO> listUnauthorizedUsersByRoleId(SecUserListByRoleParam param);
+
+    /**
+     * 批量为角色绑定用户
+     */
+    void authorize(SecUserBatchAuthorizeForRoleParam param);
+
+    /**
+     * 批量为角色解除用户绑定
+     */
+    void unauthorize(SecUserBatchAuthorizeForRoleParam param);
+
+    // -------------------------------------------------------------------------------------------
+    // user -> role
+    // -------------------------------------------------------------------------------------------
+
+    /**
+     * 查询用户绑定角色列表
+     */
+    List<SecRoleDTO> listAuthorizedRolesByUserId(SecRoleListByUserParam param);
+
+    /**
+     * 查询用户未绑定角色列表
+     */
+    List<SecRoleDTO> listUnauthorizedRolesByUserId(SecRoleListByUserParam param);
+
+    /**
+     * 批量为用户绑定角色
+     */
+    void authorize(SecRoleBatchAuthorizeForUserParam param);
+
+    /**
+     * 批量为用户解除角色绑定
+     */
+    void unauthorize(SecRoleBatchAuthorizeForUserParam param);
+
 }
diff --git a/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/impl/SecAuthorizeServiceImpl.java b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/impl/SecAuthorizeServiceImpl.java
index 935857fc0..1d340d538 100644
--- a/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/impl/SecAuthorizeServiceImpl.java
+++ b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/impl/SecAuthorizeServiceImpl.java
@@ -18,31 +18,30 @@
 
 package cn.sliew.scaleph.security.service.impl;
 
-import cn.sliew.scaleph.dao.entity.master.security.SecResourceWebRole;
-import cn.sliew.scaleph.dao.entity.master.security.SecResourceWebVO;
-import cn.sliew.scaleph.dao.entity.master.security.SecRole;
+import cn.sliew.scaleph.dao.entity.master.security.*;
 import cn.sliew.scaleph.dao.mapper.master.security.SecResourceWebRoleMapper;
+import cn.sliew.scaleph.dao.mapper.master.security.SecUserRoleMapper;
+import cn.sliew.scaleph.security.authentication.UserDetailInfo;
 import cn.sliew.scaleph.security.service.SecAuthorizeService;
 import cn.sliew.scaleph.security.service.SecResourceWebService;
 import cn.sliew.scaleph.security.service.convert.SecResourceWebWithAuthorizeConvert;
 import cn.sliew.scaleph.security.service.convert.SecRoleConvert;
-import cn.sliew.scaleph.security.service.dto.SecResourceWebDTO;
-import cn.sliew.scaleph.security.service.dto.SecResourceWebWithAuthorizeDTO;
-import cn.sliew.scaleph.security.service.dto.SecRoleDTO;
-import cn.sliew.scaleph.security.service.dto.UmiRoute;
-import cn.sliew.scaleph.security.service.param.SecResourceWebBatchAuthorizeForRoleParam;
-import cn.sliew.scaleph.security.service.param.SecResourceWebListByRoleParam;
-import cn.sliew.scaleph.security.service.param.SecRoleBatchAuthorizeForResourceWebParam;
-import cn.sliew.scaleph.security.service.param.SecRoleListByResourceWebParam;
+import cn.sliew.scaleph.security.service.convert.SecUserConvert;
+import cn.sliew.scaleph.security.service.dto.*;
+import cn.sliew.scaleph.security.service.param.*;
+import cn.sliew.scaleph.security.util.SecurityUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 
 @Service
 public class SecAuthorizeServiceImpl implements SecAuthorizeService {
@@ -51,12 +50,19 @@ public class SecAuthorizeServiceImpl implements SecAuthorizeService {
     private SecResourceWebService secResourceWebService;
     @Autowired
     private SecResourceWebRoleMapper secResourceWebRoleMapper;
+    @Autowired
+    private SecUserRoleMapper secUserRoleMapper;
 
     /**
      * fixme 这里没有获取用户自己的资源，先获取的所有资源
      */
     @Override
     public List<UmiRoute> getWebRoute() {
+        Optional<Long> optional = SecurityUtil.getCurrentUserId();
+        if (optional.isEmpty()) {
+            return Collections.emptyList();
+        }
+        Long userId = optional.get();
         return buildRouteByPid(0L);
     }
 
@@ -159,4 +165,76 @@ public void unauthorize(SecResourceWebBatchAuthorizeForRoleParam param) {
             secResourceWebRoleMapper.delete(queryWrapper);
         }
     }
+
+    @Override
+    public Page<SecUserDTO> listAuthorizedUsersByRoleId(SecUserListByRoleParam param) {
+        Page page = new Page(param.getCurrent(), param.getPageSize());
+        Page<SecUser> secUserPage = secUserRoleMapper.selectRelatedUsersByRole(page, param.getRoleId(), param.getStatus(), param.getUserName());
+        Page<SecUserDTO> result = new Page<>(secUserPage.getCurrent(), secUserPage.getSize(), secUserPage.getTotal());
+        List<SecUserDTO> secUserDTOS = SecUserConvert.INSTANCE.toDto(secUserPage.getRecords());
+        result.setRecords(secUserDTOS);
+        return result;
+    }
+
+    @Override
+    public Page<SecUserDTO> listUnauthorizedUsersByRoleId(SecUserListByRoleParam param) {
+        Page page = new Page(param.getCurrent(), param.getPageSize());
+        Page<SecUser> secUserPage = secUserRoleMapper.selectUnrelatedUsersByRole(page, param.getRoleId(), param.getStatus(), param.getUserName());
+        Page<SecUserDTO> result = new Page<>(secUserPage.getCurrent(), secUserPage.getSize(), secUserPage.getTotal());
+        List<SecUserDTO> secUserDTOS = SecUserConvert.INSTANCE.toDto(secUserPage.getRecords());
+        result.setRecords(secUserDTOS);
+        return result;
+    }
+
+    @Override
+    public void authorize(SecUserBatchAuthorizeForRoleParam param) {
+        for (Long userId : param.getUserIds()) {
+            SecUserRole record = new SecUserRole();
+            record.setUserId(userId);
+            record.setRoleId(param.getRoleId());
+            secUserRoleMapper.insert(record);
+        }
+    }
+
+    @Override
+    public void unauthorize(SecUserBatchAuthorizeForRoleParam param) {
+        for (Long userId : param.getUserIds()) {
+            LambdaQueryWrapper<SecUserRole> queryWrapper = Wrappers.lambdaQuery(SecUserRole.class)
+                    .eq(SecUserRole::getUserId, userId)
+                    .eq(SecUserRole::getRoleId, param.getRoleId());
+            secUserRoleMapper.delete(queryWrapper);
+        }
+    }
+
+    @Override
+    public List<SecRoleDTO> listAuthorizedRolesByUserId(SecRoleListByUserParam param) {
+        List<SecRole> secRoleList = secUserRoleMapper.selectRelatedRolesByUser(param.getUserId(), param.getStatus(), param.getName());
+        return SecRoleConvert.INSTANCE.toDto(secRoleList);
+    }
+
+    @Override
+    public List<SecRoleDTO> listUnauthorizedRolesByUserId(SecRoleListByUserParam param) {
+        List<SecRole> secRoleList = secUserRoleMapper.selectUnrelatedRolesByUser(param.getUserId(), param.getStatus(), param.getName());
+        return SecRoleConvert.INSTANCE.toDto(secRoleList);
+    }
+
+    @Override
+    public void authorize(SecRoleBatchAuthorizeForUserParam param) {
+        for (Long roleId : param.getRoleIds()) {
+            SecUserRole record = new SecUserRole();
+            record.setUserId(param.getUserId());
+            record.setRoleId(roleId);
+            secUserRoleMapper.insert(record);
+        }
+    }
+
+    @Override
+    public void unauthorize(SecRoleBatchAuthorizeForUserParam param) {
+        for (Long roleId : param.getRoleIds()) {
+            LambdaQueryWrapper<SecUserRole> queryWrapper = Wrappers.lambdaQuery(SecUserRole.class)
+                    .eq(SecUserRole::getUserId, param.getUserId())
+                    .eq(SecUserRole::getRoleId, roleId);
+            secUserRoleMapper.delete(queryWrapper);
+        }
+    }
 }
diff --git a/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/param/SecRoleBatchAuthorizeForUserParam.java b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/param/SecRoleBatchAuthorizeForUserParam.java
new file mode 100644
index 000000000..020dd5fa3
--- /dev/null
+++ b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/param/SecRoleBatchAuthorizeForUserParam.java
@@ -0,0 +1,38 @@
+/*
+ * 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 cn.sliew.scaleph.security.service.param;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+public class SecRoleBatchAuthorizeForUserParam {
+
+    @NotNull
+    @Schema(description = "用户 id")
+    private Long userId;
+
+    @NotEmpty
+    @Schema(description = "待授权/取消授权角色 id 列表")
+    private List<Long> roleIds;
+}
diff --git a/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/param/SecRoleListByUserParam.java b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/param/SecRoleListByUserParam.java
new file mode 100644
index 000000000..bfef440c0
--- /dev/null
+++ b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/param/SecRoleListByUserParam.java
@@ -0,0 +1,41 @@
+/*
+ * 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 cn.sliew.scaleph.security.service.param;
+
+import cn.sliew.scaleph.common.dict.security.RoleStatus;
+import cn.sliew.scaleph.common.dict.security.UserStatus;
+import cn.sliew.scaleph.system.model.PaginationParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class SecRoleListByUserParam extends PaginationParam {
+
+    @NotNull
+    @Schema(description = "用户 id")
+    private Long userId;
+
+    @Schema(description = "用户状态")
+    private RoleStatus status;
+
+    @Schema(description = "角色名称。支持搜索")
+    private String name;
+}
diff --git a/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/param/SecUserBatchAuthorizeForRoleParam.java b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/param/SecUserBatchAuthorizeForRoleParam.java
new file mode 100644
index 000000000..3a14b191f
--- /dev/null
+++ b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/param/SecUserBatchAuthorizeForRoleParam.java
@@ -0,0 +1,38 @@
+/*
+ * 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 cn.sliew.scaleph.security.service.param;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+public class SecUserBatchAuthorizeForRoleParam {
+
+    @NotNull
+    @Schema(description = "角色 id")
+    private Long roleId;
+
+    @NotEmpty
+    @Schema(description = "待授权/取消授权用户 id 列表")
+    private List<Long> userIds;
+}
diff --git a/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/param/SecUserListByRoleParam.java b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/param/SecUserListByRoleParam.java
new file mode 100644
index 000000000..1f253bcb5
--- /dev/null
+++ b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/param/SecUserListByRoleParam.java
@@ -0,0 +1,40 @@
+/*
+ * 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 cn.sliew.scaleph.security.service.param;
+
+import cn.sliew.scaleph.common.dict.security.UserStatus;
+import cn.sliew.scaleph.system.model.PaginationParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class SecUserListByRoleParam extends PaginationParam {
+
+    @NotNull
+    @Schema(description = "角色 id")
+    private Long roleId;
+
+    @Schema(description = "用户状态")
+    private UserStatus status;
+
+    @Schema(description = "用户名称。支持搜索")
+    private String userName;
+}
diff --git a/scaleph-security/src/main/java/cn/sliew/scaleph/security/util/SecurityUtil.java b/scaleph-security/src/main/java/cn/sliew/scaleph/security/util/SecurityUtil.java
index bdb4b33fa..cfc562a9d 100644
--- a/scaleph-security/src/main/java/cn/sliew/scaleph/security/util/SecurityUtil.java
+++ b/scaleph-security/src/main/java/cn/sliew/scaleph/security/util/SecurityUtil.java
@@ -18,11 +18,14 @@
 
 package cn.sliew.scaleph.security.util;
 
+import cn.sliew.scaleph.security.authentication.UserDetailInfo;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.util.ObjectUtils;
 
+import java.util.Optional;
+
 /**
  * @author gleiyu
  */
@@ -54,4 +57,17 @@ public static String getCurrentUserName() {
         }
         return null;
     }
+
+    /**
+     * 获取当前登录的用户名称
+     *
+     * @return username
+     */
+    public static Optional<Long> getCurrentUserId() {
+        UserDetailInfo userDetailInfo = (UserDetailInfo) SecurityUtil.getCurrentUser();
+        if (userDetailInfo != null) {
+            return Optional.of(userDetailInfo.getUser().getId());
+        }
+        return Optional.empty();
+    }
 }
diff --git a/tools/docker/mysql/init.d/scaleph-security-mysql.sql b/tools/docker/mysql/init.d/scaleph-security-mysql.sql
index 6d99e6db8..a089994db 100644
--- a/tools/docker/mysql/init.d/scaleph-security-mysql.sql
+++ b/tools/docker/mysql/init.d/scaleph-security-mysql.sql
@@ -619,6 +619,7 @@ create table sec_user_role
 -- init data
 insert into sec_user_role (id, user_id, role_id, creator, editor)
 values (1, 1, 1, 'sys', 'sys');
+
 /* 部门角色关联表 */
 drop table if exists sec_dept_role;
 create table sec_dept_role

From 3aa59de2bf5f93c8904df1c670c61ab626daab19 Mon Sep 17 00:00:00 2001
From: kalencaya <1942460489@qq.com>
Date: Mon, 20 Nov 2023 19:34:38 +0800
Subject: [PATCH 15/24] [Feature][scaleph-engine-doris] add selectdb
 doris-operator crd (#646)

* feature: doris operator crd definition

* fix: resource-web and role relation error
---
 .../security/SecResourceWebRoleMapper.xml     | 19 +++----
 .../engine/doris/operator/DorisCluster.java   |  2 -
 .../engine/doris/operator/spec/AdminUser.java | 10 ++++
 .../operator/spec/AutoScalerVersion.java      | 11 +++-
 .../operator/spec/AutoScalingPolicy.java      |  2 +-
 .../doris/operator/spec/ConfigMapInfo.java    |  3 ++
 .../spec/ContainerResourceMetricSource.java   | 44 ++++++++++++++++
 .../spec/CrossVersionObjectReference.java     | 46 ++++++++++++++++
 .../doris/operator/spec/DorisClusterSpec.java | 22 ++++++++
 .../doris/operator/spec/DorisServicePort.java | 12 +++++
 .../doris/operator/spec/ExportService.java    | 15 ++++++
 .../operator/spec/ExternalMetricSource.java   | 38 ++++++++++++++
 .../engine/doris/operator/spec/FeAddress.java |  1 -
 .../engine/doris/operator/spec/FeSpec.java    |  8 +++
 .../engine/doris/operator/spec/HPAPolicy.java |  4 +-
 .../doris/operator/spec/HPAScalingPolicy.java | 43 +++++++++++++++
 .../operator/spec/HPAScalingPolicyType.java   | 35 +++++++++++++
 .../doris/operator/spec/HPAScalingRules.java  | 19 +++++++
 .../spec/HorizontalPodAutoscalerBehavior.java |  4 +-
 .../doris/operator/spec/MetricSpec.java       |  7 ++-
 .../operator/spec/ObjectMetricSource.java     |  4 +-
 .../doris/operator/status/CnStatus.java       |  8 ++-
 .../operator/status/ComponentCondition.java   | 52 +++++++++++++++++++
 .../doris/operator/status/ComponentPhase.java | 24 +++++++++
 .../operator/status/ComponentStatus.java      | 52 +++++++++++++++++++
 .../operator/status/DorisClusterStatus.java   | 26 ++++++++++
 26 files changed, 488 insertions(+), 23 deletions(-)
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ContainerResourceMetricSource.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/CrossVersionObjectReference.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ExternalMetricSource.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HPAScalingPolicy.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HPAScalingPolicyType.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/status/ComponentCondition.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/status/ComponentPhase.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/status/ComponentStatus.java

diff --git a/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebRoleMapper.xml b/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebRoleMapper.xml
index 637d22134..f9479421f 100644
--- a/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebRoleMapper.xml
+++ b/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebRoleMapper.xml
@@ -64,15 +64,16 @@
         t1.*
         FROM
         sec_role t1
-        WHERE
-        <if test="status != null">
-            AND t1.`status` = #{status}
-        </if>
-        <if test="name != null and name != ''">
-            AND t1.`name` like concat('%',#{name},'%')
-        </if>
-        AND NOT EXISTS ( SELECT * FROM sec_resource_web_role t2 WHERE t1.id = t2.role_id AND t2.resource_web_id =
-        #{resourceWebId} )
+        <where>
+            <if test="status != null">
+                AND t1.`status` = #{status}
+            </if>
+            <if test="name != null and name != ''">
+                AND t1.`name` like concat('%',#{name},'%')
+            </if>
+            AND NOT EXISTS ( SELECT * FROM sec_resource_web_role t2 WHERE t1.id = t2.role_id AND t2.resource_web_id =
+            #{resourceWebId} )
+        </where>
         ORDER BY
         t1.`code`
     </select>
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/DorisCluster.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/DorisCluster.java
index 40df42f32..c25ddd205 100644
--- a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/DorisCluster.java
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/DorisCluster.java
@@ -31,6 +31,4 @@
 @Kind("DorisCluster")
 public class DorisCluster extends CustomResource<DorisClusterSpec, DorisClusterStatus> implements Namespaced {
 
-
-
 }
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/AdminUser.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/AdminUser.java
index c6903ad6b..b705099ba 100644
--- a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/AdminUser.java
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/AdminUser.java
@@ -20,9 +20,19 @@
 
 import lombok.Data;
 
+/**
+ * AdminUser describe administrator for manage components in specified cluster.
+ */
 @Data
 public class AdminUser extends BaseSpec {
 
+    /**
+     * the user name for admin service’s node.
+     */
     private String name;
+
+    /**
+     * password, login to doris db.
+     */
     private String password;
 }
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/AutoScalerVersion.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/AutoScalerVersion.java
index 81cd489f7..6f09b066a 100644
--- a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/AutoScalerVersion.java
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/AutoScalerVersion.java
@@ -19,5 +19,14 @@
 package cn.sliew.scaleph.engine.doris.operator.spec;
 
 public enum AutoScalerVersion {
-    v1, v2;
+
+    /**
+     * the cn service use v1 autoscaler. reference to https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/
+     */
+    v1,
+
+    /**
+     * the cn service use v2. reference to https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/
+     */
+    v2;
 }
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/AutoScalingPolicy.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/AutoScalingPolicy.java
index 8fe2b5dfc..61dccf3ff 100644
--- a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/AutoScalingPolicy.java
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/AutoScalingPolicy.java
@@ -31,7 +31,7 @@ public class AutoScalingPolicy {
     /**
      * the policy of cn autoscale. operator use autoscaling v2.
      */
-    private Object hpaPolicy;
+    private HPAPolicy hpaPolicy;
 
     /**
      * version represents the autoscaler version for cn service. only support v1,,v2
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ConfigMapInfo.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ConfigMapInfo.java
index f827e02ae..b0136b3b3 100644
--- a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ConfigMapInfo.java
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ConfigMapInfo.java
@@ -20,6 +20,9 @@
 
 import lombok.Data;
 
+/**
+ * ConfigMapInfo specify configmap to mount for component.
+ */
 @Data
 public class ConfigMapInfo {
 
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ContainerResourceMetricSource.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ContainerResourceMetricSource.java
new file mode 100644
index 000000000..a9f9f1115
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ContainerResourceMetricSource.java
@@ -0,0 +1,44 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+import lombok.Data;
+
+/**
+ * ContainerResourceMetricSource indicates how to scale on a resource metric known to Kubernetes, as specified in requests and limits, describing each pod in the current scale target (e.g. CPU or memory). The values will be averaged together before being compared to the target. Such metrics are built in to Kubernetes, and have special scaling options on top of those available to normal per-pod metrics using the “pods” source. Only one “target” type should be set.
+ */
+@Data
+public class ContainerResourceMetricSource {
+
+    /**
+     * name is the name of the resource in question.
+     */
+    private String name;
+
+    /**
+     * target specifies the target value for the given metric
+     */
+    private MetricTarget target;
+
+    /**
+     * container is the name of the container in the pods of the scaling target
+     */
+    private String container;
+
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/CrossVersionObjectReference.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/CrossVersionObjectReference.java
new file mode 100644
index 000000000..314afff6c
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/CrossVersionObjectReference.java
@@ -0,0 +1,46 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+import lombok.Data;
+
+import javax.annotation.Nullable;
+
+/**
+ * CrossVersionObjectReference contains enough information to let you identify the referred resource.
+ */
+@Data
+public class CrossVersionObjectReference {
+
+    /**
+     * Kind of the referent; More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds”
+     */
+    private String kind;
+
+    /**
+     * Name of the referent; More info: http://kubernetes.io/docs/user-guide/identifiers#names
+     */
+    private String name;
+
+    /**
+     * API version of the referent
+     */
+    @Nullable
+    private String apiVersion;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/DorisClusterSpec.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/DorisClusterSpec.java
index c8c9c7561..2de0a195f 100644
--- a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/DorisClusterSpec.java
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/DorisClusterSpec.java
@@ -20,12 +20,34 @@
 
 import lombok.Data;
 
+/**
+ * DorisClusterSpec defines the desired state of DorisCluster
+ */
 @Data
 public class DorisClusterSpec {
 
+    /**
+     * defines the fe cluster state that will be created by operator.
+     */
     private FeSpec feSpec;
+
+    /**
+     * defines the be cluster state pod that will be created by operator.
+     */
     private BeSpec beSpec;
+
+    /**
+     * defines the cn cluster state that will be created by operator.
+     */
     private CnSpec cnSpec;
+
+    /**
+     * efines the broker state that will be created by operator.
+     */
     private BrokerSpec brokerSpec;
+
+    /**
+     * administrator for register or drop component from fe cluster. adminUser for all component register and operator drop component.
+     */
     private AdminUser adminUser;
 }
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/DorisServicePort.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/DorisServicePort.java
index 2c2bf7dc6..9ab4749b3 100644
--- a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/DorisServicePort.java
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/DorisServicePort.java
@@ -20,12 +20,24 @@
 
 import lombok.Data;
 
+import javax.annotation.Nullable;
+
 /**
  * 仅在 NodeType 场景起作用
+ * DorisServicePort for ServiceType=NodePort situation.
  */
 @Data
 public class DorisServicePort {
 
+    /**
+     * The port on each node on which this service is exposed when type is NodePort or LoadBalancer. Usually assigned by the system. If a value is specified, in-range, and not in use it will be used, otherwise the operation will fail. If not specified, a port will be allocated if this Service requires one. If this field is specified when creating a Service which does not need it, creation will fail. This field will be wiped when updating a Service to no longer need it (e.g. changing type from NodePort to ClusterIP). More info: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport need in 30000-32767
+     */
+    @Nullable
     private Integer nodePort;
+
+    /**
+     * Number or name of the port to access on the pods targeted by the service. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. If this is a string, it will be looked up as a named port in the target Pod’s container ports. If this is not specified, the value of the ‘port’ field is used (an identity map). This field is ignored for services with clusterIP=None, and should be omitted or set equal to the ‘port’ field. More info: https://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service
+     */
+    @Nullable
     private Integer targetPort;
 }
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ExportService.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ExportService.java
index 24a068412..a486971ef 100644
--- a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ExportService.java
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ExportService.java
@@ -21,17 +21,32 @@
 import cn.sliew.scaleph.common.dict.flink.ServiceExposedType;
 import lombok.Data;
 
+import javax.annotation.Nullable;
 import java.util.List;
 
+/**
+ * ExportService consisting of expose ports for user access to software service.
+ */
 @Data
 public class ExportService {
 
     /**
      * fixme k8s 的 type
      * https://github.com/selectdb/doris-operator/blob/master/doc/api.md#exportservice
+     * type of service,the possible value for the service type are : ClusterIP, NodePort, LoadBalancer,ExternalName. More info: https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types
      */
+    @Nullable
     private ServiceExposedType type;
+
+    /**
+     * ServicePort config service for NodePort access mode.
+     */
     private List<DorisServicePort> servicePorts;
+
+    /**
+     * Only applies to Service Type: LoadBalancer. This feature depends on whether the underlying cloud-provider supports specifying the loadBalancerIP when a load balancer is created. This field will be ignored if the cloud-provider does not support the feature. This field was under-specified and its meaning varies across implementations, and it cannot support dual-stack. As of Kubernetes v1.24, users are encouraged to use implementation-specific annotations when available. This field may be removed in a future API version.
+     */
+    @Nullable
     private String loadBalancerIP;
 
 }
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ExternalMetricSource.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ExternalMetricSource.java
new file mode 100644
index 000000000..7dcc23043
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ExternalMetricSource.java
@@ -0,0 +1,38 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+import lombok.Data;
+
+/**
+ * ExternalMetricSource indicates how to scale on a metric not associated with any Kubernetes object (for example length of queue in cloud messaging service, or QPS from loadbalancer running outside of cluster).
+ */
+@Data
+public class ExternalMetricSource {
+
+    /**
+     * metric identifies the target metric by name and selector
+     */
+    private MetricIdentifier metric;
+
+    /**
+     * target specifies the target value for the given metric
+     */
+    private MetricTarget target;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/FeAddress.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/FeAddress.java
index 19a8a2341..091816302 100644
--- a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/FeAddress.java
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/FeAddress.java
@@ -35,5 +35,4 @@ public class FeAddress {
      * the fe addresses if not deploy by crd, user can use k8s deploy fe observer.
      */
     private Endpoints endpoints;
-
 }
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/FeSpec.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/FeSpec.java
index 30b332c6b..46c5873dc 100644
--- a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/FeSpec.java
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/FeSpec.java
@@ -20,6 +20,14 @@
 
 import lombok.Data;
 
+/**
+ * FeSpec describes a template for creating copies of a fe software service.
+ */
 @Data
 public class FeSpec extends BaseSpec {
+
+    /**
+     * the number of fe in election. electionNumber <= replicas, left as observers. default value=3
+     */
+    private Integer electionNumber;
 }
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HPAPolicy.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HPAPolicy.java
index e65538a13..ab7528b99 100644
--- a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HPAPolicy.java
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HPAPolicy.java
@@ -30,11 +30,11 @@ public class HPAPolicy {
      * Metrics specifies how to scale based on a single metric the struct copy from k8s.io/api/autoscaling/v2beta2/types.go. the redundancy code will hide the restriction about HorizontalPodAutoscaler version and kubernetes releases matching issue. the splice will have unsafe.Pointer convert, so be careful to edit the struct fileds.
      */
     @Nullable
-    private List<Object> metrics;
+    private List<MetricSpec> metrics;
 
     /**
      * HorizontalPodAutoscalerBehavior configures the scaling behavior of the target. the struct copy from k8s.io/api/autoscaling/v2beta2/types.go. the redundancy code will hide the restriction about HorizontalPodAutoscaler version and kubernetes releases matching issue. the
      */
     @Nullable
-    private Object behavior;
+    private HorizontalPodAutoscalerBehavior behavior;
 }
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HPAScalingPolicy.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HPAScalingPolicy.java
new file mode 100644
index 000000000..30cc0f4ea
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HPAScalingPolicy.java
@@ -0,0 +1,43 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+import lombok.Data;
+
+/**
+ * HPAScalingPolicy is a single policy which must hold true for a specified past interval.
+ */
+@Data
+public class HPAScalingPolicy {
+
+    /**
+     * Type is used to specify the scaling policy.
+     */
+    private HPAScalingPolicyType type;
+
+    /**
+     * Value contains the amount of change which is permitted by the policy. It must be greater than zero
+     */
+    private Integer value;
+
+    /**
+     * PeriodSeconds specifies the window of time for which the policy should hold true. PeriodSeconds must be greater than zero and less than or equal to 1800 (30 min).
+     */
+    private Integer periodSeconds;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HPAScalingPolicyType.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HPAScalingPolicyType.java
new file mode 100644
index 000000000..ac1d2546a
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HPAScalingPolicyType.java
@@ -0,0 +1,35 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.spec;
+
+/**
+ * HPAScalingPolicyType is the type of the policy which could be used while making scaling decisions.
+ */
+public enum HPAScalingPolicyType {
+
+    /**
+     * PercentScalingPolicy is a policy used to specify a relative amount of change with respect to the current number of pods.
+     */
+    Percent,
+
+    /**
+     * PodsScalingPolicy is a policy used to specify a change in absolute number of pods.
+     */
+    Pods;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HPAScalingRules.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HPAScalingRules.java
index 94c83fcd9..620ac557d 100644
--- a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HPAScalingRules.java
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HPAScalingRules.java
@@ -20,8 +20,27 @@
 
 import lombok.Data;
 
+import javax.annotation.Nullable;
+import java.util.List;
+
 @Data
 public class HPAScalingRules {
 
+    /**
+     * StabilizationWindowSeconds is the number of seconds for which past recommendations should be considered while scaling up or scaling down. StabilizationWindowSeconds must be greater than or equal to zero and less than or equal to 3600 (one hour). If not set, use the default values: - For scale up: 0 (i.e. no stabilization is done). - For scale down: 300 (i.e. the stabilization window is 300 seconds long).
+     */
+    @Nullable
+    private Integer stabilizationWindowSeconds;
+
+    /**
+     * selectPolicy is used to specify which policy should be used. If not set, the default value MaxPolicySelect is used.
+     */
+    @Nullable
+    private ScalingPolicySelect selectPolicy;
 
+    /**
+     * policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid
+     */
+    @Nullable
+    private List<HPAScalingPolicy> policies;
 }
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HorizontalPodAutoscalerBehavior.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HorizontalPodAutoscalerBehavior.java
index ea4b44956..5920237e0 100644
--- a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HorizontalPodAutoscalerBehavior.java
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/HorizontalPodAutoscalerBehavior.java
@@ -32,11 +32,11 @@ public class HorizontalPodAutoscalerBehavior {
      * scaleUp is scaling policy for scaling Up. If not set, the default value is the higher of: * increase no more than 4 pods per 60 seconds * double the number of pods per 60 seconds No stabilization is used.
      */
     @Nullable
-    private Object scaleUp;
+    private HPAScalingRules scaleUp;
 
     /**
      * scaleDown is scaling policy for scaling Down. If not set, the default value is to allow to scale down to minReplicas pods, with a 300 second stabilization window (i.e., the highest recommendation for the last 300sec is used).
      */
     @Nullable
-    private Object scaleDown;
+    private HPAScalingRules scaleDown;
 }
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/MetricSpec.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/MetricSpec.java
index 3a962b868..ffa42563e 100644
--- a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/MetricSpec.java
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/MetricSpec.java
@@ -22,6 +22,9 @@
 
 import javax.annotation.Nullable;
 
+/**
+ * MetricSpec specifies how to scale based on a single metric (only type and one other matching field should be set at once).
+ */
 @Data
 public class MetricSpec {
 
@@ -46,11 +49,11 @@ public class MetricSpec {
      * container resource refers to a resource metric (such as those specified in requests and limits) known to Kubernetes describing a single container in each pod of the current scale target (e.g. CPU or memory). Such metrics are built in to Kubernetes, and have special scaling options on top of those available to normal per-pod metrics using the “pods” source. This is an alpha feature and can be enabled by the HPAContainerMetrics feature flag.
      */
     @Nullable
-    private Object containerResource;
+    private ContainerResourceMetricSource containerResource;
 
     /**
      * external refers to a global metric that is not associated with any Kubernetes object. It allows autoscaling based on information coming from components running outside of cluster (for example length of queue in cloud messaging service, or QPS from loadbalancer running outside of cluster).
      */
     @Nullable
-    private Object external;
+    private ExternalMetricSource external;
 }
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ObjectMetricSource.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ObjectMetricSource.java
index 1be52f7ba..1218e9421 100644
--- a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ObjectMetricSource.java
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/ObjectMetricSource.java
@@ -29,12 +29,12 @@ public class ObjectMetricSource {
     /**
      *
      */
-    private Object describedObject;
+    private CrossVersionObjectReference describedObject;
 
     /**
      * metric identifies the target metric by name and selector
      */
-    private Object metric;
+    private MetricIdentifier metric;
 
     /**
      * target specifies the target value for the given metric
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/status/CnStatus.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/status/CnStatus.java
index a32f3111d..05b600bb1 100644
--- a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/status/CnStatus.java
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/status/CnStatus.java
@@ -18,8 +18,14 @@
 
 package cn.sliew.scaleph.engine.doris.operator.status;
 
+import cn.sliew.scaleph.engine.doris.operator.spec.HorizontalScaler;
 import lombok.Data;
 
 @Data
-public class CnStatus {
+public class CnStatus extends ComponentStatus {
+
+    /**
+     * HorizontalAutoscaler have the autoscaler information.
+     */
+    private HorizontalScaler horizontalScaler;
 }
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/status/ComponentCondition.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/status/ComponentCondition.java
new file mode 100644
index 000000000..2df0348f7
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/status/ComponentCondition.java
@@ -0,0 +1,52 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.status;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class ComponentCondition {
+
+    /**
+     *
+     */
+    private String subResourceName;
+
+    /**
+     * Phase of statefulset condition.
+     */
+    private ComponentPhase phase;
+
+    /**
+     * The last time this condition was updated.
+     */
+    private LocalDateTime lastTransitionTime;
+
+    /**
+     * The reason for the condition’s last transition.
+     */
+    private String reason;
+
+    /**
+     * A human readable message indicating details about the transition.
+     */
+    private String message;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/status/ComponentPhase.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/status/ComponentPhase.java
new file mode 100644
index 000000000..8f098c24f
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/status/ComponentPhase.java
@@ -0,0 +1,24 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.status;
+
+public enum ComponentPhase {
+
+    available, haveMemberFailed, reconciling, waitScheduling;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/status/ComponentStatus.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/status/ComponentStatus.java
new file mode 100644
index 000000000..28d794091
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/status/ComponentStatus.java
@@ -0,0 +1,52 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.operator.status;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ComponentStatus {
+
+    /**
+     * DorisComponentStatus represents the status of a doris component. the name of fe service exposed for user.
+     */
+    private String accessService;
+
+    /**
+     * FailedInstances failed pod names.
+     */
+    private List<String> failedInstances;
+
+    /**
+     * CreatingInstances in creating pod names.
+     */
+    private List<String> creatingInstances;
+
+    /**
+     * RunningInstances in running status pod names.
+     */
+    private List<String> runningInstances;
+
+    /**
+     *
+     */
+    private Object componentCondition;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/status/DorisClusterStatus.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/status/DorisClusterStatus.java
index a9de661a2..f18f431f0 100644
--- a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/status/DorisClusterStatus.java
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/status/DorisClusterStatus.java
@@ -18,5 +18,31 @@
 
 package cn.sliew.scaleph.engine.doris.operator.status;
 
+import lombok.Data;
+
+/**
+ * DorisClusterStatus defines the observed state of DorisCluster
+ */
+@Data
 public class DorisClusterStatus {
+
+    /**
+     * describe fe cluster status, record running, creating and failed pods.
+     */
+    private ComponentStatus feStatus;
+
+    /**
+     * describe be cluster status, recode running, creating and failed pods.
+     */
+    private ComponentStatus beStatus;
+
+    /**
+     * describe cn cluster status, record running, creating and failed pods.
+     */
+    private CnStatus cnStatus;
+
+    /**
+     * describe broker cluster status, record running, creating and failed pods.
+     */
+    private ComponentStatus brokerStatus;
 }

From b52462bfdbe2957707c31cb0a3afa422d13ec4be Mon Sep 17 00:00:00 2001
From: kalencaya <1942460489@qq.com>
Date: Mon, 20 Nov 2023 21:32:03 +0800
Subject: [PATCH 16/24] [Bug][scaleph-security] fix umi route icon error (#647)

* fix: resource-web and role relation error

* fix: route icon error
---
 .../service/impl/SecAuthorizeServiceImpl.java | 10 -----
 .../scaleph/security/util/SecurityUtil.java   |  1 +
 .../scaleph/security/web/TokenFilter.java     |  1 +
 .../mysql/init.d/scaleph-security-mysql.sql   | 40 +++++++++----------
 4 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/impl/SecAuthorizeServiceImpl.java b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/impl/SecAuthorizeServiceImpl.java
index 1d340d538..c92634e16 100644
--- a/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/impl/SecAuthorizeServiceImpl.java
+++ b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/impl/SecAuthorizeServiceImpl.java
@@ -21,7 +21,6 @@
 import cn.sliew.scaleph.dao.entity.master.security.*;
 import cn.sliew.scaleph.dao.mapper.master.security.SecResourceWebRoleMapper;
 import cn.sliew.scaleph.dao.mapper.master.security.SecUserRoleMapper;
-import cn.sliew.scaleph.security.authentication.UserDetailInfo;
 import cn.sliew.scaleph.security.service.SecAuthorizeService;
 import cn.sliew.scaleph.security.service.SecResourceWebService;
 import cn.sliew.scaleph.security.service.convert.SecResourceWebWithAuthorizeConvert;
@@ -29,19 +28,15 @@
 import cn.sliew.scaleph.security.service.convert.SecUserConvert;
 import cn.sliew.scaleph.security.service.dto.*;
 import cn.sliew.scaleph.security.service.param.*;
-import cn.sliew.scaleph.security.util.SecurityUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
 
 @Service
 public class SecAuthorizeServiceImpl implements SecAuthorizeService {
@@ -58,11 +53,6 @@ public class SecAuthorizeServiceImpl implements SecAuthorizeService {
      */
     @Override
     public List<UmiRoute> getWebRoute() {
-        Optional<Long> optional = SecurityUtil.getCurrentUserId();
-        if (optional.isEmpty()) {
-            return Collections.emptyList();
-        }
-        Long userId = optional.get();
         return buildRouteByPid(0L);
     }
 
diff --git a/scaleph-security/src/main/java/cn/sliew/scaleph/security/util/SecurityUtil.java b/scaleph-security/src/main/java/cn/sliew/scaleph/security/util/SecurityUtil.java
index cfc562a9d..af2b6e6db 100644
--- a/scaleph-security/src/main/java/cn/sliew/scaleph/security/util/SecurityUtil.java
+++ b/scaleph-security/src/main/java/cn/sliew/scaleph/security/util/SecurityUtil.java
@@ -62,6 +62,7 @@ public static String getCurrentUserName() {
      * 获取当前登录的用户名称
      *
      * @return username
+     * @see cn.sliew.scaleph.security.web.TokenFilter
      */
     public static Optional<Long> getCurrentUserId() {
         UserDetailInfo userDetailInfo = (UserDetailInfo) SecurityUtil.getCurrentUser();
diff --git a/scaleph-security/src/main/java/cn/sliew/scaleph/security/web/TokenFilter.java b/scaleph-security/src/main/java/cn/sliew/scaleph/security/web/TokenFilter.java
index ee0b97e6c..8955e6ac5 100644
--- a/scaleph-security/src/main/java/cn/sliew/scaleph/security/web/TokenFilter.java
+++ b/scaleph-security/src/main/java/cn/sliew/scaleph/security/web/TokenFilter.java
@@ -125,6 +125,7 @@ private Authentication getAuthentication(OnlineUserVO onlineUser) {
             }
             onlineUser.setRoles(roleList);
             onlineUser.setPrivileges(privilegeList);
+            // fixme User != UserDetailInfo
             User principal = new User(onlineUser.getUserName(), "", authorities);
             return new UsernamePasswordAuthenticationToken(principal, onlineUser.getToken(),
                     authorities);
diff --git a/tools/docker/mysql/init.d/scaleph-security-mysql.sql b/tools/docker/mysql/init.d/scaleph-security-mysql.sql
index a089994db..837ae4832 100644
--- a/tools/docker/mysql/init.d/scaleph-security-mysql.sql
+++ b/tools/docker/mysql/init.d/scaleph-security-mysql.sql
@@ -320,16 +320,16 @@ INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`,
 VALUES (5, '2', 0, 'user-center', '/user/center', NULL, NULL, NULL, './User', NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web` (`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`,
                                 `remark`, `creator`, `editor`)
-VALUES (6, '0', 0, 'studio', '/studio', NULL, NULL, 'codeSandbox', NULL, NULL, 'sys', 'sys');
+VALUES (6, '0', 0, 'studio', '/studio', NULL, NULL, 'CodeSandboxOutlined', NULL, NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web` (`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`,
                                 `remark`, `creator`, `editor`)
 VALUES (7, '2', 6, '', '/studio', '/studio/databoard', NULL, NULL, NULL, NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web` (`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`,
                                 `remark`, `creator`, `editor`)
-VALUES (8, '2', 6, 'databoard', '/studio/databoard', NULL, NULL, 'dashboard', './Studio/DataBoard', NULL, 'sys', 'sys');
+VALUES (8, '2', 6, 'databoard', '/studio/databoard', NULL, NULL, 'DashboardOutlined', './Studio/DataBoard', NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web` (`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`,
                                 `remark`, `creator`, `editor`)
-VALUES (9, '0', 0, 'project', '/project', NULL, NULL, 'project', NULL, NULL, 'sys', 'sys');
+VALUES (9, '0', 0, 'project', '/project', NULL, NULL, 'ProjectOutlined', NULL, NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web` (`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`,
                                 `remark`, `creator`, `editor`)
 VALUES (10, '2', 9, NULL, '/project', NULL, NULL, NULL, './Project', NULL, 'sys', 'sys');
@@ -341,7 +341,7 @@ INSERT INTO `sec_resource_web` (`id`, `type`, `pid`, `name`, `path`, `redirect`,
 VALUES (12, '1', 11, NULL, '/workspace', '/workspace/artifact', NULL, NULL, NULL, NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web` (`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`,
                                 `remark`, `creator`, `editor`)
-VALUES (13, '1', 11, 'project.artifact', '/workspace/artifact', NULL, NULL, 'code', NULL, NULL, 'sys', 'sys');
+VALUES (13, '1', 11, 'project.artifact', '/workspace/artifact', NULL, NULL, 'CodeOutlined', NULL, NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web` (`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`,
                                 `remark`, `creator`, `editor`)
 VALUES (14, '2', 13, NULL, '/workspace/artifact', '/workspace/artifact/jar', NULL, NULL, NULL, NULL, 'sys', 'sys');
@@ -371,7 +371,7 @@ VALUES (20, '2', 13, NULL, '/workspace/artifact/seatunnel/dag', NULL, NULL, NULL
         './Project/Workspace/Artifact/DI/DiJobFlow', NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web` (`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`,
                                 `remark`, `creator`, `editor`)
-VALUES (21, '1', 11, 'project.flink.kubernetes', '/workspace/flink/kubernetes', NULL, NULL, 'deploymentUnit', NULL,
+VALUES (21, '1', 11, 'project.flink.kubernetes', '/workspace/flink/kubernetes', NULL, NULL, 'DeploymentUnitOutlined', NULL,
         NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web` (`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`,
                                 `remark`, `creator`, `editor`)
@@ -419,7 +419,7 @@ VALUES (32, '2', 21, NULL, '/workspace/flink/kubernetes/job/detail', NULL, NULL,
         './Project/Workspace/Kubernetes/Job/Detail', NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web` (`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`,
                                 `remark`, `creator`, `editor`)
-VALUES (33, '0', 0, 'resource', '/resource', NULL, NULL, 'fileText', NULL, NULL, 'sys', 'sys');
+VALUES (33, '0', 0, 'resource', '/resource', NULL, NULL, 'FileTextOutlined', NULL, NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web` (`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`,
                                 `remark`, `creator`, `editor`)
 VALUES (34, '2', 33, '', '/resource', '/resource/jar', NULL, NULL, NULL, NULL, 'sys', 'sys');
@@ -456,52 +456,52 @@ INSERT INTO `sec_resource_web` (`id`, `type`, `pid`, `name`, `path`, `redirect`,
 VALUES (43, '2', 41, NULL, '/dataSource/stepForms', NULL, NULL, NULL, './DataSource/StepForms', NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
-VALUES (44, '0', 0, 'stdata', '/stdata', NULL, NULL, 'database', NULL, NULL, 'sys', 'sys');
+VALUES (44, '0', 0, 'stdata', '/stdata', NULL, NULL, 'DatabaseOutlined', NULL, NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
 VALUES (45, '2', 44, NULL, '/stdata', '/stdata/system', NULL, NULL, NULL, NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
-VALUES (46, '2', 44, 'system', '/stdata/system', NULL, NULL, 'group', './Stdata/System', NULL, 'sys', 'sys');
+VALUES (46, '2', 44, 'system', '/stdata/system', NULL, NULL, 'GroupOutlined', './Stdata/System', NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
-VALUES (47, '2', 44, 'dataElement', '/stdata/dataElement', NULL, NULL, 'hdd', './Stdata/DataElement', NULL, 'sys',
+VALUES (47, '2', 44, 'dataElement', '/stdata/dataElement', NULL, NULL, 'HddOutlined', './Stdata/DataElement', NULL, 'sys',
         'sys');
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
-VALUES (48, '2', 44, 'refdata', '/stdata/refdata', NULL, NULL, 'profile', './Stdata/RefData', NULL, 'sys', 'sys');
+VALUES (48, '2', 44, 'refdata', '/stdata/refdata', NULL, NULL, 'ProfileOutlined', './Stdata/RefData', NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
 VALUES (49, '2', 44, NULL, '/stdata/refdata/value', NULL, NULL, NULL, './Stdata/RefData/Value', NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
-VALUES (50, '2', 44, 'refdataMap', '/stdata/refdataMap', NULL, NULL, 'oneToOne', './Stdata/RefDataMap', NULL, 'sys',
+VALUES (50, '2', 44, 'refdataMap', '/stdata/refdataMap', NULL, NULL, 'OneToOneOutlined', './Stdata/RefDataMap', NULL, 'sys',
         'sys');
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
-VALUES (51, '0', 0, 'admin', '/admin', NULL, NULL, 'setting', NULL, NULL, 'sys', 'sys');
+VALUES (51, '0', 0, 'admin', '/admin', NULL, NULL, 'SettingOutlined', NULL, NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
 VALUES (52, '2', 51, NULL, '/admin', '/admin/dept', NULL, NULL, NULL, NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
-VALUES (53, '2', 51, 'dept', '/admin/dept', NULL, NULL, 'apartment', './Admin/Dept', NULL, 'sys', 'sys');
+VALUES (53, '2', 51, 'dept', '/admin/dept', NULL, NULL, 'ApartmentOutlined', './Admin/Dept', NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
-VALUES (54, '2', 51, 'role', '/admin/role', NULL, NULL, 'safety', './Admin/Role', NULL, 'sys', 'sys');
+VALUES (54, '2', 51, 'role', '/admin/role', NULL, NULL, 'SafetyOutlined', './Admin/Role', NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
-VALUES (55, '2', 51, 'user', '/admin/user', NULL, NULL, 'user', './Admin/User', NULL, 'sys', 'sys');
+VALUES (55, '2', 51, 'user', '/admin/user', NULL, NULL, 'UserOutlined', './Admin/User', NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
-VALUES (56, '2', 51, 'resource.web', '/admin/resource/web', NULL, NULL, 'team', './Admin/Resource/Web', NULL, 'sys',
+VALUES (56, '2', 51, 'resource.web', '/admin/resource/web', NULL, NULL, 'TeamOutlined', './Admin/Resource/Web', NULL, 'sys',
         'sys');
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
-VALUES (57, '2', 51, 'privilege', '/admin/privilege', NULL, NULL, 'team', './Admin/Privilege', NULL, 'sys', 'sys');
+VALUES (57, '2', 51, 'privilege', '/admin/privilege', NULL, NULL, 'TeamOutlined', './Admin/Privilege', NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
-VALUES (58, '2', 51, 'quartz', '/admin/workflow/quartz', NULL, NULL, 'fieldTime', './Workflow/Definition/Quartz', NULL,
+VALUES (58, '2', 51, 'quartz', '/admin/workflow/quartz', NULL, NULL, 'FieldTimeOutlined', './Workflow/Definition/Quartz', NULL,
         'sys', 'sys');
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
@@ -512,10 +512,10 @@ INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`,
 VALUES (61, '2', 51, NULL, '/admin/workflow/schedule', NULL, NULL, NULL, './Workflow/Schedule', NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
-VALUES (62, '2', 51, 'dict', '/admin/dict', NULL, NULL, 'table', './Admin/Dict', NULL, 'sys', 'sys');
+VALUES (62, '2', 51, 'dict', '/admin/dict', NULL, NULL, 'TableOutlined', './Admin/Dict', NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
-VALUES (63, '2', 51, 'setting', '/admin/setting', NULL, NULL, 'setting', './Admin/Setting', NULL, 'sys', 'sys');
+VALUES (63, '2', 51, 'setting', '/admin/setting', NULL, NULL, 'SettingOutlined', './Admin/Setting', NULL, 'sys', 'sys');
 
 
 drop table if exists sec_resource_web_role;

From af2912170b17a09766268311ce06822a15c2f3fc Mon Sep 17 00:00:00 2001
From: kalencaya <1942460489@qq.com>
Date: Tue, 21 Nov 2023 23:21:48 +0800
Subject: [PATCH 17/24] [Feature][scaleph-ui-react] add doris template web
 under project (#648)

* feature: add doris template mapper

* feature: add doris template service

* feature: add doris template service

* feature: add doris template web route

* feature: add doris template web
---
 .../ws/WsDorisTemplateController.java         |  96 +++++++++
 .../dao/entity/master/ws/WsDorisTemplate.java |  72 +++++++
 .../master/ws/WsDorisTemplateMapper.java      |  31 +++
 .../master/ws/WsDorisTemplateMapper.xml       |  51 +++++
 .../engine/doris/operator/spec/BaseSpec.java  |  10 +-
 .../doris/service/WsDorisTemplateService.java |  45 ++++
 .../convert/WsDorisTemplateConvert.java       |  79 +++++++
 .../doris/service/dto/WsDorisTemplateDTO.java |  57 +++++
 .../impl/WsDorisTemplateServiceImpl.java      |  99 +++++++++
 .../param/WsDorisTemplateAddParam.java        |  44 ++++
 .../param/WsDorisTemplateListParam.java       |  36 ++++
 .../param/WsDorisTemplateUpdateParam.java     |  44 ++++
 .../doris/service/resource/DorisTemplate.java |  20 ++
 .../cn/sliew/scaleph/kubernetes/Constant.java |   6 +
 .../generator/MybatisPlusGenerator.java       |   2 +-
 scaleph-ui-react/config/routes.ts             |  23 ++
 scaleph-ui-react/src/locales/zh-CN/menu.ts    |   2 +
 .../src/locales/zh-CN/pages/project.ts        |   6 +
 .../Doris/Template/DorisTemplateForm.tsx      |  88 ++++++++
 .../Workspace/Doris/Template/index.tsx        | 197 ++++++++++++++++++
 .../project/WsDorisTemplateService.ts         |  50 +++++
 .../src/services/project/typings.d.ts         |  34 +++
 .../mysql/init.d/scaleph-security-mysql.sql   |  35 +++-
 .../docker/mysql/init.d/scaleph-ws-mysql.sql  |  59 ++++--
 24 files changed, 1159 insertions(+), 27 deletions(-)
 create mode 100644 scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/ws/WsDorisTemplateController.java
 create mode 100644 scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsDorisTemplate.java
 create mode 100644 scaleph-dao/src/main/java/cn/sliew/scaleph/dao/mapper/master/ws/WsDorisTemplateMapper.java
 create mode 100644 scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/ws/WsDorisTemplateMapper.xml
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/WsDorisTemplateService.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/convert/WsDorisTemplateConvert.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/dto/WsDorisTemplateDTO.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/impl/WsDorisTemplateServiceImpl.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisTemplateAddParam.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisTemplateListParam.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisTemplateUpdateParam.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/resource/DorisTemplate.java
 create mode 100644 scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/DorisTemplateForm.tsx
 create mode 100644 scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/index.tsx
 create mode 100644 scaleph-ui-react/src/services/project/WsDorisTemplateService.ts

diff --git a/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/ws/WsDorisTemplateController.java b/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/ws/WsDorisTemplateController.java
new file mode 100644
index 000000000..e5ab31f8f
--- /dev/null
+++ b/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/ws/WsDorisTemplateController.java
@@ -0,0 +1,96 @@
+/*
+ * 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 cn.sliew.scaleph.api.controller.ws;
+
+import cn.sliew.scaleph.api.annotation.Logging;
+import cn.sliew.scaleph.engine.doris.service.WsDorisTemplateService;
+import cn.sliew.scaleph.engine.doris.service.dto.WsDorisTemplateDTO;
+import cn.sliew.scaleph.engine.doris.service.param.WsDorisTemplateAddParam;
+import cn.sliew.scaleph.engine.doris.service.param.WsDorisTemplateListParam;
+import cn.sliew.scaleph.engine.doris.service.param.WsDorisTemplateUpdateParam;
+import cn.sliew.scaleph.system.model.ResponseVO;
+import cn.sliew.scaleph.system.snowflake.exception.UidGenerateException;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@Tag(name = "Doris管理-模板管理")
+@RestController
+@RequestMapping(path = "/api/doris/template")
+public class WsDorisTemplateController {
+
+    @Autowired
+    private WsDorisTemplateService wsDorisTemplateService;
+
+    @Logging
+    @GetMapping
+    @Operation(summary = "查询模板列表", description = "分页查询模板列表")
+    public ResponseEntity<Page<WsDorisTemplateDTO>> list(@Valid WsDorisTemplateListParam param) {
+        Page<WsDorisTemplateDTO> page = wsDorisTemplateService.list(param);
+        return new ResponseEntity<>(page, HttpStatus.OK);
+    }
+
+    @Logging
+    @GetMapping("/{id}")
+    @Operation(summary = "查询模板信息", description = "查询模板信息")
+    public ResponseEntity<ResponseVO<WsDorisTemplateDTO>> selectOne(@PathVariable("id") Long id) {
+        WsDorisTemplateDTO dto = wsDorisTemplateService.selectOne(id);
+        return new ResponseEntity(ResponseVO.success(dto), HttpStatus.OK);
+    }
+
+    @Logging
+    @PutMapping
+    @Operation(summary = "新增模板", description = "新增模板")
+    public ResponseEntity<ResponseVO> insert(@Valid @RequestBody WsDorisTemplateAddParam param) throws UidGenerateException {
+        wsDorisTemplateService.insert(param);
+        return new ResponseEntity<>(ResponseVO.success(), HttpStatus.OK);
+    }
+
+    @Logging
+    @PostMapping
+    @Operation(summary = "修改模板", description = "修改模板")
+    public ResponseEntity<ResponseVO> update(@Valid @RequestBody WsDorisTemplateUpdateParam param) {
+        wsDorisTemplateService.update(param);
+        return new ResponseEntity<>(ResponseVO.success(), HttpStatus.OK);
+    }
+
+    @Logging
+    @DeleteMapping("/{id}")
+    @Operation(summary = "删除模板", description = "删除模板")
+    public ResponseEntity<ResponseVO> delete(@PathVariable("id") Long id) {
+        wsDorisTemplateService.deleteById(id);
+        return new ResponseEntity<>(ResponseVO.success(), HttpStatus.OK);
+    }
+
+    @Logging
+    @DeleteMapping("/batch")
+    @Operation(summary = "批量删除模板", description = "批量删除模板")
+    public ResponseEntity<ResponseVO> deleteBatch(@RequestBody List<Long> ids) {
+        wsDorisTemplateService.deleteBatch(ids);
+        return new ResponseEntity<>(ResponseVO.success(), HttpStatus.OK);
+    }
+
+}
diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsDorisTemplate.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsDorisTemplate.java
new file mode 100644
index 000000000..cb7cd5464
--- /dev/null
+++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsDorisTemplate.java
@@ -0,0 +1,72 @@
+/*
+ * 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 cn.sliew.scaleph.dao.entity.master.ws;
+
+import cn.sliew.scaleph.dao.entity.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * doris template
+ */
+@Data
+@TableName("ws_doris_template")
+@Schema(name = "WsDorisTemplate对象", description = "doris template")
+public class WsDorisTemplate extends BaseDO {
+
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "项目id")
+    @TableField("project_id")
+    private Long projectId;
+
+    @TableField("`name`")
+    private String name;
+
+    @TableField("template_id")
+    private String templateId;
+
+    @TableField("namespace")
+    private String namespace;
+
+    @Schema(description = "session handler")
+    @TableField("`admin`")
+    private String admin;
+
+    @Schema(description = "fe spec")
+    @TableField("fe_spec")
+    private String feSpec;
+
+    @Schema(description = "be spec")
+    @TableField("be_spec")
+    private String beSpec;
+
+    @Schema(description = "cn spec")
+    @TableField("cn_spec")
+    private String cnSpec;
+
+    @Schema(description = "broker spec")
+    @TableField("broker_spec")
+    private String brokerSpec;
+
+    @TableField("remark")
+    private String remark;
+}
diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/mapper/master/ws/WsDorisTemplateMapper.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/mapper/master/ws/WsDorisTemplateMapper.java
new file mode 100644
index 000000000..6d616eae0
--- /dev/null
+++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/mapper/master/ws/WsDorisTemplateMapper.java
@@ -0,0 +1,31 @@
+/*
+ * 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 cn.sliew.scaleph.dao.mapper.master.ws;
+
+import cn.sliew.scaleph.dao.entity.master.ws.WsDorisTemplate;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * doris template Mapper 接口
+ */
+@Repository
+public interface WsDorisTemplateMapper extends BaseMapper<WsDorisTemplate> {
+
+}
diff --git a/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/ws/WsDorisTemplateMapper.xml b/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/ws/WsDorisTemplateMapper.xml
new file mode 100644
index 000000000..aaba28934
--- /dev/null
+++ b/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/ws/WsDorisTemplateMapper.xml
@@ -0,0 +1,51 @@
+<?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="cn.sliew.scaleph.dao.mapper.master.ws.WsDorisTemplateMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.sliew.scaleph.dao.entity.master.ws.WsDorisTemplate">
+        <result column="id" property="id" />
+        <result column="creator" property="creator" />
+        <result column="create_time" property="createTime" />
+        <result column="editor" property="editor" />
+        <result column="update_time" property="updateTime" />
+        <result column="project_id" property="projectId" />
+        <result column="name" property="name" />
+        <result column="template_id" property="templateId" />
+        <result column="namespace" property="namespace" />
+        <result column="admin" property="admin" />
+        <result column="fe_spec" property="feSpec" />
+        <result column="be_spec" property="beSpec" />
+        <result column="cn_spec" property="cnSpec" />
+        <result column="broker_spec" property="brokerSpec" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,
+        creator,
+        create_time,
+        editor,
+        update_time,
+        project_id, `name`, template_id, namespace, `admin`, fe_spec, be_spec, cn_spec, broker_spec, remark
+    </sql>
+
+</mapper>
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/BaseSpec.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/BaseSpec.java
index 14ca0963a..7fe51d99c 100644
--- a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/BaseSpec.java
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/BaseSpec.java
@@ -18,10 +18,13 @@
 
 package cn.sliew.scaleph.engine.doris.operator.spec;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.fabric8.kubernetes.api.model.*;
 import lombok.Data;
 
 import javax.annotation.Nullable;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -71,10 +74,13 @@ public class BaseSpec {
     private Integer replicas;
 
     /**
-     * fixme 错误
      * (Members of ResourceRequirements are embedded into this type.)
      */
-    private ResourceRequirements ResourceRequirements;
+    @JsonProperty("limits")
+    private Map<String, Quantity> limits = new LinkedHashMap();
+
+    @JsonProperty("requests")
+    private Map<String, Quantity> requests = new LinkedHashMap();
 
     /**
      * (Optional) Tolerations for scheduling pods onto some dedicated nodes
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/WsDorisTemplateService.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/WsDorisTemplateService.java
new file mode 100644
index 000000000..77c037b71
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/WsDorisTemplateService.java
@@ -0,0 +1,45 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.service;
+
+import cn.sliew.scaleph.engine.doris.service.dto.WsDorisTemplateDTO;
+import cn.sliew.scaleph.engine.doris.service.param.WsDorisTemplateAddParam;
+import cn.sliew.scaleph.engine.doris.service.param.WsDorisTemplateListParam;
+import cn.sliew.scaleph.engine.doris.service.param.WsDorisTemplateUpdateParam;
+import cn.sliew.scaleph.engine.doris.service.resource.DorisTemplate;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.List;
+
+public interface WsDorisTemplateService {
+
+    Page<WsDorisTemplateDTO> list(WsDorisTemplateListParam param);
+
+    WsDorisTemplateDTO selectOne(Long id);
+
+    DorisTemplate asYaml(Long id);
+
+    int insert(WsDorisTemplateAddParam param);
+
+    int update(WsDorisTemplateUpdateParam param);
+
+    int deleteById(Long id);
+
+    int deleteBatch(List<Long> ids);
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/convert/WsDorisTemplateConvert.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/convert/WsDorisTemplateConvert.java
new file mode 100644
index 000000000..dcdf4e330
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/convert/WsDorisTemplateConvert.java
@@ -0,0 +1,79 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.service.convert;
+
+import cn.sliew.milky.common.util.JacksonUtil;
+import cn.sliew.scaleph.common.convert.BaseConvert;
+import cn.sliew.scaleph.dao.entity.master.ws.WsDorisTemplate;
+import cn.sliew.scaleph.engine.doris.operator.spec.*;
+import cn.sliew.scaleph.engine.doris.service.dto.WsDorisTemplateDTO;
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.factory.Mappers;
+import org.springframework.beans.BeanUtils;
+import org.springframework.util.StringUtils;
+
+@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE)
+public interface WsDorisTemplateConvert extends BaseConvert<WsDorisTemplate, WsDorisTemplateDTO> {
+    WsDorisTemplateConvert INSTANCE = Mappers.getMapper(WsDorisTemplateConvert.class);
+
+    @Override
+    default WsDorisTemplate toDo(WsDorisTemplateDTO dto) {
+        WsDorisTemplate entity = new WsDorisTemplate();
+        BeanUtils.copyProperties(dto, entity);
+        if (dto.getAdmin() != null) {
+            entity.setAdmin(JacksonUtil.toJsonString(dto.getAdmin()));
+        }
+        if (dto.getFeSpec() != null) {
+            entity.setFeSpec(JacksonUtil.toJsonString(dto.getFeSpec()));
+        }
+        if (dto.getBeSpec() != null) {
+            entity.setBeSpec(JacksonUtil.toJsonString(dto.getBeSpec()));
+        }
+        if (dto.getCnSpec() != null) {
+            entity.setCnSpec(JacksonUtil.toJsonString(dto.getCnSpec()));
+        }
+        if (dto.getBrokerSpec() != null) {
+            entity.setBrokerSpec(JacksonUtil.toJsonString(dto.getBrokerSpec()));
+        }
+        return entity;
+    }
+
+    @Override
+    default WsDorisTemplateDTO toDto(WsDorisTemplate entity) {
+        WsDorisTemplateDTO dto = new WsDorisTemplateDTO();
+        BeanUtils.copyProperties(entity, dto);
+        if (StringUtils.hasText(entity.getAdmin())) {
+            dto.setAdmin(JacksonUtil.parseJsonString(entity.getAdmin(), AdminUser.class));
+        }
+        if (StringUtils.hasText(entity.getFeSpec())) {
+            dto.setFeSpec(JacksonUtil.parseJsonString(entity.getFeSpec(), FeSpec.class));
+        }
+        if (StringUtils.hasText(entity.getBeSpec())) {
+            dto.setBeSpec(JacksonUtil.parseJsonString(entity.getBeSpec(), BeSpec.class));
+        }
+        if (StringUtils.hasText(entity.getCnSpec())) {
+            dto.setCnSpec(JacksonUtil.parseJsonString(entity.getCnSpec(), CnSpec.class));
+        }
+        if (StringUtils.hasText(entity.getBrokerSpec())) {
+            dto.setBrokerSpec(JacksonUtil.parseJsonString(entity.getBrokerSpec(), BrokerSpec.class));
+        }
+        return dto;
+    }
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/dto/WsDorisTemplateDTO.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/dto/WsDorisTemplateDTO.java
new file mode 100644
index 000000000..efd0b365e
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/dto/WsDorisTemplateDTO.java
@@ -0,0 +1,57 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.service.dto;
+
+import cn.sliew.scaleph.engine.doris.operator.spec.*;
+import cn.sliew.scaleph.system.model.BaseDTO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(name = "WsDorisTemplate对象", description = "doris template")
+public class WsDorisTemplateDTO extends BaseDTO {
+
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "项目id")
+    private Long projectId;
+
+    private String name;
+
+    private String templateId;
+
+    private String namespace;
+
+    @Schema(description = "session handler")
+    private AdminUser admin;
+
+    @Schema(description = "fe spec")
+    private FeSpec feSpec;
+
+    @Schema(description = "be spec")
+    private BeSpec beSpec;
+
+    @Schema(description = "cn spec")
+    private CnSpec cnSpec;
+
+    @Schema(description = "broker spec")
+    private BrokerSpec brokerSpec;
+
+    private String remark;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/impl/WsDorisTemplateServiceImpl.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/impl/WsDorisTemplateServiceImpl.java
new file mode 100644
index 000000000..ba1354516
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/impl/WsDorisTemplateServiceImpl.java
@@ -0,0 +1,99 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.service.impl;
+
+import cn.sliew.scaleph.common.util.UUIDUtil;
+import cn.sliew.scaleph.dao.entity.master.ws.WsDorisTemplate;
+import cn.sliew.scaleph.dao.mapper.master.ws.WsDorisTemplateMapper;
+import cn.sliew.scaleph.engine.doris.service.WsDorisTemplateService;
+import cn.sliew.scaleph.engine.doris.service.convert.WsDorisTemplateConvert;
+import cn.sliew.scaleph.engine.doris.service.dto.WsDorisTemplateDTO;
+import cn.sliew.scaleph.engine.doris.service.param.WsDorisTemplateAddParam;
+import cn.sliew.scaleph.engine.doris.service.param.WsDorisTemplateListParam;
+import cn.sliew.scaleph.engine.doris.service.param.WsDorisTemplateUpdateParam;
+import cn.sliew.scaleph.engine.doris.service.resource.DorisTemplate;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
+
+import static cn.sliew.milky.common.check.Ensures.checkState;
+
+@Service
+public class WsDorisTemplateServiceImpl implements WsDorisTemplateService {
+
+    @Autowired
+    private WsDorisTemplateMapper wsDorisTemplateMapper;
+
+    @Override
+    public Page<WsDorisTemplateDTO> list(WsDorisTemplateListParam param) {
+        Page<WsDorisTemplate> page = new Page<>(param.getCurrent(), param.getPageSize());
+        LambdaQueryWrapper<WsDorisTemplate> queryWrapper = Wrappers.lambdaQuery(WsDorisTemplate.class)
+                .eq(WsDorisTemplate::getProjectId, param.getProjectId())
+                .like(StringUtils.hasText(param.getName()), WsDorisTemplate::getName, param.getName())
+                .orderByAsc(WsDorisTemplate::getId);
+        Page<WsDorisTemplate> wsDorisTemplatePage = wsDorisTemplateMapper.selectPage(page, queryWrapper);
+        Page<WsDorisTemplateDTO> result = new Page<>(wsDorisTemplatePage.getCurrent(), wsDorisTemplatePage.getSize(), wsDorisTemplatePage.getTotal());
+        List<WsDorisTemplateDTO> dtoList = WsDorisTemplateConvert.INSTANCE.toDto(page.getRecords());
+        result.setRecords(dtoList);
+        return result;
+    }
+
+    @Override
+    public WsDorisTemplateDTO selectOne(Long id) {
+        WsDorisTemplate record = wsDorisTemplateMapper.selectById(id);
+        checkState(record != null, () -> "doris template not exist for id = " + id);
+        return WsDorisTemplateConvert.INSTANCE.toDto(record);
+    }
+
+    @Override
+    public DorisTemplate asYaml(Long id) {
+        return null;
+    }
+
+    @Override
+    public int insert(WsDorisTemplateAddParam param) {
+        WsDorisTemplate record = new WsDorisTemplate();
+        BeanUtils.copyProperties(param, record);
+        record.setTemplateId(UUIDUtil.randomUUId());
+        return wsDorisTemplateMapper.insert(record);
+    }
+
+    @Override
+    public int update(WsDorisTemplateUpdateParam param) {
+        WsDorisTemplate record = new WsDorisTemplate();
+        BeanUtils.copyProperties(param, record);
+        return wsDorisTemplateMapper.updateById(record);
+    }
+
+    @Override
+    public int deleteById(Long id) {
+        return wsDorisTemplateMapper.deleteById(id);
+    }
+
+    @Override
+    public int deleteBatch(List<Long> ids) {
+        return wsDorisTemplateMapper.deleteBatchIds(ids);
+    }
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisTemplateAddParam.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisTemplateAddParam.java
new file mode 100644
index 000000000..35d170583
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisTemplateAddParam.java
@@ -0,0 +1,44 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.service.param;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class WsDorisTemplateAddParam {
+
+    @NotNull
+    @Schema(description = "project id")
+    private Long projectId;
+
+    @NotBlank
+    @Schema(description = "name")
+    private String name;
+
+    @NotBlank
+    @Schema(description = "namespace")
+    private String namespace;
+
+    @Schema(description = "remark")
+    private String remark;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisTemplateListParam.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisTemplateListParam.java
new file mode 100644
index 000000000..7665bbf9b
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisTemplateListParam.java
@@ -0,0 +1,36 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.service.param;
+
+import cn.sliew.scaleph.system.model.PaginationParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class WsDorisTemplateListParam extends PaginationParam {
+
+    @NotNull
+    @Schema(description = "project id")
+    private Long projectId;
+
+    @Schema(description = "name")
+    private String name;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisTemplateUpdateParam.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisTemplateUpdateParam.java
new file mode 100644
index 000000000..e8c2b657b
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisTemplateUpdateParam.java
@@ -0,0 +1,44 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.service.param;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class WsDorisTemplateUpdateParam {
+
+    @NotNull
+    @Schema(description = "id")
+    private Long id;
+
+    @NotBlank
+    @Schema(description = "name")
+    private String name;
+
+    @NotBlank
+    @Schema(description = "namespace")
+    private String namespace;
+
+    @Schema(description = "remark")
+    private String remark;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/resource/DorisTemplate.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/resource/DorisTemplate.java
new file mode 100644
index 000000000..91d944a36
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/resource/DorisTemplate.java
@@ -0,0 +1,20 @@
+package cn.sliew.scaleph.engine.doris.service.resource;
+
+import cn.sliew.scaleph.engine.doris.operator.spec.DorisClusterSpec;
+import cn.sliew.scaleph.engine.doris.operator.status.DorisClusterStatus;
+import cn.sliew.scaleph.kubernetes.Constant;
+import cn.sliew.scaleph.kubernetes.resource.Resource;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import io.fabric8.kubernetes.client.CustomResource;
+import io.fabric8.kubernetes.model.annotation.Group;
+import io.fabric8.kubernetes.model.annotation.Version;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@Group(Constant.SCALEPH_GROUP)
+@Version(Constant.SCALEPH_VERSION)
+@EqualsAndHashCode
+@JsonPropertyOrder({"apiVersion", "kind", "metadata", "spec", "status"})
+public class DorisTemplate extends CustomResource<DorisClusterSpec, DorisClusterStatus> implements Resource {
+}
diff --git a/scaleph-kubernetes/src/main/java/cn/sliew/scaleph/kubernetes/Constant.java b/scaleph-kubernetes/src/main/java/cn/sliew/scaleph/kubernetes/Constant.java
index 163be93d6..3a10cf758 100644
--- a/scaleph-kubernetes/src/main/java/cn/sliew/scaleph/kubernetes/Constant.java
+++ b/scaleph-kubernetes/src/main/java/cn/sliew/scaleph/kubernetes/Constant.java
@@ -25,6 +25,12 @@ public enum Constant {
     // https://kubernetes.io/docs/reference/using-api/api-concepts/#the-resourceversion-parameter
     public static final String KUBERNETES_ZERO_RESOURCE_VERSION = "0";
 
+    public static final String[] JSON_PROPERTY_ORDER = {"apiVersion", "kind", "metadata", "spec", "status"};
+
+    public static final String SCALEPH_GROUP = "scaleph.sliew.cn";
+    public static final String SCALEPH_VERSION = "v1alpha";
+    public static final String SCALEPH_API_VERSION = SCALEPH_GROUP + "/" + SCALEPH_VERSION;
+
     public static final String GROUP = "flink.apache.org";
     public static final String VERSION = "v1beta1";
     public static final String API_VERSION = GROUP + "/" + VERSION;
diff --git a/scaleph-support/scaleph-generator/src/main/java/cn/sliew/scaleph/generator/MybatisPlusGenerator.java b/scaleph-support/scaleph-generator/src/main/java/cn/sliew/scaleph/generator/MybatisPlusGenerator.java
index 12a505942..1a1e9f2ee 100644
--- a/scaleph-support/scaleph-generator/src/main/java/cn/sliew/scaleph/generator/MybatisPlusGenerator.java
+++ b/scaleph-support/scaleph-generator/src/main/java/cn/sliew/scaleph/generator/MybatisPlusGenerator.java
@@ -54,7 +54,7 @@ public class MybatisPlusGenerator {
     /**
      * just add table names here and run the {@link #main(String[])} method.
      */
-    private static final String[] TABLES = {"sec_resource_web_role"};
+    private static final String[] TABLES = {"ws_doris_template"};
 
     public static void main(String[] args) {
         //自动生成配置
diff --git a/scaleph-ui-react/config/routes.ts b/scaleph-ui-react/config/routes.ts
index 4db11dce8..d4530111f 100644
--- a/scaleph-ui-react/config/routes.ts
+++ b/scaleph-ui-react/config/routes.ts
@@ -218,6 +218,29 @@ export default [
           },
         ]
       },
+      {
+        name: 'project.doris',
+        path: '/workspace/doris',
+        icon: 'solution',
+        pCode: PRIVILEGE_CODE.workspaceClusterShow,
+        access: 'normalRouteFilter',
+        routes: [
+          {
+            path: '/workspace/doris',
+            redirect: '/workspace/doris/template',
+            pCode: PRIVILEGE_CODE.workspaceJobShow,
+            access: 'normalRouteFilter',
+          },
+          {
+            name: 'template',
+            path: '/workspace/doris/template',
+            exact: true,
+            component: './Project/Workspace/Doris/Template',
+            pCode: PRIVILEGE_CODE.workspaceClusterConfigShow,
+            access: 'normalRouteFilter'
+          }
+        ]
+      },
     ]
   },
   {
diff --git a/scaleph-ui-react/src/locales/zh-CN/menu.ts b/scaleph-ui-react/src/locales/zh-CN/menu.ts
index 1d01dc60d..4323768e4 100644
--- a/scaleph-ui-react/src/locales/zh-CN/menu.ts
+++ b/scaleph-ui-react/src/locales/zh-CN/menu.ts
@@ -12,6 +12,8 @@ export default {
   'menu.project.flink.kubernetes.session-cluster': 'SessionCluster',
   'menu.project.flink.kubernetes.deployment': 'Deployment',
   'menu.project.flink.kubernetes.job': 'Job',
+  'menu.project.doris': 'Doris',
+  'menu.project.doris.template': 'Template',
 
   'menu.resource': '资源',
   'menu.resource.jar': '公共 Jar',
diff --git a/scaleph-ui-react/src/locales/zh-CN/pages/project.ts b/scaleph-ui-react/src/locales/zh-CN/pages/project.ts
index 3ad221079..70c122b11 100644
--- a/scaleph-ui-react/src/locales/zh-CN/pages/project.ts
+++ b/scaleph-ui-react/src/locales/zh-CN/pages/project.ts
@@ -919,6 +919,12 @@ export default {
   'pages.project.flink.kubernetes.job.detail.savepoint.formatType': 'Format',
   'pages.project.flink.kubernetes.job.detail.savepoint.triggerType': 'Trigger Type',
   'pages.project.flink.kubernetes.job.detail.savepoint.location': 'Location',
+
+  'pages.project.doris.template': 'Template',
+  'pages.project.doris.template.name': '名称',
+  'pages.project.doris.template.namespace': '命名空间',
+
+
   'Run': '运行',
   'Save': '保存',
   'Format': '格式化',
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/DorisTemplateForm.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/DorisTemplateForm.tsx
new file mode 100644
index 000000000..24d8172cc
--- /dev/null
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/DorisTemplateForm.tsx
@@ -0,0 +1,88 @@
+import {useIntl} from "umi";
+import React from "react";
+import {Form, message, Modal} from "antd";
+import {ProForm, ProFormDigit, ProFormText} from "@ant-design/pro-components";
+import {ModalFormProps} from '@/app.d';
+import {WsDorisTemplate} from "@/services/project/typings";
+import {WORKSPACE_CONF} from "@/constant";
+import {WsDorisTemplateService} from "@/services/project/WsDorisTemplateService";
+
+const DorisTemplateForm: React.FC<ModalFormProps<WsDorisTemplate>> = ({
+                                                                        data,
+                                                                        visible,
+                                                                        onVisibleChange,
+                                                                        onCancel
+                                                                      }) => {
+  const intl = useIntl();
+  const [form] = Form.useForm();
+  const projectId = localStorage.getItem(WORKSPACE_CONF.projectId);
+
+  return (
+    <Modal
+      open={visible}
+      title={
+        data.id
+          ? intl.formatMessage({id: 'app.common.operate.edit.label'}) +
+          intl.formatMessage({id: 'pages.project.doris.template'})
+          : intl.formatMessage({id: 'app.common.operate.new.label'}) +
+          intl.formatMessage({id: 'pages.project.doris.template'})
+      }
+      width={580}
+      destroyOnClose={true}
+      onCancel={onCancel}
+      onOk={() => {
+        form.validateFields().then((values) => {
+          data.id
+            ? WsDorisTemplateService.update({...values}).then((response) => {
+              if (response.success) {
+                message.success(intl.formatMessage({id: 'app.common.operate.edit.success'}));
+                if (onVisibleChange) {
+                  onVisibleChange(false);
+                }
+              }
+            })
+            : WsDorisTemplateService.add({...values, projectId: projectId}).then((response) => {
+              if (response.success) {
+                message.success(intl.formatMessage({id: 'app.common.operate.new.success'}));
+                if (onVisibleChange) {
+                  onVisibleChange(false);
+                }
+              }
+            });
+        });
+      }}
+    >
+      <ProForm
+        form={form}
+        layout={"horizontal"}
+        submitter={false}
+        labelCol={{span: 6}}
+        wrapperCol={{span: 16}}
+        initialValues={{
+          id: data.id,
+          name: data.name,
+          namespace: data.namespace,
+          remark: data.remark
+        }}
+      >
+        <ProFormDigit name={"id"} hidden/>
+        <ProFormText
+          name={"name"}
+          label={intl.formatMessage({id: 'pages.project.doris.template.name'})}
+          rules={[{required: true}]}
+        />
+        <ProFormText
+          name={"namespace"}
+          label={intl.formatMessage({id: 'pages.project.doris.template.namespace'})}
+          rules={[{required: true}]}
+        />
+        <ProFormText
+          name={"remark"}
+          label={intl.formatMessage({id: 'app.common.data.remark'})}
+        />
+      </ProForm>
+    </Modal>
+  );
+}
+
+export default DorisTemplateForm;
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/index.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/index.tsx
new file mode 100644
index 000000000..847a7f359
--- /dev/null
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/index.tsx
@@ -0,0 +1,197 @@
+import {history, useAccess, useIntl} from "umi";
+import React, {useRef, useState} from "react";
+import {Button, message, Modal, Space, Tooltip} from "antd";
+import {DeleteOutlined, EditOutlined, NodeIndexOutlined} from "@ant-design/icons";
+import {ActionType, ProColumns, ProFormInstance, ProTable} from "@ant-design/pro-components";
+import {PRIVILEGE_CODE, WORKSPACE_CONF} from "@/constant";
+import {WsDorisTemplate} from "@/services/project/typings";
+import {WsFlinkKubernetesTemplateService} from "@/services/project/WsFlinkKubernetesTemplateService";
+import {WsDorisTemplateService} from "@/services/project/WsDorisTemplateService";
+import DorisTemplateForm from "@/pages/Project/Workspace/Doris/Template/DorisTemplateForm";
+
+const DorisTemplateWeb: React.FC = () => {
+  const intl = useIntl();
+  const access = useAccess();
+  const actionRef = useRef<ActionType>();
+  const formRef = useRef<ProFormInstance>();
+  const [selectedRows, setSelectedRows] = useState<WsDorisTemplate[]>([]);
+  const [dorisTemplateFormData, setDorisTemplateFormData] = useState<{
+    visiable: boolean;
+    data: WsDorisTemplate;
+  }>({visiable: false, data: {}});
+  const projectId = localStorage.getItem(WORKSPACE_CONF.projectId);
+
+  const tableColumns: ProColumns<WsDorisTemplate>[] = [
+    {
+      title: intl.formatMessage({id: 'pages.project.doris.template.name'}),
+      dataIndex: 'name'
+    },
+    {
+      title: intl.formatMessage({id: 'pages.project.doris.template.namespace'}),
+      dataIndex: 'namespace',
+      hideInSearch: true,
+    },
+    {
+      title: intl.formatMessage({id: 'app.common.data.remark'}),
+      dataIndex: 'remark',
+      hideInSearch: true,
+    },
+    {
+      title: intl.formatMessage({id: 'app.common.data.createTime'}),
+      dataIndex: 'createTime',
+      hideInSearch: true,
+      width: 180,
+    },
+    {
+      title: intl.formatMessage({id: 'app.common.data.updateTime'}),
+      dataIndex: 'updateTime',
+      hideInSearch: true,
+      width: 180,
+    },
+    {
+      title: intl.formatMessage({id: 'app.common.operate.label'}),
+      dataIndex: 'actions',
+      align: 'center',
+      width: 120,
+      fixed: 'right',
+      valueType: 'option',
+      render: (_, record) => (
+        <Space>
+          {access.canAccess(PRIVILEGE_CODE.datadevProjectEdit) && (
+            <Tooltip title={intl.formatMessage({id: 'app.common.operate.edit.label'})}>
+              <Button
+                shape="default"
+                type="link"
+                icon={<EditOutlined/>}
+                onClick={() => {
+                  setDorisTemplateFormData({visiable: true, data: record});
+                }}
+              />
+            </Tooltip>
+          )}
+          {access.canAccess(PRIVILEGE_CODE.datadevJobEdit) && (
+            <Tooltip title={intl.formatMessage({id: 'pages.project.flink.kubernetes.deployment.template.define'})}>
+              <Button
+                shape="default"
+                type="link"
+                icon={<NodeIndexOutlined/>}
+                onClick={() => {
+                  history.push("/workspace/flink/kubernetes/template/detail", record)
+                }}
+              />
+            </Tooltip>
+          )}
+          {access.canAccess(PRIVILEGE_CODE.datadevDatasourceDelete) && (
+            <Tooltip title={intl.formatMessage({id: 'app.common.operate.delete.label'})}>
+              <Button
+                shape="default"
+                type="link"
+                danger
+                icon={<DeleteOutlined/>}
+                onClick={() => {
+                  Modal.confirm({
+                    title: intl.formatMessage({id: 'app.common.operate.delete.confirm.title'}),
+                    content: intl.formatMessage({id: 'app.common.operate.delete.confirm.content'}),
+                    okText: intl.formatMessage({id: 'app.common.operate.confirm.label'}),
+                    okButtonProps: {danger: true},
+                    cancelText: intl.formatMessage({id: 'app.common.operate.cancel.label'}),
+                    onOk() {
+                      WsDorisTemplateService.delete(record).then((d) => {
+                        if (d.success) {
+                          message.success(intl.formatMessage({id: 'app.common.operate.delete.success'}));
+                          actionRef.current?.reload();
+                        }
+                      });
+                    },
+                  });
+                }}
+              />
+            </Tooltip>
+          )}
+        </Space>
+      ),
+    },
+  ];
+
+  return (<div>
+    <ProTable<WsDorisTemplate>
+      search={{
+        labelWidth: 'auto',
+        span: {xs: 24, sm: 12, md: 8, lg: 6, xl: 6, xxl: 4},
+      }}
+      rowKey="id"
+      actionRef={actionRef}
+      formRef={formRef}
+      options={false}
+      columns={tableColumns}
+      request={(params, sorter, filter) =>
+        WsDorisTemplateService.list({...params, projectId: projectId})
+      }
+      toolbar={{
+        actions: [
+          access.canAccess(PRIVILEGE_CODE.datadevResourceAdd) && (
+            <Button
+              key="new"
+              type="primary"
+              onClick={() => {
+                setDorisTemplateFormData({visiable: true, data: {}});
+              }}
+            >
+              {intl.formatMessage({id: 'app.common.operate.new.label'})}
+            </Button>
+          ),
+          access.canAccess(PRIVILEGE_CODE.datadevResourceDelete) && (
+            <Button
+              key="del"
+              type="default"
+              disabled={selectedRows.length < 1}
+              onClick={() => {
+                Modal.confirm({
+                  title: intl.formatMessage({id: 'app.common.operate.delete.confirm.title'}),
+                  content: intl.formatMessage({id: 'app.common.operate.delete.confirm.content'}),
+                  okText: intl.formatMessage({id: 'app.common.operate.confirm.label'}),
+                  okButtonProps: {danger: true},
+                  cancelText: intl.formatMessage({id: 'app.common.operate.cancel.label'}),
+                  onOk() {
+                    WsDorisTemplateService.deleteBatch(selectedRows).then((d) => {
+                      if (d.success) {
+                        message.success(intl.formatMessage({id: 'app.common.operate.delete.success'}));
+                        actionRef.current?.reload();
+                      }
+                    });
+                  },
+                });
+              }}
+            >
+              {intl.formatMessage({id: 'app.common.operate.delete.label'})}
+            </Button>
+          )
+        ],
+      }}
+      pagination={{showQuickJumper: true, showSizeChanger: true, defaultPageSize: 10}}
+      rowSelection={{
+        fixed: true,
+        onChange(selectedRowKeys, selectedRows, info) {
+          setSelectedRows(selectedRows);
+        },
+      }}
+      tableAlertRender={false}
+      tableAlertOptionRender={false}
+    />
+    {dorisTemplateFormData.visiable && (
+      <DorisTemplateForm
+        visible={dorisTemplateFormData.visiable}
+        onCancel={() => {
+          setDorisTemplateFormData({visiable: false, data: {}});
+        }}
+        onVisibleChange={(visiable) => {
+          setDorisTemplateFormData({visiable: visiable, data: {}});
+          actionRef.current?.reload();
+        }}
+        data={dorisTemplateFormData.data}
+      />
+    )}
+  </div>);
+}
+
+export default DorisTemplateWeb;
diff --git a/scaleph-ui-react/src/services/project/WsDorisTemplateService.ts b/scaleph-ui-react/src/services/project/WsDorisTemplateService.ts
new file mode 100644
index 000000000..36fa1ffbc
--- /dev/null
+++ b/scaleph-ui-react/src/services/project/WsDorisTemplateService.ts
@@ -0,0 +1,50 @@
+import {PageResponse, ResponseBody} from '@/app.d';
+import {request} from 'umi';
+import {WsDorisTemplate, WsDorisTemplateAddParam, WsDorisTemplateParam, WsDorisTemplateUpdateParam} from './typings';
+
+export const WsDorisTemplateService = {
+  url: '/api/doris/template',
+
+  list: async (queryParam: WsDorisTemplateParam) => {
+    return request<PageResponse<WsDorisTemplate>>(`${WsDorisTemplateService.url}`, {
+      method: 'GET',
+      params: queryParam,
+    }).then((res) => {
+      const result = {
+        data: res.records,
+        total: res.total,
+        pageSize: res.size,
+        current: res.current,
+      };
+      return result;
+    });
+  },
+
+  add: async (param: WsDorisTemplateAddParam) => {
+    return request<ResponseBody<any>>(`${WsDorisTemplateService.url}`, {
+      method: 'PUT',
+      data: param,
+    });
+  },
+
+  update: async (param: WsDorisTemplateUpdateParam) => {
+    return request<ResponseBody<any>>(`${WsDorisTemplateService.url}`, {
+      method: 'POST',
+      data: param,
+    });
+  },
+
+  delete: async (row: WsDorisTemplate) => {
+    return request<ResponseBody<any>>(`${WsDorisTemplateService.url}/` + row.id, {
+      method: 'DELETE',
+    });
+  },
+
+  deleteBatch: async (rows: WsDorisTemplate[]) => {
+    const params = rows.map((row) => row.id);
+    return request<ResponseBody<any>>(`${WsDorisTemplateService.url}/` + 'batch', {
+      method: 'DELETE',
+      data: params,
+    });
+  },
+};
diff --git a/scaleph-ui-react/src/services/project/typings.d.ts b/scaleph-ui-react/src/services/project/typings.d.ts
index 745f5dc4e..f85c0a133 100644
--- a/scaleph-ui-react/src/services/project/typings.d.ts
+++ b/scaleph-ui-react/src/services/project/typings.d.ts
@@ -427,3 +427,37 @@ export type WsFlinkKubernetesJobInstanceSavepoint = {
 export type WsFlinkKubernetesJobInstanceSavepointParam = QueryParam & {
   wsFlinkKubernetesJobInstanceId: number
 };
+
+export type WsDorisTemplate = {
+  id?: number;
+  projectId: number;
+  name?: string;
+  namespace: string;
+  admin?: Record<string, any>;
+  feSpec?: Record<string, any>;
+  beSpec?: Record<string, any>;
+  cnSpec?: Record<string, any>;
+  brokerSpec?: Record<string, any>;
+  remark?: string;
+  createTime?: Date;
+  updateTime?: Date;
+};
+
+export type WsDorisTemplateParam = QueryParam & {
+  projectId: number;
+  name?: string;
+};
+
+export type WsDorisTemplateAddParam = {
+  projectId: number;
+  name: string;
+  namespace: string;
+  remark?: string;
+};
+
+export type WsDorisTemplateUpdateParam = {
+  id: number;
+  name: string;
+  namespace: string;
+  remark?: string;
+};
diff --git a/tools/docker/mysql/init.d/scaleph-security-mysql.sql b/tools/docker/mysql/init.d/scaleph-security-mysql.sql
index 837ae4832..aa1155d92 100644
--- a/tools/docker/mysql/init.d/scaleph-security-mysql.sql
+++ b/tools/docker/mysql/init.d/scaleph-security-mysql.sql
@@ -326,7 +326,8 @@ INSERT INTO `sec_resource_web` (`id`, `type`, `pid`, `name`, `path`, `redirect`,
 VALUES (7, '2', 6, '', '/studio', '/studio/databoard', NULL, NULL, NULL, NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web` (`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`,
                                 `remark`, `creator`, `editor`)
-VALUES (8, '2', 6, 'databoard', '/studio/databoard', NULL, NULL, 'DashboardOutlined', './Studio/DataBoard', NULL, 'sys', 'sys');
+VALUES (8, '2', 6, 'databoard', '/studio/databoard', NULL, NULL, 'DashboardOutlined', './Studio/DataBoard', NULL, 'sys',
+        'sys');
 INSERT INTO `sec_resource_web` (`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`,
                                 `remark`, `creator`, `editor`)
 VALUES (9, '0', 0, 'project', '/project', NULL, NULL, 'ProjectOutlined', NULL, NULL, 'sys', 'sys');
@@ -371,7 +372,8 @@ VALUES (20, '2', 13, NULL, '/workspace/artifact/seatunnel/dag', NULL, NULL, NULL
         './Project/Workspace/Artifact/DI/DiJobFlow', NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web` (`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`,
                                 `remark`, `creator`, `editor`)
-VALUES (21, '1', 11, 'project.flink.kubernetes', '/workspace/flink/kubernetes', NULL, NULL, 'DeploymentUnitOutlined', NULL,
+VALUES (21, '1', 11, 'project.flink.kubernetes', '/workspace/flink/kubernetes', NULL, NULL, 'DeploymentUnitOutlined',
+        NULL,
         NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web` (`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`,
                                 `remark`, `creator`, `editor`)
@@ -465,17 +467,20 @@ INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`,
 VALUES (46, '2', 44, 'system', '/stdata/system', NULL, NULL, 'GroupOutlined', './Stdata/System', NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
-VALUES (47, '2', 44, 'dataElement', '/stdata/dataElement', NULL, NULL, 'HddOutlined', './Stdata/DataElement', NULL, 'sys',
+VALUES (47, '2', 44, 'dataElement', '/stdata/dataElement', NULL, NULL, 'HddOutlined', './Stdata/DataElement', NULL,
+        'sys',
         'sys');
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
-VALUES (48, '2', 44, 'refdata', '/stdata/refdata', NULL, NULL, 'ProfileOutlined', './Stdata/RefData', NULL, 'sys', 'sys');
+VALUES (48, '2', 44, 'refdata', '/stdata/refdata', NULL, NULL, 'ProfileOutlined', './Stdata/RefData', NULL, 'sys',
+        'sys');
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
 VALUES (49, '2', 44, NULL, '/stdata/refdata/value', NULL, NULL, NULL, './Stdata/RefData/Value', NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
-VALUES (50, '2', 44, 'refdataMap', '/stdata/refdataMap', NULL, NULL, 'OneToOneOutlined', './Stdata/RefDataMap', NULL, 'sys',
+VALUES (50, '2', 44, 'refdataMap', '/stdata/refdataMap', NULL, NULL, 'OneToOneOutlined', './Stdata/RefDataMap', NULL,
+        'sys',
         'sys');
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
@@ -494,14 +499,17 @@ INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`,
 VALUES (55, '2', 51, 'user', '/admin/user', NULL, NULL, 'UserOutlined', './Admin/User', NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
-VALUES (56, '2', 51, 'resource.web', '/admin/resource/web', NULL, NULL, 'TeamOutlined', './Admin/Resource/Web', NULL, 'sys',
+VALUES (56, '2', 51, 'resource.web', '/admin/resource/web', NULL, NULL, 'TeamOutlined', './Admin/Resource/Web', NULL,
+        'sys',
         'sys');
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
-VALUES (57, '2', 51, 'privilege', '/admin/privilege', NULL, NULL, 'TeamOutlined', './Admin/Privilege', NULL, 'sys', 'sys');
+VALUES (57, '2', 51, 'privilege', '/admin/privilege', NULL, NULL, 'TeamOutlined', './Admin/Privilege', NULL, 'sys',
+        'sys');
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
-VALUES (58, '2', 51, 'quartz', '/admin/workflow/quartz', NULL, NULL, 'FieldTimeOutlined', './Workflow/Definition/Quartz', NULL,
+VALUES (58, '2', 51, 'quartz', '/admin/workflow/quartz', NULL, NULL, 'FieldTimeOutlined',
+        './Workflow/Definition/Quartz', NULL,
         'sys', 'sys');
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
@@ -516,7 +524,16 @@ VALUES (62, '2', 51, 'dict', '/admin/dict', NULL, NULL, 'TableOutlined', './Admi
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
 VALUES (63, '2', 51, 'setting', '/admin/setting', NULL, NULL, 'SettingOutlined', './Admin/Setting', NULL, 'sys', 'sys');
-
+INSERT INTO `sec_resource_web` (`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`,
+                                `remark`, `creator`, `editor`)
+VALUES (64, '1', 11, 'project.doris', '/workspace/doris', NULL, NULL, 'SolutionOutlined', NULL, NULL, 'sys', 'sys');
+INSERT INTO `sec_resource_web` (`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`,
+                                `remark`, `creator`, `editor`)
+VALUES (65, '2', 64, NULL, '/workspace/doris', '/workspace/doris/template', NULL, NULL, NULL, NULL, 'sys', 'sys');
+INSERT INTO `sec_resource_web` (`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`,
+                                `remark`, `creator`, `editor`)
+VALUES (66, '2', 64, 'template', '/workspace/doris/template', NULL, NULL, NULL, './Project/Workspace/Doris/Template',
+        NULL, 'sys', 'sys');
 
 drop table if exists sec_resource_web_role;
 create table sec_resource_web_role
diff --git a/tools/docker/mysql/init.d/scaleph-ws-mysql.sql b/tools/docker/mysql/init.d/scaleph-ws-mysql.sql
index d3e7aef80..319ac3e70 100644
--- a/tools/docker/mysql/init.d/scaleph-ws-mysql.sql
+++ b/tools/docker/mysql/init.d/scaleph-ws-mysql.sql
@@ -70,7 +70,7 @@ create table ws_flink_artifact_jar
     editor            varchar(32) comment '修改人',
     update_time       timestamp default current_timestamp on update current_timestamp comment '修改时间',
     primary key (id),
-    key idx_flink_artifact (flink_artifact_id)
+    key               idx_flink_artifact (flink_artifact_id)
 ) engine = innodb comment = 'flink artifact jar';
 
 DROP TABLE IF EXISTS ws_flink_artifact_sql;
@@ -86,7 +86,7 @@ CREATE TABLE ws_flink_artifact_sql
     editor            varchar(32),
     update_time       datetime    not null default current_timestamp on update current_timestamp,
     PRIMARY KEY (id),
-    key idx_flink_artifact (flink_artifact_id)
+    key               idx_flink_artifact (flink_artifact_id)
 ) ENGINE = INNODB COMMENT = 'flink artifact sql';
 
 INSERT INTO `ws_flink_artifact_sql` (`id`, `flink_artifact_id`, `flink_version`, `script`, `current`, `creator`,
@@ -139,7 +139,7 @@ create table ws_di_job
     editor            varchar(32) comment '修改人',
     update_time       timestamp default current_timestamp on update current_timestamp comment '修改时间',
     primary key (id),
-    key idx_flink_artifact (flink_artifact_id)
+    key               idx_flink_artifact (flink_artifact_id)
 ) engine = innodb comment '数据集成-作业信息';
 INSERT INTO ws_di_job (id, flink_artifact_id, job_engine, job_id, current, creator, editor)
 VALUES (1, 4, 'seatunnel', 'b8e16c94-258c-4487-a88c-8aad40a38b35', 1, 'sys', 'sys');
@@ -471,7 +471,7 @@ create table ws_flink_custom_artifact
     editor        varchar(32) comment '修改人',
     update_time   timestamp default current_timestamp on update current_timestamp comment '修改时间',
     primary key (id),
-    key idx_custom (flink_version, type, file_name)
+    key           idx_custom (flink_version, type, file_name)
 ) engine = innodb comment = 'flink custom artifact';
 
 drop table if exists ws_flink_custom_factory;
@@ -487,7 +487,7 @@ create table ws_flink_custom_factory
     editor                   varchar(32) comment '修改人',
     update_time              timestamp default current_timestamp on update current_timestamp comment '修改时间',
     primary key (id),
-    key idx_custom (flink_custom_artifact_id, factory_class, `name`)
+    key                      idx_custom (flink_custom_artifact_id, factory_class, `name`)
 ) engine = innodb comment = 'flink custom factory';
 
 drop table if exists ws_flink_sql_gateway_session;
@@ -527,15 +527,44 @@ create table ws_flink_sql_gateway_operation
 drop table if exists ws_flink_sql_gateway_catalog;
 create table ws_flink_sql_gateway_catalog
 (
-    id                   bigint       not null auto_increment comment '自增主键',
-    session_handler      varchar(64)  not null comment 'session handler',
-    `catalog_name`       varchar(255) not null comment 'catalog name',
-    catalog_options      text comment 'catalog config options',
-    catalog_description  varchar(255) comment 'catalog description',
-    creator              varchar(32) comment '创建人',
-    create_time          timestamp default current_timestamp comment '创建时间',
-    editor               varchar(32) comment '修改人',
-    update_time          timestamp default current_timestamp on update current_timestamp comment '修改时间',
+    id                  bigint       not null auto_increment comment '自增主键',
+    session_handler     varchar(64)  not null comment 'session handler',
+    `catalog_name`      varchar(255) not null comment 'catalog name',
+    catalog_options     text comment 'catalog config options',
+    catalog_description varchar(255) comment 'catalog description',
+    creator             varchar(32) comment '创建人',
+    create_time         timestamp default current_timestamp comment '创建时间',
+    editor              varchar(32) comment '修改人',
+    update_time         timestamp default current_timestamp on update current_timestamp comment '修改时间',
     primary key (id),
     unique key uniq_catalog (session_handler, catalog_name)
-) engine = innodb comment = 'flink sql gateway catalog';
\ No newline at end of file
+) engine = innodb comment = 'flink sql gateway catalog';
+
+drop table if exists ws_doris_template;
+create table ws_doris_template
+(
+    id            bigint       not null auto_increment comment '自增主键',
+    project_id    bigint       not null comment '项目id',
+    `name`        varchar(64)  not null,
+    template_id   varchar(64)  not null,
+    namespace     varchar(255) not null,
+    admin         varchar(255) comment 'session handler',
+    `fe_spec`     text comment 'fe spec',
+    `be_spec`     text comment 'be spec',
+    `cn_spec`     text comment 'cn spec',
+    `broker_spec` text comment 'broker spec',
+    remark        varchar(255),
+    creator       varchar(32) comment '创建人',
+    create_time   timestamp default current_timestamp comment '创建时间',
+    editor        varchar(32) comment '修改人',
+    update_time   timestamp default current_timestamp on update current_timestamp comment '修改时间',
+    primary key (id),
+    unique key uniq_name (project_id, `name`)
+) engine = innodb comment = 'doris template';
+
+INSERT INTO `ws_doris_template`(`id`, `project_id`, `name`, `template_id`, `namespace`, `admin`, `fe_spec`, `be_spec`,
+                                `cn_spec`, `broker_spec`, `remark`, `creator`, `editor`)
+VALUES (1, 1, 'simple-doriscluster-sample', 'zexbfaf0eba4ce824787a9bed88148eb233f', 'default', NULL,
+        '{\"replicas\":1,\"image\":\"selectdb/doris.fe-ubuntu:2.0.2\",\"limits\":{\"cpu\":4,\"memory\":\"8Gi\"},\"requests\":{\"cpu\":4,\"memory\":\"8Gi\"}}',
+        '{\"replicas\":1,\"image\":\"selectdb/doris.be-ubuntu:2.0.2\",\"limits\":{\"cpu\":4,\"memory\":\"8Gi\"},\"requests\":{\"cpu\":4,\"memory\":\"8Gi\"}}',
+        NULL, NULL, NULL, 'sys', 'sys');
\ No newline at end of file

From 04d62c65bfad33d95bb3d439b582f7d148719fff Mon Sep 17 00:00:00 2001
From: kalencaya <1942460489@qq.com>
Date: Sun, 26 Nov 2023 10:19:20 +0800
Subject: [PATCH 18/24] [Feature][scaleph-engine-doris] add doris template
 steps form (#649)

* feature: upgrade flink kubernetes operator to 1.7.0

* feature: add doris template detail web

* feature: add doris template detail web

* feature: add doris template steps

* feature: add doris template steps

* feature: add doris template steps route

* feature: add doris template component step

* fix: knife4j error

* fix: knife4j error

* fix: knife4j error

* fix: knife4j error
---
 pom.xml                                       |   2 +-
 .../scaleph/api/config/WebMvcConfig.java      |  45 +------
 .../src/main/resources/application.yml        |   2 +-
 .../kubernetes/operator/spec/JobSpec.java     |   6 +
 .../operator/status/Checkpoint.java           |  80 +++++++++++
 .../operator/status/CheckpointInfo.java       | 124 ++++++++++++++++++
 .../operator/status/CheckpointType.java       |  43 ++++++
 .../kubernetes/operator/status/JobStatus.java |   5 +
 .../kubernetes/operator/status/Savepoint.java |  17 ++-
 .../operator/status/SavepointInfo.java        |  44 ++++++-
 .../kubernetes/operator/status/Snapshot.java  |  29 ++++
 .../operator/status/SnapshotInfo.java         |  43 ++++++
 .../operator/status/SnapshotTriggerType.java  |  41 ++++++
 .../scaleph/system/model/ResponseVO.java      |   2 -
 scaleph-ui-react/config/routes.ts             |  16 ++-
 .../src/locales/zh-CN/pages/project.ts        |  16 +++
 .../Workspace/Doris/Template/Detail/index.tsx |  14 ++
 .../Doris/Template/Steps/BaseStepForm.tsx     |  31 +++++
 .../Steps/Component/DorisAdminUser.tsx        |  28 ++++
 .../Steps/Component/DorisBeComponent.tsx      |  60 +++++++++
 .../Steps/Component/DorisCnComponent.tsx      |  60 +++++++++
 .../Steps/Component/DorisFeComponent.tsx      |  60 +++++++++
 .../Template/Steps/ComponentStepForm.tsx      |  22 ++++
 .../Workspace/Doris/Template/Steps/index.tsx  |  39 ++++++
 .../Workspace/Doris/Template/index.tsx        |   7 +-
 .../Kubernetes/Template/Detail/index.tsx      |   3 +-
 .../mysql/init.d/scaleph-security-mysql.sql   |   8 ++
 27 files changed, 785 insertions(+), 62 deletions(-)
 create mode 100644 scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/Checkpoint.java
 create mode 100644 scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/CheckpointInfo.java
 create mode 100644 scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/CheckpointType.java
 create mode 100644 scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/Snapshot.java
 create mode 100644 scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/SnapshotInfo.java
 create mode 100644 scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/SnapshotTriggerType.java
 create mode 100644 scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Detail/index.tsx
 create mode 100644 scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/BaseStepForm.tsx
 create mode 100644 scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/Component/DorisAdminUser.tsx
 create mode 100644 scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/Component/DorisBeComponent.tsx
 create mode 100644 scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/Component/DorisCnComponent.tsx
 create mode 100644 scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/Component/DorisFeComponent.tsx
 create mode 100644 scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/ComponentStepForm.tsx
 create mode 100644 scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/index.tsx

diff --git a/pom.xml b/pom.xml
index b7ce5da37..b7e46f499 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,7 +133,7 @@
         <mapstruct.lombok.binding.version>0.2.0</mapstruct.lombok.binding.version>
         <org.projectlombok.version>1.18.24</org.projectlombok.version>
         <velocity.engine.version>2.2</velocity.engine.version>
-        <knife4j.version>4.3.0</knife4j.version>
+        <knife4j.version>4.1.0</knife4j.version>
         <auto-service.version>1.0.1</auto-service.version>
         <hutool.version>5.8.22</hutool.version>
         <commons.lang3.version>3.12.0</commons.lang3.version>
diff --git a/scaleph-api/src/main/java/cn/sliew/scaleph/api/config/WebMvcConfig.java b/scaleph-api/src/main/java/cn/sliew/scaleph/api/config/WebMvcConfig.java
index d13a1e206..55cc44655 100644
--- a/scaleph-api/src/main/java/cn/sliew/scaleph/api/config/WebMvcConfig.java
+++ b/scaleph-api/src/main/java/cn/sliew/scaleph/api/config/WebMvcConfig.java
@@ -23,33 +23,18 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.actuate.autoconfigure.endpoint.web.CorsEndpointProperties;
-import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties;
-import org.springframework.boot.actuate.autoconfigure.web.server.ManagementPortType;
-import org.springframework.boot.actuate.endpoint.ExposableEndpoint;
-import org.springframework.boot.actuate.endpoint.web.*;
-import org.springframework.boot.actuate.endpoint.web.annotation.ControllerEndpointsSupplier;
-import org.springframework.boot.actuate.endpoint.web.annotation.ServletEndpointsSupplier;
-import org.springframework.boot.actuate.endpoint.web.servlet.WebMvcEndpointHandlerMapping;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
 import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.converter.GenericConverter;
-import org.springframework.core.env.Environment;
 import org.springframework.format.FormatterRegistry;
 import org.springframework.security.util.FieldUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ReflectionUtils;
-import org.springframework.util.StringUtils;
 import org.springframework.web.filter.OncePerRequestFilter;
 import org.springframework.web.servlet.AsyncHandlerInterceptor;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.config.annotation.*;
 import org.springframework.web.util.ContentCachingRequestWrapper;
 import org.springframework.web.util.ContentCachingResponseWrapper;
 import org.springframework.web.util.WebUtils;
@@ -60,7 +45,9 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.lang.reflect.Field;
-import java.util.*;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 @Slf4j
 @Configuration
@@ -182,26 +169,6 @@ public Object convert(Object value, TypeDescriptor sourceType, TypeDescriptor ta
         }
     }
 
-    /**
-     * fixme springmvc new path pattern-based path matching strategy not supported by springfox
-     */
-    @Bean
-    public WebMvcEndpointHandlerMapping webEndpointServletHandlerMapping(WebEndpointsSupplier webEndpointsSupplier, ServletEndpointsSupplier servletEndpointsSupplier, ControllerEndpointsSupplier controllerEndpointsSupplier, EndpointMediaTypes endpointMediaTypes, CorsEndpointProperties corsProperties, WebEndpointProperties webEndpointProperties, Environment environment) {
-        List<ExposableEndpoint<?>> allEndpoints = new ArrayList();
-        Collection<ExposableWebEndpoint> webEndpoints = webEndpointsSupplier.getEndpoints();
-        allEndpoints.addAll(webEndpoints);
-        allEndpoints.addAll(servletEndpointsSupplier.getEndpoints());
-        allEndpoints.addAll(controllerEndpointsSupplier.getEndpoints());
-        String basePath = webEndpointProperties.getBasePath();
-        EndpointMapping endpointMapping = new EndpointMapping(basePath);
-        boolean shouldRegisterLinksMapping = this.shouldRegisterLinksMapping(webEndpointProperties, environment, basePath);
-        return new WebMvcEndpointHandlerMapping(endpointMapping, webEndpoints, endpointMediaTypes, corsProperties.toCorsConfiguration(), new EndpointLinksResolver(allEndpoints, basePath), shouldRegisterLinksMapping, null);
-    }
-
-    private boolean shouldRegisterLinksMapping(WebEndpointProperties webEndpointProperties, Environment environment, String basePath) {
-        return webEndpointProperties.getDiscovery().isEnabled() && (StringUtils.hasText(basePath) || ManagementPortType.get(environment).equals(ManagementPortType.DIFFERENT));
-    }
-
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
         registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/");
@@ -210,8 +177,8 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
 
     @Override
     public void addViewControllers(ViewControllerRegistry registry) {
-         registry.addViewController("/").setViewName("redirect:/ui/");
-         registry.addViewController("/ui/").setViewName("forward:/ui/index.html");
+        registry.addViewController("/").setViewName("redirect:/ui/");
+        registry.addViewController("/ui/").setViewName("forward:/ui/index.html");
     }
 
 }
diff --git a/scaleph-api/src/main/resources/application.yml b/scaleph-api/src/main/resources/application.yml
index d9a44cb1f..547e26409 100644
--- a/scaleph-api/src/main/resources/application.yml
+++ b/scaleph-api/src/main/resources/application.yml
@@ -95,10 +95,10 @@ logging:
 
 springdoc:
   swagger-ui:
-    path: /swagger-ui.html
     tags-sorter: alpha
     operations-sorter: alpha
   api-docs:
+    enabled: true
     path: /v3/api-docs
   group-configs:
     - group: 'default'
diff --git a/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/spec/JobSpec.java b/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/spec/JobSpec.java
index 106e41c59..2d763e171 100644
--- a/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/spec/JobSpec.java
+++ b/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/spec/JobSpec.java
@@ -72,6 +72,12 @@ public class JobSpec implements Diffable<JobSpec> {
      */
     private String initialSavepointPath;
 
+    /**
+     * Nonce used to manually trigger checkpoint for the running job. In order to trigger a
+     * checkpoint, change the number to anything other than the current value.
+     */
+    private Long checkpointTriggerNonce;
+
     /**
      * Upgrade mode of the Flink job.
      */
diff --git a/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/Checkpoint.java b/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/Checkpoint.java
new file mode 100644
index 000000000..0f5f03739
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/Checkpoint.java
@@ -0,0 +1,80 @@
+/*
+ * 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 cn.sliew.scaleph.engine.flink.kubernetes.operator.status;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.annotation.Nullable;
+
+/**
+ * Represents information about a finished checkpoint.
+ */
+@Data
+@NoArgsConstructor
+public class Checkpoint implements Snapshot {
+    /**
+     * Millisecond timestamp at the start of the checkpoint operation.
+     */
+    private long timeStamp;
+
+    /**
+     * Checkpoint trigger mechanism.
+     */
+    private SnapshotTriggerType triggerType = SnapshotTriggerType.UNKNOWN;
+
+    /**
+     * Checkpoint format.
+     */
+    private CheckpointType formatType = CheckpointType.UNKNOWN;
+
+    /**
+     * Nonce value used when the checkpoint was triggered manually {@link
+     * SnapshotTriggerType#MANUAL}, null for other types of checkpoint.
+     */
+    private Long triggerNonce;
+
+    public Checkpoint(
+            long timeStamp,
+            @Nullable SnapshotTriggerType triggerType,
+            @Nullable CheckpointType formatType,
+            @Nullable Long triggerNonce) {
+        this.timeStamp = timeStamp;
+        if (triggerType != null) {
+            this.triggerType = triggerType;
+        }
+        if (formatType != null) {
+            this.formatType = formatType;
+        }
+        this.triggerNonce = triggerNonce;
+    }
+
+    public static Checkpoint of(long timeStamp, SnapshotTriggerType triggerType) {
+        return new Checkpoint(timeStamp, triggerType, CheckpointType.UNKNOWN, null);
+    }
+
+    public static Checkpoint of(SnapshotTriggerType triggerType) {
+        return new Checkpoint(
+                System.currentTimeMillis(), triggerType, CheckpointType.UNKNOWN, null);
+    }
+
+    public static Checkpoint of(SnapshotTriggerType triggerType, CheckpointType formatType) {
+        return new Checkpoint(System.currentTimeMillis(), triggerType, formatType, null);
+    }
+}
diff --git a/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/CheckpointInfo.java b/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/CheckpointInfo.java
new file mode 100644
index 000000000..5f7b658de
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/CheckpointInfo.java
@@ -0,0 +1,124 @@
+/*
+ * 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 cn.sliew.scaleph.engine.flink.kubernetes.operator.status;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * Stores checkpoint-related information.
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class CheckpointInfo implements SnapshotInfo {
+    /**
+     * Last completed checkpoint by the operator.
+     */
+    private Checkpoint lastCheckpoint;
+
+    /**
+     * Trigger id of a pending checkpoint operation.
+     */
+    private String triggerId;
+
+    /**
+     * Trigger timestamp of a pending checkpoint operation.
+     */
+    private Long triggerTimestamp;
+
+    /**
+     * Checkpoint trigger mechanism.
+     */
+    private SnapshotTriggerType triggerType;
+
+    /**
+     * Checkpoint format.
+     */
+    private CheckpointType formatType;
+
+    /**
+     * Trigger timestamp of last periodic checkpoint operation.
+     */
+    private long lastPeriodicCheckpointTimestamp = 0L;
+
+    public void setTrigger(
+            String triggerId, SnapshotTriggerType triggerType, CheckpointType formatType) {
+        this.triggerId = triggerId;
+        this.triggerTimestamp = System.currentTimeMillis();
+        this.triggerType = triggerType;
+        this.formatType = formatType;
+    }
+
+    public void resetTrigger() {
+        this.triggerId = null;
+        this.triggerTimestamp = null;
+        this.triggerType = null;
+        this.formatType = null;
+    }
+
+    /**
+     * Update last checkpoint info.
+     *
+     * @param checkpoint Checkpoint to be added.
+     */
+    public void updateLastCheckpoint(Checkpoint checkpoint) {
+        lastCheckpoint = checkpoint;
+        if (checkpoint.getTriggerType() == SnapshotTriggerType.PERIODIC) {
+            lastPeriodicCheckpointTimestamp = checkpoint.getTimeStamp();
+        }
+        resetTrigger();
+    }
+
+    @JsonIgnore
+    @Override
+    public Long getLastTriggerNonce() {
+        return lastCheckpoint == null ? null : lastCheckpoint.getTriggerNonce();
+    }
+
+    @JsonIgnore
+    @Override
+    public long getLastPeriodicTriggerTimestamp() {
+        return lastPeriodicCheckpointTimestamp;
+    }
+
+    @JsonIgnore
+    @Override
+    public SnapshotTriggerType getLastTriggerType() {
+        return lastCheckpoint == null ? null : lastCheckpoint.getTriggerType();
+    }
+
+    @JsonIgnore
+    @Override
+    public String formatErrorMessage(Long triggerNonce) {
+        return SnapshotTriggerType.PERIODIC == triggerType
+                ? "Periodic checkpoint failed"
+                : "Checkpoint failed for checkpointTriggerNonce: " + triggerNonce;
+    }
+
+    @JsonIgnore
+    @Override
+    public Snapshot getLastSnapshot() {
+        return lastCheckpoint;
+    }
+}
diff --git a/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/CheckpointType.java b/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/CheckpointType.java
new file mode 100644
index 000000000..c020e6cb5
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/CheckpointType.java
@@ -0,0 +1,43 @@
+/*
+ * 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 cn.sliew.scaleph.engine.flink.kubernetes.operator.status;
+
+import org.apache.flink.configuration.description.InlineElement;
+
+import static org.apache.flink.configuration.description.TextElement.text;
+
+/**
+ * Checkpoint format type.
+ */
+public enum CheckpointType {
+
+    FULL("A comprehensive snapshot, saving the complete state of a data stream."),
+    INCREMENTAL("A more efficient, reduced snapshot, saving only the differences in state data since the last checkpoint."),
+
+    /**
+     * Checkpoint format unknown, if the checkpoint was not triggered by the operator.
+     */
+    UNKNOWN("Only for internal purposes.");
+
+    private final InlineElement description;
+
+    CheckpointType(String description) {
+        this.description = text(description);
+    }
+}
diff --git a/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/JobStatus.java b/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/JobStatus.java
index a9b3d6ac5..eb3569315 100644
--- a/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/JobStatus.java
+++ b/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/JobStatus.java
@@ -58,4 +58,9 @@ public class JobStatus {
      * Information about pending and last savepoint for the job.
      */
     private SavepointInfo savepointInfo = new SavepointInfo();
+
+    /**
+     * Information about pending and last checkpoint for the job.
+     */
+    private Object checkpointInfo = new Object();
 }
\ No newline at end of file
diff --git a/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/Savepoint.java b/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/Savepoint.java
index bb1f89a44..08f7471b4 100644
--- a/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/Savepoint.java
+++ b/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/Savepoint.java
@@ -28,7 +28,8 @@
  */
 @Data
 @NoArgsConstructor
-public class Savepoint {
+public class Savepoint implements Snapshot {
+
     /**
      * Millisecond timestamp at the start of the savepoint operation.
      */
@@ -42,7 +43,7 @@ public class Savepoint {
     /**
      * Savepoint trigger mechanism.
      */
-    private SavepointTriggerType triggerType = SavepointTriggerType.UNKNOWN;
+    private SnapshotTriggerType triggerType = SnapshotTriggerType.UNKNOWN;
 
     /**
      * Savepoint format.
@@ -51,14 +52,14 @@ public class Savepoint {
 
     /**
      * Nonce value used when the savepoint was triggered manually {@link
-     * SavepointTriggerType#MANUAL}, null for other types of savepoints.
+     * SnapshotTriggerType#MANUAL}, null for other types of savepoints.
      */
     private Long triggerNonce;
 
     public Savepoint(
             long timeStamp,
             String location,
-            @Nullable SavepointTriggerType triggerType,
+            @Nullable SnapshotTriggerType triggerType,
             @Nullable SavepointFormatType formatType,
             @Nullable Long triggerNonce) {
         this.timeStamp = timeStamp;
@@ -72,7 +73,11 @@ public Savepoint(
         this.triggerNonce = triggerNonce;
     }
 
-    public static Savepoint of(String location, SavepointTriggerType triggerType) {
+    public static Savepoint of(String location, long timeStamp, SnapshotTriggerType triggerType) {
+        return new Savepoint(timeStamp, location, triggerType, SavepointFormatType.UNKNOWN, null);
+    }
+
+    public static Savepoint of(String location, SnapshotTriggerType triggerType) {
         return new Savepoint(
                 System.currentTimeMillis(),
                 location,
@@ -82,7 +87,7 @@ public static Savepoint of(String location, SavepointTriggerType triggerType) {
     }
 
     public static Savepoint of(
-            String location, SavepointTriggerType triggerType, SavepointFormatType formatType) {
+            String location, SnapshotTriggerType triggerType, SavepointFormatType formatType) {
         return new Savepoint(System.currentTimeMillis(), location, triggerType, formatType, null);
     }
 }
diff --git a/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/SavepointInfo.java b/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/SavepointInfo.java
index 08936a359..89ca5e508 100644
--- a/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/SavepointInfo.java
+++ b/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/SavepointInfo.java
@@ -18,6 +18,7 @@
 
 package cn.sliew.scaleph.engine.flink.kubernetes.operator.status;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -33,8 +34,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class SavepointInfo {
-
+public class SavepointInfo implements SnapshotInfo {
     /**
      * Last completed savepoint by the operator.
      */
@@ -53,7 +53,7 @@ public class SavepointInfo {
     /**
      * Savepoint trigger mechanism.
      */
-    private SavepointTriggerType triggerType;
+    private SnapshotTriggerType triggerType;
 
     /**
      * Savepoint format.
@@ -71,7 +71,7 @@ public class SavepointInfo {
     private long lastPeriodicSavepointTimestamp = 0L;
 
     public void setTrigger(
-            String triggerId, SavepointTriggerType triggerType, SavepointFormatType formatType) {
+            String triggerId, SnapshotTriggerType triggerType, SavepointFormatType formatType) {
         this.triggerId = triggerId;
         this.triggerTimestamp = System.currentTimeMillis();
         this.triggerType = triggerType;
@@ -95,10 +95,42 @@ public void updateLastSavepoint(Savepoint savepoint) {
         if (lastSavepoint == null || !lastSavepoint.getLocation().equals(savepoint.getLocation())) {
             lastSavepoint = savepoint;
             savepointHistory.add(savepoint);
-            if (savepoint.getTriggerType() == SavepointTriggerType.PERIODIC) {
+            if (savepoint.getTriggerType() == SnapshotTriggerType.PERIODIC) {
                 lastPeriodicSavepointTimestamp = savepoint.getTimeStamp();
             }
         }
         resetTrigger();
     }
-}
\ No newline at end of file
+
+    @JsonIgnore
+    @Override
+    public Long getLastTriggerNonce() {
+        return lastSavepoint == null ? null : lastSavepoint.getTriggerNonce();
+    }
+
+    @JsonIgnore
+    @Override
+    public long getLastPeriodicTriggerTimestamp() {
+        return lastPeriodicSavepointTimestamp;
+    }
+
+    @JsonIgnore
+    @Override
+    public SnapshotTriggerType getLastTriggerType() {
+        return lastSavepoint == null ? null : lastSavepoint.getTriggerType();
+    }
+
+    @JsonIgnore
+    @Override
+    public String formatErrorMessage(Long triggerNonce) {
+        return SnapshotTriggerType.PERIODIC == triggerType
+                ? "Periodic savepoint failed"
+                : "Savepoint failed for savepointTriggerNonce: " + triggerNonce;
+    }
+
+    @JsonIgnore
+    @Override
+    public Snapshot getLastSnapshot() {
+        return lastSavepoint;
+    }
+}
diff --git a/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/Snapshot.java b/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/Snapshot.java
new file mode 100644
index 000000000..3f0ec9d7a
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/Snapshot.java
@@ -0,0 +1,29 @@
+/*
+ * 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 cn.sliew.scaleph.engine.flink.kubernetes.operator.status;
+
+/**
+ * A common interface for {@link Checkpoint} and {@link Savepoint}.
+ */
+public interface Snapshot {
+
+    long getTimeStamp();
+
+    SnapshotTriggerType getTriggerType();
+}
diff --git a/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/SnapshotInfo.java b/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/SnapshotInfo.java
new file mode 100644
index 000000000..609f5aded
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/SnapshotInfo.java
@@ -0,0 +1,43 @@
+/*
+ * 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 cn.sliew.scaleph.engine.flink.kubernetes.operator.status;
+
+/**
+ * Interface representing common snapshot information.
+ */
+public interface SnapshotInfo {
+
+    String getTriggerId();
+
+    Long getTriggerTimestamp();
+
+    Long getLastTriggerNonce();
+
+    long getLastPeriodicTriggerTimestamp();
+
+    SnapshotTriggerType getLastTriggerType();
+
+    SnapshotTriggerType getTriggerType();
+
+    String formatErrorMessage(Long triggerNonce);
+
+    Snapshot getLastSnapshot();
+
+    void resetTrigger();
+}
\ No newline at end of file
diff --git a/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/SnapshotTriggerType.java b/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/SnapshotTriggerType.java
new file mode 100644
index 000000000..f427d7470
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-flink-kubernetes/src/main/java/cn/sliew/scaleph/engine/flink/kubernetes/operator/status/SnapshotTriggerType.java
@@ -0,0 +1,41 @@
+/*
+ * 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 cn.sliew.scaleph.engine.flink.kubernetes.operator.status;
+
+/**
+ * Snapshot trigger mechanism.
+ */
+public enum SnapshotTriggerType {
+    /**
+     * Snapshot manually triggered by changing a triggerNonce.
+     */
+    MANUAL,
+    /**
+     * Snapshot periodically triggered by the operator.
+     */
+    PERIODIC,
+    /**
+     * Snapshot triggered during stateful upgrade.
+     */
+    UPGRADE,
+    /**
+     * Snapshot trigger mechanism unknown, such as savepoint retrieved directly from Flink job.
+     */
+    UNKNOWN
+}
diff --git a/scaleph-support/scaleph-system/src/main/java/cn/sliew/scaleph/system/model/ResponseVO.java b/scaleph-support/scaleph-system/src/main/java/cn/sliew/scaleph/system/model/ResponseVO.java
index 652a6f3d9..eb524efe2 100644
--- a/scaleph-support/scaleph-system/src/main/java/cn/sliew/scaleph/system/model/ResponseVO.java
+++ b/scaleph-support/scaleph-system/src/main/java/cn/sliew/scaleph/system/model/ResponseVO.java
@@ -21,7 +21,6 @@
 import cn.sliew.milky.common.util.JacksonUtil;
 import cn.sliew.scaleph.common.enums.ErrorShowTypeEnum;
 import cn.sliew.scaleph.common.enums.ResponseCodeEnum;
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.SneakyThrows;
 
@@ -29,7 +28,6 @@
  * @author gleiyu
  */
 @Data
-@Schema(name = "通用响应体", description = "通用响应体")
 public class ResponseVO<T> {
     /**
      * operate result
diff --git a/scaleph-ui-react/config/routes.ts b/scaleph-ui-react/config/routes.ts
index d4530111f..47eb26af8 100644
--- a/scaleph-ui-react/config/routes.ts
+++ b/scaleph-ui-react/config/routes.ts
@@ -238,7 +238,21 @@ export default [
             component: './Project/Workspace/Doris/Template',
             pCode: PRIVILEGE_CODE.workspaceClusterConfigShow,
             access: 'normalRouteFilter'
-          }
+          },
+          {
+            path: '/workspace/doris/template/steps',
+            exact: true,
+            component: './Project/Workspace/Doris/Template/Steps',
+            pCode: PRIVILEGE_CODE.workspaceClusterConfigShow,
+            access: 'normalRouteFilter'
+          },
+          {
+            path: '/workspace/doris/template/detail',
+            exact: true,
+            component: './Project/Workspace/Doris/Template/Detail',
+            pCode: PRIVILEGE_CODE.workspaceClusterConfigShow,
+            access: 'normalRouteFilter'
+          },
         ]
       },
     ]
diff --git a/scaleph-ui-react/src/locales/zh-CN/pages/project.ts b/scaleph-ui-react/src/locales/zh-CN/pages/project.ts
index 70c122b11..df5e4fb98 100644
--- a/scaleph-ui-react/src/locales/zh-CN/pages/project.ts
+++ b/scaleph-ui-react/src/locales/zh-CN/pages/project.ts
@@ -923,6 +923,22 @@ export default {
   'pages.project.doris.template': 'Template',
   'pages.project.doris.template.name': '名称',
   'pages.project.doris.template.namespace': '命名空间',
+  'pages.project.doris.template.define': '模板定义',
+  'pages.project.doris.template.steps.base': '基础信息',
+  'pages.project.doris.template.steps.component': '集群组件',
+  'pages.project.doris.template.steps.component.admin': 'Admin用户',
+  'pages.project.doris.template.steps.component.fe': 'FE节点',
+  'pages.project.doris.template.steps.component.be': 'BE节点',
+  'pages.project.doris.template.steps.component.cn': '计算节点',
+  'pages.project.doris.template.steps.component.broker': 'Broker节点',
+  'pages.project.doris.template.steps.component.admin.name': '用户名',
+  'pages.project.doris.template.steps.component.admin.password': '密码',
+  'pages.project.doris.template.steps.component.base.image': '镜像',
+  'pages.project.doris.template.steps.component.base.replicas': '数量',
+  'pages.project.doris.template.steps.component.base.requests.cpu': 'CPU',
+  'pages.project.doris.template.steps.component.base.requests.memory': '内存',
+  'pages.project.doris.template.steps.component.base.limits.cpu': '最大CPU',
+  'pages.project.doris.template.steps.component.base.limits.memory': '最大内存',
 
 
   'Run': '运行',
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Detail/index.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Detail/index.tsx
new file mode 100644
index 000000000..95c79b982
--- /dev/null
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Detail/index.tsx
@@ -0,0 +1,14 @@
+import {useIntl, useLocation} from "umi";
+import React from "react";
+import {WsFlinkKubernetesTemplate} from "@/services/project/typings";
+
+const DorisTemplateDetailWeb: React.FC = () => {
+  const intl = useIntl();
+  const data = useLocation().state as WsFlinkKubernetesTemplate
+
+  return (
+    <div>DorisTemplateDetailWeb</div>
+  );
+}
+
+export default DorisTemplateDetailWeb;
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/BaseStepForm.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/BaseStepForm.tsx
new file mode 100644
index 000000000..c56a2ee41
--- /dev/null
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/BaseStepForm.tsx
@@ -0,0 +1,31 @@
+import React from "react";
+import {Form} from "antd";
+import {ProCard, ProFormDigit, ProFormText} from "@ant-design/pro-components";
+import {useIntl} from "umi";
+
+const DorisTemplateBase: React.FC = () => {
+  const intl = useIntl();
+  const [form] = Form.useForm()
+
+  return (
+    <ProCard>
+      <ProFormDigit name={"id"} hidden/>
+      <ProFormText
+        name={"name"}
+        label={intl.formatMessage({id: 'pages.project.doris.template.name'})}
+        rules={[{required: true}]}
+      />
+      <ProFormText
+        name={"namespace"}
+        label={intl.formatMessage({id: 'pages.project.doris.template.namespace'})}
+        rules={[{required: true}]}
+      />
+      <ProFormText
+        name={"remark"}
+        label={intl.formatMessage({id: 'app.common.data.remark'})}
+      />
+    </ProCard>
+  );
+}
+
+export default DorisTemplateBase;
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/Component/DorisAdminUser.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/Component/DorisAdminUser.tsx
new file mode 100644
index 000000000..0364d81ec
--- /dev/null
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/Component/DorisAdminUser.tsx
@@ -0,0 +1,28 @@
+import {useIntl} from "umi";
+import {ProCard, ProFormDigit, ProFormGroup, ProFormList, ProFormText} from "@ant-design/pro-components";
+
+const DorisAdminUser: React.FC = () => {
+  const intl = useIntl();
+
+  return (<ProCard
+    title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.admin'})}
+    headerBordered
+    collapsible={true}>
+    <ProFormText
+      name="admin.name"
+      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.admin.name'})}
+      colProps={{span: 10, offset: 1}}
+      rules={[{required: true}]}
+      initialValue={"admin"}
+    />
+    <ProFormText
+      name="admin.password"
+      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.admin.password'})}
+      colProps={{span: 10, offset: 1}}
+      rules={[{required: true}]}
+      initialValue={"Admin123"}
+    />
+  </ProCard>);
+}
+
+export default DorisAdminUser;
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/Component/DorisBeComponent.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/Component/DorisBeComponent.tsx
new file mode 100644
index 000000000..51549db54
--- /dev/null
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/Component/DorisBeComponent.tsx
@@ -0,0 +1,60 @@
+import {useIntl} from "umi";
+import {ProCard, ProFormDigit, ProFormGroup, ProFormList, ProFormText} from "@ant-design/pro-components";
+
+const DorisFeComponent: React.FC = () => {
+  const intl = useIntl();
+
+  return (<ProCard
+    title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.be'})}
+    headerBordered
+    collapsible={true}
+    defaultCollapsed>
+    <ProFormDigit
+      name="be.replicas"
+      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.replicas'})}
+      colProps={{span: 10, offset: 1}}
+      initialValue={3}
+      fieldProps={{
+        min: 1
+      }}
+    />
+    <ProFormText
+      name="be.image"
+      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.image'})}
+      colProps={{span: 10, offset: 1}}
+      initialValue={"selectdb/doris.be-ubuntu:2.0.2"}
+    />
+    <ProFormDigit
+      name="be.requests.cpu"
+      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.cpu'})}
+      colProps={{span: 10, offset: 1}}
+      initialValue={8}
+      fieldProps={{
+        min: 1
+      }}
+    />
+    <ProFormText
+      name="be.requests.memory"
+      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.memory'})}
+      colProps={{span: 10, offset: 1}}
+      initialValue={"16Gi"}
+    />
+    <ProFormDigit
+      name="be.limits.cpu"
+      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.cpu'})}
+      colProps={{span: 10, offset: 1}}
+      initialValue={16}
+      fieldProps={{
+        min: 1
+      }}
+    />
+    <ProFormText
+      name="be.limits.memory"
+      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.memory'})}
+      colProps={{span: 10, offset: 1}}
+      initialValue={"32Gi"}
+    />
+  </ProCard>);
+}
+
+export default DorisFeComponent;
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/Component/DorisCnComponent.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/Component/DorisCnComponent.tsx
new file mode 100644
index 000000000..9305937f9
--- /dev/null
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/Component/DorisCnComponent.tsx
@@ -0,0 +1,60 @@
+import {useIntl} from "umi";
+import {ProCard, ProFormDigit, ProFormText} from "@ant-design/pro-components";
+
+const DorisFeComponent: React.FC = () => {
+  const intl = useIntl();
+
+  return (<ProCard
+    title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.cn'})}
+    headerBordered
+    collapsible={true}
+    defaultCollapsed>
+    <ProFormDigit
+      name="cn.replicas"
+      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.replicas'})}
+      colProps={{span: 10, offset: 1}}
+      initialValue={3}
+      fieldProps={{
+        min: 1
+      }}
+    />
+    <ProFormText
+      name="cn.image"
+      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.image'})}
+      colProps={{span: 10, offset: 1}}
+      initialValue={"selectdb/doris.be-ubuntu:2.0.2"}
+    />
+    <ProFormDigit
+      name="cn.requests.cpu"
+      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.cpu'})}
+      colProps={{span: 10, offset: 1}}
+      initialValue={8}
+      fieldProps={{
+        min: 1
+      }}
+    />
+    <ProFormText
+      name="cn.requests.memory"
+      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.memory'})}
+      colProps={{span: 10, offset: 1}}
+      initialValue={"16Gi"}
+    />
+    <ProFormDigit
+      name="cn.limits.cpu"
+      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.cpu'})}
+      colProps={{span: 10, offset: 1}}
+      initialValue={16}
+      fieldProps={{
+        min: 1
+      }}
+    />
+    <ProFormText
+      name="cn.limits.memory"
+      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.memory'})}
+      colProps={{span: 10, offset: 1}}
+      initialValue={"32Gi"}
+    />
+  </ProCard>);
+}
+
+export default DorisFeComponent;
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/Component/DorisFeComponent.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/Component/DorisFeComponent.tsx
new file mode 100644
index 000000000..d57bd9a8c
--- /dev/null
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/Component/DorisFeComponent.tsx
@@ -0,0 +1,60 @@
+import {useIntl} from "umi";
+import {ProCard, ProFormDigit, ProFormGroup, ProFormList, ProFormText} from "@ant-design/pro-components";
+
+const DorisFeComponent: React.FC = () => {
+  const intl = useIntl();
+
+  return (<ProCard
+    title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.fe'})}
+    headerBordered
+    collapsible={true}
+    defaultCollapsed>
+    <ProFormDigit
+      name="fe.replicas"
+      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.replicas'})}
+      colProps={{span: 10, offset: 1}}
+      initialValue={3}
+      fieldProps={{
+        min: 1
+      }}
+    />
+    <ProFormText
+      name="fe.image"
+      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.image'})}
+      colProps={{span: 10, offset: 1}}
+      initialValue={"selectdb/doris.fe-ubuntu:2.0.2"}
+    />
+    <ProFormDigit
+      name="fe.requests.cpu"
+      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.cpu'})}
+      colProps={{span: 10, offset: 1}}
+      initialValue={8}
+      fieldProps={{
+        min: 1
+      }}
+    />
+    <ProFormText
+      name="fe.requests.memory"
+      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.memory'})}
+      colProps={{span: 10, offset: 1}}
+      initialValue={"16Gi"}
+    />
+    <ProFormDigit
+      name="fe.limits.cpu"
+      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.cpu'})}
+      colProps={{span: 10, offset: 1}}
+      initialValue={16}
+      fieldProps={{
+        min: 1
+      }}
+    />
+    <ProFormText
+      name="fe.limits.memory"
+      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.memory'})}
+      colProps={{span: 10, offset: 1}}
+      initialValue={"32Gi"}
+    />
+  </ProCard>);
+}
+
+export default DorisFeComponent;
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/ComponentStepForm.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/ComponentStepForm.tsx
new file mode 100644
index 000000000..e35ccb672
--- /dev/null
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/ComponentStepForm.tsx
@@ -0,0 +1,22 @@
+import React from "react";
+import {Form} from "antd";
+import {ProCard} from "@ant-design/pro-components";
+import DorisFeComponent from "@/pages/Project/Workspace/Doris/Template/Steps/Component/DorisFeComponent";
+import DorisAdminUser from "@/pages/Project/Workspace/Doris/Template/Steps/Component/DorisAdminUser";
+import DorisBeComponent from "@/pages/Project/Workspace/Doris/Template/Steps/Component/DorisBeComponent";
+import DorisCnComponent from "@/pages/Project/Workspace/Doris/Template/Steps/Component/DorisCnComponent";
+
+const DorisTemplateComponent: React.FC = () => {
+  const [form] = Form.useForm()
+
+  return (
+    <ProCard>
+      <DorisAdminUser/>
+      <DorisFeComponent/>
+      <DorisBeComponent/>
+      <DorisCnComponent/>
+    </ProCard>
+  );
+}
+
+export default DorisTemplateComponent;
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/index.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/index.tsx
new file mode 100644
index 000000000..4f89b9931
--- /dev/null
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/index.tsx
@@ -0,0 +1,39 @@
+import {useIntl} from "umi";
+import React, {useRef} from "react";
+import {ProCard, ProFormInstance, StepsForm} from "@ant-design/pro-components";
+import {WORKSPACE_CONF} from "@/constant";
+import DorisTemplateComponent from "@/pages/Project/Workspace/Doris/Template/Steps/ComponentStepForm";
+import DorisTemplateBase from "@/pages/Project/Workspace/Doris/Template/Steps/BaseStepForm";
+
+const DorisTemplateSteps: React.FC = () => {
+  const intl = useIntl();
+  const formRef = useRef<ProFormInstance>();
+  const projectId = localStorage.getItem(WORKSPACE_CONF.projectId);
+
+  return (
+    <ProCard className={'step-form-submitter'}>
+      <StepsForm
+        formRef={formRef}
+        formProps={{
+          grid: true,
+          rowProps: {gutter: [16, 8]}
+        }}
+      >
+        <StepsForm.StepForm
+          name="base"
+          title={intl.formatMessage({id: 'pages.project.doris.template.steps.base'})}
+          style={{width: 1000}}>
+          <DorisTemplateBase/>
+        </StepsForm.StepForm>
+        <StepsForm.StepForm
+          name="component"
+          title={intl.formatMessage({id: 'pages.project.doris.template.steps.component'})}
+          style={{width: 1000}}>
+          <DorisTemplateComponent/>
+        </StepsForm.StepForm>
+      </StepsForm>
+    </ProCard>
+  )
+}
+
+export default DorisTemplateSteps;
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/index.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/index.tsx
index 847a7f359..a0e092727 100644
--- a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/index.tsx
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/index.tsx
@@ -5,7 +5,6 @@ import {DeleteOutlined, EditOutlined, NodeIndexOutlined} from "@ant-design/icons
 import {ActionType, ProColumns, ProFormInstance, ProTable} from "@ant-design/pro-components";
 import {PRIVILEGE_CODE, WORKSPACE_CONF} from "@/constant";
 import {WsDorisTemplate} from "@/services/project/typings";
-import {WsFlinkKubernetesTemplateService} from "@/services/project/WsFlinkKubernetesTemplateService";
 import {WsDorisTemplateService} from "@/services/project/WsDorisTemplateService";
 import DorisTemplateForm from "@/pages/Project/Workspace/Doris/Template/DorisTemplateForm";
 
@@ -70,13 +69,13 @@ const DorisTemplateWeb: React.FC = () => {
             </Tooltip>
           )}
           {access.canAccess(PRIVILEGE_CODE.datadevJobEdit) && (
-            <Tooltip title={intl.formatMessage({id: 'pages.project.flink.kubernetes.deployment.template.define'})}>
+            <Tooltip title={intl.formatMessage({id: 'pages.project.doris.template.define'})}>
               <Button
                 shape="default"
                 type="link"
                 icon={<NodeIndexOutlined/>}
                 onClick={() => {
-                  history.push("/workspace/flink/kubernetes/template/detail", record)
+                  history.push("/workspace/doris/template/detail", record)
                 }}
               />
             </Tooltip>
@@ -134,7 +133,7 @@ const DorisTemplateWeb: React.FC = () => {
               key="new"
               type="primary"
               onClick={() => {
-                setDorisTemplateFormData({visiable: true, data: {}});
+                history.push("/workspace/doris/template/steps")
               }}
             >
               {intl.formatMessage({id: 'app.common.operate.new.label'})}
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Template/Detail/index.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Template/Detail/index.tsx
index 5e86eb0b8..0c1e6dac9 100644
--- a/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Template/Detail/index.tsx
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Kubernetes/Template/Detail/index.tsx
@@ -1,4 +1,4 @@
-import {history, useIntl, useLocation} from "umi";
+import {connect, history, useIntl, useLocation} from "umi";
 import React from "react";
 import {Button, Tabs} from "antd";
 import {FooterToolbar, PageContainer} from "@ant-design/pro-components";
@@ -6,7 +6,6 @@ import DeploymentTemplateAdvanced from "@/pages/Project/Workspace/Kubernetes/Tem
 import DeploymentTemplateYAML from "@/pages/Project/Workspace/Kubernetes/Template/Detail/YAML";
 import {WsFlinkKubernetesTemplate} from "@/services/project/typings";
 import {WsFlinkKubernetesTemplateService} from "@/services/project/WsFlinkKubernetesTemplateService";
-import {connect} from "@@/exports";
 
 const FlinkKubernetesDeploymentTemplateDetailWeb: React.FC = (props: any) => {
   const intl = useIntl();
diff --git a/tools/docker/mysql/init.d/scaleph-security-mysql.sql b/tools/docker/mysql/init.d/scaleph-security-mysql.sql
index aa1155d92..911deafee 100644
--- a/tools/docker/mysql/init.d/scaleph-security-mysql.sql
+++ b/tools/docker/mysql/init.d/scaleph-security-mysql.sql
@@ -534,6 +534,14 @@ INSERT INTO `sec_resource_web` (`id`, `type`, `pid`, `name`, `path`, `redirect`,
                                 `remark`, `creator`, `editor`)
 VALUES (66, '2', 64, 'template', '/workspace/doris/template', NULL, NULL, NULL, './Project/Workspace/Doris/Template',
         NULL, 'sys', 'sys');
+INSERT INTO `sec_resource_web` (`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`,
+                                `remark`, `creator`, `editor`)
+VALUES (67, '2', 64, NULL, '/workspace/doris/template/steps', NULL, NULL, NULL,
+        './Project/Workspace/Doris/Template/Steps', NULL, 'sys', 'sys');
+INSERT INTO `sec_resource_web` (`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`,
+                                `remark`, `creator`, `editor`)
+VALUES (68, '2', 64, NULL, '/workspace/doris/template/detail', NULL, NULL, NULL,
+        './Project/Workspace/Doris/Template/Detail', NULL, 'sys', 'sys');
 
 drop table if exists sec_resource_web_role;
 create table sec_resource_web_role

From 311fdded8500ed82cb8fb6936c50563a94439238 Mon Sep 17 00:00:00 2001
From: kalencaya <1942460489@qq.com>
Date: Mon, 27 Nov 2023 20:19:36 +0800
Subject: [PATCH 19/24] [Feature][scaleph-engine-doris] add doris template
 detail web (#650)

* fix: doris template step form item error

* feature: add doris template yaml step

* feature: add doris template yaml step

* feature: add createStatus for doris template

* feature: add yaml step for doris template steps

* feature: add yaml step for doris template steps

* feature: add yaml step for doris template steps

* feature: remove doris template createStatus field

* feature: refactor doris template step model

* feature: add yaml area for doris template detail web

* feature: add yaml area for doris template detail web
---
 .../ws/WsDorisTemplateController.java         |   9 +
 .../dao/entity/master/ws/WsDorisTemplate.java |   6 -
 .../engine/doris/operator/spec/AdminUser.java |   2 +-
 .../doris/service/WsDorisTemplateService.java |   4 +-
 .../doris/service/dto/WsDorisTemplateDTO.java |   2 +-
 .../impl/WsDorisTemplateServiceImpl.java      |  38 +++-
 .../param/WsDorisTemplateAddParam.java        |  18 ++
 .../param/WsDorisTemplateUpdateParam.java     |  18 ++
 .../doris/service/resource/DorisTemplate.java |  20 --
 .../resource/template/DorisTemplate.java      |  38 ++++
 .../template/DorisTemplateConverter.java      |  72 +++++++
 .../resource/ResourceConverter.java           |   2 +-
 .../src/locales/zh-CN/pages/project.ts        |   4 +
 .../doris/template/dorisTemplateSteps.ts      |  61 ++++++
 .../Workspace/Doris/Template/Detail/index.tsx | 177 +++++++++++++++++-
 .../Steps/Component/DorisAdminUser.tsx        |  32 ++--
 .../Steps/Component/DorisBeComponent.tsx      |  92 ++++-----
 .../Steps/Component/DorisCnComponent.tsx      |  94 +++++-----
 .../Steps/Component/DorisFeComponent.tsx      |  92 ++++-----
 .../Template/Steps/ComponentStepForm.tsx      |   3 -
 .../Doris/Template/Steps/YAMLStepForm.tsx     |  41 ++++
 .../Workspace/Doris/Template/Steps/index.tsx  |  58 +++++-
 .../Workspace/Doris/Template/index.tsx        |   2 +-
 .../project/WsDorisTemplateService.ts         |  98 ++++++++++
 .../src/services/project/typings.d.ts         |  10 +
 .../docker/mysql/init.d/scaleph-ws-mysql.sql  |  13 +-
 26 files changed, 802 insertions(+), 204 deletions(-)
 delete mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/resource/DorisTemplate.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/resource/template/DorisTemplate.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/resource/template/DorisTemplateConverter.java
 create mode 100644 scaleph-ui-react/src/models/project/workspace/doris/template/dorisTemplateSteps.ts
 create mode 100644 scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/YAMLStepForm.tsx

diff --git a/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/ws/WsDorisTemplateController.java b/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/ws/WsDorisTemplateController.java
index e5ab31f8f..da311ef06 100644
--- a/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/ws/WsDorisTemplateController.java
+++ b/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/ws/WsDorisTemplateController.java
@@ -24,6 +24,7 @@
 import cn.sliew.scaleph.engine.doris.service.param.WsDorisTemplateAddParam;
 import cn.sliew.scaleph.engine.doris.service.param.WsDorisTemplateListParam;
 import cn.sliew.scaleph.engine.doris.service.param.WsDorisTemplateUpdateParam;
+import cn.sliew.scaleph.engine.doris.service.resource.template.DorisTemplate;
 import cn.sliew.scaleph.system.model.ResponseVO;
 import cn.sliew.scaleph.system.snowflake.exception.UidGenerateException;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -61,6 +62,14 @@ public ResponseEntity<ResponseVO<WsDorisTemplateDTO>> selectOne(@PathVariable("i
         return new ResponseEntity(ResponseVO.success(dto), HttpStatus.OK);
     }
 
+    @Logging
+    @PostMapping("asYaml")
+    @Operation(summary = "转换模板信息", description = "转换模板信息")
+    public ResponseEntity<ResponseVO<DorisTemplate>> asYaml(@RequestBody WsDorisTemplateDTO dto) {
+        DorisTemplate template = wsDorisTemplateService.asYaml(dto);
+        return new ResponseEntity(ResponseVO.success(template), HttpStatus.OK);
+    }
+
     @Logging
     @PutMapping
     @Operation(summary = "新增模板", description = "新增模板")
diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsDorisTemplate.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsDorisTemplate.java
index cb7cd5464..b938b191a 100644
--- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsDorisTemplate.java
+++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsDorisTemplate.java
@@ -34,7 +34,6 @@ public class WsDorisTemplate extends BaseDO {
 
     private static final long serialVersionUID = 1L;
 
-    @Schema(description = "项目id")
     @TableField("project_id")
     private Long projectId;
 
@@ -47,23 +46,18 @@ public class WsDorisTemplate extends BaseDO {
     @TableField("namespace")
     private String namespace;
 
-    @Schema(description = "session handler")
     @TableField("`admin`")
     private String admin;
 
-    @Schema(description = "fe spec")
     @TableField("fe_spec")
     private String feSpec;
 
-    @Schema(description = "be spec")
     @TableField("be_spec")
     private String beSpec;
 
-    @Schema(description = "cn spec")
     @TableField("cn_spec")
     private String cnSpec;
 
-    @Schema(description = "broker spec")
     @TableField("broker_spec")
     private String brokerSpec;
 
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/AdminUser.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/AdminUser.java
index b705099ba..392209268 100644
--- a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/AdminUser.java
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/spec/AdminUser.java
@@ -24,7 +24,7 @@
  * AdminUser describe administrator for manage components in specified cluster.
  */
 @Data
-public class AdminUser extends BaseSpec {
+public class AdminUser {
 
     /**
      * the user name for admin service’s node.
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/WsDorisTemplateService.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/WsDorisTemplateService.java
index 77c037b71..9763db7a6 100644
--- a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/WsDorisTemplateService.java
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/WsDorisTemplateService.java
@@ -22,7 +22,7 @@
 import cn.sliew.scaleph.engine.doris.service.param.WsDorisTemplateAddParam;
 import cn.sliew.scaleph.engine.doris.service.param.WsDorisTemplateListParam;
 import cn.sliew.scaleph.engine.doris.service.param.WsDorisTemplateUpdateParam;
-import cn.sliew.scaleph.engine.doris.service.resource.DorisTemplate;
+import cn.sliew.scaleph.engine.doris.service.resource.template.DorisTemplate;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.List;
@@ -33,7 +33,7 @@ public interface WsDorisTemplateService {
 
     WsDorisTemplateDTO selectOne(Long id);
 
-    DorisTemplate asYaml(Long id);
+    DorisTemplate asYaml(WsDorisTemplateDTO dto);
 
     int insert(WsDorisTemplateAddParam param);
 
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/dto/WsDorisTemplateDTO.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/dto/WsDorisTemplateDTO.java
index efd0b365e..7d814b371 100644
--- a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/dto/WsDorisTemplateDTO.java
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/dto/WsDorisTemplateDTO.java
@@ -38,7 +38,7 @@ public class WsDorisTemplateDTO extends BaseDTO {
 
     private String namespace;
 
-    @Schema(description = "session handler")
+    @Schema(description = "admin user")
     private AdminUser admin;
 
     @Schema(description = "fe spec")
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/impl/WsDorisTemplateServiceImpl.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/impl/WsDorisTemplateServiceImpl.java
index ba1354516..42f09b70d 100644
--- a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/impl/WsDorisTemplateServiceImpl.java
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/impl/WsDorisTemplateServiceImpl.java
@@ -18,6 +18,7 @@
 
 package cn.sliew.scaleph.engine.doris.service.impl;
 
+import cn.sliew.milky.common.util.JacksonUtil;
 import cn.sliew.scaleph.common.util.UUIDUtil;
 import cn.sliew.scaleph.dao.entity.master.ws.WsDorisTemplate;
 import cn.sliew.scaleph.dao.mapper.master.ws.WsDorisTemplateMapper;
@@ -27,7 +28,8 @@
 import cn.sliew.scaleph.engine.doris.service.param.WsDorisTemplateAddParam;
 import cn.sliew.scaleph.engine.doris.service.param.WsDorisTemplateListParam;
 import cn.sliew.scaleph.engine.doris.service.param.WsDorisTemplateUpdateParam;
-import cn.sliew.scaleph.engine.doris.service.resource.DorisTemplate;
+import cn.sliew.scaleph.engine.doris.service.resource.template.DorisTemplate;
+import cn.sliew.scaleph.engine.doris.service.resource.template.DorisTemplateConverter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -68,8 +70,8 @@ public WsDorisTemplateDTO selectOne(Long id) {
     }
 
     @Override
-    public DorisTemplate asYaml(Long id) {
-        return null;
+    public DorisTemplate asYaml(WsDorisTemplateDTO dto) {
+        return DorisTemplateConverter.INSTANCE.convertTo(dto);
     }
 
     @Override
@@ -77,6 +79,21 @@ public int insert(WsDorisTemplateAddParam param) {
         WsDorisTemplate record = new WsDorisTemplate();
         BeanUtils.copyProperties(param, record);
         record.setTemplateId(UUIDUtil.randomUUId());
+        if (param.getAdmin() != null) {
+            record.setAdmin(JacksonUtil.toJsonString(param.getAdmin()));
+        }
+        if (param.getFeSpec() != null) {
+            record.setFeSpec(JacksonUtil.toJsonString(param.getFeSpec()));
+        }
+        if (param.getBeSpec() != null) {
+            record.setBeSpec(JacksonUtil.toJsonString(param.getBeSpec()));
+        }
+        if (param.getCnSpec() != null) {
+            record.setCnSpec(JacksonUtil.toJsonString(param.getCnSpec()));
+        }
+        if (param.getBrokerSpec() != null) {
+            record.setBrokerSpec(JacksonUtil.toJsonString(param.getBrokerSpec()));
+        }
         return wsDorisTemplateMapper.insert(record);
     }
 
@@ -84,6 +101,21 @@ public int insert(WsDorisTemplateAddParam param) {
     public int update(WsDorisTemplateUpdateParam param) {
         WsDorisTemplate record = new WsDorisTemplate();
         BeanUtils.copyProperties(param, record);
+        if (param.getAdmin() != null) {
+            record.setAdmin(JacksonUtil.toJsonString(param.getAdmin()));
+        }
+        if (param.getFeSpec() != null) {
+            record.setFeSpec(JacksonUtil.toJsonString(param.getFeSpec()));
+        }
+        if (param.getBeSpec() != null) {
+            record.setBeSpec(JacksonUtil.toJsonString(param.getBeSpec()));
+        }
+        if (param.getCnSpec() != null) {
+            record.setCnSpec(JacksonUtil.toJsonString(param.getCnSpec()));
+        }
+        if (param.getBrokerSpec() != null) {
+            record.setBrokerSpec(JacksonUtil.toJsonString(param.getBrokerSpec()));
+        }
         return wsDorisTemplateMapper.updateById(record);
     }
 
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisTemplateAddParam.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisTemplateAddParam.java
index 35d170583..7319f29b1 100644
--- a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisTemplateAddParam.java
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisTemplateAddParam.java
@@ -18,6 +18,7 @@
 
 package cn.sliew.scaleph.engine.doris.service.param;
 
+import cn.sliew.scaleph.engine.doris.operator.spec.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -39,6 +40,23 @@ public class WsDorisTemplateAddParam {
     @Schema(description = "namespace")
     private String namespace;
 
+    @NotNull
+    @Schema(description = "admin user")
+    private AdminUser admin;
+
+    @NotNull
+    @Schema(description = "fe spec")
+    private FeSpec feSpec;
+
+    @Schema(description = "be spec")
+    private BeSpec beSpec;
+
+    @Schema(description = "cn spec")
+    private CnSpec cnSpec;
+
+    @Schema(description = "broker spec")
+    private BrokerSpec brokerSpec;
+
     @Schema(description = "remark")
     private String remark;
 }
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisTemplateUpdateParam.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisTemplateUpdateParam.java
index e8c2b657b..72ec12ee6 100644
--- a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisTemplateUpdateParam.java
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisTemplateUpdateParam.java
@@ -18,6 +18,7 @@
 
 package cn.sliew.scaleph.engine.doris.service.param;
 
+import cn.sliew.scaleph.engine.doris.operator.spec.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -39,6 +40,23 @@ public class WsDorisTemplateUpdateParam {
     @Schema(description = "namespace")
     private String namespace;
 
+    @NotNull
+    @Schema(description = "admin user")
+    private AdminUser admin;
+
+    @NotNull
+    @Schema(description = "fe spec")
+    private FeSpec feSpec;
+
+    @Schema(description = "be spec")
+    private BeSpec beSpec;
+
+    @Schema(description = "cn spec")
+    private CnSpec cnSpec;
+
+    @Schema(description = "broker spec")
+    private BrokerSpec brokerSpec;
+
     @Schema(description = "remark")
     private String remark;
 }
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/resource/DorisTemplate.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/resource/DorisTemplate.java
deleted file mode 100644
index 91d944a36..000000000
--- a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/resource/DorisTemplate.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.sliew.scaleph.engine.doris.service.resource;
-
-import cn.sliew.scaleph.engine.doris.operator.spec.DorisClusterSpec;
-import cn.sliew.scaleph.engine.doris.operator.status.DorisClusterStatus;
-import cn.sliew.scaleph.kubernetes.Constant;
-import cn.sliew.scaleph.kubernetes.resource.Resource;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import io.fabric8.kubernetes.client.CustomResource;
-import io.fabric8.kubernetes.model.annotation.Group;
-import io.fabric8.kubernetes.model.annotation.Version;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@Data
-@Group(Constant.SCALEPH_GROUP)
-@Version(Constant.SCALEPH_VERSION)
-@EqualsAndHashCode
-@JsonPropertyOrder({"apiVersion", "kind", "metadata", "spec", "status"})
-public class DorisTemplate extends CustomResource<DorisClusterSpec, DorisClusterStatus> implements Resource {
-}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/resource/template/DorisTemplate.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/resource/template/DorisTemplate.java
new file mode 100644
index 000000000..27f2b4eb9
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/resource/template/DorisTemplate.java
@@ -0,0 +1,38 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.service.resource.template;
+
+import cn.sliew.scaleph.engine.doris.operator.spec.DorisClusterSpec;
+import cn.sliew.scaleph.engine.doris.operator.status.DorisClusterStatus;
+import cn.sliew.scaleph.kubernetes.Constant;
+import cn.sliew.scaleph.kubernetes.resource.Resource;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import io.fabric8.kubernetes.client.CustomResource;
+import io.fabric8.kubernetes.model.annotation.Group;
+import io.fabric8.kubernetes.model.annotation.Version;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@Group(Constant.SCALEPH_GROUP)
+@Version(Constant.SCALEPH_VERSION)
+@EqualsAndHashCode
+@JsonPropertyOrder({"apiVersion", "kind", "metadata", "spec", "status"})
+public class DorisTemplate extends CustomResource<DorisClusterSpec, DorisClusterStatus> implements Resource {
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/resource/template/DorisTemplateConverter.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/resource/template/DorisTemplateConverter.java
new file mode 100644
index 000000000..f567d92d4
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/resource/template/DorisTemplateConverter.java
@@ -0,0 +1,72 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.service.resource.template;
+
+import cn.sliew.scaleph.config.resource.ResourceLabels;
+import cn.sliew.scaleph.engine.doris.operator.spec.DorisClusterSpec;
+import cn.sliew.scaleph.engine.doris.service.dto.WsDorisTemplateDTO;
+import cn.sliew.scaleph.kubernetes.resource.ResourceConverter;
+import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
+import org.springframework.util.StringUtils;
+
+import java.util.Map;
+
+public enum DorisTemplateConverter implements ResourceConverter<WsDorisTemplateDTO, DorisTemplate> {
+    INSTANCE;
+
+    @Override
+    public DorisTemplate convertTo(WsDorisTemplateDTO source) {
+        DorisTemplate template = new DorisTemplate();
+        ObjectMetaBuilder builder = new ObjectMetaBuilder(true);
+        String name = StringUtils.hasText(source.getTemplateId()) ? source.getTemplateId() : source.getName();
+        builder.withName(name);
+        builder.withNamespace(source.getNamespace());
+        builder.withLabels(Map.of(ResourceLabels.SCALEPH_LABEL_NAME, source.getName()));
+        template.setMetadata(builder.build());
+        DorisClusterSpec spec = new DorisClusterSpec();
+        spec.setFeSpec(source.getFeSpec());
+        spec.setBeSpec(source.getBeSpec());
+        spec.setCnSpec(source.getCnSpec());
+        spec.setBrokerSpec(source.getBrokerSpec());
+        spec.setAdminUser(source.getAdmin());
+        template.setSpec(spec);
+        return template;
+    }
+
+    @Override
+    public WsDorisTemplateDTO convertFrom(DorisTemplate target) {
+        WsDorisTemplateDTO dto = new WsDorisTemplateDTO();
+        String name = target.getMetadata().getName();
+        if (target.getMetadata().getLabels() != null) {
+            Map<String, String> labels = target.getMetadata().getLabels();
+            name = labels.computeIfAbsent(ResourceLabels.SCALEPH_LABEL_NAME, key -> target.getMetadata().getName());
+        }
+        dto.setName(name);
+        dto.setTemplateId(target.getMetadata().getName());
+        dto.setNamespace(target.getMetadata().getNamespace());
+
+        DorisClusterSpec spec = target.getSpec();
+        dto.setFeSpec(spec.getFeSpec());
+        dto.setBeSpec(spec.getBeSpec());
+        dto.setCnSpec(spec.getCnSpec());
+        dto.setBrokerSpec(spec.getBrokerSpec());
+        dto.setAdmin(spec.getAdminUser());
+        return dto;
+    }
+}
diff --git a/scaleph-kubernetes/src/main/java/cn/sliew/scaleph/kubernetes/resource/ResourceConverter.java b/scaleph-kubernetes/src/main/java/cn/sliew/scaleph/kubernetes/resource/ResourceConverter.java
index 3fc5e987b..aab3162e3 100644
--- a/scaleph-kubernetes/src/main/java/cn/sliew/scaleph/kubernetes/resource/ResourceConverter.java
+++ b/scaleph-kubernetes/src/main/java/cn/sliew/scaleph/kubernetes/resource/ResourceConverter.java
@@ -20,7 +20,7 @@
 
 public interface ResourceConverter<S, T> {
 
-    T convertTo(S source) throws Exception;
+    T convertTo(S source);
 
     S convertFrom(T target);
 }
diff --git a/scaleph-ui-react/src/locales/zh-CN/pages/project.ts b/scaleph-ui-react/src/locales/zh-CN/pages/project.ts
index df5e4fb98..cff721b09 100644
--- a/scaleph-ui-react/src/locales/zh-CN/pages/project.ts
+++ b/scaleph-ui-react/src/locales/zh-CN/pages/project.ts
@@ -939,6 +939,10 @@ export default {
   'pages.project.doris.template.steps.component.base.requests.memory': '内存',
   'pages.project.doris.template.steps.component.base.limits.cpu': '最大CPU',
   'pages.project.doris.template.steps.component.base.limits.memory': '最大内存',
+  'pages.project.doris.template.steps.yaml': 'YAML',
+  'pages.project.doris.template.detail': '模版详情',
+  'pages.project.doris.template.detail.component': '集群组件',
+  'pages.project.doris.template.detail.yaml': 'YAML',
 
 
   'Run': '运行',
diff --git a/scaleph-ui-react/src/models/project/workspace/doris/template/dorisTemplateSteps.ts b/scaleph-ui-react/src/models/project/workspace/doris/template/dorisTemplateSteps.ts
new file mode 100644
index 000000000..57cec9362
--- /dev/null
+++ b/scaleph-ui-react/src/models/project/workspace/doris/template/dorisTemplateSteps.ts
@@ -0,0 +1,61 @@
+import {WsDorisTemplate} from "@/services/project/typings";
+import {Effect, Reducer} from "umi";
+import YAML from "yaml";
+import {WsDorisTemplateService} from "@/services/project/WsDorisTemplateService";
+
+export interface StateType {
+  template: WsDorisTemplate,
+  templateYaml: string
+  templateYamlWithDefault: string
+}
+
+export interface ModelType {
+  namespace: string;
+
+  state: StateType;
+
+  effects: {
+    queryTemplate: Effect;
+  };
+
+  reducers: {
+    updateTemplate: Reducer<StateType>;
+  };
+}
+
+const model: ModelType = {
+  namespace: "dorisTemplateSteps",
+
+  state: {
+    template: null,
+    templateYaml: null,
+    templateYamlWithDefault: null
+  },
+
+  effects: {
+    * editTemplate({payload}, {call, put}) {
+      const {data} = yield call(WsDorisTemplateService.asYaml, payload);
+      const response = yield call(WsDorisTemplateService.asYaml, payload);
+      yield put({type: 'updateTemplate',
+        payload: {
+          template: payload,
+          templateYaml: YAML.stringify(data),
+          templateYamlWithDefault: YAML.stringify(response.data)
+        }
+      });
+    },
+  },
+
+  reducers: {
+    updateTemplate(state, {payload}) {
+      return {
+        ...state,
+        template: payload.template,
+        templateYaml: payload.templateYaml,
+        templateYamlWithDefault: payload.templateYamlWithDefault,
+      };
+    },
+  },
+};
+
+export default model;
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Detail/index.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Detail/index.tsx
index 95c79b982..69e29cbda 100644
--- a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Detail/index.tsx
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Detail/index.tsx
@@ -1,13 +1,182 @@
 import {useIntl, useLocation} from "umi";
-import React from "react";
-import {WsFlinkKubernetesTemplate} from "@/services/project/typings";
+import React, {useEffect, useRef, useState} from "react";
+import {WsDorisTemplate} from "@/services/project/typings";
+import {PageContainer, ProCard, StatisticCard} from "@ant-design/pro-components";
+import {Divider, Space, Statistic} from "antd";
+import RcResizeObserver from 'rc-resize-observer';
+import Editor, {Monaco, useMonaco} from "@monaco-editor/react";
+import {WsDorisTemplateService} from "@/services/project/WsDorisTemplateService";
+import YAML from "yaml";
 
 const DorisTemplateDetailWeb: React.FC = () => {
   const intl = useIntl();
-  const data = useLocation().state as WsFlinkKubernetesTemplate
+  const data = useLocation().state as WsDorisTemplate
+  const editorRef = useRef(null);
+  const monaco = useMonaco();
+
+  const [yaml, setYaml] = useState<string>(null);
+  const [responsive, setResponsive] = useState(false);
+
+  useEffect(() => {
+    monaco?.languages.typescript.javascriptDefaults.setEagerModelSync(true);
+  }, [monaco]);
+
+  const handleEditorDidMount = (editor, monaco: Monaco) => {
+    editorRef.current = editor;
+  }
+
+  useEffect(() => {
+    WsDorisTemplateService.asYaml(data).then((response) => {
+      if (response.success) {
+        setYaml(YAML.stringify(response.data))
+      }
+    });
+  }, []);
 
   return (
-    <div>DorisTemplateDetailWeb</div>
+    <PageContainer title={intl.formatMessage({id: 'pages.project.doris.template.detail'})}>
+      <RcResizeObserver
+        key="resize-observer"
+        onResize={(offset) => {
+          setResponsive(offset.width < 596);
+        }}
+      >
+        <ProCard.Group title={intl.formatMessage({id: 'pages.project.doris.template.detail.component'})}
+                       direction={responsive ? 'column' : 'row'}>
+          <ProCard bordered hoverable>
+            <StatisticCard title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.fe'})}
+                           statistic={{
+                             value: data.feSpec?.replicas,
+                             prefix: intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.replicas'}) + ' x',
+                             description: (
+                               <Space>
+                                 <Statistic
+                                   title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.cpu'})}
+                                   value={data.feSpec?.requests?.cpu}/>
+                                 <Statistic
+                                   title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.memory'})}
+                                   value={data.feSpec?.requests?.memory}/>
+                                 <Statistic
+                                   title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.cpu'})}
+                                   value={data.feSpec?.limits?.cpu}/>
+                                 <Statistic
+                                   title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.memory'})}
+                                   value={data.feSpec?.limits?.memory}/>
+                               </Space>
+                             ),
+                           }}
+                           footer={
+                             <div>{intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.image'}) + ": " + data.feSpec?.image ? data.feSpec?.image : '-'}</div>
+                           }
+            />
+          </ProCard>
+          <Divider type={responsive ? 'horizontal' : 'vertical'}/>
+          <ProCard bordered hoverable>
+            <StatisticCard title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.be'})}
+                           statistic={{
+                             value: data.beSpec?.replicas,
+                             prefix: intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.replicas'}) + ' x',
+                             description: (
+                               <Space>
+                                 <Statistic
+                                   title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.cpu'})}
+                                   value={data.beSpec?.requests?.cpu}/>
+                                 <Statistic
+                                   title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.memory'})}
+                                   value={data.beSpec?.requests?.memory}/>
+                                 <Statistic
+                                   title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.cpu'})}
+                                   value={data.beSpec?.limits?.cpu}/>
+                                 <Statistic
+                                   title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.memory'})}
+                                   value={data.beSpec?.limits?.memory}/>
+                               </Space>
+                             ),
+                           }}
+                           footer={
+                             <div>{intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.image'}) + ": " + data.beSpec?.image ? data.beSpec?.image : '-'}</div>
+                           }
+            />
+          </ProCard>
+          <Divider type={responsive ? 'horizontal' : 'vertical'}/>
+          <ProCard bordered hoverable>
+            <StatisticCard title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.cn'})}
+                           statistic={{
+                             value: data.cnSpec?.replicas,
+                             prefix: intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.replicas'}) + ' x',
+                             description: (
+                               <Space>
+                                 <Statistic
+                                   title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.cpu'})}
+                                   value={data.cnSpec?.requests?.cpu}/>
+                                 <Statistic
+                                   title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.memory'})}
+                                   value={data.cnSpec?.requests?.memory}/>
+                                 <Statistic
+                                   title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.cpu'})}
+                                   value={data.cnSpec?.limits?.cpu}/>
+                                 <Statistic
+                                   title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.memory'})}
+                                   value={data.cnSpec?.limits?.memory}/>
+                               </Space>
+                             ),
+                           }}
+                           footer={
+                             <div>{intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.image'}) + ": " + data.cnSpec?.image ? data.cnSpec?.image : '-'}</div>
+                           }
+            />
+          </ProCard>
+          <Divider type={responsive ? 'horizontal' : 'vertical'}/>
+          <ProCard bordered hoverable>
+            <StatisticCard title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.broker'})}
+                           statistic={{
+                             value: data.brokerSpec?.replicas,
+                             prefix: intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.replicas'}) + ' x',
+                             description: (
+                               <Space>
+                                 <Statistic
+                                   title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.cpu'})}
+                                   value={data.brokerSpec?.requests?.cpu}/>
+                                 <Statistic
+                                   title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.memory'})}
+                                   value={data.brokerSpec?.requests?.memory}/>
+                                 <Statistic
+                                   title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.cpu'})}
+                                   value={data.brokerSpec?.limits?.cpu}/>
+                                 <Statistic
+                                   title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.memory'})}
+                                   value={data.brokerSpec?.limits?.memory}/>
+                               </Space>
+                             ),
+                           }}
+                           footer={
+                             <div>{intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.image'}) + ": " + data.brokerSpec?.image ? data.brokerSpec?.image : '-'}</div>
+                           }
+            />
+          </ProCard>
+        </ProCard.Group>
+        <Divider type={'horizontal'}/>
+        <ProCard.Group title="YAML" direction={responsive ? 'column' : 'row'}>
+          <ProCard bordered>
+            <Editor
+              width="730"
+              height="600px"
+              language="yaml"
+              theme="vs-white"
+              value={yaml}
+              options={{
+                selectOnLineNumbers: true,
+                readOnly: true,
+                minimap: {
+                  enabled: false
+                }
+              }}
+              onMount={handleEditorDidMount}
+            />
+          </ProCard>
+        </ProCard.Group>
+      </RcResizeObserver>
+    </PageContainer>
   );
 }
 
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/Component/DorisAdminUser.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/Component/DorisAdminUser.tsx
index 0364d81ec..8143ce489 100644
--- a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/Component/DorisAdminUser.tsx
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/Component/DorisAdminUser.tsx
@@ -1,5 +1,5 @@
 import {useIntl} from "umi";
-import {ProCard, ProFormDigit, ProFormGroup, ProFormList, ProFormText} from "@ant-design/pro-components";
+import {ProCard, ProFormGroup, ProFormText} from "@ant-design/pro-components";
 
 const DorisAdminUser: React.FC = () => {
   const intl = useIntl();
@@ -8,20 +8,22 @@ const DorisAdminUser: React.FC = () => {
     title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.admin'})}
     headerBordered
     collapsible={true}>
-    <ProFormText
-      name="admin.name"
-      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.admin.name'})}
-      colProps={{span: 10, offset: 1}}
-      rules={[{required: true}]}
-      initialValue={"admin"}
-    />
-    <ProFormText
-      name="admin.password"
-      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.admin.password'})}
-      colProps={{span: 10, offset: 1}}
-      rules={[{required: true}]}
-      initialValue={"Admin123"}
-    />
+    <ProFormGroup>
+      <ProFormText
+        name="admin.name"
+        label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.admin.name'})}
+        colProps={{span: 10, offset: 1}}
+        rules={[{required: true}]}
+        initialValue={"admin"}
+      />
+      <ProFormText
+        name="admin.password"
+        label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.admin.password'})}
+        colProps={{span: 10, offset: 1}}
+        rules={[{required: true}]}
+        initialValue={"Admin123"}
+      />
+    </ProFormGroup>
   </ProCard>);
 }
 
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/Component/DorisBeComponent.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/Component/DorisBeComponent.tsx
index 51549db54..5c3f470e6 100644
--- a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/Component/DorisBeComponent.tsx
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/Component/DorisBeComponent.tsx
@@ -9,51 +9,53 @@ const DorisFeComponent: React.FC = () => {
     headerBordered
     collapsible={true}
     defaultCollapsed>
-    <ProFormDigit
-      name="be.replicas"
-      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.replicas'})}
-      colProps={{span: 10, offset: 1}}
-      initialValue={3}
-      fieldProps={{
-        min: 1
-      }}
-    />
-    <ProFormText
-      name="be.image"
-      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.image'})}
-      colProps={{span: 10, offset: 1}}
-      initialValue={"selectdb/doris.be-ubuntu:2.0.2"}
-    />
-    <ProFormDigit
-      name="be.requests.cpu"
-      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.cpu'})}
-      colProps={{span: 10, offset: 1}}
-      initialValue={8}
-      fieldProps={{
-        min: 1
-      }}
-    />
-    <ProFormText
-      name="be.requests.memory"
-      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.memory'})}
-      colProps={{span: 10, offset: 1}}
-      initialValue={"16Gi"}
-    />
-    <ProFormDigit
-      name="be.limits.cpu"
-      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.cpu'})}
-      colProps={{span: 10, offset: 1}}
-      initialValue={16}
-      fieldProps={{
-        min: 1
-      }}
-    />
-    <ProFormText
-      name="be.limits.memory"
-      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.memory'})}
-      colProps={{span: 10, offset: 1}}
-      initialValue={"32Gi"}
-    />
+    <ProFormGroup>
+      <ProFormDigit
+        name="be.replicas"
+        label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.replicas'})}
+        colProps={{span: 10, offset: 1}}
+        initialValue={3}
+        fieldProps={{
+          min: 1
+        }}
+      />
+      <ProFormText
+        name="be.image"
+        label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.image'})}
+        colProps={{span: 10, offset: 1}}
+        initialValue={"selectdb/doris.be-ubuntu:2.0.2"}
+      />
+      <ProFormDigit
+        name="be.requests.cpu"
+        label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.cpu'})}
+        colProps={{span: 10, offset: 1}}
+        initialValue={8}
+        fieldProps={{
+          min: 1
+        }}
+      />
+      <ProFormText
+        name="be.requests.memory"
+        label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.memory'})}
+        colProps={{span: 10, offset: 1}}
+        initialValue={"16Gi"}
+      />
+      <ProFormDigit
+        name="be.limits.cpu"
+        label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.cpu'})}
+        colProps={{span: 10, offset: 1}}
+        initialValue={16}
+        fieldProps={{
+          min: 1
+        }}
+      />
+      <ProFormText
+        name="be.limits.memory"
+        label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.memory'})}
+        colProps={{span: 10, offset: 1}}
+        initialValue={"32Gi"}
+      />
+    </ProFormGroup>
   </ProCard>);
 }
 
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/Component/DorisCnComponent.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/Component/DorisCnComponent.tsx
index 9305937f9..c9fff33c9 100644
--- a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/Component/DorisCnComponent.tsx
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/Component/DorisCnComponent.tsx
@@ -1,5 +1,5 @@
 import {useIntl} from "umi";
-import {ProCard, ProFormDigit, ProFormText} from "@ant-design/pro-components";
+import {ProCard, ProFormDigit, ProFormGroup, ProFormText} from "@ant-design/pro-components";
 
 const DorisFeComponent: React.FC = () => {
   const intl = useIntl();
@@ -9,51 +9,53 @@ const DorisFeComponent: React.FC = () => {
     headerBordered
     collapsible={true}
     defaultCollapsed>
-    <ProFormDigit
-      name="cn.replicas"
-      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.replicas'})}
-      colProps={{span: 10, offset: 1}}
-      initialValue={3}
-      fieldProps={{
-        min: 1
-      }}
-    />
-    <ProFormText
-      name="cn.image"
-      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.image'})}
-      colProps={{span: 10, offset: 1}}
-      initialValue={"selectdb/doris.be-ubuntu:2.0.2"}
-    />
-    <ProFormDigit
-      name="cn.requests.cpu"
-      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.cpu'})}
-      colProps={{span: 10, offset: 1}}
-      initialValue={8}
-      fieldProps={{
-        min: 1
-      }}
-    />
-    <ProFormText
-      name="cn.requests.memory"
-      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.memory'})}
-      colProps={{span: 10, offset: 1}}
-      initialValue={"16Gi"}
-    />
-    <ProFormDigit
-      name="cn.limits.cpu"
-      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.cpu'})}
-      colProps={{span: 10, offset: 1}}
-      initialValue={16}
-      fieldProps={{
-        min: 1
-      }}
-    />
-    <ProFormText
-      name="cn.limits.memory"
-      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.memory'})}
-      colProps={{span: 10, offset: 1}}
-      initialValue={"32Gi"}
-    />
+    <ProFormGroup>
+      <ProFormDigit
+        name="cn.replicas"
+        label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.replicas'})}
+        colProps={{span: 10, offset: 1}}
+        initialValue={3}
+        fieldProps={{
+          min: 1
+        }}
+      />
+      <ProFormText
+        name="cn.image"
+        label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.image'})}
+        colProps={{span: 10, offset: 1}}
+        initialValue={"selectdb/doris.be-ubuntu:2.0.2"}
+      />
+      <ProFormDigit
+        name="cn.requests.cpu"
+        label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.cpu'})}
+        colProps={{span: 10, offset: 1}}
+        initialValue={8}
+        fieldProps={{
+          min: 1
+        }}
+      />
+      <ProFormText
+        name="cn.requests.memory"
+        label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.memory'})}
+        colProps={{span: 10, offset: 1}}
+        initialValue={"16Gi"}
+      />
+      <ProFormDigit
+        name="cn.limits.cpu"
+        label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.cpu'})}
+        colProps={{span: 10, offset: 1}}
+        initialValue={16}
+        fieldProps={{
+          min: 1
+        }}
+      />
+      <ProFormText
+        name="cn.limits.memory"
+        label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.memory'})}
+        colProps={{span: 10, offset: 1}}
+        initialValue={"32Gi"}
+      />
+    </ProFormGroup>
   </ProCard>);
 }
 
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/Component/DorisFeComponent.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/Component/DorisFeComponent.tsx
index d57bd9a8c..45c3908a2 100644
--- a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/Component/DorisFeComponent.tsx
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/Component/DorisFeComponent.tsx
@@ -9,51 +9,53 @@ const DorisFeComponent: React.FC = () => {
     headerBordered
     collapsible={true}
     defaultCollapsed>
-    <ProFormDigit
-      name="fe.replicas"
-      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.replicas'})}
-      colProps={{span: 10, offset: 1}}
-      initialValue={3}
-      fieldProps={{
-        min: 1
-      }}
-    />
-    <ProFormText
-      name="fe.image"
-      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.image'})}
-      colProps={{span: 10, offset: 1}}
-      initialValue={"selectdb/doris.fe-ubuntu:2.0.2"}
-    />
-    <ProFormDigit
-      name="fe.requests.cpu"
-      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.cpu'})}
-      colProps={{span: 10, offset: 1}}
-      initialValue={8}
-      fieldProps={{
-        min: 1
-      }}
-    />
-    <ProFormText
-      name="fe.requests.memory"
-      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.memory'})}
-      colProps={{span: 10, offset: 1}}
-      initialValue={"16Gi"}
-    />
-    <ProFormDigit
-      name="fe.limits.cpu"
-      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.cpu'})}
-      colProps={{span: 10, offset: 1}}
-      initialValue={16}
-      fieldProps={{
-        min: 1
-      }}
-    />
-    <ProFormText
-      name="fe.limits.memory"
-      label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.memory'})}
-      colProps={{span: 10, offset: 1}}
-      initialValue={"32Gi"}
-    />
+    <ProFormGroup>
+      <ProFormDigit
+        name="fe.replicas"
+        label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.replicas'})}
+        colProps={{span: 10, offset: 1}}
+        initialValue={3}
+        fieldProps={{
+          min: 1
+        }}
+      />
+      <ProFormText
+        name="fe.image"
+        label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.image'})}
+        colProps={{span: 10, offset: 1}}
+        initialValue={"selectdb/doris.fe-ubuntu:2.0.2"}
+      />
+      <ProFormDigit
+        name="fe.requests.cpu"
+        label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.cpu'})}
+        colProps={{span: 10, offset: 1}}
+        initialValue={8}
+        fieldProps={{
+          min: 1
+        }}
+      />
+      <ProFormText
+        name="fe.requests.memory"
+        label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.memory'})}
+        colProps={{span: 10, offset: 1}}
+        initialValue={"16Gi"}
+      />
+      <ProFormDigit
+        name="fe.limits.cpu"
+        label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.cpu'})}
+        colProps={{span: 10, offset: 1}}
+        initialValue={16}
+        fieldProps={{
+          min: 1
+        }}
+      />
+      <ProFormText
+        name="fe.limits.memory"
+        label={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.memory'})}
+        colProps={{span: 10, offset: 1}}
+        initialValue={"32Gi"}
+      />
+    </ProFormGroup>
   </ProCard>);
 }
 
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/ComponentStepForm.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/ComponentStepForm.tsx
index e35ccb672..6a144ec82 100644
--- a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/ComponentStepForm.tsx
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/ComponentStepForm.tsx
@@ -1,5 +1,4 @@
 import React from "react";
-import {Form} from "antd";
 import {ProCard} from "@ant-design/pro-components";
 import DorisFeComponent from "@/pages/Project/Workspace/Doris/Template/Steps/Component/DorisFeComponent";
 import DorisAdminUser from "@/pages/Project/Workspace/Doris/Template/Steps/Component/DorisAdminUser";
@@ -7,8 +6,6 @@ import DorisBeComponent from "@/pages/Project/Workspace/Doris/Template/Steps/Com
 import DorisCnComponent from "@/pages/Project/Workspace/Doris/Template/Steps/Component/DorisCnComponent";
 
 const DorisTemplateComponent: React.FC = () => {
-  const [form] = Form.useForm()
-
   return (
     <ProCard>
       <DorisAdminUser/>
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/YAMLStepForm.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/YAMLStepForm.tsx
new file mode 100644
index 000000000..c02566c83
--- /dev/null
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/YAMLStepForm.tsx
@@ -0,0 +1,41 @@
+import React, {useEffect, useRef} from "react";
+import {ProCard} from "@ant-design/pro-components";
+import Editor, {Monaco, useMonaco} from "@monaco-editor/react";
+import {connect} from "umi";
+
+const DorisTemplateYAML: React.FC = (props: any) => {
+  const editorRef = useRef(null);
+  const monaco = useMonaco();
+
+  useEffect(() => {
+    monaco?.languages.typescript.javascriptDefaults.setEagerModelSync(true);
+  }, [monaco]);
+
+  const handleEditorDidMount = (editor, monaco: Monaco) => {
+    editorRef.current = editor;
+  }
+
+  return (
+    <ProCard>
+      <Editor
+        width="730"
+        height="600px"
+        language="yaml"
+        theme="vs-white"
+        value={props.dorisTemplateSteps.templateYaml}
+        options={{
+          selectOnLineNumbers: true,
+          readOnly: true,
+          minimap: {
+            enabled: false
+          }
+        }}
+        onMount={handleEditorDidMount}
+      />
+    </ProCard>
+
+  );
+}
+
+const mapModelToProps = ({dorisTemplateSteps}: any) => ({dorisTemplateSteps})
+export default connect(mapModelToProps)(DorisTemplateYAML);
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/index.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/index.tsx
index 4f89b9931..ae7d35242 100644
--- a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/index.tsx
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/index.tsx
@@ -1,15 +1,53 @@
-import {useIntl} from "umi";
+import {connect, history, useIntl} from "umi";
 import React, {useRef} from "react";
 import {ProCard, ProFormInstance, StepsForm} from "@ant-design/pro-components";
 import {WORKSPACE_CONF} from "@/constant";
 import DorisTemplateComponent from "@/pages/Project/Workspace/Doris/Template/Steps/ComponentStepForm";
 import DorisTemplateBase from "@/pages/Project/Workspace/Doris/Template/Steps/BaseStepForm";
+import DorisTemplateYAML from "@/pages/Project/Workspace/Doris/Template/Steps/YAMLStepForm";
+import {WsDorisTemplate} from "@/services/project/typings";
+import {WsDorisTemplateService} from "@/services/project/WsDorisTemplateService";
 
-const DorisTemplateSteps: React.FC = () => {
+const DorisTemplateSteps: React.FC = (props: any) => {
   const intl = useIntl();
   const formRef = useRef<ProFormInstance>();
   const projectId = localStorage.getItem(WORKSPACE_CONF.projectId);
 
+  const onBaseStepFinish = (values: Record<string, any>) => {
+    const template: WsDorisTemplate = {
+      projectId: projectId,
+      name: values.name,
+      namespace: values.namespace,
+      remark: values.remark,
+    }
+    editDorisTemplate(template)
+    return Promise.resolve(true)
+  }
+
+  const onComponentStepFinish = (values: Record<string, any>) => {
+    try {
+      const template: WsDorisTemplate = WsDorisTemplateService.formatData(props.dorisTemplateSteps.template, values)
+      editDorisTemplate(template)
+    } catch (unused) {
+    }
+    return Promise.resolve(true)
+  }
+
+  const editDorisTemplate = (template: WsDorisTemplate) => {
+    props.dispatch({
+      type: 'dorisTemplateSteps/editTemplate',
+      payload: template
+    })
+  }
+
+  const onAllFinish = (values: Record<string, any>) => {
+    return WsDorisTemplateService.add(props.dorisTemplateSteps.template).then((response) => {
+      if (response.success) {
+        history.back()
+      }
+    })
+  }
+
   return (
     <ProCard className={'step-form-submitter'}>
       <StepsForm
@@ -18,22 +56,32 @@ const DorisTemplateSteps: React.FC = () => {
           grid: true,
           rowProps: {gutter: [16, 8]}
         }}
+        onFinish={onAllFinish}
       >
         <StepsForm.StepForm
           name="base"
           title={intl.formatMessage({id: 'pages.project.doris.template.steps.base'})}
-          style={{width: 1000}}>
+          style={{width: 1000}}
+          onFinish={onBaseStepFinish}>
           <DorisTemplateBase/>
         </StepsForm.StepForm>
         <StepsForm.StepForm
           name="component"
           title={intl.formatMessage({id: 'pages.project.doris.template.steps.component'})}
-          style={{width: 1000}}>
+          style={{width: 1000}}
+          onFinish={onComponentStepFinish}>
           <DorisTemplateComponent/>
         </StepsForm.StepForm>
+        <StepsForm.StepForm
+          name="yaml"
+          title={intl.formatMessage({id: 'pages.project.doris.template.steps.yaml'})}
+          style={{width: 1000}}>
+          <DorisTemplateYAML/>
+        </StepsForm.StepForm>
       </StepsForm>
     </ProCard>
   )
 }
 
-export default DorisTemplateSteps;
+const mapModelToProps = ({dorisTemplateSteps}: any) => ({dorisTemplateSteps})
+export default connect(mapModelToProps)(DorisTemplateSteps);
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/index.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/index.tsx
index a0e092727..f8f13bafd 100644
--- a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/index.tsx
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/index.tsx
@@ -1,6 +1,6 @@
 import {history, useAccess, useIntl} from "umi";
 import React, {useRef, useState} from "react";
-import {Button, message, Modal, Space, Tooltip} from "antd";
+import {Button, message, Modal, Space, Tag, Tooltip} from "antd";
 import {DeleteOutlined, EditOutlined, NodeIndexOutlined} from "@ant-design/icons";
 import {ActionType, ProColumns, ProFormInstance, ProTable} from "@ant-design/pro-components";
 import {PRIVILEGE_CODE, WORKSPACE_CONF} from "@/constant";
diff --git a/scaleph-ui-react/src/services/project/WsDorisTemplateService.ts b/scaleph-ui-react/src/services/project/WsDorisTemplateService.ts
index 36fa1ffbc..0cc1761bd 100644
--- a/scaleph-ui-react/src/services/project/WsDorisTemplateService.ts
+++ b/scaleph-ui-react/src/services/project/WsDorisTemplateService.ts
@@ -20,6 +20,13 @@ export const WsDorisTemplateService = {
     });
   },
 
+  asYaml: async (param: WsDorisTemplate) => {
+    return request<ResponseBody<any>>(`${WsDorisTemplateService.url}/asYaml`, {
+      method: 'POST',
+      data: param,
+    });
+  },
+
   add: async (param: WsDorisTemplateAddParam) => {
     return request<ResponseBody<any>>(`${WsDorisTemplateService.url}`, {
       method: 'PUT',
@@ -47,4 +54,95 @@ export const WsDorisTemplateService = {
       data: params,
     });
   },
+
+  formatData: (data: WsDorisTemplate, value: Record<string, any>) => {
+    const admin: Record<string, any> = {
+      name: value['admin.name'],
+      password: value['admin.password'],
+    }
+    data.admin = admin
+
+    const feSpec: Record<string, any> = {
+      replicas: value['fe.replicas'],
+      image: value['fe.image']
+    }
+    const feSpecRequests: Record<string, any> = {
+      cpu: value['fe.requests.cpu'],
+      memory: value['fe.requests.memory']
+    }
+    const feSpecLimits: Record<string, any> = {
+      cpu: value['fe.limits.cpu'],
+      memory: value['fe.limits.memory']
+    }
+    feSpec.requests = feSpecRequests
+    feSpec.limits = feSpecLimits
+    data.feSpec = feSpec
+
+    const beSpec: Record<string, any> = {
+      replicas: value['be.replicas'],
+      image: value['be.image']
+    }
+    const beSpecRequests: Record<string, any> = {
+      cpu: value['be.requests.cpu'],
+      memory: value['be.requests.memory']
+    }
+    const beSpecLimits: Record<string, any> = {
+      cpu: value['be.limits.cpu'],
+      memory: value['be.limits.memory']
+    }
+    beSpec.requests = beSpecRequests
+    beSpec.limits = beSpecLimits
+    data.beSpec = beSpec
+
+    const cnSpec: Record<string, any> = {
+      replicas: value['cn.replicas'],
+      image: value['cn.image']
+    }
+    const cnSpecRequests: Record<string, any> = {
+      cpu: value['cn.requests.cpu'],
+      memory: value['cn.requests.memory']
+    }
+    const cnSpecLimits: Record<string, any> = {
+      cpu: value['cn.limits.cpu'],
+      memory: value['cn.limits.memory']
+    }
+    cnSpec.requests = cnSpecRequests
+    cnSpec.limits = cnSpecLimits
+    data.cnSpec = cnSpec
+    return data
+  },
+
+  parseData: (data: WsDorisTemplate) => {
+    const value: Record<string, any> = {
+      'name': data.name,
+      'namespace': data.namespace,
+      'remark': data.remark,
+
+      'admin.name': data.admin?.name,
+      'admin.password': data.admin?.password,
+
+      'fe.replicas': data.feSpec?.replicas,
+      'fe.image': data.feSpec?.image,
+      'fe.requests.cpu': data.feSpec?.requests?.cpu,
+      'fe.requests.memory': data.feSpec?.requests?.memory,
+      'fe.limits.cpu': data.feSpec?.limits?.cpu,
+      'fe.limits.memory': data.feSpec?.limits?.memory,
+
+      'be.replicas': data.beSpec?.replicas,
+      'be.image': data.beSpec?.image,
+      'be.requests.cpu': data.beSpec?.requests?.cpu,
+      'be.requests.memory': data.beSpec?.requests?.memory,
+      'be.limits.cpu': data.beSpec?.limits?.cpu,
+      'be.limits.memory': data.beSpec?.limits?.memory,
+
+      'cn.replicas': data.cnSpec?.replicas,
+      'cn.image': data.cnSpec?.image,
+      'cn.requests.cpu': data.cnSpec?.requests?.cpu,
+      'cn.requests.memory': data.cnSpec?.requests?.memory,
+      'cn.limits.cpu': data.cnSpec?.limits?.cpu,
+      'cn.limits.memory': data.cnSpec?.limits?.memory,
+    }
+
+    return value
+  }
 };
diff --git a/scaleph-ui-react/src/services/project/typings.d.ts b/scaleph-ui-react/src/services/project/typings.d.ts
index f85c0a133..24a32088b 100644
--- a/scaleph-ui-react/src/services/project/typings.d.ts
+++ b/scaleph-ui-react/src/services/project/typings.d.ts
@@ -452,6 +452,11 @@ export type WsDorisTemplateAddParam = {
   projectId: number;
   name: string;
   namespace: string;
+  admin?: Record<string, any>;
+  feSpec?: Record<string, any>;
+  beSpec?: Record<string, any>;
+  cnSpec?: Record<string, any>;
+  brokerSpec?: Record<string, any>;
   remark?: string;
 };
 
@@ -459,5 +464,10 @@ export type WsDorisTemplateUpdateParam = {
   id: number;
   name: string;
   namespace: string;
+  admin?: Record<string, any>;
+  feSpec?: Record<string, any>;
+  beSpec?: Record<string, any>;
+  cnSpec?: Record<string, any>;
+  brokerSpec?: Record<string, any>;
   remark?: string;
 };
diff --git a/tools/docker/mysql/init.d/scaleph-ws-mysql.sql b/tools/docker/mysql/init.d/scaleph-ws-mysql.sql
index 319ac3e70..59e38a789 100644
--- a/tools/docker/mysql/init.d/scaleph-ws-mysql.sql
+++ b/tools/docker/mysql/init.d/scaleph-ws-mysql.sql
@@ -70,7 +70,7 @@ create table ws_flink_artifact_jar
     editor            varchar(32) comment '修改人',
     update_time       timestamp default current_timestamp on update current_timestamp comment '修改时间',
     primary key (id),
-    key               idx_flink_artifact (flink_artifact_id)
+    key idx_flink_artifact (flink_artifact_id)
 ) engine = innodb comment = 'flink artifact jar';
 
 DROP TABLE IF EXISTS ws_flink_artifact_sql;
@@ -86,7 +86,7 @@ CREATE TABLE ws_flink_artifact_sql
     editor            varchar(32),
     update_time       datetime    not null default current_timestamp on update current_timestamp,
     PRIMARY KEY (id),
-    key               idx_flink_artifact (flink_artifact_id)
+    key idx_flink_artifact (flink_artifact_id)
 ) ENGINE = INNODB COMMENT = 'flink artifact sql';
 
 INSERT INTO `ws_flink_artifact_sql` (`id`, `flink_artifact_id`, `flink_version`, `script`, `current`, `creator`,
@@ -139,7 +139,7 @@ create table ws_di_job
     editor            varchar(32) comment '修改人',
     update_time       timestamp default current_timestamp on update current_timestamp comment '修改时间',
     primary key (id),
-    key               idx_flink_artifact (flink_artifact_id)
+    key idx_flink_artifact (flink_artifact_id)
 ) engine = innodb comment '数据集成-作业信息';
 INSERT INTO ws_di_job (id, flink_artifact_id, job_engine, job_id, current, creator, editor)
 VALUES (1, 4, 'seatunnel', 'b8e16c94-258c-4487-a88c-8aad40a38b35', 1, 'sys', 'sys');
@@ -471,7 +471,7 @@ create table ws_flink_custom_artifact
     editor        varchar(32) comment '修改人',
     update_time   timestamp default current_timestamp on update current_timestamp comment '修改时间',
     primary key (id),
-    key           idx_custom (flink_version, type, file_name)
+    key idx_custom (flink_version, type, file_name)
 ) engine = innodb comment = 'flink custom artifact';
 
 drop table if exists ws_flink_custom_factory;
@@ -487,7 +487,7 @@ create table ws_flink_custom_factory
     editor                   varchar(32) comment '修改人',
     update_time              timestamp default current_timestamp on update current_timestamp comment '修改时间',
     primary key (id),
-    key                      idx_custom (flink_custom_artifact_id, factory_class, `name`)
+    key idx_custom (flink_custom_artifact_id, factory_class, `name`)
 ) engine = innodb comment = 'flink custom factory';
 
 drop table if exists ws_flink_sql_gateway_session;
@@ -564,7 +564,8 @@ create table ws_doris_template
 
 INSERT INTO `ws_doris_template`(`id`, `project_id`, `name`, `template_id`, `namespace`, `admin`, `fe_spec`, `be_spec`,
                                 `cn_spec`, `broker_spec`, `remark`, `creator`, `editor`)
-VALUES (1, 1, 'simple-doriscluster-sample', 'zexbfaf0eba4ce824787a9bed88148eb233f', 'default', NULL,
+VALUES (1, 1, 'simple-doriscluster-sample', 'zexbfaf0eba4ce824787a9bed88148eb233f', 'default',
+        '{"name":"admin","password":"Admin123"}',
         '{\"replicas\":1,\"image\":\"selectdb/doris.fe-ubuntu:2.0.2\",\"limits\":{\"cpu\":4,\"memory\":\"8Gi\"},\"requests\":{\"cpu\":4,\"memory\":\"8Gi\"}}',
         '{\"replicas\":1,\"image\":\"selectdb/doris.be-ubuntu:2.0.2\",\"limits\":{\"cpu\":4,\"memory\":\"8Gi\"},\"requests\":{\"cpu\":4,\"memory\":\"8Gi\"}}',
         NULL, NULL, NULL, 'sys', 'sys');
\ No newline at end of file

From 5b64e7d684a399336e9540f56f08bdb9e1514120 Mon Sep 17 00:00:00 2001
From: kalencaya <1942460489@qq.com>
Date: Wed, 29 Nov 2023 09:51:37 +0800
Subject: [PATCH 20/24] [Feature][scaleph-engine-doris] add doris instance
 service (#651)

* feature: add doris instance service

* feature: add doris instance controller

* feature: add doris instance controller

* feature: add doris instance web

* feature: add doris instance steps

* feature: add doris instance steps

* feature: add doris instance steps

* fix: system nav bar error
---
 .../ws/WsDorisInstanceController.java         | 104 ++++++++++
 .../dao/entity/master/ws/WsDorisInstance.java |  83 ++++++++
 .../master/ws/WsDorisInstanceMapper.java      |  31 +++
 .../master/ws/WsDorisInstanceMapper.xml       |  57 ++++++
 .../operator/status/ComponentStatus.java      |   2 +-
 .../doris/service/WsDorisInstanceService.java |  47 +++++
 .../convert/WsDorisInstanceConvert.java       | 105 ++++++++++
 .../doris/service/dto/WsDorisInstanceDTO.java |  80 ++++++++
 .../impl/WsDorisInstanceServiceImpl.java      | 138 +++++++++++++
 .../param/WsDorisInstanceAddParam.java        |  66 +++++++
 .../param/WsDorisInstanceListParam.java       |  36 ++++
 .../param/WsDorisInstanceUpdateParam.java     |  70 +++++++
 .../generator/MybatisPlusGenerator.java       |   2 +-
 scaleph-ui-react/config/routes.ts             |  15 ++
 scaleph-ui-react/src/locales/zh-CN/menu.ts    |   1 +
 .../src/locales/zh-CN/pages/project.ts        |   7 +
 .../doris/instance/dorisInstanceSteps.ts      |  62 ++++++
 .../doris/template/dorisTemplateSteps.ts      |   2 +-
 .../Doris/Instance/Steps/BaseStepForm.tsx     |  68 +++++++
 .../Workspace/Doris/Instance/Steps/index.tsx  |  74 +++++++
 .../Workspace/Doris/Instance/index.tsx        | 182 ++++++++++++++++++
 .../Doris/Template/Steps/BaseStepForm.tsx     |   2 -
 .../Workspace/Doris/Template/index.tsx        |   2 +-
 .../project/WsDorisInstanceService.ts         |  57 ++++++
 .../src/services/project/typings.d.ts         |  54 ++++++
 .../mysql/init.d/scaleph-security-mysql.sql   |  35 +++-
 .../docker/mysql/init.d/scaleph-ws-mysql.sql  |  32 ++-
 27 files changed, 1401 insertions(+), 13 deletions(-)
 create mode 100644 scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/ws/WsDorisInstanceController.java
 create mode 100644 scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsDorisInstance.java
 create mode 100644 scaleph-dao/src/main/java/cn/sliew/scaleph/dao/mapper/master/ws/WsDorisInstanceMapper.java
 create mode 100644 scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/ws/WsDorisInstanceMapper.xml
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/WsDorisInstanceService.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/convert/WsDorisInstanceConvert.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/dto/WsDorisInstanceDTO.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/impl/WsDorisInstanceServiceImpl.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisInstanceAddParam.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisInstanceListParam.java
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisInstanceUpdateParam.java
 create mode 100644 scaleph-ui-react/src/models/project/workspace/doris/instance/dorisInstanceSteps.ts
 create mode 100644 scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/Steps/BaseStepForm.tsx
 create mode 100644 scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/Steps/index.tsx
 create mode 100644 scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/index.tsx
 create mode 100644 scaleph-ui-react/src/services/project/WsDorisInstanceService.ts

diff --git a/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/ws/WsDorisInstanceController.java b/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/ws/WsDorisInstanceController.java
new file mode 100644
index 000000000..cb75387b6
--- /dev/null
+++ b/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/ws/WsDorisInstanceController.java
@@ -0,0 +1,104 @@
+/*
+ * 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 cn.sliew.scaleph.api.controller.ws;
+
+import cn.sliew.scaleph.api.annotation.Logging;
+import cn.sliew.scaleph.engine.doris.operator.DorisCluster;
+import cn.sliew.scaleph.engine.doris.service.WsDorisInstanceService;
+import cn.sliew.scaleph.engine.doris.service.dto.WsDorisInstanceDTO;
+import cn.sliew.scaleph.engine.doris.service.param.WsDorisInstanceAddParam;
+import cn.sliew.scaleph.engine.doris.service.param.WsDorisInstanceListParam;
+import cn.sliew.scaleph.engine.doris.service.param.WsDorisInstanceUpdateParam;
+import cn.sliew.scaleph.system.model.ResponseVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@Tag(name = "Doris管理-实例管理")
+@RestController
+@RequestMapping(path = "/api/doris/instance")
+public class WsDorisInstanceController {
+
+    @Autowired
+    private WsDorisInstanceService wsDorisInstanceService;
+
+    @Logging
+    @GetMapping
+    @Operation(summary = "查询实例列表", description = "分页查询实例列表")
+    public ResponseEntity<Page<WsDorisInstanceDTO>> list(@Valid WsDorisInstanceListParam param) {
+        Page<WsDorisInstanceDTO> page = wsDorisInstanceService.list(param);
+        return new ResponseEntity<>(page, HttpStatus.OK);
+    }
+
+    @Logging
+    @GetMapping("/{id}")
+    @Operation(summary = "查询实例信息", description = "查询实例信息")
+    public ResponseEntity<ResponseVO<WsDorisInstanceDTO>> selectOne(@PathVariable("id") Long id) {
+        WsDorisInstanceDTO dto = wsDorisInstanceService.selectOne(id);
+        return new ResponseEntity(ResponseVO.success(dto), HttpStatus.OK);
+    }
+
+    @Logging
+    @PostMapping("asYaml")
+    @Operation(summary = "转换实例信息", description = "转换实例信息")
+    public ResponseEntity<ResponseVO<DorisCluster>> asYaml(@RequestBody WsDorisInstanceDTO dto) {
+        DorisCluster cluster = wsDorisInstanceService.asYaml(dto);
+        return new ResponseEntity(ResponseVO.success(cluster), HttpStatus.OK);
+    }
+
+    @Logging
+    @PutMapping
+    @Operation(summary = "新增实例", description = "新增实例")
+    public ResponseEntity<ResponseVO> insert(@Valid @RequestBody WsDorisInstanceAddParam param) {
+        wsDorisInstanceService.insert(param);
+        return new ResponseEntity<>(ResponseVO.success(), HttpStatus.OK);
+    }
+
+    @Logging
+    @PostMapping
+    @Operation(summary = "修改实例", description = "修改实例")
+    public ResponseEntity<ResponseVO> update(@Valid @RequestBody WsDorisInstanceUpdateParam param) {
+        wsDorisInstanceService.update(param);
+        return new ResponseEntity<>(ResponseVO.success(), HttpStatus.OK);
+    }
+
+    @Logging
+    @DeleteMapping("/{id}")
+    @Operation(summary = "删除实例", description = "删除实例")
+    public ResponseEntity<ResponseVO> delete(@PathVariable("id") Long id) {
+        wsDorisInstanceService.deleteById(id);
+        return new ResponseEntity<>(ResponseVO.success(), HttpStatus.OK);
+    }
+
+    @Logging
+    @DeleteMapping("/batch")
+    @Operation(summary = "批量删除实例", description = "批量删除实例")
+    public ResponseEntity<ResponseVO> deleteBatch(@RequestBody List<Long> ids) {
+        wsDorisInstanceService.deleteBatch(ids);
+        return new ResponseEntity<>(ResponseVO.success(), HttpStatus.OK);
+    }
+
+}
diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsDorisInstance.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsDorisInstance.java
new file mode 100644
index 000000000..452c5e6a3
--- /dev/null
+++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsDorisInstance.java
@@ -0,0 +1,83 @@
+/*
+ * 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 cn.sliew.scaleph.dao.entity.master.ws;
+
+import cn.sliew.scaleph.common.dict.common.YesOrNo;
+import cn.sliew.scaleph.dao.entity.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * doris instance
+ */
+@Data
+@TableName("ws_doris_instance")
+public class WsDorisInstance extends BaseDO {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableField("project_id")
+    private Long projectId;
+
+    @TableField("cluster_credential_id")
+    private Long clusterCredentialId;
+
+    @TableField("`name`")
+    private String name;
+
+    @TableField("instance_id")
+    private String instanceId;
+
+    @TableField("namespace")
+    private String namespace;
+
+    @TableField("`admin`")
+    private String admin;
+
+    @TableField("fe_spec")
+    private String feSpec;
+
+    @TableField("be_spec")
+    private String beSpec;
+
+    @TableField("cn_spec")
+    private String cnSpec;
+
+    @TableField("broker_spec")
+    private String brokerSpec;
+
+    @TableField("deployed")
+    private YesOrNo deployed;
+
+    @TableField("fe_status")
+    private String feStatus;
+
+    @TableField("be_status")
+    private String beStatus;
+
+    @TableField("cn_status")
+    private String cnStatus;
+
+    @TableField("broker_status")
+    private String brokerStatus;
+
+    @TableField("remark")
+    private String remark;
+}
diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/mapper/master/ws/WsDorisInstanceMapper.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/mapper/master/ws/WsDorisInstanceMapper.java
new file mode 100644
index 000000000..693e0521b
--- /dev/null
+++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/mapper/master/ws/WsDorisInstanceMapper.java
@@ -0,0 +1,31 @@
+/*
+ * 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 cn.sliew.scaleph.dao.mapper.master.ws;
+
+import cn.sliew.scaleph.dao.entity.master.ws.WsDorisInstance;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * doris instance Mapper 接口
+ */
+@Repository
+public interface WsDorisInstanceMapper extends BaseMapper<WsDorisInstance> {
+
+}
diff --git a/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/ws/WsDorisInstanceMapper.xml b/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/ws/WsDorisInstanceMapper.xml
new file mode 100644
index 000000000..d3b8a6a9c
--- /dev/null
+++ b/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/ws/WsDorisInstanceMapper.xml
@@ -0,0 +1,57 @@
+<?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="cn.sliew.scaleph.dao.mapper.master.ws.WsDorisInstanceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="cn.sliew.scaleph.dao.entity.master.ws.WsDorisInstance">
+        <result column="id" property="id" />
+        <result column="creator" property="creator" />
+        <result column="create_time" property="createTime" />
+        <result column="editor" property="editor" />
+        <result column="update_time" property="updateTime" />
+        <result column="project_id" property="projectId" />
+        <result column="cluster_credential_id" property="clusterCredentialId" />
+        <result column="name" property="name" />
+        <result column="instance_id" property="instanceId" />
+        <result column="namespace" property="namespace" />
+        <result column="admin" property="admin" />
+        <result column="fe_spec" property="feSpec" />
+        <result column="be_spec" property="beSpec" />
+        <result column="cn_spec" property="cnSpec" />
+        <result column="broker_spec" property="brokerSpec" />
+        <result column="deployed" property="deployed" />
+        <result column="fe_status" property="feStatus" />
+        <result column="be_status" property="beStatus" />
+        <result column="cn_status" property="cnStatus" />
+        <result column="broker_status" property="brokerStatus" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id,
+        creator,
+        create_time,
+        editor,
+        update_time,
+        project_id, cluster_credential_id, `name`, instance_id, namespace, `admin`, fe_spec, be_spec, cn_spec, broker_spec, deployed, fe_status, be_status, cn_status, broker_status, remark
+    </sql>
+
+</mapper>
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/status/ComponentStatus.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/status/ComponentStatus.java
index 28d794091..5c3c2c317 100644
--- a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/status/ComponentStatus.java
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/operator/status/ComponentStatus.java
@@ -48,5 +48,5 @@ public class ComponentStatus {
     /**
      *
      */
-    private Object componentCondition;
+    private ComponentCondition componentCondition;
 }
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/WsDorisInstanceService.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/WsDorisInstanceService.java
new file mode 100644
index 000000000..3ed8b41ea
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/WsDorisInstanceService.java
@@ -0,0 +1,47 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.service;
+
+import cn.sliew.scaleph.engine.doris.operator.DorisCluster;
+import cn.sliew.scaleph.engine.doris.service.dto.WsDorisInstanceDTO;
+import cn.sliew.scaleph.engine.doris.service.param.WsDorisInstanceAddParam;
+import cn.sliew.scaleph.engine.doris.service.param.WsDorisInstanceListParam;
+import cn.sliew.scaleph.engine.doris.service.param.WsDorisInstanceUpdateParam;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.List;
+
+public interface WsDorisInstanceService {
+
+    Page<WsDorisInstanceDTO> list(WsDorisInstanceListParam param);
+
+    WsDorisInstanceDTO selectOne(Long id);
+
+    WsDorisInstanceDTO fromTemplate(Long templateId);
+
+    DorisCluster asYaml(WsDorisInstanceDTO dto);
+
+    int insert(WsDorisInstanceAddParam param);
+
+    int update(WsDorisInstanceUpdateParam param);
+
+    int deleteById(Long id);
+
+    int deleteBatch(List<Long> ids);
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/convert/WsDorisInstanceConvert.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/convert/WsDorisInstanceConvert.java
new file mode 100644
index 000000000..ffa9bda2a
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/convert/WsDorisInstanceConvert.java
@@ -0,0 +1,105 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.service.convert;
+
+import cn.sliew.milky.common.util.JacksonUtil;
+import cn.sliew.scaleph.common.convert.BaseConvert;
+import cn.sliew.scaleph.dao.entity.master.ws.WsDorisInstance;
+import cn.sliew.scaleph.engine.doris.operator.spec.*;
+import cn.sliew.scaleph.engine.doris.operator.status.CnStatus;
+import cn.sliew.scaleph.engine.doris.operator.status.ComponentStatus;
+import cn.sliew.scaleph.engine.doris.service.dto.WsDorisInstanceDTO;
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.factory.Mappers;
+import org.springframework.beans.BeanUtils;
+import org.springframework.util.StringUtils;
+
+@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE)
+public interface WsDorisInstanceConvert extends BaseConvert<WsDorisInstance, WsDorisInstanceDTO> {
+    WsDorisInstanceConvert INSTANCE = Mappers.getMapper(WsDorisInstanceConvert.class);
+
+    @Override
+    default WsDorisInstance toDo(WsDorisInstanceDTO dto) {
+        WsDorisInstance entity = new WsDorisInstance();
+        BeanUtils.copyProperties(dto, entity);
+        if (dto.getAdmin() != null) {
+            entity.setAdmin(JacksonUtil.toJsonString(dto.getAdmin()));
+        }
+        if (dto.getFeSpec() != null) {
+            entity.setFeSpec(JacksonUtil.toJsonString(dto.getFeSpec()));
+        }
+        if (dto.getBeSpec() != null) {
+            entity.setBeSpec(JacksonUtil.toJsonString(dto.getBeSpec()));
+        }
+        if (dto.getCnSpec() != null) {
+            entity.setCnSpec(JacksonUtil.toJsonString(dto.getCnSpec()));
+        }
+        if (dto.getBrokerSpec() != null) {
+            entity.setBrokerSpec(JacksonUtil.toJsonString(dto.getBrokerSpec()));
+        }
+        if (dto.getFeStatus() != null) {
+            entity.setFeStatus(JacksonUtil.toJsonString(dto.getFeStatus()));
+        }
+        if (dto.getBeStatus() != null) {
+            entity.setBeStatus(JacksonUtil.toJsonString(dto.getBeStatus()));
+        }
+        if (dto.getCnStatus() != null) {
+            entity.setCnStatus(JacksonUtil.toJsonString(dto.getCnStatus()));
+        }
+        if (dto.getBrokerStatus() != null) {
+            entity.setBrokerStatus(JacksonUtil.toJsonString(dto.getBrokerStatus()));
+        }
+        return entity;
+    }
+
+    @Override
+    default WsDorisInstanceDTO toDto(WsDorisInstance entity) {
+        WsDorisInstanceDTO dto = new WsDorisInstanceDTO();
+        BeanUtils.copyProperties(entity, dto);
+        if (StringUtils.hasText(entity.getAdmin())) {
+            dto.setAdmin(JacksonUtil.parseJsonString(entity.getAdmin(), AdminUser.class));
+        }
+        if (StringUtils.hasText(entity.getFeSpec())) {
+            dto.setFeSpec(JacksonUtil.parseJsonString(entity.getFeSpec(), FeSpec.class));
+        }
+        if (StringUtils.hasText(entity.getBeSpec())) {
+            dto.setBeSpec(JacksonUtil.parseJsonString(entity.getBeSpec(), BeSpec.class));
+        }
+        if (StringUtils.hasText(entity.getCnSpec())) {
+            dto.setCnSpec(JacksonUtil.parseJsonString(entity.getCnSpec(), CnSpec.class));
+        }
+        if (StringUtils.hasText(entity.getBrokerSpec())) {
+            dto.setBrokerSpec(JacksonUtil.parseJsonString(entity.getBrokerSpec(), BrokerSpec.class));
+        }
+        if (StringUtils.hasText(entity.getFeStatus())) {
+            dto.setFeStatus(JacksonUtil.parseJsonString(entity.getFeStatus(), ComponentStatus.class));
+        }
+        if (StringUtils.hasText(entity.getBeStatus())) {
+            dto.setBeStatus(JacksonUtil.parseJsonString(entity.getBeStatus(), ComponentStatus.class));
+        }
+        if (StringUtils.hasText(entity.getCnStatus())) {
+            dto.setCnStatus(JacksonUtil.parseJsonString(entity.getCnStatus(), CnStatus.class));
+        }
+        if (StringUtils.hasText(entity.getBrokerStatus())) {
+            dto.setBrokerStatus(JacksonUtil.parseJsonString(entity.getBrokerStatus(), ComponentStatus.class));
+        }
+        return dto;
+    }
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/dto/WsDorisInstanceDTO.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/dto/WsDorisInstanceDTO.java
new file mode 100644
index 000000000..623477b9e
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/dto/WsDorisInstanceDTO.java
@@ -0,0 +1,80 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.service.dto;
+
+import cn.sliew.scaleph.common.dict.common.YesOrNo;
+import cn.sliew.scaleph.engine.doris.operator.spec.*;
+import cn.sliew.scaleph.engine.doris.operator.status.CnStatus;
+import cn.sliew.scaleph.engine.doris.operator.status.ComponentStatus;
+import cn.sliew.scaleph.system.model.BaseDTO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * doris instance
+ */
+@Data
+@Schema(name = "WsDorisInstance对象", description = "doris instance")
+public class WsDorisInstanceDTO extends BaseDTO {
+
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "项目id")
+    private Long projectId;
+
+    private Long clusterCredentialId;
+
+    private String name;
+
+    private String instanceId;
+
+    private String namespace;
+
+    @Schema(description = "admin user")
+    private AdminUser admin;
+
+    @Schema(description = "fe spec")
+    private FeSpec feSpec;
+
+    @Schema(description = "be spec")
+    private BeSpec beSpec;
+
+    @Schema(description = "cn spec")
+    private CnSpec cnSpec;
+
+    @Schema(description = "broker spec")
+    private BrokerSpec brokerSpec;
+
+    @Schema(description = "是否部署")
+    private YesOrNo deployed;
+
+    @Schema(description = "fe status")
+    private ComponentStatus feStatus;
+
+    @Schema(description = "be status")
+    private ComponentStatus beStatus;
+
+    @Schema(description = "cn status")
+    private CnStatus cnStatus;
+
+    @Schema(description = "broker status")
+    private ComponentStatus brokerStatus;
+
+    private String remark;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/impl/WsDorisInstanceServiceImpl.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/impl/WsDorisInstanceServiceImpl.java
new file mode 100644
index 000000000..ef16dac45
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/impl/WsDorisInstanceServiceImpl.java
@@ -0,0 +1,138 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.service.impl;
+
+import cn.sliew.milky.common.util.JacksonUtil;
+import cn.sliew.scaleph.common.util.UUIDUtil;
+import cn.sliew.scaleph.dao.entity.master.ws.WsDorisInstance;
+import cn.sliew.scaleph.dao.mapper.master.ws.WsDorisInstanceMapper;
+import cn.sliew.scaleph.engine.doris.operator.DorisCluster;
+import cn.sliew.scaleph.engine.doris.service.WsDorisInstanceService;
+import cn.sliew.scaleph.engine.doris.service.WsDorisTemplateService;
+import cn.sliew.scaleph.engine.doris.service.convert.WsDorisInstanceConvert;
+import cn.sliew.scaleph.engine.doris.service.dto.WsDorisInstanceDTO;
+import cn.sliew.scaleph.engine.doris.service.param.WsDorisInstanceAddParam;
+import cn.sliew.scaleph.engine.doris.service.param.WsDorisInstanceListParam;
+import cn.sliew.scaleph.engine.doris.service.param.WsDorisInstanceUpdateParam;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
+
+import static cn.sliew.milky.common.check.Ensures.checkState;
+
+@Service
+public class WsDorisInstanceServiceImpl implements WsDorisInstanceService {
+
+    @Autowired
+    private WsDorisInstanceMapper wsDorisInstanceMapper;
+    @Autowired
+    private WsDorisTemplateService wsDorisTemplateService;
+
+    @Override
+    public Page<WsDorisInstanceDTO> list(WsDorisInstanceListParam param) {
+        Page<WsDorisInstance> page = new Page<>(param.getCurrent(), param.getPageSize());
+        LambdaQueryWrapper<WsDorisInstance> queryWrapper = Wrappers.lambdaQuery(WsDorisInstance.class)
+                .eq(WsDorisInstance::getProjectId, param.getProjectId())
+                .like(StringUtils.hasText(param.getName()), WsDorisInstance::getName, param.getName())
+                .orderByAsc(WsDorisInstance::getId);
+        Page<WsDorisInstance> wsDorisInstancePage = wsDorisInstanceMapper.selectPage(page, queryWrapper);
+        Page<WsDorisInstanceDTO> result = new Page<>(wsDorisInstancePage.getCurrent(), wsDorisInstancePage.getSize(), wsDorisInstancePage.getTotal());
+        List<WsDorisInstanceDTO> dtoList = WsDorisInstanceConvert.INSTANCE.toDto(page.getRecords());
+        result.setRecords(dtoList);
+        return result;
+    }
+
+    @Override
+    public WsDorisInstanceDTO selectOne(Long id) {
+        WsDorisInstance record = wsDorisInstanceMapper.selectById(id);
+        checkState(record != null, () -> "doris instance not exist for id = " + id);
+        return WsDorisInstanceConvert.INSTANCE.toDto(record);
+    }
+
+    @Override
+    public WsDorisInstanceDTO fromTemplate(Long templateId) {
+        return null;
+    }
+
+    @Override
+    public DorisCluster asYaml(WsDorisInstanceDTO dto) {
+        return null;
+    }
+
+    @Override
+    public int insert(WsDorisInstanceAddParam param) {
+        WsDorisInstance record = new WsDorisInstance();
+        BeanUtils.copyProperties(param, record);
+        record.setInstanceId(UUIDUtil.randomUUId());
+        if (param.getAdmin() != null) {
+            record.setAdmin(JacksonUtil.toJsonString(param.getAdmin()));
+        }
+        if (param.getFeSpec() != null) {
+            record.setFeSpec(JacksonUtil.toJsonString(param.getFeSpec()));
+        }
+        if (param.getBeSpec() != null) {
+            record.setBeSpec(JacksonUtil.toJsonString(param.getBeSpec()));
+        }
+        if (param.getCnSpec() != null) {
+            record.setCnSpec(JacksonUtil.toJsonString(param.getCnSpec()));
+        }
+        if (param.getBrokerSpec() != null) {
+            record.setBrokerSpec(JacksonUtil.toJsonString(param.getBrokerSpec()));
+        }
+        return wsDorisInstanceMapper.insert(record);
+    }
+
+    @Override
+    public int update(WsDorisInstanceUpdateParam param) {
+        WsDorisInstance record = new WsDorisInstance();
+        BeanUtils.copyProperties(param, record);
+        if (param.getAdmin() != null) {
+            record.setAdmin(JacksonUtil.toJsonString(param.getAdmin()));
+        }
+        if (param.getFeSpec() != null) {
+            record.setFeSpec(JacksonUtil.toJsonString(param.getFeSpec()));
+        }
+        if (param.getBeSpec() != null) {
+            record.setBeSpec(JacksonUtil.toJsonString(param.getBeSpec()));
+        }
+        if (param.getCnSpec() != null) {
+            record.setCnSpec(JacksonUtil.toJsonString(param.getCnSpec()));
+        }
+        if (param.getBrokerSpec() != null) {
+            record.setBrokerSpec(JacksonUtil.toJsonString(param.getBrokerSpec()));
+        }
+        return wsDorisInstanceMapper.updateById(record);
+    }
+
+    @Override
+    public int deleteById(Long id) {
+        return wsDorisInstanceMapper.deleteById(id);
+    }
+
+    @Override
+    public int deleteBatch(List<Long> ids) {
+        return wsDorisInstanceMapper.deleteBatchIds(ids);
+    }
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisInstanceAddParam.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisInstanceAddParam.java
new file mode 100644
index 000000000..384de5254
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisInstanceAddParam.java
@@ -0,0 +1,66 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.service.param;
+
+import cn.sliew.scaleph.engine.doris.operator.spec.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class WsDorisInstanceAddParam {
+
+    @NotNull
+    @Schema(description = "project id")
+    private Long projectId;
+
+    @NotNull
+    @Schema(description = "cluster credential id")
+    private Long clusterCredentialId;
+
+    @NotBlank
+    @Schema(description = "name")
+    private String name;
+
+    @NotBlank
+    @Schema(description = "namespace")
+    private String namespace;
+
+    @NotNull
+    @Schema(description = "admin user")
+    private AdminUser admin;
+
+    @NotNull
+    @Schema(description = "fe spec")
+    private FeSpec feSpec;
+
+    @Schema(description = "be spec")
+    private BeSpec beSpec;
+
+    @Schema(description = "cn spec")
+    private CnSpec cnSpec;
+
+    @Schema(description = "broker spec")
+    private BrokerSpec brokerSpec;
+
+    @Schema(description = "remark")
+    private String remark;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisInstanceListParam.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisInstanceListParam.java
new file mode 100644
index 000000000..9bc7bdce5
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisInstanceListParam.java
@@ -0,0 +1,36 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.service.param;
+
+import cn.sliew.scaleph.system.model.PaginationParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class WsDorisInstanceListParam extends PaginationParam {
+
+    @NotNull
+    @Schema(description = "project id")
+    private Long projectId;
+
+    @Schema(description = "name")
+    private String name;
+}
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisInstanceUpdateParam.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisInstanceUpdateParam.java
new file mode 100644
index 000000000..e927d27d1
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisInstanceUpdateParam.java
@@ -0,0 +1,70 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.service.param;
+
+import cn.sliew.scaleph.engine.doris.operator.spec.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class WsDorisInstanceUpdateParam {
+
+    @NotNull
+    @Schema(description = "id")
+    private Long id;
+
+    @NotNull
+    @Schema(description = "project id")
+    private Long projectId;
+
+    @NotNull
+    @Schema(description = "cluster credential id")
+    private Long clusterCredentialId;
+
+    @NotBlank
+    @Schema(description = "name")
+    private String name;
+
+    @NotBlank
+    @Schema(description = "namespace")
+    private String namespace;
+
+    @NotNull
+    @Schema(description = "admin user")
+    private AdminUser admin;
+
+    @NotNull
+    @Schema(description = "fe spec")
+    private FeSpec feSpec;
+
+    @Schema(description = "be spec")
+    private BeSpec beSpec;
+
+    @Schema(description = "cn spec")
+    private CnSpec cnSpec;
+
+    @Schema(description = "broker spec")
+    private BrokerSpec brokerSpec;
+
+    @Schema(description = "remark")
+    private String remark;
+}
diff --git a/scaleph-support/scaleph-generator/src/main/java/cn/sliew/scaleph/generator/MybatisPlusGenerator.java b/scaleph-support/scaleph-generator/src/main/java/cn/sliew/scaleph/generator/MybatisPlusGenerator.java
index 1a1e9f2ee..a3dca1727 100644
--- a/scaleph-support/scaleph-generator/src/main/java/cn/sliew/scaleph/generator/MybatisPlusGenerator.java
+++ b/scaleph-support/scaleph-generator/src/main/java/cn/sliew/scaleph/generator/MybatisPlusGenerator.java
@@ -54,7 +54,7 @@ public class MybatisPlusGenerator {
     /**
      * just add table names here and run the {@link #main(String[])} method.
      */
-    private static final String[] TABLES = {"ws_doris_template"};
+    private static final String[] TABLES = {"ws_doris_instance"};
 
     public static void main(String[] args) {
         //自动生成配置
diff --git a/scaleph-ui-react/config/routes.ts b/scaleph-ui-react/config/routes.ts
index 47eb26af8..0f4d6a829 100644
--- a/scaleph-ui-react/config/routes.ts
+++ b/scaleph-ui-react/config/routes.ts
@@ -253,6 +253,21 @@ export default [
             pCode: PRIVILEGE_CODE.workspaceClusterConfigShow,
             access: 'normalRouteFilter'
           },
+          {
+            name: 'instance',
+            path: '/workspace/doris/instance',
+            exact: true,
+            component: './Project/Workspace/Doris/Instance',
+            pCode: PRIVILEGE_CODE.workspaceClusterConfigShow,
+            access: 'normalRouteFilter'
+          },
+          {
+            path: '/workspace/doris/instance/steps',
+            exact: true,
+            component: './Project/Workspace/Doris/Instance/Steps',
+            pCode: PRIVILEGE_CODE.workspaceClusterConfigShow,
+            access: 'normalRouteFilter'
+          },
         ]
       },
     ]
diff --git a/scaleph-ui-react/src/locales/zh-CN/menu.ts b/scaleph-ui-react/src/locales/zh-CN/menu.ts
index 4323768e4..2fd892e8b 100644
--- a/scaleph-ui-react/src/locales/zh-CN/menu.ts
+++ b/scaleph-ui-react/src/locales/zh-CN/menu.ts
@@ -14,6 +14,7 @@ export default {
   'menu.project.flink.kubernetes.job': 'Job',
   'menu.project.doris': 'Doris',
   'menu.project.doris.template': 'Template',
+  'menu.project.doris.instance': 'Instance',
 
   'menu.resource': '资源',
   'menu.resource.jar': '公共 Jar',
diff --git a/scaleph-ui-react/src/locales/zh-CN/pages/project.ts b/scaleph-ui-react/src/locales/zh-CN/pages/project.ts
index cff721b09..3d8ce78ec 100644
--- a/scaleph-ui-react/src/locales/zh-CN/pages/project.ts
+++ b/scaleph-ui-react/src/locales/zh-CN/pages/project.ts
@@ -943,6 +943,13 @@ export default {
   'pages.project.doris.template.detail': '模版详情',
   'pages.project.doris.template.detail.component': '集群组件',
   'pages.project.doris.template.detail.yaml': 'YAML',
+  'pages.project.doris.instance': 'Instance',
+  'pages.project.doris.instance.name': '名称',
+  'pages.project.doris.instance.namespace': '命名空间',
+  'pages.project.doris.instance.steps': '创建实例',
+  'pages.project.doris.instance.steps.base': '基础信息',
+  'pages.project.doris.instance.steps.base.cluster': 'Cluster',
+  'pages.project.doris.instance.steps.base.template': 'Template',
 
 
   'Run': '运行',
diff --git a/scaleph-ui-react/src/models/project/workspace/doris/instance/dorisInstanceSteps.ts b/scaleph-ui-react/src/models/project/workspace/doris/instance/dorisInstanceSteps.ts
new file mode 100644
index 000000000..9a90b100c
--- /dev/null
+++ b/scaleph-ui-react/src/models/project/workspace/doris/instance/dorisInstanceSteps.ts
@@ -0,0 +1,62 @@
+import {WsDorisInstance, WsDorisTemplate} from "@/services/project/typings";
+import {Effect, Reducer} from "umi";
+import YAML from "yaml";
+import {WsDorisTemplateService} from "@/services/project/WsDorisTemplateService";
+
+export interface StateType {
+  template: WsDorisTemplate,
+  instance: WsDorisInstance,
+  instanceYaml: string
+  instanceYamlWithDefault: string
+}
+
+export interface ModelType {
+  namespace: string;
+
+  state: StateType;
+
+  effects: {
+    queryTemplate: Effect;
+  };
+
+  reducers: {
+    updateTemplate: Reducer<StateType>;
+  };
+}
+
+const model: ModelType = {
+  namespace: "dorisInstanceSteps",
+
+  state: {
+    template: null,
+    templateYaml: null,
+    templateYamlWithDefault: null
+  },
+
+  effects: {
+    *editTemplate({payload}, {call, put}) {
+      const {data} = yield call(WsDorisTemplateService.asYaml, payload);
+      const response = yield call(WsDorisTemplateService.asYaml, payload);
+      yield put({type: 'updateTemplate',
+        payload: {
+          template: payload,
+          templateYaml: YAML.stringify(data),
+          templateYamlWithDefault: YAML.stringify(response.data)
+        }
+      });
+    },
+  },
+
+  reducers: {
+    updateTemplate(state, {payload}) {
+      return {
+        ...state,
+        template: payload.template,
+        templateYaml: payload.templateYaml,
+        templateYamlWithDefault: payload.templateYamlWithDefault,
+      };
+    },
+  },
+};
+
+export default model;
diff --git a/scaleph-ui-react/src/models/project/workspace/doris/template/dorisTemplateSteps.ts b/scaleph-ui-react/src/models/project/workspace/doris/template/dorisTemplateSteps.ts
index 57cec9362..261bca236 100644
--- a/scaleph-ui-react/src/models/project/workspace/doris/template/dorisTemplateSteps.ts
+++ b/scaleph-ui-react/src/models/project/workspace/doris/template/dorisTemplateSteps.ts
@@ -33,7 +33,7 @@ const model: ModelType = {
   },
 
   effects: {
-    * editTemplate({payload}, {call, put}) {
+    *editTemplate({payload}, {call, put}) {
       const {data} = yield call(WsDorisTemplateService.asYaml, payload);
       const response = yield call(WsDorisTemplateService.asYaml, payload);
       yield put({type: 'updateTemplate',
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/Steps/BaseStepForm.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/Steps/BaseStepForm.tsx
new file mode 100644
index 000000000..591fe55b2
--- /dev/null
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/Steps/BaseStepForm.tsx
@@ -0,0 +1,68 @@
+import React from "react";
+import {ProCard, ProFormDigit, ProFormSelect, ProFormText} from "@ant-design/pro-components";
+import {useIntl} from "umi";
+import {ClusterCredentialListParam} from "@/services/resource/typings";
+import {ClusterCredentialService} from "@/services/resource/clusterCredential.service";
+import {WsDorisTemplate} from "@/services/project/typings";
+import {WsDorisTemplateService} from "@/services/project/WsDorisTemplateService";
+import {WORKSPACE_CONF} from "@/constant";
+
+const DorisInstanceBase: React.FC = () => {
+  const intl = useIntl();
+  const localProjectId = localStorage.getItem(WORKSPACE_CONF.projectId);
+
+  return (
+    <ProCard>
+      <ProFormDigit name={"id"} hidden/>
+      <ProFormText
+        name={"name"}
+        label={intl.formatMessage({id: 'pages.project.doris.instance.name'})}
+        rules={[{required: true}]}
+      />
+      <ProFormSelect
+        name="clusterCredentialId"
+        label={intl.formatMessage({id: 'pages.project.doris.instance.steps.base.cluster'})}
+        rules={[{required: true}]}
+        allowClear={false}
+        request={((params, props) => {
+          const param: ClusterCredentialListParam = {
+            name: params.keyWords,
+          };
+          return ClusterCredentialService.list(param).then((response) => {
+            return response.data.map((item) => {
+              return {label: item.name, value: item.id, item: item}
+            })
+          })
+        })}
+      />
+      <ProFormText
+        name={"namespace"}
+        label={intl.formatMessage({id: 'pages.project.doris.instance.namespace'})}
+        rules={[{required: true}]}
+      />
+      <ProFormSelect
+        name="templateId"
+        label={intl.formatMessage({id: 'pages.project.doris.instance.steps.base.template'})}
+        rules={[{required: true}]}
+        allowClear={false}
+        request={((params, props) => {
+          const param: WsDorisTemplate = {
+            projectId: localProjectId,
+            name: params.keyWords,
+          };
+          return WsDorisTemplateService.list(param).then((response) => {
+            return response.data.map((item) => {
+              return {label: item.name, value: item.id, item: item}
+            })
+          })
+        })}
+      />
+      <ProFormText
+        name={"remark"}
+        label={intl.formatMessage({id: 'app.common.data.remark'})}
+      />
+    </ProCard>
+  );
+}
+
+export default DorisInstanceBase;
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/Steps/index.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/Steps/index.tsx
new file mode 100644
index 000000000..6fead5b83
--- /dev/null
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/Steps/index.tsx
@@ -0,0 +1,74 @@
+import {connect, history, useIntl} from "umi";
+import React, {useRef} from "react";
+import {PageContainer, ProCard, ProFormInstance, StepsForm} from "@ant-design/pro-components";
+import {WORKSPACE_CONF} from "@/constant";
+import {WsDorisInstance, WsDorisTemplate} from "@/services/project/typings";
+import {WsDorisTemplateService} from "@/services/project/WsDorisTemplateService";
+import DorisInstanceBase from "@/pages/Project/Workspace/Doris/Instance/Steps/BaseStepForm";
+
+const DorisInstanceSteps: React.FC = (props: any) => {
+  const intl = useIntl();
+  const formRef = useRef<ProFormInstance>();
+  const localProjectId = localStorage.getItem(WORKSPACE_CONF.projectId);
+
+  const onBaseStepFinish = (values: Record<string, any>) => {
+    const template: WsDorisInstance = {
+      projectId: localProjectId,
+      name: values.name,
+      namespace: values.namespace,
+      remark: values.remark,
+    }
+    editDorisTemplate(template)
+    return Promise.resolve(true)
+  }
+
+  const onComponentStepFinish = (values: Record<string, any>) => {
+    try {
+      const template: WsDorisTemplate = WsDorisTemplateService.formatData(props.dorisTemplateSteps.template, values)
+      editDorisTemplate(template)
+    } catch (unused) {
+    }
+    return Promise.resolve(true)
+  }
+
+  const editDorisTemplate = (template: WsDorisTemplate) => {
+    props.dispatch({
+      type: 'dorisInstanceSteps/editTemplate',
+      payload: template
+    })
+  }
+
+  const onAllFinish = (values: Record<string, any>) => {
+    return WsDorisTemplateService.add(props.dorisTemplateSteps.template).then((response) => {
+      if (response.success) {
+        history.back()
+      }
+    })
+  }
+
+  return (
+    <PageContainer title={intl.formatMessage({id: 'pages.project.doris.instance.steps'})}>
+      <ProCard className={'step-form-submitter'}>
+        <StepsForm
+          formRef={formRef}
+          formProps={{
+            grid: true,
+            rowProps: {gutter: [16, 8]}
+          }}
+          onFinish={onAllFinish}
+        >
+          <StepsForm.StepForm
+            name="base"
+            title={intl.formatMessage({id: 'pages.project.doris.instance.steps.base'})}
+            style={{width: 1000}}
+            onFinish={onBaseStepFinish}>
+            <DorisInstanceBase/>
+          </StepsForm.StepForm>
+        </StepsForm>
+      </ProCard>
+    </PageContainer>
+  )
+}
+
+const mapModelToProps = ({dorisInstanceSteps}: any) => ({dorisInstanceSteps})
+export default connect(mapModelToProps)(DorisInstanceSteps);
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/index.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/index.tsx
new file mode 100644
index 000000000..667c9b776
--- /dev/null
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/index.tsx
@@ -0,0 +1,182 @@
+import {history, useAccess, useIntl} from "umi";
+import React, {useRef, useState} from "react";
+import {Button, message, Modal, Space, Tooltip} from "antd";
+import {DeleteOutlined, EditOutlined, NodeIndexOutlined} from "@ant-design/icons";
+import {ActionType, ProColumns, ProFormInstance, ProTable} from "@ant-design/pro-components";
+import {PRIVILEGE_CODE, WORKSPACE_CONF} from "@/constant";
+import {WsDorisInstance, WsDorisTemplate} from "@/services/project/typings";
+import {WsDorisInstanceService} from "@/services/project/WsDorisInstanceService";
+
+const DorisInstanceWeb: React.FC = () => {
+  const intl = useIntl();
+  const access = useAccess();
+  const actionRef = useRef<ActionType>();
+  const formRef = useRef<ProFormInstance>();
+  const [selectedRows, setSelectedRows] = useState<WsDorisInstance[]>([]);
+  const [dorisInstanceFormData, setDorisInstanceFormData] = useState<{
+    visiable: WsDorisInstance;
+    data: WsDorisTemplate;
+  }>({visiable: false, data: {}});
+  const projectId = localStorage.getItem(WORKSPACE_CONF.projectId);
+
+  const tableColumns: ProColumns<WsDorisInstance>[] = [
+    {
+      title: intl.formatMessage({id: 'pages.project.doris.template.name'}),
+      dataIndex: 'name'
+    },
+    {
+      title: intl.formatMessage({id: 'pages.project.doris.template.namespace'}),
+      dataIndex: 'namespace',
+      hideInSearch: true,
+    },
+    {
+      title: intl.formatMessage({id: 'app.common.data.remark'}),
+      dataIndex: 'remark',
+      hideInSearch: true,
+    },
+    {
+      title: intl.formatMessage({id: 'app.common.data.createTime'}),
+      dataIndex: 'createTime',
+      hideInSearch: true,
+      width: 180,
+    },
+    {
+      title: intl.formatMessage({id: 'app.common.data.updateTime'}),
+      dataIndex: 'updateTime',
+      hideInSearch: true,
+      width: 180,
+    },
+    {
+      title: intl.formatMessage({id: 'app.common.operate.label'}),
+      dataIndex: 'actions',
+      align: 'center',
+      width: 120,
+      fixed: 'right',
+      valueType: 'option',
+      render: (_, record) => (
+        <Space>
+          {access.canAccess(PRIVILEGE_CODE.datadevProjectEdit) && (
+            <Tooltip title={intl.formatMessage({id: 'app.common.operate.edit.label'})}>
+              <Button
+                shape="default"
+                type="link"
+                icon={<EditOutlined/>}
+                onClick={() => {
+                  setDorisInstanceFormData({visiable: true, data: record});
+                }}
+              />
+            </Tooltip>
+          )}
+          {access.canAccess(PRIVILEGE_CODE.datadevJobEdit) && (
+            <Tooltip title={intl.formatMessage({id: 'pages.project.doris.template.define'})}>
+              <Button
+                shape="default"
+                type="link"
+                icon={<NodeIndexOutlined/>}
+                onClick={() => {
+                  history.push("/workspace/doris/template/detail", record)
+                }}
+              />
+            </Tooltip>
+          )}
+          {access.canAccess(PRIVILEGE_CODE.datadevDatasourceDelete) && (
+            <Tooltip title={intl.formatMessage({id: 'app.common.operate.delete.label'})}>
+              <Button
+                shape="default"
+                type="link"
+                danger
+                icon={<DeleteOutlined/>}
+                onClick={() => {
+                  Modal.confirm({
+                    title: intl.formatMessage({id: 'app.common.operate.delete.confirm.title'}),
+                    content: intl.formatMessage({id: 'app.common.operate.delete.confirm.content'}),
+                    okText: intl.formatMessage({id: 'app.common.operate.confirm.label'}),
+                    okButtonProps: {danger: true},
+                    cancelText: intl.formatMessage({id: 'app.common.operate.cancel.label'}),
+                    onOk() {
+                      WsDorisInstanceService.delete(record).then((d) => {
+                        if (d.success) {
+                          message.success(intl.formatMessage({id: 'app.common.operate.delete.success'}));
+                          actionRef.current?.reload();
+                        }
+                      });
+                    },
+                  });
+                }}
+              />
+            </Tooltip>
+          )}
+        </Space>
+      ),
+    },
+  ];
+
+  return (<div>
+    <ProTable<WsDorisInstance>
+      search={{
+        labelWidth: 'auto',
+        span: {xs: 24, sm: 12, md: 8, lg: 6, xl: 6, xxl: 4},
+      }}
+      rowKey="id"
+      actionRef={actionRef}
+      formRef={formRef}
+      options={false}
+      columns={tableColumns}
+      request={(params, sorter, filter) =>
+        WsDorisInstanceService.list({...params, projectId: projectId})
+      }
+      toolbar={{
+        actions: [
+          access.canAccess(PRIVILEGE_CODE.datadevResourceAdd) && (
+            <Button
+              key="new"
+              type="primary"
+              onClick={() => {
+                history.push("/workspace/doris/instance/steps")
+              }}
+            >
+              {intl.formatMessage({id: 'app.common.operate.new.label'})}
+            </Button>
+          ),
+          access.canAccess(PRIVILEGE_CODE.datadevResourceDelete) && (
+            <Button
+              key="del"
+              type="default"
+              disabled={selectedRows.length < 1}
+              onClick={() => {
+                Modal.confirm({
+                  title: intl.formatMessage({id: 'app.common.operate.delete.confirm.title'}),
+                  content: intl.formatMessage({id: 'app.common.operate.delete.confirm.content'}),
+                  okText: intl.formatMessage({id: 'app.common.operate.confirm.label'}),
+                  okButtonProps: {danger: true},
+                  cancelText: intl.formatMessage({id: 'app.common.operate.cancel.label'}),
+                  onOk() {
+                    WsDorisInstanceService.deleteBatch(selectedRows).then((d) => {
+                      if (d.success) {
+                        message.success(intl.formatMessage({id: 'app.common.operate.delete.success'}));
+                        actionRef.current?.reload();
+                      }
+                    });
+                  },
+                });
+              }}
+            >
+              {intl.formatMessage({id: 'app.common.operate.delete.label'})}
+            </Button>
+          )
+        ],
+      }}
+      pagination={{showQuickJumper: true, showSizeChanger: true, defaultPageSize: 10}}
+      rowSelection={{
+        fixed: true,
+        onChange(selectedRowKeys, selectedRows, info) {
+          setSelectedRows(selectedRows);
+        },
+      }}
+      tableAlertRender={false}
+      tableAlertOptionRender={false}
+    />
+  </div>);
+}
+
+export default DorisInstanceWeb;
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/BaseStepForm.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/BaseStepForm.tsx
index c56a2ee41..ce46a3619 100644
--- a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/BaseStepForm.tsx
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/BaseStepForm.tsx
@@ -1,11 +1,9 @@
 import React from "react";
-import {Form} from "antd";
 import {ProCard, ProFormDigit, ProFormText} from "@ant-design/pro-components";
 import {useIntl} from "umi";
 
 const DorisTemplateBase: React.FC = () => {
   const intl = useIntl();
-  const [form] = Form.useForm()
 
   return (
     <ProCard>
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/index.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/index.tsx
index f8f13bafd..a0e092727 100644
--- a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/index.tsx
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/index.tsx
@@ -1,6 +1,6 @@
 import {history, useAccess, useIntl} from "umi";
 import React, {useRef, useState} from "react";
-import {Button, message, Modal, Space, Tag, Tooltip} from "antd";
+import {Button, message, Modal, Space, Tooltip} from "antd";
 import {DeleteOutlined, EditOutlined, NodeIndexOutlined} from "@ant-design/icons";
 import {ActionType, ProColumns, ProFormInstance, ProTable} from "@ant-design/pro-components";
 import {PRIVILEGE_CODE, WORKSPACE_CONF} from "@/constant";
diff --git a/scaleph-ui-react/src/services/project/WsDorisInstanceService.ts b/scaleph-ui-react/src/services/project/WsDorisInstanceService.ts
new file mode 100644
index 000000000..be991d2a5
--- /dev/null
+++ b/scaleph-ui-react/src/services/project/WsDorisInstanceService.ts
@@ -0,0 +1,57 @@
+import {PageResponse, ResponseBody} from '@/app.d';
+import {request} from 'umi';
+import {WsDorisInstance, WsDorisInstanceAddParam, WsDorisInstanceParam, WsDorisInstanceUpdateParam} from './typings';
+
+export const WsDorisInstanceService = {
+  url: '/api/doris/instance',
+
+  list: async (queryParam: WsDorisInstanceParam) => {
+    return request<PageResponse<WsDorisInstance>>(`${WsDorisInstanceService.url}`, {
+      method: 'GET',
+      params: queryParam,
+    }).then((res) => {
+      const result = {
+        data: res.records,
+        total: res.total,
+        pageSize: res.size,
+        current: res.current,
+      };
+      return result;
+    });
+  },
+
+  asYaml: async (param: WsDorisInstance) => {
+    return request<ResponseBody<any>>(`${WsDorisInstanceService.url}/asYaml`, {
+      method: 'POST',
+      data: param,
+    });
+  },
+
+  add: async (param: WsDorisInstanceAddParam) => {
+    return request<ResponseBody<any>>(`${WsDorisInstanceService.url}`, {
+      method: 'PUT',
+      data: param,
+    });
+  },
+
+  update: async (param: WsDorisInstanceUpdateParam) => {
+    return request<ResponseBody<any>>(`${WsDorisInstanceService.url}`, {
+      method: 'POST',
+      data: param,
+    });
+  },
+
+  delete: async (row: WsDorisInstance) => {
+    return request<ResponseBody<any>>(`${WsDorisInstanceService.url}/` + row.id, {
+      method: 'DELETE',
+    });
+  },
+
+  deleteBatch: async (rows: WsDorisInstance[]) => {
+    const params = rows.map((row) => row.id);
+    return request<ResponseBody<any>>(`${WsDorisInstanceService.url}/` + 'batch', {
+      method: 'DELETE',
+      data: params,
+    });
+  },
+};
diff --git a/scaleph-ui-react/src/services/project/typings.d.ts b/scaleph-ui-react/src/services/project/typings.d.ts
index 24a32088b..50e2b8539 100644
--- a/scaleph-ui-react/src/services/project/typings.d.ts
+++ b/scaleph-ui-react/src/services/project/typings.d.ts
@@ -432,6 +432,7 @@ export type WsDorisTemplate = {
   id?: number;
   projectId: number;
   name?: string;
+  templateId?: string;
   namespace: string;
   admin?: Record<string, any>;
   feSpec?: Record<string, any>;
@@ -471,3 +472,56 @@ export type WsDorisTemplateUpdateParam = {
   brokerSpec?: Record<string, any>;
   remark?: string;
 };
+
+export type WsDorisInstance = {
+  id?: number;
+  projectId: number;
+  clusterCredentialId?: number;
+  name?: string;
+  instanceId?: string;
+  namespace: string;
+  admin?: Record<string, any>;
+  feSpec?: Record<string, any>;
+  beSpec?: Record<string, any>;
+  cnSpec?: Record<string, any>;
+  brokerSpec?: Record<string, any>;
+  deployed?: Dict;
+  feStatus?: Record<string, any>;
+  beStatus?: Record<string, any>;
+  cnStatus?: Record<string, any>;
+  brokerStatus?: Record<string, any>;
+  remark?: string;
+  createTime?: Date;
+  updateTime?: Date;
+};
+
+export type WsDorisInstanceParam = QueryParam & {
+  projectId: number;
+  name?: string;
+};
+
+export type WsDorisInstanceAddParam = {
+  projectId: number;
+  clusterCredentialId?: number;
+  name: string;
+  namespace: string;
+  admin?: Record<string, any>;
+  feSpec?: Record<string, any>;
+  beSpec?: Record<string, any>;
+  cnSpec?: Record<string, any>;
+  brokerSpec?: Record<string, any>;
+  remark?: string;
+};
+
+export type WsDorisInstanceUpdateParam = {
+  id: number;
+  clusterCredentialId?: number;
+  name: string;
+  namespace: string;
+  admin?: Record<string, any>;
+  feSpec?: Record<string, any>;
+  beSpec?: Record<string, any>;
+  cnSpec?: Record<string, any>;
+  brokerSpec?: Record<string, any>;
+  remark?: string;
+};
diff --git a/tools/docker/mysql/init.d/scaleph-security-mysql.sql b/tools/docker/mysql/init.d/scaleph-security-mysql.sql
index 911deafee..a5194a153 100644
--- a/tools/docker/mysql/init.d/scaleph-security-mysql.sql
+++ b/tools/docker/mysql/init.d/scaleph-security-mysql.sql
@@ -34,6 +34,23 @@ insert into sec_user (id, type, user_name, nick_name, avatar, email, phone, pass
 values (1, '0', 'sys_admin', '超级管理员', null, 'test@admin.com', null,
         '$2a$10$QX2DBrOBGLuhEmboliW66ulvQ5Hiy9GCdhsqqs1HgJVgslYhZEC6q',
         '0', null, null, 0, '0', null, 'sys', 'sys');
+INSERT INTO `sec_user`(`id`, `type`, `user_name`, `nick_name`, `avatar`, `email`, `phone`, `password`, `gender`,
+                       `address`, `summary`, `order`, `status`, `remark`, `creator`, `editor`)
+VALUES (2, '1', 'kalencaya', '王奇', NULL, '1942460489@qq.com', NULL,
+        '$2a$10$QX2DBrOBGLuhEmboliW66ulvQ5Hiy9GCdhsqqs1HgJVgslYhZEC6q', '1', NULL, NULL, 0, '0', NULL, 'sys', 'sys');
+INSERT INTO `sec_user`(`id`, `type`, `user_name`, `nick_name`, `avatar`, `email`, `phone`, `password`, `gender`,
+                       `address`, `summary`, `order`, `status`, `remark`, `creator`, `editor`)
+VALUES (3, '1', 'gleiyu', '耿雷雨', NULL, 'gleiyu@sina.cn', NULL,
+        '$2a$10$QX2DBrOBGLuhEmboliW66ulvQ5Hiy9GCdhsqqs1HgJVgslYhZEC6q', '1', NULL, NULL, 0, '0', NULL, 'sys', 'sys');
+INSERT INTO `sec_user`(`id`, `type`, `user_name`, `nick_name`, `avatar`, `email`, `phone`, `password`, `gender`,
+                       `address`, `summary`, `order`, `status`, `remark`, `creator`, `editor`)
+VALUES (4, '1', 'LiuBodong', 'LiuBodong', NULL, 'liubodong2010@126.com', NULL,
+        '$2a$10$QX2DBrOBGLuhEmboliW66ulvQ5Hiy9GCdhsqqs1HgJVgslYhZEC6q', '1', NULL,
+        'Want to learn everything but do well in nothing.', 0, '0', NULL, 'sys', 'sys');
+INSERT INTO `sec_user`(`id`, `type`, `user_name`, `nick_name`, `avatar`, `email`, `phone`, `password`, `gender`,
+                       `address`, `summary`, `order`, `status`, `remark`, `creator`, `editor`)
+VALUES (5, '1', 'bailongsen1027', NULL, NULL, 'test@123.com', NULL,
+        '$2a$10$QX2DBrOBGLuhEmboliW66ulvQ5Hiy9GCdhsqqs1HgJVgslYhZEC6q', '1', NULL, NULL, 0, '0', NULL, 'sys', 'sys');
 
 /* 角色表 */
 drop table if exists sec_role;
@@ -305,19 +322,19 @@ create table sec_resource_web
 
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
-VALUES (1, '2', 0, 'index', '/', '/studio/databoard', NULL, NULL, NULL, NULL, 'sys', 'sys');
+VALUES (1, '2', 0, NULL, '/', '/studio/databoard', NULL, NULL, NULL, NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
-VALUES (2, '2', 0, '404', '/404', NULL, NULL, NULL, './404', NULL, 'sys', 'sys');
+VALUES (2, '2', 0, NULL, '/404', NULL, NULL, NULL, './404', NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
-VALUES (3, '2', 0, 'login', '/login', NULL, 0, NULL, './User/Login', NULL, 'sys', 'sys');
+VALUES (3, '2', 0, NULL, '/login', NULL, 0, NULL, './User/Login', NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
-VALUES (4, '2', 0, 'register', '/register', NULL, 0, NULL, './User/Register', NULL, 'sys', 'sys');
+VALUES (4, '2', 0, NULL, '/register', NULL, 0, NULL, './User/Register', NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
                                `creator`, `editor`)
-VALUES (5, '2', 0, 'user-center', '/user/center', NULL, NULL, NULL, './User', NULL, 'sys', 'sys');
+VALUES (5, '2', 0, NULL, '/user/center', NULL, NULL, NULL, './User', NULL, 'sys', 'sys');
 INSERT INTO `sec_resource_web` (`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`,
                                 `remark`, `creator`, `editor`)
 VALUES (6, '0', 0, 'studio', '/studio', NULL, NULL, 'CodeSandboxOutlined', NULL, NULL, 'sys', 'sys');
@@ -542,6 +559,14 @@ INSERT INTO `sec_resource_web` (`id`, `type`, `pid`, `name`, `path`, `redirect`,
                                 `remark`, `creator`, `editor`)
 VALUES (68, '2', 64, NULL, '/workspace/doris/template/detail', NULL, NULL, NULL,
         './Project/Workspace/Doris/Template/Detail', NULL, 'sys', 'sys');
+INSERT INTO `sec_resource_web` (`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`,
+                                `remark`, `creator`, `editor`)
+VALUES (69, '2', 64, 'instance', '/workspace/doris/instance', NULL, NULL, NULL, './Project/Workspace/Doris/Instance',
+        NULL, 'sys', 'sys');
+INSERT INTO `sec_resource_web` (`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`,
+                                `remark`, `creator`, `editor`)
+VALUES (70, '2', 64, NULL, '/workspace/doris/instance/steps', NULL, NULL, NULL,
+        './Project/Workspace/Doris/Instance/Steps', NULL, 'sys', 'sys');
 
 drop table if exists sec_resource_web_role;
 create table sec_resource_web_role
diff --git a/tools/docker/mysql/init.d/scaleph-ws-mysql.sql b/tools/docker/mysql/init.d/scaleph-ws-mysql.sql
index 59e38a789..1eba5720e 100644
--- a/tools/docker/mysql/init.d/scaleph-ws-mysql.sql
+++ b/tools/docker/mysql/init.d/scaleph-ws-mysql.sql
@@ -548,7 +548,7 @@ create table ws_doris_template
     `name`        varchar(64)  not null,
     template_id   varchar(64)  not null,
     namespace     varchar(255) not null,
-    admin         varchar(255) comment 'session handler',
+    admin         varchar(255) comment 'admin user',
     `fe_spec`     text comment 'fe spec',
     `be_spec`     text comment 'be spec',
     `cn_spec`     text comment 'cn spec',
@@ -568,4 +568,32 @@ VALUES (1, 1, 'simple-doriscluster-sample', 'zexbfaf0eba4ce824787a9bed88148eb233
         '{"name":"admin","password":"Admin123"}',
         '{\"replicas\":1,\"image\":\"selectdb/doris.fe-ubuntu:2.0.2\",\"limits\":{\"cpu\":4,\"memory\":\"8Gi\"},\"requests\":{\"cpu\":4,\"memory\":\"8Gi\"}}',
         '{\"replicas\":1,\"image\":\"selectdb/doris.be-ubuntu:2.0.2\",\"limits\":{\"cpu\":4,\"memory\":\"8Gi\"},\"requests\":{\"cpu\":4,\"memory\":\"8Gi\"}}',
-        NULL, NULL, NULL, 'sys', 'sys');
\ No newline at end of file
+        NULL, NULL, NULL, 'sys', 'sys');
+
+drop table if exists ws_doris_instance;
+create table ws_doris_instance
+(
+    id                    bigint       not null auto_increment comment '自增主键',
+    project_id            bigint       not null comment '项目id',
+    cluster_credential_id bigint       not null,
+    `name`                varchar(64)  not null,
+    instance_id           varchar(64)  not null,
+    namespace             varchar(255) not null,
+    admin                 varchar(255) comment 'admin user',
+    `fe_spec`             text comment 'fe spec',
+    `be_spec`             text comment 'be spec',
+    `cn_spec`             text comment 'cn spec',
+    `broker_spec`         text comment 'broker spec',
+    deployed              varchar(8) comment '是否部署',
+    `fe_status`           text comment 'fe status',
+    `be_status`           text comment 'be status',
+    `cn_status`           text comment 'cn status',
+    `broker_status`       text comment 'broker status',
+    remark                varchar(255),
+    creator               varchar(32) comment '创建人',
+    create_time           timestamp default current_timestamp comment '创建时间',
+    editor                varchar(32) comment '修改人',
+    update_time           timestamp default current_timestamp on update current_timestamp comment '修改时间',
+    primary key (id),
+    unique key uniq_name (project_id, `name`, cluster_credential_id)
+) engine = innodb comment = 'doris instance';
\ No newline at end of file

From ffc377cb80983e913b613738d59c3a8423d7207c Mon Sep 17 00:00:00 2001
From: kalencaya <1942460489@qq.com>
Date: Sat, 2 Dec 2023 16:03:45 +0800
Subject: [PATCH 21/24] [Feature][scaleph-engine-doris] add doris instance
 steps form web (#652)

* fix: user resource

* fix: user resource

* feature: add doris instance steps form
---
 .../ws/WsDorisInstanceController.java         |  8 ++
 .../master/security/SecResourceWebMapper.java |  5 ++
 .../master/security/SecResourceWebMapper.xml  | 16 ++++
 .../impl/WsDorisInstanceServiceImpl.java      | 16 +++-
 .../cluster/DorisClusterConverter.java        | 73 +++++++++++++++++++
 .../service/SecResourceWebService.java        |  6 +-
 .../service/impl/SecAuthorizeServiceImpl.java | 17 +++--
 .../impl/SecResourceWebServiceImpl.java       |  6 ++
 .../scaleph/security/vo/OnlineUserVO.java     |  1 +
 .../security/web/OnlineUserService.java       |  6 ++
 .../scaleph/security/web/TokenFilter.java     |  4 +-
 .../src/locales/zh-CN/pages/project.ts        |  3 +
 .../doris/instance/dorisInstanceSteps.ts      | 30 ++++----
 .../Instance/Steps/ComponentStepForm.tsx      | 31 ++++++++
 .../Doris/Instance/Steps/YAMLStepForm.tsx     | 41 +++++++++++
 .../Workspace/Doris/Instance/Steps/index.tsx  | 52 +++++++++----
 .../Workspace/Doris/Instance/index.tsx        | 21 ++++--
 .../project/WsDorisInstanceService.ts         |  7 ++
 .../mysql/init.d/scaleph-security-mysql.sql   |  9 +++
 19 files changed, 305 insertions(+), 47 deletions(-)
 create mode 100644 scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/resource/cluster/DorisClusterConverter.java
 create mode 100644 scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/Steps/ComponentStepForm.tsx
 create mode 100644 scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/Steps/YAMLStepForm.tsx

diff --git a/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/ws/WsDorisInstanceController.java b/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/ws/WsDorisInstanceController.java
index cb75387b6..b2b179a71 100644
--- a/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/ws/WsDorisInstanceController.java
+++ b/scaleph-api/src/main/java/cn/sliew/scaleph/api/controller/ws/WsDorisInstanceController.java
@@ -61,6 +61,14 @@ public ResponseEntity<ResponseVO<WsDorisInstanceDTO>> selectOne(@PathVariable("i
         return new ResponseEntity(ResponseVO.success(dto), HttpStatus.OK);
     }
 
+    @Logging
+    @GetMapping("fromTemplate")
+    @Operation(summary = "根据模板创建实例", description = "根据模板创建实例")
+    public ResponseEntity<ResponseVO<WsDorisInstanceDTO>> fromTemplate(@RequestParam("templateId") Long templateId) {
+        WsDorisInstanceDTO cluster = wsDorisInstanceService.fromTemplate(templateId);
+        return new ResponseEntity(ResponseVO.success(cluster), HttpStatus.OK);
+    }
+
     @Logging
     @PostMapping("asYaml")
     @Operation(summary = "转换实例信息", description = "转换实例信息")
diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebMapper.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebMapper.java
index 342a25411..fa20c2650 100644
--- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebMapper.java
+++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebMapper.java
@@ -20,12 +20,17 @@
 
 import cn.sliew.scaleph.dao.entity.master.security.SecResourceWeb;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * 资源-web Mapper 接口
  */
 @Repository
 public interface SecResourceWebMapper extends BaseMapper<SecResourceWeb> {
 
+    List<SecResourceWeb> listByPidAndUserId(@Param("pid") Long pid, @Param("userId") Long userId, @Param("name") String name);
+
 }
diff --git a/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebMapper.xml b/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebMapper.xml
index 2f0d9bbff..c1a11f375 100644
--- a/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebMapper.xml
+++ b/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/security/SecResourceWebMapper.xml
@@ -50,4 +50,20 @@
         update_time,
         `type`, pid, `name`, `path`, redirect, layout, icon, `component`, remark
     </sql>
+
+    <select id="listByPidAndUserId" resultMap="BaseResultMap">
+        SELECT
+        t1.*
+        FROM
+        sec_resource_web t1
+        JOIN sec_resource_web_role t2 ON t1.id = t2.resource_web_id
+        JOIN sec_role t3 ON t2.role_id = t3.id AND t3.`status` = '1'
+        JOIN sec_user_role t4 ON t3.id = t4.role_id
+        WHERE
+        t1.pid = #{pid}
+        AND t4.user_id = #{userId}
+        <if test="name != null and name != ''">
+            AND t1.`name` like CONCAT('%', #{name}, '%')
+        </if>
+    </select>
 </mapper>
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/impl/WsDorisInstanceServiceImpl.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/impl/WsDorisInstanceServiceImpl.java
index ef16dac45..155eef96e 100644
--- a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/impl/WsDorisInstanceServiceImpl.java
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/impl/WsDorisInstanceServiceImpl.java
@@ -19,6 +19,7 @@
 package cn.sliew.scaleph.engine.doris.service.impl;
 
 import cn.sliew.milky.common.util.JacksonUtil;
+import cn.sliew.scaleph.common.dict.common.YesOrNo;
 import cn.sliew.scaleph.common.util.UUIDUtil;
 import cn.sliew.scaleph.dao.entity.master.ws.WsDorisInstance;
 import cn.sliew.scaleph.dao.mapper.master.ws.WsDorisInstanceMapper;
@@ -27,9 +28,11 @@
 import cn.sliew.scaleph.engine.doris.service.WsDorisTemplateService;
 import cn.sliew.scaleph.engine.doris.service.convert.WsDorisInstanceConvert;
 import cn.sliew.scaleph.engine.doris.service.dto.WsDorisInstanceDTO;
+import cn.sliew.scaleph.engine.doris.service.dto.WsDorisTemplateDTO;
 import cn.sliew.scaleph.engine.doris.service.param.WsDorisInstanceAddParam;
 import cn.sliew.scaleph.engine.doris.service.param.WsDorisInstanceListParam;
 import cn.sliew.scaleph.engine.doris.service.param.WsDorisInstanceUpdateParam;
+import cn.sliew.scaleph.engine.doris.service.resource.cluster.DorisClusterConverter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -73,12 +76,20 @@ public WsDorisInstanceDTO selectOne(Long id) {
 
     @Override
     public WsDorisInstanceDTO fromTemplate(Long templateId) {
-        return null;
+        WsDorisTemplateDTO wsDorisTemplateDTO = wsDorisTemplateService.selectOne(templateId);
+        WsDorisInstanceDTO wsDorisInstanceDTO = new WsDorisInstanceDTO();
+        wsDorisInstanceDTO.setAdmin(wsDorisTemplateDTO.getAdmin());
+        wsDorisInstanceDTO.setFeSpec(wsDorisTemplateDTO.getFeSpec());
+        wsDorisInstanceDTO.setBeSpec(wsDorisTemplateDTO.getBeSpec());
+        wsDorisInstanceDTO.setCnSpec(wsDorisTemplateDTO.getCnSpec());
+        wsDorisInstanceDTO.setBrokerSpec(wsDorisTemplateDTO.getBrokerSpec());
+        wsDorisInstanceDTO.setRemark("generated from template-" + wsDorisTemplateDTO.getName());
+        return wsDorisInstanceDTO;
     }
 
     @Override
     public DorisCluster asYaml(WsDorisInstanceDTO dto) {
-        return null;
+        return DorisClusterConverter.INSTANCE.convertTo(dto);
     }
 
     @Override
@@ -86,6 +97,7 @@ public int insert(WsDorisInstanceAddParam param) {
         WsDorisInstance record = new WsDorisInstance();
         BeanUtils.copyProperties(param, record);
         record.setInstanceId(UUIDUtil.randomUUId());
+        record.setDeployed(YesOrNo.NO);
         if (param.getAdmin() != null) {
             record.setAdmin(JacksonUtil.toJsonString(param.getAdmin()));
         }
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/resource/cluster/DorisClusterConverter.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/resource/cluster/DorisClusterConverter.java
new file mode 100644
index 000000000..d7ced0e4b
--- /dev/null
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/resource/cluster/DorisClusterConverter.java
@@ -0,0 +1,73 @@
+/*
+ * 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 cn.sliew.scaleph.engine.doris.service.resource.cluster;
+
+import cn.sliew.scaleph.config.resource.ResourceLabels;
+import cn.sliew.scaleph.engine.doris.operator.DorisCluster;
+import cn.sliew.scaleph.engine.doris.operator.spec.DorisClusterSpec;
+import cn.sliew.scaleph.engine.doris.service.dto.WsDorisInstanceDTO;
+import cn.sliew.scaleph.kubernetes.resource.ResourceConverter;
+import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
+import org.springframework.util.StringUtils;
+
+import java.util.Map;
+
+public enum DorisClusterConverter implements ResourceConverter<WsDorisInstanceDTO, DorisCluster> {
+    INSTANCE;
+
+    @Override
+    public DorisCluster convertTo(WsDorisInstanceDTO source) {
+        DorisCluster cluster = new DorisCluster();
+        ObjectMetaBuilder builder = new ObjectMetaBuilder(true);
+        String name = StringUtils.hasText(source.getInstanceId()) ? source.getInstanceId() : source.getName();
+        builder.withName(name);
+        builder.withNamespace(source.getNamespace());
+        builder.withLabels(Map.of(ResourceLabels.SCALEPH_LABEL_NAME, source.getName()));
+        cluster.setMetadata(builder.build());
+        DorisClusterSpec spec = new DorisClusterSpec();
+        spec.setFeSpec(source.getFeSpec());
+        spec.setBeSpec(source.getBeSpec());
+        spec.setCnSpec(source.getCnSpec());
+        spec.setBrokerSpec(source.getBrokerSpec());
+        spec.setAdminUser(source.getAdmin());
+        cluster.setSpec(spec);
+        return cluster;
+    }
+
+    @Override
+    public WsDorisInstanceDTO convertFrom(DorisCluster target) {
+        WsDorisInstanceDTO dto = new WsDorisInstanceDTO();
+        String name = target.getMetadata().getName();
+        if (target.getMetadata().getLabels() != null) {
+            Map<String, String> labels = target.getMetadata().getLabels();
+            name = labels.computeIfAbsent(ResourceLabels.SCALEPH_LABEL_NAME, key -> target.getMetadata().getName());
+        }
+        dto.setName(name);
+        dto.setInstanceId(target.getMetadata().getName());
+        dto.setNamespace(target.getMetadata().getNamespace());
+
+        DorisClusterSpec spec = target.getSpec();
+        dto.setFeSpec(spec.getFeSpec());
+        dto.setBeSpec(spec.getBeSpec());
+        dto.setCnSpec(spec.getCnSpec());
+        dto.setBrokerSpec(spec.getBrokerSpec());
+        dto.setAdmin(spec.getAdminUser());
+        return dto;
+    }
+}
diff --git a/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/SecResourceWebService.java b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/SecResourceWebService.java
index 8636635c7..2f8c23a1e 100644
--- a/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/SecResourceWebService.java
+++ b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/SecResourceWebService.java
@@ -20,7 +20,9 @@
 
 import cn.sliew.scaleph.common.dict.security.ResourceType;
 import cn.sliew.scaleph.security.service.dto.SecResourceWebDTO;
-import cn.sliew.scaleph.security.service.param.*;
+import cn.sliew.scaleph.security.service.param.SecResourceWebAddParam;
+import cn.sliew.scaleph.security.service.param.SecResourceWebListParam;
+import cn.sliew.scaleph.security.service.param.SecResourceWebUpdateParam;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.List;
@@ -33,6 +35,8 @@ public interface SecResourceWebService {
 
     List<SecResourceWebDTO> listByPid(Long pid, String name);
 
+    List<SecResourceWebDTO> listByPidAndUserId(Long pid, Long userId, String name);
+
     int insert(SecResourceWebAddParam param);
 
     int update(SecResourceWebUpdateParam param);
diff --git a/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/impl/SecAuthorizeServiceImpl.java b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/impl/SecAuthorizeServiceImpl.java
index c92634e16..6216f4901 100644
--- a/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/impl/SecAuthorizeServiceImpl.java
+++ b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/impl/SecAuthorizeServiceImpl.java
@@ -21,6 +21,7 @@
 import cn.sliew.scaleph.dao.entity.master.security.*;
 import cn.sliew.scaleph.dao.mapper.master.security.SecResourceWebRoleMapper;
 import cn.sliew.scaleph.dao.mapper.master.security.SecUserRoleMapper;
+import cn.sliew.scaleph.security.authentication.UserDetailInfo;
 import cn.sliew.scaleph.security.service.SecAuthorizeService;
 import cn.sliew.scaleph.security.service.SecResourceWebService;
 import cn.sliew.scaleph.security.service.convert.SecResourceWebWithAuthorizeConvert;
@@ -28,10 +29,12 @@
 import cn.sliew.scaleph.security.service.convert.SecUserConvert;
 import cn.sliew.scaleph.security.service.dto.*;
 import cn.sliew.scaleph.security.service.param.*;
+import cn.sliew.scaleph.security.util.SecurityUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
@@ -47,17 +50,17 @@ public class SecAuthorizeServiceImpl implements SecAuthorizeService {
     private SecResourceWebRoleMapper secResourceWebRoleMapper;
     @Autowired
     private SecUserRoleMapper secUserRoleMapper;
+    @Autowired
+    private UserDetailsService userDetailsService;
 
-    /**
-     * fixme 这里没有获取用户自己的资源，先获取的所有资源
-     */
     @Override
     public List<UmiRoute> getWebRoute() {
-        return buildRouteByPid(0L);
+        UserDetailInfo userDetails = (UserDetailInfo) userDetailsService.loadUserByUsername(SecurityUtil.getCurrentUserName());
+        return buildRouteByPid(0L, userDetails.getUser().getId());
     }
 
-    private List<UmiRoute> buildRouteByPid(Long pid) {
-        List<SecResourceWebDTO> secResourceWebDTOS = secResourceWebService.listByPid(pid, null);
+    private List<UmiRoute> buildRouteByPid(Long pid, Long userId) {
+        List<SecResourceWebDTO> secResourceWebDTOS = secResourceWebService.listByPidAndUserId(pid, userId, null);
         List<UmiRoute> routes = new ArrayList<>(secResourceWebDTOS.size());
         for (SecResourceWebDTO secResourceWebDTO : secResourceWebDTOS) {
             UmiRoute route = new UmiRoute();
@@ -66,7 +69,7 @@ private List<UmiRoute> buildRouteByPid(Long pid) {
             route.setRedirect(secResourceWebDTO.getRedirect());
             route.setIcon(secResourceWebDTO.getIcon());
             route.setComponent(secResourceWebDTO.getComponent());
-            List<UmiRoute> childRoutes = buildRouteByPid(secResourceWebDTO.getId());
+            List<UmiRoute> childRoutes = buildRouteByPid(secResourceWebDTO.getId(), userId);
             if (CollectionUtils.isEmpty(childRoutes) == false) {
                 route.setRoutes(childRoutes);
             }
diff --git a/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/impl/SecResourceWebServiceImpl.java b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/impl/SecResourceWebServiceImpl.java
index 9c208afbd..1cc8a275c 100644
--- a/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/impl/SecResourceWebServiceImpl.java
+++ b/scaleph-security/src/main/java/cn/sliew/scaleph/security/service/impl/SecResourceWebServiceImpl.java
@@ -82,6 +82,12 @@ public List<SecResourceWebDTO> listByPid(Long pid, String name) {
         return SecResourceWebConvert.INSTANCE.toDto(list);
     }
 
+    @Override
+    public List<SecResourceWebDTO> listByPidAndUserId(Long pid, Long userId, String name) {
+        List<SecResourceWeb> list = secResourceWebMapper.listByPidAndUserId(pid, userId, name);
+        return SecResourceWebConvert.INSTANCE.toDto(list);
+    }
+
     @Override
     public int insert(SecResourceWebAddParam param) {
         SecResourceWeb record = BeanUtil.copy(param, new SecResourceWeb());
diff --git a/scaleph-security/src/main/java/cn/sliew/scaleph/security/vo/OnlineUserVO.java b/scaleph-security/src/main/java/cn/sliew/scaleph/security/vo/OnlineUserVO.java
index bcfeb5d99..913b8e521 100644
--- a/scaleph-security/src/main/java/cn/sliew/scaleph/security/vo/OnlineUserVO.java
+++ b/scaleph-security/src/main/java/cn/sliew/scaleph/security/vo/OnlineUserVO.java
@@ -30,6 +30,7 @@
  */
 @Data
 public class OnlineUserVO {
+    private Long userId;
     private String userName;
     private String email;
     private String ipAddress;
diff --git a/scaleph-security/src/main/java/cn/sliew/scaleph/security/web/OnlineUserService.java b/scaleph-security/src/main/java/cn/sliew/scaleph/security/web/OnlineUserService.java
index e83dc2436..e9a5616e0 100644
--- a/scaleph-security/src/main/java/cn/sliew/scaleph/security/web/OnlineUserService.java
+++ b/scaleph-security/src/main/java/cn/sliew/scaleph/security/web/OnlineUserService.java
@@ -63,6 +63,7 @@ public class OnlineUserService {
     public void insert(UserDetailInfo userInfo, String token) {
         OnlineUserVO onlineUser = new OnlineUserVO();
         onlineUser.setToken(token);
+        onlineUser.setUserId(userInfo.getUser().getId());
         onlineUser.setEmail(userInfo.getUser().getEmail());
         onlineUser.setIpAddress(userInfo.getLoginIpAddress());
         onlineUser.setLoginTime(userInfo.getLoginTime());
@@ -94,6 +95,11 @@ public void insert(UserDetailInfo userInfo, String token) {
         redisUtil.set(Constants.ONLINE_TOKEN_KEY + token, onlineUser, time);
     }
 
+    public OnlineUserVO getOnlineUser(String token) {
+        //用户在线且有效，获取用户的权限信息 只要在redis中存在数据则认为是有效在线用户
+        return (OnlineUserVO) redisUtil.get(Constants.ONLINE_TOKEN_KEY + token);
+    }
+
     /**
      * 登出用户
      *
diff --git a/scaleph-security/src/main/java/cn/sliew/scaleph/security/web/TokenFilter.java b/scaleph-security/src/main/java/cn/sliew/scaleph/security/web/TokenFilter.java
index 8955e6ac5..f20b4334a 100644
--- a/scaleph-security/src/main/java/cn/sliew/scaleph/security/web/TokenFilter.java
+++ b/scaleph-security/src/main/java/cn/sliew/scaleph/security/web/TokenFilter.java
@@ -71,9 +71,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
             throws IOException, ServletException {
         HttpServletRequest httpServletRequest = (HttpServletRequest) request;
         String token = resolveToken(httpServletRequest);
-        //用户在线且有效，获取用户的权限信息 只要在redis中存在数据则认为是有效在线用户
-        OnlineUserVO onlineUser =
-                (OnlineUserVO) redisUtil.get(Constants.ONLINE_TOKEN_KEY + token);
+        OnlineUserVO onlineUser = onlineUserService.getOnlineUser(token);
         if (onlineUser != null) {
             long time =
                     onlineUser.getRemember() ? properties.getLongTokenValidityInSeconds() / 1000 :
diff --git a/scaleph-ui-react/src/locales/zh-CN/pages/project.ts b/scaleph-ui-react/src/locales/zh-CN/pages/project.ts
index 3d8ce78ec..b9c84fb17 100644
--- a/scaleph-ui-react/src/locales/zh-CN/pages/project.ts
+++ b/scaleph-ui-react/src/locales/zh-CN/pages/project.ts
@@ -946,10 +946,13 @@ export default {
   'pages.project.doris.instance': 'Instance',
   'pages.project.doris.instance.name': '名称',
   'pages.project.doris.instance.namespace': '命名空间',
+  'pages.project.doris.instance.deployed': '是否部署？',
   'pages.project.doris.instance.steps': '创建实例',
   'pages.project.doris.instance.steps.base': '基础信息',
   'pages.project.doris.instance.steps.base.cluster': 'Cluster',
   'pages.project.doris.instance.steps.base.template': 'Template',
+  'pages.project.doris.instance.steps.component': '集群组件',
+  'pages.project.doris.instance.steps.yaml': 'YAML',
 
 
   'Run': '运行',
diff --git a/scaleph-ui-react/src/models/project/workspace/doris/instance/dorisInstanceSteps.ts b/scaleph-ui-react/src/models/project/workspace/doris/instance/dorisInstanceSteps.ts
index 9a90b100c..57b8dc536 100644
--- a/scaleph-ui-react/src/models/project/workspace/doris/instance/dorisInstanceSteps.ts
+++ b/scaleph-ui-react/src/models/project/workspace/doris/instance/dorisInstanceSteps.ts
@@ -2,9 +2,9 @@ import {WsDorisInstance, WsDorisTemplate} from "@/services/project/typings";
 import {Effect, Reducer} from "umi";
 import YAML from "yaml";
 import {WsDorisTemplateService} from "@/services/project/WsDorisTemplateService";
+import {WsDorisInstanceService} from "@/services/project/WsDorisInstanceService";
 
 export interface StateType {
-  template: WsDorisTemplate,
   instance: WsDorisInstance,
   instanceYaml: string
   instanceYamlWithDefault: string
@@ -28,32 +28,32 @@ const model: ModelType = {
   namespace: "dorisInstanceSteps",
 
   state: {
-    template: null,
-    templateYaml: null,
-    templateYamlWithDefault: null
+    instance: null,
+    instanceYaml: null,
+    instanceYamlWithDefault: null
   },
 
   effects: {
-    *editTemplate({payload}, {call, put}) {
-      const {data} = yield call(WsDorisTemplateService.asYaml, payload);
-      const response = yield call(WsDorisTemplateService.asYaml, payload);
-      yield put({type: 'updateTemplate',
+    *editInstance({payload}, {call, put}) {
+      const {data} = yield call(WsDorisInstanceService.asYaml, payload);
+      const response = yield call(WsDorisInstanceService.asYaml, payload);
+      yield put({type: 'updateInstance',
         payload: {
-          template: payload,
-          templateYaml: YAML.stringify(data),
-          templateYamlWithDefault: YAML.stringify(response.data)
+          instance: payload,
+          instanceYaml: YAML.stringify(data),
+          instanceYamlWithDefault: YAML.stringify(response.data)
         }
       });
     },
   },
 
   reducers: {
-    updateTemplate(state, {payload}) {
+    updateInstance(state, {payload}) {
       return {
         ...state,
-        template: payload.template,
-        templateYaml: payload.templateYaml,
-        templateYamlWithDefault: payload.templateYamlWithDefault,
+        instance: payload.instance,
+        instanceYaml: payload.instanceYaml,
+        instanceYamlWithDefault: payload.instanceYamlWithDefault,
       };
     },
   },
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/Steps/ComponentStepForm.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/Steps/ComponentStepForm.tsx
new file mode 100644
index 000000000..7ff90d37d
--- /dev/null
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/Steps/ComponentStepForm.tsx
@@ -0,0 +1,31 @@
+import React, {useEffect} from "react";
+import {ProCard} from "@ant-design/pro-components";
+import DorisFeComponent from "@/pages/Project/Workspace/Doris/Template/Steps/Component/DorisFeComponent";
+import DorisAdminUser from "@/pages/Project/Workspace/Doris/Template/Steps/Component/DorisAdminUser";
+import DorisBeComponent from "@/pages/Project/Workspace/Doris/Template/Steps/Component/DorisBeComponent";
+import DorisCnComponent from "@/pages/Project/Workspace/Doris/Template/Steps/Component/DorisCnComponent";
+import {connect} from "umi";
+import {Form} from "antd";
+import {WsDorisTemplateService} from "@/services/project/WsDorisTemplateService";
+
+const DorisInstanceComponent: React.FC = (props: any) => {
+  const form = Form.useFormInstance()
+
+  useEffect(() => {
+    if (props.dorisInstanceSteps.instance) {
+      form.setFieldsValue(WsDorisTemplateService.parseData({...props.dorisInstanceSteps.instance}))
+    }
+  }, [props.dorisInstanceSteps.instance]);
+
+  return (
+    <ProCard>
+      <DorisAdminUser/>
+      <DorisFeComponent/>
+      <DorisBeComponent/>
+      <DorisCnComponent/>
+    </ProCard>
+  );
+}
+
+const mapModelToProps = ({dorisInstanceSteps}: any) => ({dorisInstanceSteps})
+export default connect(mapModelToProps)(DorisInstanceComponent);
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/Steps/YAMLStepForm.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/Steps/YAMLStepForm.tsx
new file mode 100644
index 000000000..807aee7b1
--- /dev/null
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/Steps/YAMLStepForm.tsx
@@ -0,0 +1,41 @@
+import React, {useEffect, useRef} from "react";
+import {ProCard} from "@ant-design/pro-components";
+import Editor, {Monaco, useMonaco} from "@monaco-editor/react";
+import {connect} from "umi";
+
+const DorisInstanceYAML: React.FC = (props: any) => {
+  const editorRef = useRef(null);
+  const monaco = useMonaco();
+
+  useEffect(() => {
+    monaco?.languages.typescript.javascriptDefaults.setEagerModelSync(true);
+  }, [monaco]);
+
+  const handleEditorDidMount = (editor, monaco: Monaco) => {
+    editorRef.current = editor;
+  }
+
+  return (
+    <ProCard>
+      <Editor
+        width="730"
+        height="600px"
+        language="yaml"
+        theme="vs-white"
+        value={props.dorisInstanceSteps.instanceYaml}
+        options={{
+          selectOnLineNumbers: true,
+          readOnly: true,
+          minimap: {
+            enabled: false
+          }
+        }}
+        onMount={handleEditorDidMount}
+      />
+    </ProCard>
+
+  );
+}
+
+const mapModelToProps = ({dorisInstanceSteps}: any) => ({dorisInstanceSteps})
+export default connect(mapModelToProps)(DorisInstanceYAML);
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/Steps/index.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/Steps/index.tsx
index 6fead5b83..29f8eb320 100644
--- a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/Steps/index.tsx
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/Steps/index.tsx
@@ -5,6 +5,9 @@ import {WORKSPACE_CONF} from "@/constant";
 import {WsDorisInstance, WsDorisTemplate} from "@/services/project/typings";
 import {WsDorisTemplateService} from "@/services/project/WsDorisTemplateService";
 import DorisInstanceBase from "@/pages/Project/Workspace/Doris/Instance/Steps/BaseStepForm";
+import {WsDorisInstanceService} from "@/services/project/WsDorisInstanceService";
+import DorisInstanceComponent from "@/pages/Project/Workspace/Doris/Instance/Steps/ComponentStepForm";
+import DorisInstanceYAML from "@/pages/Project/Workspace/Doris/Instance/Steps/YAMLStepForm";
 
 const DorisInstanceSteps: React.FC = (props: any) => {
   const intl = useIntl();
@@ -12,34 +15,44 @@ const DorisInstanceSteps: React.FC = (props: any) => {
   const localProjectId = localStorage.getItem(WORKSPACE_CONF.projectId);
 
   const onBaseStepFinish = (values: Record<string, any>) => {
-    const template: WsDorisInstance = {
-      projectId: localProjectId,
-      name: values.name,
-      namespace: values.namespace,
-      remark: values.remark,
-    }
-    editDorisTemplate(template)
-    return Promise.resolve(true)
+    return WsDorisInstanceService.fromTemplate(values.templateId).then(response => {
+      const instance: WsDorisInstance = response.data
+      instance.projectId = localProjectId
+      instance.name = values.name
+      instance.clusterCredentialId = values.clusterCredentialId
+      instance.namespace = values.namespace
+      instance.remark = values.remark
+      editDorisInstance(instance)
+      return true
+    })
   }
 
   const onComponentStepFinish = (values: Record<string, any>) => {
     try {
-      const template: WsDorisTemplate = WsDorisTemplateService.formatData(props.dorisTemplateSteps.template, values)
-      editDorisTemplate(template)
+      const template: WsDorisTemplate = WsDorisTemplateService.formatData({}, values)
+      const instance: WsDorisInstance = {
+        ...props.dorisInstanceSteps.instance,
+        admin: template.admin,
+        feSpec: template.feSpec,
+        beSpec: template.beSpec,
+        cnSpec: template.cnSpec,
+        brokerSpec: template.brokerSpec,
+      }
+      editDorisInstance(instance)
     } catch (unused) {
     }
     return Promise.resolve(true)
   }
 
-  const editDorisTemplate = (template: WsDorisTemplate) => {
+  const editDorisInstance = (template: WsDorisInstance) => {
     props.dispatch({
-      type: 'dorisInstanceSteps/editTemplate',
+      type: 'dorisInstanceSteps/editInstance',
       payload: template
     })
   }
 
   const onAllFinish = (values: Record<string, any>) => {
-    return WsDorisTemplateService.add(props.dorisTemplateSteps.template).then((response) => {
+    return WsDorisInstanceService.add(props.dorisInstanceSteps.instance).then((response) => {
       if (response.success) {
         history.back()
       }
@@ -64,6 +77,19 @@ const DorisInstanceSteps: React.FC = (props: any) => {
             onFinish={onBaseStepFinish}>
             <DorisInstanceBase/>
           </StepsForm.StepForm>
+          <StepsForm.StepForm
+            name="component"
+            title={intl.formatMessage({id: 'pages.project.doris.instance.steps.component'})}
+            style={{width: 1000}}
+            onFinish={onComponentStepFinish}>
+            <DorisInstanceComponent/>
+          </StepsForm.StepForm>
+          <StepsForm.StepForm
+            name="yaml"
+            title={intl.formatMessage({id: 'pages.project.doris.instance.steps.yaml'})}
+            style={{width: 1000}}>
+            <DorisInstanceYAML/>
+          </StepsForm.StepForm>
         </StepsForm>
       </ProCard>
     </PageContainer>
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/index.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/index.tsx
index 667c9b776..c3f39f8e7 100644
--- a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/index.tsx
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/index.tsx
@@ -1,11 +1,12 @@
 import {history, useAccess, useIntl} from "umi";
 import React, {useRef, useState} from "react";
-import {Button, message, Modal, Space, Tooltip} from "antd";
+import {Button, message, Modal, Space, Tag, Tooltip} from "antd";
 import {DeleteOutlined, EditOutlined, NodeIndexOutlined} from "@ant-design/icons";
-import {ActionType, ProColumns, ProFormInstance, ProTable} from "@ant-design/pro-components";
-import {PRIVILEGE_CODE, WORKSPACE_CONF} from "@/constant";
+import {ActionType, ProColumns, ProFormInstance, ProFormSelect, ProTable} from "@ant-design/pro-components";
+import {DICT_TYPE, PRIVILEGE_CODE, WORKSPACE_CONF} from "@/constant";
 import {WsDorisInstance, WsDorisTemplate} from "@/services/project/typings";
 import {WsDorisInstanceService} from "@/services/project/WsDorisInstanceService";
+import {DictDataService} from "@/services/admin/dictData.service";
 
 const DorisInstanceWeb: React.FC = () => {
   const intl = useIntl();
@@ -21,14 +22,22 @@ const DorisInstanceWeb: React.FC = () => {
 
   const tableColumns: ProColumns<WsDorisInstance>[] = [
     {
-      title: intl.formatMessage({id: 'pages.project.doris.template.name'}),
+      title: intl.formatMessage({id: 'pages.project.doris.instance.name'}),
       dataIndex: 'name'
     },
     {
-      title: intl.formatMessage({id: 'pages.project.doris.template.namespace'}),
+      title: intl.formatMessage({id: 'pages.project.doris.instance.namespace'}),
       dataIndex: 'namespace',
       hideInSearch: true,
     },
+
+    {
+      title: intl.formatMessage({id: 'pages.project.doris.instance.deployed'}),
+      dataIndex: 'deployed',
+      render: (dom, entity) => {
+        return (<Tag>{entity.deployed?.label}</Tag>)
+      }
+    },
     {
       title: intl.formatMessage({id: 'app.common.data.remark'}),
       dataIndex: 'remark',
@@ -74,7 +83,7 @@ const DorisInstanceWeb: React.FC = () => {
                 type="link"
                 icon={<NodeIndexOutlined/>}
                 onClick={() => {
-                  history.push("/workspace/doris/template/detail", record)
+                  // history.push("/workspace/doris/template/detail", record)
                 }}
               />
             </Tooltip>
diff --git a/scaleph-ui-react/src/services/project/WsDorisInstanceService.ts b/scaleph-ui-react/src/services/project/WsDorisInstanceService.ts
index be991d2a5..f8a7c90c1 100644
--- a/scaleph-ui-react/src/services/project/WsDorisInstanceService.ts
+++ b/scaleph-ui-react/src/services/project/WsDorisInstanceService.ts
@@ -20,6 +20,13 @@ export const WsDorisInstanceService = {
     });
   },
 
+  fromTemplate: async (templateId: number) => {
+    return request<ResponseBody<WsDorisInstance>>(`${WsDorisInstanceService.url}/fromTemplate`, {
+      method: 'GET',
+      params: {templateId: templateId},
+    });
+  },
+
   asYaml: async (param: WsDorisInstance) => {
     return request<ResponseBody<any>>(`${WsDorisInstanceService.url}/asYaml`, {
       method: 'POST',
diff --git a/tools/docker/mysql/init.d/scaleph-security-mysql.sql b/tools/docker/mysql/init.d/scaleph-security-mysql.sql
index a5194a153..0be690c3e 100644
--- a/tools/docker/mysql/init.d/scaleph-security-mysql.sql
+++ b/tools/docker/mysql/init.d/scaleph-security-mysql.sql
@@ -582,6 +582,15 @@ create table sec_resource_web_role
     unique key (resource_web_id, role_id)
 ) engine = innodb comment = '资源-web与角色关联表';
 
+insert into sec_resource_web_role (resource_web_id, role_id, creator, editor)
+select t1.id as resource_web_id,
+       t2.id as role_id,
+       'sys' as creator,
+       'sys' as editor
+from sec_resource_web t1,
+     sec_role t2
+where t2.`code` in ('sys_admin', 'sys_super_admin');
+
 /* 部门表 */
 drop table if exists sec_dept;
 create table sec_dept

From 76178959c134714b86cf766378e0c9886716678f Mon Sep 17 00:00:00 2001
From: kalencaya <1942460489@qq.com>
Date: Tue, 5 Dec 2023 08:07:41 +0800
Subject: [PATCH 22/24] [Feature][scaleph-engine-doris] add doris instance
 detail web  (#653)

* feature: add doris instance detail web

* feature: add doris instance detail web

* feature: add doris instance detail web
---
 .../dao/entity/master/ws/WsDorisTemplate.java |   3 -
 .../master/ws/WsDorisTemplateMapper.xml       |   3 +-
 .../doris/service/dto/WsDorisTemplateDTO.java |   2 -
 .../param/WsDorisTemplateAddParam.java        |   4 -
 .../param/WsDorisTemplateUpdateParam.java     |   4 -
 .../template/DorisTemplateConverter.java      |   2 -
 scaleph-ui-react/config/routes.ts             |   7 +
 .../src/locales/zh-CN/pages/project.ts        |   1 -
 .../Workspace/Doris/Instance/Detail/index.tsx | 186 ++++++++++++++++++
 .../Instance/DorisInstanceSimpleForm.tsx      |  83 ++++++++
 .../Doris/Instance/Steps/BaseStepForm.tsx     |   5 +-
 .../Workspace/Doris/Instance/index.tsx        |  24 ++-
 .../Doris/Template/DorisTemplateForm.tsx      |   9 +-
 .../Doris/Template/Steps/BaseStepForm.tsx     |   9 +-
 .../Workspace/Doris/Template/Steps/index.tsx  |   1 -
 .../Workspace/Doris/Template/index.tsx        |   5 -
 .../project/WsDorisTemplateService.ts         |   1 -
 .../src/services/project/typings.d.ts         |   3 -
 .../mysql/init.d/scaleph-security-mysql.sql   |   4 +
 .../docker/mysql/init.d/scaleph-ws-mysql.sql  |  31 ++-
 20 files changed, 322 insertions(+), 65 deletions(-)
 create mode 100644 scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/Detail/index.tsx
 create mode 100644 scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/DorisInstanceSimpleForm.tsx

diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsDorisTemplate.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsDorisTemplate.java
index b938b191a..caa71b2db 100644
--- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsDorisTemplate.java
+++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsDorisTemplate.java
@@ -43,9 +43,6 @@ public class WsDorisTemplate extends BaseDO {
     @TableField("template_id")
     private String templateId;
 
-    @TableField("namespace")
-    private String namespace;
-
     @TableField("`admin`")
     private String admin;
 
diff --git a/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/ws/WsDorisTemplateMapper.xml b/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/ws/WsDorisTemplateMapper.xml
index aaba28934..d953f6462 100644
--- a/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/ws/WsDorisTemplateMapper.xml
+++ b/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/ws/WsDorisTemplateMapper.xml
@@ -29,7 +29,6 @@
         <result column="project_id" property="projectId" />
         <result column="name" property="name" />
         <result column="template_id" property="templateId" />
-        <result column="namespace" property="namespace" />
         <result column="admin" property="admin" />
         <result column="fe_spec" property="feSpec" />
         <result column="be_spec" property="beSpec" />
@@ -45,7 +44,7 @@
         create_time,
         editor,
         update_time,
-        project_id, `name`, template_id, namespace, `admin`, fe_spec, be_spec, cn_spec, broker_spec, remark
+        project_id, `name`, template_id, `admin`, fe_spec, be_spec, cn_spec, broker_spec, remark
     </sql>
 
 </mapper>
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/dto/WsDorisTemplateDTO.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/dto/WsDorisTemplateDTO.java
index 7d814b371..205ca4025 100644
--- a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/dto/WsDorisTemplateDTO.java
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/dto/WsDorisTemplateDTO.java
@@ -36,8 +36,6 @@ public class WsDorisTemplateDTO extends BaseDTO {
 
     private String templateId;
 
-    private String namespace;
-
     @Schema(description = "admin user")
     private AdminUser admin;
 
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisTemplateAddParam.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisTemplateAddParam.java
index 7319f29b1..4ff2fedc2 100644
--- a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisTemplateAddParam.java
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisTemplateAddParam.java
@@ -36,10 +36,6 @@ public class WsDorisTemplateAddParam {
     @Schema(description = "name")
     private String name;
 
-    @NotBlank
-    @Schema(description = "namespace")
-    private String namespace;
-
     @NotNull
     @Schema(description = "admin user")
     private AdminUser admin;
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisTemplateUpdateParam.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisTemplateUpdateParam.java
index 72ec12ee6..a887dcb93 100644
--- a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisTemplateUpdateParam.java
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/param/WsDorisTemplateUpdateParam.java
@@ -36,10 +36,6 @@ public class WsDorisTemplateUpdateParam {
     @Schema(description = "name")
     private String name;
 
-    @NotBlank
-    @Schema(description = "namespace")
-    private String namespace;
-
     @NotNull
     @Schema(description = "admin user")
     private AdminUser admin;
diff --git a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/resource/template/DorisTemplateConverter.java b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/resource/template/DorisTemplateConverter.java
index f567d92d4..af4cb1d63 100644
--- a/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/resource/template/DorisTemplateConverter.java
+++ b/scaleph-engine/scaleph-engine-doris/src/main/java/cn/sliew/scaleph/engine/doris/service/resource/template/DorisTemplateConverter.java
@@ -36,7 +36,6 @@ public DorisTemplate convertTo(WsDorisTemplateDTO source) {
         ObjectMetaBuilder builder = new ObjectMetaBuilder(true);
         String name = StringUtils.hasText(source.getTemplateId()) ? source.getTemplateId() : source.getName();
         builder.withName(name);
-        builder.withNamespace(source.getNamespace());
         builder.withLabels(Map.of(ResourceLabels.SCALEPH_LABEL_NAME, source.getName()));
         template.setMetadata(builder.build());
         DorisClusterSpec spec = new DorisClusterSpec();
@@ -59,7 +58,6 @@ public WsDorisTemplateDTO convertFrom(DorisTemplate target) {
         }
         dto.setName(name);
         dto.setTemplateId(target.getMetadata().getName());
-        dto.setNamespace(target.getMetadata().getNamespace());
 
         DorisClusterSpec spec = target.getSpec();
         dto.setFeSpec(spec.getFeSpec());
diff --git a/scaleph-ui-react/config/routes.ts b/scaleph-ui-react/config/routes.ts
index 0f4d6a829..1fcc0a931 100644
--- a/scaleph-ui-react/config/routes.ts
+++ b/scaleph-ui-react/config/routes.ts
@@ -268,6 +268,13 @@ export default [
             pCode: PRIVILEGE_CODE.workspaceClusterConfigShow,
             access: 'normalRouteFilter'
           },
+          {
+            path: '/workspace/doris/instance/detail',
+            exact: true,
+            component: './Project/Workspace/Doris/Instance/Detail',
+            pCode: PRIVILEGE_CODE.workspaceClusterConfigShow,
+            access: 'normalRouteFilter'
+          },
         ]
       },
     ]
diff --git a/scaleph-ui-react/src/locales/zh-CN/pages/project.ts b/scaleph-ui-react/src/locales/zh-CN/pages/project.ts
index b9c84fb17..a6c40469c 100644
--- a/scaleph-ui-react/src/locales/zh-CN/pages/project.ts
+++ b/scaleph-ui-react/src/locales/zh-CN/pages/project.ts
@@ -922,7 +922,6 @@ export default {
 
   'pages.project.doris.template': 'Template',
   'pages.project.doris.template.name': '名称',
-  'pages.project.doris.template.namespace': '命名空间',
   'pages.project.doris.template.define': '模板定义',
   'pages.project.doris.template.steps.base': '基础信息',
   'pages.project.doris.template.steps.component': '集群组件',
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/Detail/index.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/Detail/index.tsx
new file mode 100644
index 000000000..9830f972e
--- /dev/null
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/Detail/index.tsx
@@ -0,0 +1,186 @@
+import {useIntl, useLocation} from "umi";
+import React, {useEffect, useRef, useState} from "react";
+import {WsDorisInstance} from "@/services/project/typings";
+import {PageContainer, ProCard, StatisticCard} from "@ant-design/pro-components";
+import {Divider, Space, Statistic} from "antd";
+import RcResizeObserver from 'rc-resize-observer';
+import Editor, {Monaco, useMonaco} from "@monaco-editor/react";
+import {WsDorisTemplateService} from "@/services/project/WsDorisTemplateService";
+import YAML from "yaml";
+import {WsDorisInstanceService} from "@/services/project/WsDorisInstanceService";
+
+const DorisInstanceDetailWeb: React.FC = () => {
+  const intl = useIntl();
+  const data = useLocation().state as WsDorisInstance
+  const editorRef = useRef(null);
+  const monaco = useMonaco();
+
+  const [yaml, setYaml] = useState<string>(null);
+  const [responsive, setResponsive] = useState(false);
+
+  useEffect(() => {
+    monaco?.languages.typescript.javascriptDefaults.setEagerModelSync(true);
+  }, [monaco]);
+
+  const handleEditorDidMount = (editor, monaco: Monaco) => {
+    editorRef.current = editor;
+  }
+
+  useEffect(() => {
+    const yamlData = {...data}
+    yamlData.deployed = undefined
+    WsDorisInstanceService.asYaml(yamlData).then((response) => {
+      if (response.success) {
+        setYaml(YAML.stringify(response.data))
+      }
+    });
+  }, []);
+
+  return (
+    <PageContainer title={intl.formatMessage({id: 'pages.project.doris.template.detail'})}>
+      <RcResizeObserver
+        key="resize-observer"
+        onResize={(offset) => {
+          setResponsive(offset.width < 596);
+        }}
+      >
+        <ProCard.Group title={intl.formatMessage({id: 'pages.project.doris.template.detail.component'})}
+                       direction={responsive ? 'column' : 'row'}>
+          <ProCard bordered hoverable>
+            <StatisticCard title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.fe'})}
+                           statistic={{
+                             value: data.feSpec?.replicas,
+                             prefix: intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.replicas'}) + ' x',
+                             description: (
+                               <Space>
+                                 <Statistic
+                                   title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.cpu'})}
+                                   value={data.feSpec?.requests?.cpu}/>
+                                 <Statistic
+                                   title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.memory'})}
+                                   value={data.feSpec?.requests?.memory}/>
+                                 <Statistic
+                                   title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.cpu'})}
+                                   value={data.feSpec?.limits?.cpu}/>
+                                 <Statistic
+                                   title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.memory'})}
+                                   value={data.feSpec?.limits?.memory}/>
+                               </Space>
+                             ),
+                           }}
+                           footer={
+                             <div>{intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.image'}) + ": " + data.feSpec?.image ? data.feSpec?.image : '-'}</div>
+                           }
+            />
+          </ProCard>
+          <Divider type={responsive ? 'horizontal' : 'vertical'}/>
+          <ProCard bordered hoverable>
+            <StatisticCard title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.be'})}
+                           statistic={{
+                             value: data.beSpec?.replicas,
+                             prefix: intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.replicas'}) + ' x',
+                             description: (
+                               <Space>
+                                 <Statistic
+                                   title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.cpu'})}
+                                   value={data.beSpec?.requests?.cpu}/>
+                                 <Statistic
+                                   title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.memory'})}
+                                   value={data.beSpec?.requests?.memory}/>
+                                 <Statistic
+                                   title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.cpu'})}
+                                   value={data.beSpec?.limits?.cpu}/>
+                                 <Statistic
+                                   title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.memory'})}
+                                   value={data.beSpec?.limits?.memory}/>
+                               </Space>
+                             ),
+                           }}
+                           footer={
+                             <div>{intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.image'}) + ": " + data.beSpec?.image ? data.beSpec?.image : '-'}</div>
+                           }
+            />
+          </ProCard>
+          <Divider type={responsive ? 'horizontal' : 'vertical'}/>
+          <ProCard bordered hoverable>
+            <StatisticCard title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.cn'})}
+                           statistic={{
+                             value: data.cnSpec?.replicas,
+                             prefix: intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.replicas'}) + ' x',
+                             description: (
+                               <Space>
+                                 <Statistic
+                                   title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.cpu'})}
+                                   value={data.cnSpec?.requests?.cpu}/>
+                                 <Statistic
+                                   title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.memory'})}
+                                   value={data.cnSpec?.requests?.memory}/>
+                                 <Statistic
+                                   title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.cpu'})}
+                                   value={data.cnSpec?.limits?.cpu}/>
+                                 <Statistic
+                                   title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.memory'})}
+                                   value={data.cnSpec?.limits?.memory}/>
+                               </Space>
+                             ),
+                           }}
+                           footer={
+                             <div>{intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.image'}) + ": " + data.cnSpec?.image ? data.cnSpec?.image : '-'}</div>
+                           }
+            />
+          </ProCard>
+          <Divider type={responsive ? 'horizontal' : 'vertical'}/>
+          <ProCard bordered hoverable>
+            <StatisticCard title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.broker'})}
+                           statistic={{
+                             value: data.brokerSpec?.replicas,
+                             prefix: intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.replicas'}) + ' x',
+                             description: (
+                               <Space>
+                                 <Statistic
+                                   title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.cpu'})}
+                                   value={data.brokerSpec?.requests?.cpu}/>
+                                 <Statistic
+                                   title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.requests.memory'})}
+                                   value={data.brokerSpec?.requests?.memory}/>
+                                 <Statistic
+                                   title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.cpu'})}
+                                   value={data.brokerSpec?.limits?.cpu}/>
+                                 <Statistic
+                                   title={intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.limits.memory'})}
+                                   value={data.brokerSpec?.limits?.memory}/>
+                               </Space>
+                             ),
+                           }}
+                           footer={
+                             <div>{intl.formatMessage({id: 'pages.project.doris.template.steps.component.base.image'}) + ": " + data.brokerSpec?.image ? data.brokerSpec?.image : '-'}</div>
+                           }
+            />
+          </ProCard>
+        </ProCard.Group>
+        <Divider type={'horizontal'}/>
+        <ProCard.Group title="YAML" direction={responsive ? 'column' : 'row'}>
+          <ProCard bordered>
+            <Editor
+              width="730"
+              height="600px"
+              language="yaml"
+              theme="vs-white"
+              value={yaml}
+              options={{
+                selectOnLineNumbers: true,
+                readOnly: true,
+                minimap: {
+                  enabled: false
+                }
+              }}
+              onMount={handleEditorDidMount}
+            />
+          </ProCard>
+        </ProCard.Group>
+      </RcResizeObserver>
+    </PageContainer>
+  );
+}
+
+export default DorisInstanceDetailWeb;
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/DorisInstanceSimpleForm.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/DorisInstanceSimpleForm.tsx
new file mode 100644
index 000000000..a448781a5
--- /dev/null
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/DorisInstanceSimpleForm.tsx
@@ -0,0 +1,83 @@
+import {useIntl} from "umi";
+import React from "react";
+import {Form, message, Modal} from "antd";
+import {ProForm, ProFormDigit, ProFormText, ProFormTextArea} from "@ant-design/pro-components";
+import {ModalFormProps} from '@/app.d';
+import {WsDorisInstance} from "@/services/project/typings";
+import {WORKSPACE_CONF} from "@/constant";
+import {WsDorisInstanceService} from "@/services/project/WsDorisInstanceService";
+
+const DorisInstanceSimpleForm: React.FC<ModalFormProps<WsDorisInstance>> = ({
+                                                                              data,
+                                                                              visible,
+                                                                              onVisibleChange,
+                                                                              onCancel
+                                                                            }) => {
+  const intl = useIntl();
+  const [form] = Form.useForm();
+  const projectId = localStorage.getItem(WORKSPACE_CONF.projectId);
+
+  return (
+    <Modal
+      open={visible}
+      title={
+        data.id
+          ? intl.formatMessage({id: 'app.common.operate.edit.label'}) +
+          intl.formatMessage({id: 'pages.project.doris.template'})
+          : intl.formatMessage({id: 'app.common.operate.new.label'}) +
+          intl.formatMessage({id: 'pages.project.doris.template'})
+      }
+      width={580}
+      destroyOnClose={true}
+      onCancel={onCancel}
+      onOk={() => {
+        form.validateFields().then((values) => {
+          data.id
+            ? WsDorisInstanceService.update({...values}).then((response) => {
+              if (response.success) {
+                message.success(intl.formatMessage({id: 'app.common.operate.edit.success'}));
+                if (onVisibleChange) {
+                  onVisibleChange(false);
+                }
+              }
+            })
+            : WsDorisInstanceService.add({...values, projectId: projectId}).then((response) => {
+              if (response.success) {
+                message.success(intl.formatMessage({id: 'app.common.operate.new.success'}));
+                if (onVisibleChange) {
+                  onVisibleChange(false);
+                }
+              }
+            });
+        });
+      }}
+    >
+      <ProForm
+        form={form}
+        layout={"horizontal"}
+        submitter={false}
+        labelCol={{span: 6}}
+        wrapperCol={{span: 16}}
+        initialValues={{
+          id: data.id,
+          name: data.name,
+          namespace: data.namespace,
+          remark: data.remark
+        }}
+      >
+        <ProFormDigit name={"id"} hidden/>
+        <ProFormText
+          name={"name"}
+          label={intl.formatMessage({id: 'pages.project.doris.instance.name'})}
+          rules={[{required: true}]}
+        />
+        <ProFormTextArea
+          name={"remark"}
+          label={intl.formatMessage({id: 'app.common.data.remark'})}
+        />
+      </ProForm>
+    </Modal>
+  );
+}
+
+export default DorisInstanceSimpleForm;
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/Steps/BaseStepForm.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/Steps/BaseStepForm.tsx
index 591fe55b2..6a12e2ec0 100644
--- a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/Steps/BaseStepForm.tsx
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/Steps/BaseStepForm.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import {ProCard, ProFormDigit, ProFormSelect, ProFormText} from "@ant-design/pro-components";
+import {ProCard, ProFormDigit, ProFormSelect, ProFormText, ProFormTextArea} from "@ant-design/pro-components";
 import {useIntl} from "umi";
 import {ClusterCredentialListParam} from "@/services/resource/typings";
 import {ClusterCredentialService} from "@/services/resource/clusterCredential.service";
@@ -39,6 +39,7 @@ const DorisInstanceBase: React.FC = () => {
         name={"namespace"}
         label={intl.formatMessage({id: 'pages.project.doris.instance.namespace'})}
         rules={[{required: true}]}
+        initialValue={"doris"}
       />
       <ProFormSelect
         name="templateId"
@@ -57,7 +58,7 @@ const DorisInstanceBase: React.FC = () => {
           })
         })}
       />
-      <ProFormText
+      <ProFormTextArea
         name={"remark"}
         label={intl.formatMessage({id: 'app.common.data.remark'})}
       />
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/index.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/index.tsx
index c3f39f8e7..72060164a 100644
--- a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/index.tsx
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Instance/index.tsx
@@ -2,11 +2,11 @@ import {history, useAccess, useIntl} from "umi";
 import React, {useRef, useState} from "react";
 import {Button, message, Modal, Space, Tag, Tooltip} from "antd";
 import {DeleteOutlined, EditOutlined, NodeIndexOutlined} from "@ant-design/icons";
-import {ActionType, ProColumns, ProFormInstance, ProFormSelect, ProTable} from "@ant-design/pro-components";
-import {DICT_TYPE, PRIVILEGE_CODE, WORKSPACE_CONF} from "@/constant";
+import {ActionType, ProColumns, ProFormInstance, ProTable} from "@ant-design/pro-components";
+import {PRIVILEGE_CODE, WORKSPACE_CONF} from "@/constant";
 import {WsDorisInstance, WsDorisTemplate} from "@/services/project/typings";
 import {WsDorisInstanceService} from "@/services/project/WsDorisInstanceService";
-import {DictDataService} from "@/services/admin/dictData.service";
+import DorisInstanceSimpleForm from "@/pages/Project/Workspace/Doris/Instance/DorisInstanceSimpleForm";
 
 const DorisInstanceWeb: React.FC = () => {
   const intl = useIntl();
@@ -36,7 +36,8 @@ const DorisInstanceWeb: React.FC = () => {
       dataIndex: 'deployed',
       render: (dom, entity) => {
         return (<Tag>{entity.deployed?.label}</Tag>)
-      }
+      },
+      hideInSearch: true
     },
     {
       title: intl.formatMessage({id: 'app.common.data.remark'}),
@@ -83,7 +84,7 @@ const DorisInstanceWeb: React.FC = () => {
                 type="link"
                 icon={<NodeIndexOutlined/>}
                 onClick={() => {
-                  // history.push("/workspace/doris/template/detail", record)
+                  history.push("/workspace/doris/instance/detail", record)
                 }}
               />
             </Tooltip>
@@ -185,6 +186,19 @@ const DorisInstanceWeb: React.FC = () => {
       tableAlertRender={false}
       tableAlertOptionRender={false}
     />
+    {dorisInstanceFormData.visiable && (
+      <DorisInstanceSimpleForm
+        visible={dorisInstanceFormData.visiable}
+        onCancel={() => {
+          setDorisInstanceFormData({visiable: false, data: {}});
+        }}
+        onVisibleChange={(visiable) => {
+          setDorisInstanceFormData({visiable: visiable, data: {}});
+          actionRef.current?.reload();
+        }}
+        data={dorisInstanceFormData.data}
+      />
+    )}
   </div>);
 }
 
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/DorisTemplateForm.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/DorisTemplateForm.tsx
index 24d8172cc..f7b9fa0d9 100644
--- a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/DorisTemplateForm.tsx
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/DorisTemplateForm.tsx
@@ -1,7 +1,7 @@
 import {useIntl} from "umi";
 import React from "react";
 import {Form, message, Modal} from "antd";
-import {ProForm, ProFormDigit, ProFormText} from "@ant-design/pro-components";
+import {ProForm, ProFormDigit, ProFormText, ProFormTextArea} from "@ant-design/pro-components";
 import {ModalFormProps} from '@/app.d';
 import {WsDorisTemplate} from "@/services/project/typings";
 import {WORKSPACE_CONF} from "@/constant";
@@ -71,12 +71,7 @@ const DorisTemplateForm: React.FC<ModalFormProps<WsDorisTemplate>> = ({
           label={intl.formatMessage({id: 'pages.project.doris.template.name'})}
           rules={[{required: true}]}
         />
-        <ProFormText
-          name={"namespace"}
-          label={intl.formatMessage({id: 'pages.project.doris.template.namespace'})}
-          rules={[{required: true}]}
-        />
-        <ProFormText
+        <ProFormTextArea
           name={"remark"}
           label={intl.formatMessage({id: 'app.common.data.remark'})}
         />
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/BaseStepForm.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/BaseStepForm.tsx
index ce46a3619..4d5ced08c 100644
--- a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/BaseStepForm.tsx
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/BaseStepForm.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import {ProCard, ProFormDigit, ProFormText} from "@ant-design/pro-components";
+import {ProCard, ProFormDigit, ProFormText, ProFormTextArea} from "@ant-design/pro-components";
 import {useIntl} from "umi";
 
 const DorisTemplateBase: React.FC = () => {
@@ -13,12 +13,7 @@ const DorisTemplateBase: React.FC = () => {
         label={intl.formatMessage({id: 'pages.project.doris.template.name'})}
         rules={[{required: true}]}
       />
-      <ProFormText
-        name={"namespace"}
-        label={intl.formatMessage({id: 'pages.project.doris.template.namespace'})}
-        rules={[{required: true}]}
-      />
-      <ProFormText
+      <ProFormTextArea
         name={"remark"}
         label={intl.formatMessage({id: 'app.common.data.remark'})}
       />
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/index.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/index.tsx
index ae7d35242..5223aad33 100644
--- a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/index.tsx
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/Steps/index.tsx
@@ -17,7 +17,6 @@ const DorisTemplateSteps: React.FC = (props: any) => {
     const template: WsDorisTemplate = {
       projectId: projectId,
       name: values.name,
-      namespace: values.namespace,
       remark: values.remark,
     }
     editDorisTemplate(template)
diff --git a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/index.tsx b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/index.tsx
index a0e092727..d9bbaf7bf 100644
--- a/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/index.tsx
+++ b/scaleph-ui-react/src/pages/Project/Workspace/Doris/Template/index.tsx
@@ -25,11 +25,6 @@ const DorisTemplateWeb: React.FC = () => {
       title: intl.formatMessage({id: 'pages.project.doris.template.name'}),
       dataIndex: 'name'
     },
-    {
-      title: intl.formatMessage({id: 'pages.project.doris.template.namespace'}),
-      dataIndex: 'namespace',
-      hideInSearch: true,
-    },
     {
       title: intl.formatMessage({id: 'app.common.data.remark'}),
       dataIndex: 'remark',
diff --git a/scaleph-ui-react/src/services/project/WsDorisTemplateService.ts b/scaleph-ui-react/src/services/project/WsDorisTemplateService.ts
index 0cc1761bd..0fb79a115 100644
--- a/scaleph-ui-react/src/services/project/WsDorisTemplateService.ts
+++ b/scaleph-ui-react/src/services/project/WsDorisTemplateService.ts
@@ -115,7 +115,6 @@ export const WsDorisTemplateService = {
   parseData: (data: WsDorisTemplate) => {
     const value: Record<string, any> = {
       'name': data.name,
-      'namespace': data.namespace,
       'remark': data.remark,
 
       'admin.name': data.admin?.name,
diff --git a/scaleph-ui-react/src/services/project/typings.d.ts b/scaleph-ui-react/src/services/project/typings.d.ts
index 50e2b8539..4fb3da788 100644
--- a/scaleph-ui-react/src/services/project/typings.d.ts
+++ b/scaleph-ui-react/src/services/project/typings.d.ts
@@ -433,7 +433,6 @@ export type WsDorisTemplate = {
   projectId: number;
   name?: string;
   templateId?: string;
-  namespace: string;
   admin?: Record<string, any>;
   feSpec?: Record<string, any>;
   beSpec?: Record<string, any>;
@@ -452,7 +451,6 @@ export type WsDorisTemplateParam = QueryParam & {
 export type WsDorisTemplateAddParam = {
   projectId: number;
   name: string;
-  namespace: string;
   admin?: Record<string, any>;
   feSpec?: Record<string, any>;
   beSpec?: Record<string, any>;
@@ -464,7 +462,6 @@ export type WsDorisTemplateAddParam = {
 export type WsDorisTemplateUpdateParam = {
   id: number;
   name: string;
-  namespace: string;
   admin?: Record<string, any>;
   feSpec?: Record<string, any>;
   beSpec?: Record<string, any>;
diff --git a/tools/docker/mysql/init.d/scaleph-security-mysql.sql b/tools/docker/mysql/init.d/scaleph-security-mysql.sql
index 0be690c3e..aaba0a229 100644
--- a/tools/docker/mysql/init.d/scaleph-security-mysql.sql
+++ b/tools/docker/mysql/init.d/scaleph-security-mysql.sql
@@ -567,6 +567,10 @@ INSERT INTO `sec_resource_web` (`id`, `type`, `pid`, `name`, `path`, `redirect`,
                                 `remark`, `creator`, `editor`)
 VALUES (70, '2', 64, NULL, '/workspace/doris/instance/steps', NULL, NULL, NULL,
         './Project/Workspace/Doris/Instance/Steps', NULL, 'sys', 'sys');
+INSERT INTO `sec_resource_web`(`id`, `type`, `pid`, `name`, `path`, `redirect`, `layout`, `icon`, `component`, `remark`,
+                               `creator`, `editor`)
+VALUES (71, '2', 64, '', '/workspace/doris/instance/detail', NULL, NULL, NULL,
+        './Project/Workspace/Doris/Instance/Detail', NULL, 'sys', 'sys');
 
 drop table if exists sec_resource_web_role;
 create table sec_resource_web_role
diff --git a/tools/docker/mysql/init.d/scaleph-ws-mysql.sql b/tools/docker/mysql/init.d/scaleph-ws-mysql.sql
index 1eba5720e..143bbd0bf 100644
--- a/tools/docker/mysql/init.d/scaleph-ws-mysql.sql
+++ b/tools/docker/mysql/init.d/scaleph-ws-mysql.sql
@@ -70,7 +70,7 @@ create table ws_flink_artifact_jar
     editor            varchar(32) comment '修改人',
     update_time       timestamp default current_timestamp on update current_timestamp comment '修改时间',
     primary key (id),
-    key idx_flink_artifact (flink_artifact_id)
+    key               idx_flink_artifact (flink_artifact_id)
 ) engine = innodb comment = 'flink artifact jar';
 
 DROP TABLE IF EXISTS ws_flink_artifact_sql;
@@ -86,7 +86,7 @@ CREATE TABLE ws_flink_artifact_sql
     editor            varchar(32),
     update_time       datetime    not null default current_timestamp on update current_timestamp,
     PRIMARY KEY (id),
-    key idx_flink_artifact (flink_artifact_id)
+    key               idx_flink_artifact (flink_artifact_id)
 ) ENGINE = INNODB COMMENT = 'flink artifact sql';
 
 INSERT INTO `ws_flink_artifact_sql` (`id`, `flink_artifact_id`, `flink_version`, `script`, `current`, `creator`,
@@ -139,7 +139,7 @@ create table ws_di_job
     editor            varchar(32) comment '修改人',
     update_time       timestamp default current_timestamp on update current_timestamp comment '修改时间',
     primary key (id),
-    key idx_flink_artifact (flink_artifact_id)
+    key               idx_flink_artifact (flink_artifact_id)
 ) engine = innodb comment '数据集成-作业信息';
 INSERT INTO ws_di_job (id, flink_artifact_id, job_engine, job_id, current, creator, editor)
 VALUES (1, 4, 'seatunnel', 'b8e16c94-258c-4487-a88c-8aad40a38b35', 1, 'sys', 'sys');
@@ -257,7 +257,7 @@ INSERT INTO `ws_flink_kubernetes_template`(`id`, `project_id`, `name`, `template
                                            `log_configuration`, `ingress`, additional_dependencies, `remark`, `creator`,
                                            `editor`)
 VALUES (1, 1, 'simple-sessioin-cluster', '19b77b47-b9e4-418c-90a1-533ea6121c16', 'FlinkSessionJob', 'default',
-        '{"image":"flink:1.18","imagePullPolicy":"IfNotPresent","flinkVersion":"v1_17","serviceAccount":"flink"}',
+        '{"image":"flink:1.18","imagePullPolicy":"IfNotPresent","flinkVersion":"v1_18","serviceAccount":"flink"}',
         '{"resource":{"cpu":1.0,"memory":"1G"},"replicas":1}',
         '{"resource":{"cpu":1.0,"memory":"1G"},"replicas":1}',
         NULL,
@@ -301,7 +301,7 @@ VALUES (4, 1, 'simple-seatunnel-deployment', '35e4a532-3c7b-4273-8cdb-edbef2cb9e
         '{"resource":{"cpu":1.0,"memory":"1G"},"replicas":1}',
         '{"resource":{"cpu":1.0,"memory":"1G"},"replicas":1}',
         NULL,
-        '{"web.cancel.enable":"false","taskmanager.numberOfTaskSlots":"8","kubernetes.rest-service.exposed.type":"NodePort","kubernetes.rest-service.exposed.node-port-address-type":"ExternalIP"}',
+        '{"web.cancel.enable":"false","taskmanager.numberOfTaskSlots":"1","kubernetes.rest-service.exposed.type":"NodePort","kubernetes.rest-service.exposed.node-port-address-type":"ExternalIP"}',
         NULL, NULL, NULL, NULL, 'sys', 'sys');
 
 INSERT INTO `ws_flink_kubernetes_template`(`id`, `project_id`, `name`, `template_id`, `deployment_kind`,
@@ -323,7 +323,7 @@ INSERT INTO `ws_flink_kubernetes_template`(`id`, `project_id`, `name`, `template
                                            `log_configuration`, `ingress`, additional_dependencies, `remark`, `creator`,
                                            `editor`)
 VALUES (6, 1, 'session-cluster', '8b330683-05ec-4c29-b991-df35b2036e2d', 'FlinkSessionJob', 'default',
-        '{"image":"flink:1.18","imagePullPolicy":"IfNotPresent","flinkVersion":"v1_17","serviceAccount":"flink"}',
+        '{"image":"flink:1.18","imagePullPolicy":"IfNotPresent","flinkVersion":"v1_18","serviceAccount":"flink"}',
         '{"resource":{"cpu":1.0,"memory":"1G"},"replicas":1}',
         '{"resource":{"cpu":1.0,"memory":"1G"},"replicas":1}',
         '{"apiVersion":"v1","kind":"Pod","spec":{"containers":[{"name":"flink-main-container","volumeMounts":[{"mountPath":"/flink-data","name":"flink-volume"}]}],"volumes":[{"emptyDir":{"sizeLimit":"500Mi"},"name":"flink-volume"}]}}',
@@ -471,7 +471,7 @@ create table ws_flink_custom_artifact
     editor        varchar(32) comment '修改人',
     update_time   timestamp default current_timestamp on update current_timestamp comment '修改时间',
     primary key (id),
-    key idx_custom (flink_version, type, file_name)
+    key           idx_custom (flink_version, type, file_name)
 ) engine = innodb comment = 'flink custom artifact';
 
 drop table if exists ws_flink_custom_factory;
@@ -487,7 +487,7 @@ create table ws_flink_custom_factory
     editor                   varchar(32) comment '修改人',
     update_time              timestamp default current_timestamp on update current_timestamp comment '修改时间',
     primary key (id),
-    key idx_custom (flink_custom_artifact_id, factory_class, `name`)
+    key                      idx_custom (flink_custom_artifact_id, factory_class, `name`)
 ) engine = innodb comment = 'flink custom factory';
 
 drop table if exists ws_flink_sql_gateway_session;
@@ -543,11 +543,10 @@ create table ws_flink_sql_gateway_catalog
 drop table if exists ws_doris_template;
 create table ws_doris_template
 (
-    id            bigint       not null auto_increment comment '自增主键',
-    project_id    bigint       not null comment '项目id',
-    `name`        varchar(64)  not null,
-    template_id   varchar(64)  not null,
-    namespace     varchar(255) not null,
+    id            bigint      not null auto_increment comment '自增主键',
+    project_id    bigint      not null comment '项目id',
+    `name`        varchar(64) not null,
+    template_id   varchar(64) not null,
     admin         varchar(255) comment 'admin user',
     `fe_spec`     text comment 'fe spec',
     `be_spec`     text comment 'be spec',
@@ -562,9 +561,9 @@ create table ws_doris_template
     unique key uniq_name (project_id, `name`)
 ) engine = innodb comment = 'doris template';
 
-INSERT INTO `ws_doris_template`(`id`, `project_id`, `name`, `template_id`, `namespace`, `admin`, `fe_spec`, `be_spec`,
-                                `cn_spec`, `broker_spec`, `remark`, `creator`, `editor`)
-VALUES (1, 1, 'simple-doriscluster-sample', 'zexbfaf0eba4ce824787a9bed88148eb233f', 'default',
+INSERT INTO `ws_doris_template`(`id`, `project_id`, `name`, `template_id`, `admin`, `fe_spec`, `be_spec`, `cn_spec`,
+                                `broker_spec`, `remark`, `creator`, `editor`)
+VALUES (1, 1, 'simple-doriscluster-sample', 'zexbfaf0eba4ce824787a9bed88148eb233f',
         '{"name":"admin","password":"Admin123"}',
         '{\"replicas\":1,\"image\":\"selectdb/doris.fe-ubuntu:2.0.2\",\"limits\":{\"cpu\":4,\"memory\":\"8Gi\"},\"requests\":{\"cpu\":4,\"memory\":\"8Gi\"}}',
         '{\"replicas\":1,\"image\":\"selectdb/doris.be-ubuntu:2.0.2\",\"limits\":{\"cpu\":4,\"memory\":\"8Gi\"},\"requests\":{\"cpu\":4,\"memory\":\"8Gi\"}}',

From 8b36ce78289333d30225d81c5372616636d4223c Mon Sep 17 00:00:00 2001
From: wangqi <1942460489@qq.com>
Date: Tue, 5 Dec 2023 08:14:16 +0800
Subject: [PATCH 23/24] [Release] release 2.0.0-SNAPSHOT

---
 pom.xml                                                         | 2 +-
 scaleph-api/pom.xml                                             | 2 +-
 scaleph-common/pom.xml                                          | 2 +-
 scaleph-config/pom.xml                                          | 2 +-
 scaleph-dao/pom.xml                                             | 2 +-
 scaleph-dataservice/pom.xml                                     | 2 +-
 scaleph-datasource/pom.xml                                      | 2 +-
 scaleph-dist/pom.xml                                            | 2 +-
 scaleph-engine/pom.xml                                          | 2 +-
 scaleph-engine/scaleph-engine-doris/pom.xml                     | 2 +-
 scaleph-engine/scaleph-engine-flink-client/pom.xml              | 2 +-
 scaleph-engine/scaleph-engine-flink-kubernetes/pom.xml          | 2 +-
 scaleph-engine/scaleph-engine-flink/pom.xml                     | 2 +-
 scaleph-engine/scaleph-engine-seatunnel/pom.xml                 | 2 +-
 scaleph-engine/scaleph-engine-sql-gateway/pom.xml               | 2 +-
 scaleph-engine/scaleph-engine-sql/pom.xml                       | 2 +-
 scaleph-engine/scaleph-sql-template/pom.xml                     | 2 +-
 scaleph-file-fetcher/pom.xml                                    | 2 +-
 scaleph-kubernetes/pom.xml                                      | 2 +-
 scaleph-meta/pom.xml                                            | 2 +-
 scaleph-plugins/pom.xml                                         | 2 +-
 scaleph-plugins/scaleph-plugin-datasource/pom.xml               | 2 +-
 .../scaleph-plugin-datasource-api/pom.xml                       | 2 +-
 .../scaleph-plugin-datasource-clickhouse/pom.xml                | 2 +-
 .../scaleph-plugin-datasource-doris/pom.xml                     | 2 +-
 .../scaleph-plugin-datasource-druid/pom.xml                     | 2 +-
 .../scaleph-plugin-datasource-elasticsearch/pom.xml             | 2 +-
 .../scaleph-plugin-datasource-greenplum/pom.xml                 | 2 +-
 .../scaleph-plugin-datasource-jdbc/pom.xml                      | 2 +-
 .../scaleph-plugin-datasource-kafka/pom.xml                     | 2 +-
 .../scaleph-plugin-datasource-mysql/pom.xml                     | 2 +-
 .../scaleph-plugin-datasource-oracle/pom.xml                    | 2 +-
 .../scaleph-plugin-datasource-postgre/pom.xml                   | 2 +-
 scaleph-plugins/scaleph-plugin-framework/pom.xml                | 2 +-
 scaleph-plugins/scaleph-plugin-seatunnel-connectors/pom.xml     | 2 +-
 scaleph-plugins/scaleph-plugin-seatunnel-native-flink/pom.xml   | 2 +-
 scaleph-project/pom.xml                                         | 2 +-
 scaleph-resource/pom.xml                                        | 2 +-
 scaleph-security/pom.xml                                        | 2 +-
 scaleph-support/pom.xml                                         | 2 +-
 scaleph-support/scaleph-cache/pom.xml                           | 2 +-
 scaleph-support/scaleph-generator/pom.xml                       | 2 +-
 scaleph-support/scaleph-log/pom.xml                             | 2 +-
 scaleph-support/scaleph-mail/pom.xml                            | 2 +-
 scaleph-support/scaleph-privilege/pom.xml                       | 2 +-
 scaleph-support/scaleph-storage/pom.xml                         | 2 +-
 scaleph-support/scaleph-system/pom.xml                          | 2 +-
 scaleph-ui-react/pom.xml                                        | 2 +-
 scaleph-workflow/pom.xml                                        | 2 +-
 scaleph-workflow/scaleph-workflow-api/pom.xml                   | 2 +-
 scaleph-workflow/scaleph-workflow-quartz/pom.xml                | 2 +-
 51 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/pom.xml b/pom.xml
index b7e46f499..3219df9cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>cn.sliew</groupId>
     <artifactId>scaleph</artifactId>
-    <version>1.0.5-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>scaleph</name>
     <description>Scaleph System</description>
diff --git a/scaleph-api/pom.xml b/scaleph-api/pom.xml
index 00e64f01f..c331d2ba2 100644
--- a/scaleph-api/pom.xml
+++ b/scaleph-api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-api</artifactId>
diff --git a/scaleph-common/pom.xml b/scaleph-common/pom.xml
index 4f824868d..2fbde85b4 100644
--- a/scaleph-common/pom.xml
+++ b/scaleph-common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-common</artifactId>
diff --git a/scaleph-config/pom.xml b/scaleph-config/pom.xml
index 7a3964d7b..524d0335d 100644
--- a/scaleph-config/pom.xml
+++ b/scaleph-config/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-config</artifactId>
diff --git a/scaleph-dao/pom.xml b/scaleph-dao/pom.xml
index 851ad7536..9fda41e92 100644
--- a/scaleph-dao/pom.xml
+++ b/scaleph-dao/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-dao</artifactId>
diff --git a/scaleph-dataservice/pom.xml b/scaleph-dataservice/pom.xml
index 41fd323e9..5b2081edc 100644
--- a/scaleph-dataservice/pom.xml
+++ b/scaleph-dataservice/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-dataservice</artifactId>
diff --git a/scaleph-datasource/pom.xml b/scaleph-datasource/pom.xml
index 4381c9706..4f2108bb5 100644
--- a/scaleph-datasource/pom.xml
+++ b/scaleph-datasource/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>scaleph-datasource</artifactId>
 
diff --git a/scaleph-dist/pom.xml b/scaleph-dist/pom.xml
index 84b2241a7..e7ff34065 100644
--- a/scaleph-dist/pom.xml
+++ b/scaleph-dist/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-dist</artifactId>
diff --git a/scaleph-engine/pom.xml b/scaleph-engine/pom.xml
index 2b38fcbc0..04ec7d7c6 100644
--- a/scaleph-engine/pom.xml
+++ b/scaleph-engine/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-engine</artifactId>
diff --git a/scaleph-engine/scaleph-engine-doris/pom.xml b/scaleph-engine/scaleph-engine-doris/pom.xml
index 547e50507..d323a3549 100644
--- a/scaleph-engine/scaleph-engine-doris/pom.xml
+++ b/scaleph-engine/scaleph-engine-doris/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-engine-doris</artifactId>
diff --git a/scaleph-engine/scaleph-engine-flink-client/pom.xml b/scaleph-engine/scaleph-engine-flink-client/pom.xml
index 49382633e..a79885bde 100644
--- a/scaleph-engine/scaleph-engine-flink-client/pom.xml
+++ b/scaleph-engine/scaleph-engine-flink-client/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph-engine</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-engine-flink-client</artifactId>
diff --git a/scaleph-engine/scaleph-engine-flink-kubernetes/pom.xml b/scaleph-engine/scaleph-engine-flink-kubernetes/pom.xml
index ffa660c37..9ae8a3bb9 100644
--- a/scaleph-engine/scaleph-engine-flink-kubernetes/pom.xml
+++ b/scaleph-engine/scaleph-engine-flink-kubernetes/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph-engine</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-engine-flink-kubernetes</artifactId>
diff --git a/scaleph-engine/scaleph-engine-flink/pom.xml b/scaleph-engine/scaleph-engine-flink/pom.xml
index 2d6a29579..b10b67631 100644
--- a/scaleph-engine/scaleph-engine-flink/pom.xml
+++ b/scaleph-engine/scaleph-engine-flink/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph-engine</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-engine-flink</artifactId>
diff --git a/scaleph-engine/scaleph-engine-seatunnel/pom.xml b/scaleph-engine/scaleph-engine-seatunnel/pom.xml
index 0669bdd09..e7327ff33 100644
--- a/scaleph-engine/scaleph-engine-seatunnel/pom.xml
+++ b/scaleph-engine/scaleph-engine-seatunnel/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph-engine</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-engine-seatunnel</artifactId>
diff --git a/scaleph-engine/scaleph-engine-sql-gateway/pom.xml b/scaleph-engine/scaleph-engine-sql-gateway/pom.xml
index df02a5d7d..650174752 100644
--- a/scaleph-engine/scaleph-engine-sql-gateway/pom.xml
+++ b/scaleph-engine/scaleph-engine-sql-gateway/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph-engine</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-engine-sql-gateway</artifactId>
diff --git a/scaleph-engine/scaleph-engine-sql/pom.xml b/scaleph-engine/scaleph-engine-sql/pom.xml
index 68de66033..bac98c84a 100644
--- a/scaleph-engine/scaleph-engine-sql/pom.xml
+++ b/scaleph-engine/scaleph-engine-sql/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph-engine</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-engine-sql</artifactId>
diff --git a/scaleph-engine/scaleph-sql-template/pom.xml b/scaleph-engine/scaleph-sql-template/pom.xml
index 2b2b80867..f6492419c 100644
--- a/scaleph-engine/scaleph-sql-template/pom.xml
+++ b/scaleph-engine/scaleph-sql-template/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph-engine</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-sql-template</artifactId>
diff --git a/scaleph-file-fetcher/pom.xml b/scaleph-file-fetcher/pom.xml
index 849ec7f79..93a34c406 100644
--- a/scaleph-file-fetcher/pom.xml
+++ b/scaleph-file-fetcher/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-file-fetcher</artifactId>
diff --git a/scaleph-kubernetes/pom.xml b/scaleph-kubernetes/pom.xml
index c364b8bc0..ecb40fdb6 100644
--- a/scaleph-kubernetes/pom.xml
+++ b/scaleph-kubernetes/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-kubernetes</artifactId>
diff --git a/scaleph-meta/pom.xml b/scaleph-meta/pom.xml
index e3016bbca..a7c40d278 100644
--- a/scaleph-meta/pom.xml
+++ b/scaleph-meta/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-meta</artifactId>
diff --git a/scaleph-plugins/pom.xml b/scaleph-plugins/pom.xml
index 3da0487b4..5e01f73b5 100644
--- a/scaleph-plugins/pom.xml
+++ b/scaleph-plugins/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-plugins</artifactId>
diff --git a/scaleph-plugins/scaleph-plugin-datasource/pom.xml b/scaleph-plugins/scaleph-plugin-datasource/pom.xml
index 32ffdd728..95ad39d86 100644
--- a/scaleph-plugins/scaleph-plugin-datasource/pom.xml
+++ b/scaleph-plugins/scaleph-plugin-datasource/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-plugin-datasource</artifactId>
diff --git a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-api/pom.xml b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-api/pom.xml
index f1bc4b93d..86bcc7f2a 100644
--- a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-api/pom.xml
+++ b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph-plugin-datasource</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-clickhouse/pom.xml b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-clickhouse/pom.xml
index e6f98fe21..20428b3b6 100644
--- a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-clickhouse/pom.xml
+++ b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-clickhouse/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph-plugin-datasource</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-doris/pom.xml b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-doris/pom.xml
index 2aece67a4..5bbc1509b 100644
--- a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-doris/pom.xml
+++ b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-doris/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph-plugin-datasource</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-druid/pom.xml b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-druid/pom.xml
index fbd1a3421..1e8894e9e 100644
--- a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-druid/pom.xml
+++ b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-druid/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph-plugin-datasource</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-elasticsearch/pom.xml b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-elasticsearch/pom.xml
index 3c38ebc89..8ef326c23 100644
--- a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-elasticsearch/pom.xml
+++ b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-elasticsearch/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph-plugin-datasource</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-greenplum/pom.xml b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-greenplum/pom.xml
index 4d82b2935..0a3ef1aea 100644
--- a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-greenplum/pom.xml
+++ b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-greenplum/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph-plugin-datasource</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-jdbc/pom.xml b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-jdbc/pom.xml
index 4a41c624a..5b908408f 100644
--- a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-jdbc/pom.xml
+++ b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-jdbc/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph-plugin-datasource</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-kafka/pom.xml b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-kafka/pom.xml
index ea834a20f..7cd5f3048 100644
--- a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-kafka/pom.xml
+++ b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-kafka/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph-plugin-datasource</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-mysql/pom.xml b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-mysql/pom.xml
index e5ac35d46..2aff9854f 100644
--- a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-mysql/pom.xml
+++ b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-mysql/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph-plugin-datasource</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-oracle/pom.xml b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-oracle/pom.xml
index 269a1f83b..e59d9afb5 100644
--- a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-oracle/pom.xml
+++ b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-oracle/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph-plugin-datasource</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-postgre/pom.xml b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-postgre/pom.xml
index 439c502c9..72e26e37e 100644
--- a/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-postgre/pom.xml
+++ b/scaleph-plugins/scaleph-plugin-datasource/scaleph-plugin-datasource-postgre/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph-plugin-datasource</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/scaleph-plugins/scaleph-plugin-framework/pom.xml b/scaleph-plugins/scaleph-plugin-framework/pom.xml
index 485873cbd..d0c57ccdc 100644
--- a/scaleph-plugins/scaleph-plugin-framework/pom.xml
+++ b/scaleph-plugins/scaleph-plugin-framework/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph-plugins</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-plugin-framework</artifactId>
diff --git a/scaleph-plugins/scaleph-plugin-seatunnel-connectors/pom.xml b/scaleph-plugins/scaleph-plugin-seatunnel-connectors/pom.xml
index e8d9d6368..bd90e9445 100644
--- a/scaleph-plugins/scaleph-plugin-seatunnel-connectors/pom.xml
+++ b/scaleph-plugins/scaleph-plugin-seatunnel-connectors/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph-plugins</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-plugin-seatunnel-connectors</artifactId>
diff --git a/scaleph-plugins/scaleph-plugin-seatunnel-native-flink/pom.xml b/scaleph-plugins/scaleph-plugin-seatunnel-native-flink/pom.xml
index 0ed979e51..2bc6c8eec 100644
--- a/scaleph-plugins/scaleph-plugin-seatunnel-native-flink/pom.xml
+++ b/scaleph-plugins/scaleph-plugin-seatunnel-native-flink/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph-plugins</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-plugin-seatunnel-native-flink</artifactId>
diff --git a/scaleph-project/pom.xml b/scaleph-project/pom.xml
index 6e995e432..d486088c8 100644
--- a/scaleph-project/pom.xml
+++ b/scaleph-project/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-project</artifactId>
diff --git a/scaleph-resource/pom.xml b/scaleph-resource/pom.xml
index 3e37ee5b8..8f9ba2c28 100644
--- a/scaleph-resource/pom.xml
+++ b/scaleph-resource/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-resource</artifactId>
diff --git a/scaleph-security/pom.xml b/scaleph-security/pom.xml
index d44c4dee8..82826c406 100644
--- a/scaleph-security/pom.xml
+++ b/scaleph-security/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-security</artifactId>
diff --git a/scaleph-support/pom.xml b/scaleph-support/pom.xml
index 06820eb72..fbb9e4936 100644
--- a/scaleph-support/pom.xml
+++ b/scaleph-support/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-support</artifactId>
diff --git a/scaleph-support/scaleph-cache/pom.xml b/scaleph-support/scaleph-cache/pom.xml
index abd467749..70fda9e55 100644
--- a/scaleph-support/scaleph-cache/pom.xml
+++ b/scaleph-support/scaleph-cache/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph-support</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-cache</artifactId>
diff --git a/scaleph-support/scaleph-generator/pom.xml b/scaleph-support/scaleph-generator/pom.xml
index 24d8f2415..e0be36aac 100644
--- a/scaleph-support/scaleph-generator/pom.xml
+++ b/scaleph-support/scaleph-generator/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph-support</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-generator</artifactId>
diff --git a/scaleph-support/scaleph-log/pom.xml b/scaleph-support/scaleph-log/pom.xml
index 5e23efe03..d2dd7350e 100644
--- a/scaleph-support/scaleph-log/pom.xml
+++ b/scaleph-support/scaleph-log/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph-support</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-log</artifactId>
diff --git a/scaleph-support/scaleph-mail/pom.xml b/scaleph-support/scaleph-mail/pom.xml
index 2f97d5ede..41b45fad4 100644
--- a/scaleph-support/scaleph-mail/pom.xml
+++ b/scaleph-support/scaleph-mail/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph-support</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-mail</artifactId>
diff --git a/scaleph-support/scaleph-privilege/pom.xml b/scaleph-support/scaleph-privilege/pom.xml
index ccdce8a34..637cdc1ed 100644
--- a/scaleph-support/scaleph-privilege/pom.xml
+++ b/scaleph-support/scaleph-privilege/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph-support</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-privilege</artifactId>
diff --git a/scaleph-support/scaleph-storage/pom.xml b/scaleph-support/scaleph-storage/pom.xml
index dba7d0d5d..cbe85df2c 100644
--- a/scaleph-support/scaleph-storage/pom.xml
+++ b/scaleph-support/scaleph-storage/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph-support</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-storage</artifactId>
diff --git a/scaleph-support/scaleph-system/pom.xml b/scaleph-support/scaleph-system/pom.xml
index c85b8e196..f83ee86ef 100644
--- a/scaleph-support/scaleph-system/pom.xml
+++ b/scaleph-support/scaleph-system/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph-support</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-system</artifactId>
diff --git a/scaleph-ui-react/pom.xml b/scaleph-ui-react/pom.xml
index 7362bd387..6597d0098 100644
--- a/scaleph-ui-react/pom.xml
+++ b/scaleph-ui-react/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/scaleph-workflow/pom.xml b/scaleph-workflow/pom.xml
index 8c19fa4c7..101f1715d 100644
--- a/scaleph-workflow/pom.xml
+++ b/scaleph-workflow/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-workflow</artifactId>
diff --git a/scaleph-workflow/scaleph-workflow-api/pom.xml b/scaleph-workflow/scaleph-workflow-api/pom.xml
index e0687a8b1..3d4ea0ded 100644
--- a/scaleph-workflow/scaleph-workflow-api/pom.xml
+++ b/scaleph-workflow/scaleph-workflow-api/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph-workflow</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-workflow-api</artifactId>
diff --git a/scaleph-workflow/scaleph-workflow-quartz/pom.xml b/scaleph-workflow/scaleph-workflow-quartz/pom.xml
index 5cc60719d..95a70db40 100644
--- a/scaleph-workflow/scaleph-workflow-quartz/pom.xml
+++ b/scaleph-workflow/scaleph-workflow-quartz/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.sliew</groupId>
         <artifactId>scaleph-workflow</artifactId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>scaleph-workflow-quartz</artifactId>

From 16c2a3c3af1eeabe343303acbfc2023747faf19a Mon Sep 17 00:00:00 2001
From: bailongsen <bailongsen@xinxuan.net>
Date: Tue, 5 Dec 2023 19:41:36 +0800
Subject: [PATCH 24/24] fix: Modify the assignment user prompt text display

---
 .../src/pages/Admin/Role/components/WebAssugnRoles.tsx          | 2 +-
 scaleph-ui-react/src/pages/Admin/User/index.tsx                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scaleph-ui-react/src/pages/Admin/Role/components/WebAssugnRoles.tsx b/scaleph-ui-react/src/pages/Admin/Role/components/WebAssugnRoles.tsx
index 7b34ca1bf..a99b66922 100644
--- a/scaleph-ui-react/src/pages/Admin/Role/components/WebAssugnRoles.tsx
+++ b/scaleph-ui-react/src/pages/Admin/Role/components/WebAssugnRoles.tsx
@@ -148,7 +148,7 @@ const WebResourceForm: React.FC<ModalFormParentProps<SecResourceWeb>> = ({
         >
           <TableTransfer
             containerHeight={containerInfo.height}
-            titles={[intl.formatMessage({ id: 'app.common.operate.new.accreditUser' }), intl.formatMessage({ id: 'app.common.operate.new.notAccreditUser' })]}
+            titles={[intl.formatMessage({ id: 'app.common.operate.new.notAccreditUser' }), intl.formatMessage({ id: 'app.common.operate.new.accreditUser' })]}
             dataSource={roleLists}
             targetKeys={originTargetKeys}
             showSearch={true}
diff --git a/scaleph-ui-react/src/pages/Admin/User/index.tsx b/scaleph-ui-react/src/pages/Admin/User/index.tsx
index 3166099e8..ca7b9b90b 100644
--- a/scaleph-ui-react/src/pages/Admin/User/index.tsx
+++ b/scaleph-ui-react/src/pages/Admin/User/index.tsx
@@ -124,7 +124,7 @@ const User: React.FC = () => {
         <>
           <Space>
             {access.canAccess(PRIVILEGE_CODE.datadevProjectEdit) && (
-              <Tooltip title={intl.formatMessage({ id: 'app.common.operate.new.user' })}>
+              <Tooltip title={intl.formatMessage({ id: 'app.common.operate.new.roles' })}>
                 <Button
                   shape="default"
                   type="link"