合并主分支进行测试 (#1197)

didi · Nov 27, 2023 · 2339a6f · 2339a6f
2 parents 2744f5b + b6ea4ae
commit 2339a6f
Show file tree

Hide file tree

Showing 7 changed files with 86 additions and 49 deletions.
diff --git a/km-biz/src/main/java/com/xiaojukeji/know/streaming/km/biz/group/GroupManager.java b/km-biz/src/main/java/com/xiaojukeji/know/streaming/km/biz/group/GroupManager.java
@@ -26,7 +26,7 @@ PaginationResult<GroupTopicOverviewVO> pagingGroupMembers(Long clusterPhyId,
                                                               String searchGroupKeyword,
                                                               PaginationBaseDTO dto);
 
-    PaginationResult<GroupTopicOverviewVO> pagingGroupTopicMembers(Long clusterPhyId, String groupName, PaginationBaseDTO dto);
+    PaginationResult<GroupTopicOverviewVO> pagingGroupTopicMembers(Long clusterPhyId, String groupName, PaginationBaseDTO dto) throws Exception;
 
     PaginationResult<GroupOverviewVO> pagingClusterGroupsOverview(Long clusterPhyId, ClusterGroupSummaryDTO dto);
 

diff --git a/km-biz/src/main/java/com/xiaojukeji/know/streaming/km/biz/group/impl/GroupManagerImpl.java b/km-biz/src/main/java/com/xiaojukeji/know/streaming/km/biz/group/impl/GroupManagerImpl.java
@@ -118,10 +118,15 @@ public PaginationResult<GroupTopicOverviewVO> pagingGroupMembers(Long clusterPhy
     }
 
     @Override
-    public PaginationResult<GroupTopicOverviewVO> pagingGroupTopicMembers(Long clusterPhyId, String groupName, PaginationBaseDTO dto) {
+    public PaginationResult<GroupTopicOverviewVO> pagingGroupTopicMembers(Long clusterPhyId, String groupName, PaginationBaseDTO dto) throws Exception {
         long startTimeUnitMs = System.currentTimeMillis();
 
-        Group group = groupService.getGroupFromDB(clusterPhyId, groupName);
+        ClusterPhy clusterPhy = clusterPhyService.getClusterByCluster(clusterPhyId);
+        if (clusterPhy == null) {
+            return PaginationResult.buildFailure(MsgConstant.getClusterPhyNotExist(clusterPhyId), dto);
+        }
+
+        Group group = groupService.getGroupFromKafka(clusterPhy, groupName);
 
         //没有topicMember则直接返回
         if (group == null || ValidateUtils.isEmptyList(group.getTopicMembers())) {

diff --git a/km-console/packages/layout-clusters-fe/src/pages/CommonConfig.tsx b/km-console/packages/layout-clusters-fe/src/pages/CommonConfig.tsx
@@ -33,6 +33,9 @@ export enum ClustersPermissionMap {
   TOPIC_CANCEL_REPLICATOR = 'Topic-详情-取消Topic复制',
   // Consumers
   CONSUMERS_RESET_OFFSET = 'Consumers-重置Offset',
+  GROUP_DELETE = 'Group-删除',
+  GROUP_TOPIC_DELETE = 'GroupOffset-Topic纬度删除',
+  GROUP_PARTITION_DELETE = 'GroupOffset-Partition纬度删除',
   // Test
   TEST_CONSUMER = 'Test-Consumer',
   TEST_PRODUCER = 'Test-Producer',
@@ -54,6 +57,7 @@ export enum ClustersPermissionMap {
   SECURITY_USER_ADD = 'Security-User新增',
   SECURITY_USER_DELETE = 'Security-User删除',
   SECURITY_USER_EDIT_PASSWORD = 'Security-User修改密码',
+  SECURITY_USER_VIEW_PASSWORD = 'Security-User查看密码',
 }
 
 export interface PermissionNode {

diff --git a/km-console/packages/layout-clusters-fe/src/pages/ConsumerGroup/config.tsx b/km-console/packages/layout-clusters-fe/src/pages/ConsumerGroup/config.tsx
@@ -22,7 +22,8 @@ export const defaultPagination = {
 };
 
 export const getGroupColumns = (arg?: any) => {
-  const columns = [
+  const [global] = AppContainer.useGlobalValue();
+  const columns: any = [
     {
       title: 'ConsumerGroup',
       dataIndex: 'name',
@@ -63,7 +64,9 @@ export const getGroupColumns = (arg?: any) => {
       width: 200,
       render: (t: number) => (t ? t.toLocaleString() : '-'),
     },
-    {
+  ];
+  if (global.hasPermission && global.hasPermission(ClustersPermissionMap.GROUP_DELETE)) {
+    columns.push({
       title: '操作',
       dataIndex: 'options',
       key: 'options',
@@ -77,8 +80,8 @@ export const getGroupColumns = (arg?: any) => {
           </div>
         );
       },
-    },
-  ];
+    });
+  }
   return columns;
 };
 
@@ -114,7 +117,7 @@ export const getGtoupTopicColumns = (arg?: any) => {
       render: (t: number) => (t ? t.toLocaleString() : '-'),
     },
   ];
-  if (global.hasPermission && global.hasPermission(ClustersPermissionMap.CONSUMERS_RESET_OFFSET)) {
+  if (global.hasPermission) {
     columns.push({
       title: '操作',
       dataIndex: 'desc',
@@ -123,16 +126,24 @@ export const getGtoupTopicColumns = (arg?: any) => {
       render: (value: any, record: any) => {
         return (
           <div>
-            <a onClick={() => arg.resetOffset(record)}>重置Offset</a>
-            <Popconfirm
-              placement="top"
-              title={`是否要删除当前Topic？`}
-              onConfirm={() => arg.deleteOffset(record)}
-              okText="是"
-              cancelText="否"
-            >
-              <Button type="link">删除</Button>
-            </Popconfirm>
+            {global.hasPermission(ClustersPermissionMap.CONSUMERS_RESET_OFFSET) ? (
+              <a onClick={() => arg.resetOffset(record)}>重置Offset</a>
+            ) : (
+              <></>
+            )}
+            {global.hasPermission(ClustersPermissionMap.GROUP_TOPIC_DELETE) ? (
+              <Popconfirm
+                placement="top"
+                title={`是否要删除当前Topic？`}
+                onConfirm={() => arg.deleteOffset(record)}
+                okText="是"
+                cancelText="否"
+              >
+                <Button type="link">删除</Button>
+              </Popconfirm>
+            ) : (
+              <></>
+            )}
           </div>
         );
       },

diff --git a/km-console/packages/layout-clusters-fe/src/pages/MutliClusterPage/AccessCluster.tsx b/km-console/packages/layout-clusters-fe/src/pages/MutliClusterPage/AccessCluster.tsx
@@ -537,7 +537,7 @@ const ConnectorForm = (props: {
     setSelectedTabKey(undefined);
     try {
       const jmxPortInfo = JSON.parse(initFieldsValue.jmxProperties) || {};
-      form.setFieldsValue({ ...initFieldsValue, jmxProperties: jmxPortInfo.jmxProperties });
+      form.setFieldsValue({ ...initFieldsValue, jmxProperties: jmxPortInfo.jmxPort });
     } catch {
       form.setFieldsValue({ ...initFieldsValue });
     }
@@ -546,7 +546,7 @@ const ConnectorForm = (props: {
   useLayoutEffect(() => {
     try {
       const jmxPortInfo = JSON.parse(initFieldsValue.jmxProperties) || {};
-      form.setFieldsValue({ ...initFieldsValue, jmxProperties: jmxPortInfo.jmxProperties });
+      form.setFieldsValue({ ...initFieldsValue, jmxProperties: jmxPortInfo.jmxPort });
     } catch {
       form.setFieldsValue({ ...initFieldsValue });
     }

diff --git a/km-console/packages/layout-clusters-fe/src/pages/SecurityUsers/index.tsx b/km-console/packages/layout-clusters-fe/src/pages/SecurityUsers/index.tsx
@@ -23,7 +23,7 @@ import api from '@src/api';
 import { useParams } from 'react-router-dom';
 import { regKafkaPassword } from '@src/constants/reg';
 import { tableHeaderPrefix } from '@src/constants/common';
-
+import { ClustersPermissionMap } from '../CommonConfig';
 export const randomString = (len = 32, chars = 'abcdefghijklmnopqrstuvwxyz1234567890'): string => {
   const maxPos = chars.length;
   let str = '';
@@ -85,7 +85,7 @@ const PasswordContent = (props: { clusterId: string; name: string }) => {
   const { clusterId, name } = props;
   const [loading, setLoading] = useState(false);
   const [pw, setPw] = useState(initialShowPassword);
-
+  const [global] = AppContainer.useGlobalValue();
   const switchPwStatus = () => {
     if (!loading) {
       setLoading(true);
@@ -113,9 +113,13 @@ const PasswordContent = (props: { clusterId: string; name: string }) => {
       <Tooltip title={pw} placement="bottom">
         <div style={{ maxWidth: '80%', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{pw}</div>
       </Tooltip>
-      <span style={{ marginLeft: 6 }} onClick={switchPwStatus}>
-        {loading ? <LoadingOutlined /> : pw === initialShowPassword ? <EyeInvisibleOutlined /> : <EyeOutlined />}
-      </span>
+      {global.hasPermission(ClustersPermissionMap.SECURITY_USER_VIEW_PASSWORD) ? (
+        <span style={{ marginLeft: 6 }} onClick={switchPwStatus}>
+          {loading ? <LoadingOutlined /> : pw === initialShowPassword ? <EyeInvisibleOutlined /> : <EyeOutlined />}
+        </span>
+      ) : (
+        <></>
+      )}
     </div>
   );
 };
@@ -323,7 +327,7 @@ const SecurityUsers = (): JSX.Element => {
   };
 
   const columns = () => {
-    const baseColumns = [
+    const baseColumns: any = [
       {
         title: 'KafkaUser',
         dataIndex: 'name',
@@ -348,30 +352,39 @@ const SecurityUsers = (): JSX.Element => {
           return <PasswordContent clusterId={clusterId} name={record.name} />;
         },
       },
-      {
+    ];
+    if (global.hasPermission) {
+      baseColumns.push({
         title: '操作',
         dataIndex: '',
         width: 240,
         render(record: UsersProps) {
           return (
             <>
-              <Button
-                type="link"
-                size="small"
-                style={{ paddingLeft: 0 }}
-                onClick={() => editDrawerRef.current.onOpen(true, UsersOperate.ChangePassword, getKafkaUserList, record)}
-              >
-                修改密码
-              </Button>
-              <Button type="link" size="small" onClick={() => onDelete(record)}>
-                删除
-              </Button>
+              {global.hasPermission(ClustersPermissionMap.SECURITY_USER_EDIT_PASSWORD) ? (
+                <Button
+                  type="link"
+                  size="small"
+                  style={{ paddingLeft: 0 }}
+                  onClick={() => editDrawerRef.current.onOpen(true, UsersOperate.ChangePassword, getKafkaUserList, record)}
+                >
+                  修改密码
+                </Button>
+              ) : (
+                <></>
+              )}
+              {global.hasPermission(ClustersPermissionMap.SECURITY_USER_DELETE) ? (
+                <Button type="link" size="small" onClick={() => onDelete(record)}>
+                  删除
+                </Button>
+              ) : (
+                <></>
+              )}
             </>
           );
         },
-      },
-    ];
-
+      });
+    }
     return baseColumns;
   };
 
@@ -454,13 +467,17 @@ const SecurityUsers = (): JSX.Element => {
                 setSearchKeywordsInput(e.target.value);
               }}
             />
-            <Button
-              type="primary"
-              // icon={<PlusOutlined />}
-              onClick={() => editDrawerRef.current.onOpen(true, UsersOperate.Add, getKafkaUserList)}
-            >
-              新增KafkaUser
-            </Button>
+            {global.hasPermission && global.hasPermission(ClustersPermissionMap.SECURITY_USER_ADD) ? (
+              <Button
+                type="primary"
+                // icon={<PlusOutlined />}
+                onClick={() => editDrawerRef.current.onOpen(true, UsersOperate.Add, getKafkaUserList)}
+              >
+                新增KafkaUser
+              </Button>
+            ) : (
+              <></>
+            )}
           </div>
         </div>
 

diff --git a/...in/java/com/xiaojukeji/know/streaming/km/rest/api/v3/cluster/ClusterGroupsController.java b/...in/java/com/xiaojukeji/know/streaming/km/rest/api/v3/cluster/ClusterGroupsController.java
@@ -77,7 +77,7 @@ public Result<Set<TopicPartitionKS>> getClusterPhyGroupPartitions(@PathVariable
     @GetMapping(value = "clusters/{clusterPhyId}/groups/{groupName}/topics-overview")
     public PaginationResult<GroupTopicOverviewVO> getGroupTopicsOverview(@PathVariable Long clusterPhyId,
                                                                          @PathVariable String groupName,
-                                                                         PaginationBaseDTO dto) {
+                                                                         PaginationBaseDTO dto) throws Exception {
         return groupManager.pagingGroupTopicMembers(clusterPhyId, groupName, dto);
     }