🐛 修改执行权限.

orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/OperatorLogController.java

@@ -59,7 +59,7 @@ public class OperatorLogController {
 
     @PostMapping("/query-count")
     @Operation(summary = "查询操作日志数量")
-    @PreAuthorize("@ss.hasPermission('infra:operator-log:clear')")
+    @PreAuthorize("@ss.hasPermission('infra:operator-log:management:clear')")
     public Long getOperatorLogCount(@RequestBody OperatorLogQueryRequest request) {
         return operatorLogService.getOperatorLogCount(request);
     }
@@ -67,7 +67,7 @@ public class OperatorLogController {
     @OperatorLog(OperatorLogOperatorType.CLEAR)
     @PostMapping("/clear")
     @Operation(summary = "清空操作日志")
-    @PreAuthorize("@ss.hasPermission('infra:operator-log:clear')")
+    @PreAuthorize("@ss.hasPermission('infra:operator-log:management:clear')")
     public Integer clearOperatorLog(@RequestBody OperatorLogQueryRequest request) {
         return operatorLogService.clearOperatorLog(request);
     }

orion-ops-ui/src/views/exec/exec-command-log/components/exec-command-host-log-table.vue

@@ -69,7 +69,7 @@
                       position="left"
                       type="warning"
                       @ok="interruptedHost(record)">
-          <a-button v-permission="['asset:exec:interrupt-exec']"
+          <a-button v-permission="['asset:exec-command:interrupt']"
                     type="text"
                     size="mini"
                     status="danger"
@@ -82,7 +82,7 @@
                       position="left"
                       type="warning"
                       @ok="deleteRow(record)">
-          <a-button v-permission="['asset:exec-log:delete']"
+          <a-button v-permission="['asset:exec-command-log:delete']"
                     type="text"
                     size="mini"
                     status="danger">
@@ -119,7 +119,7 @@
     row: ExecCommandLogQueryResponse;
   }>();
 
-  const emits = defineEmits(['viewCommand', 'viewParams']);
+  const emits = defineEmits(['viewCommand', 'viewParams', 'refreshHost']);
 
   const expandable = useExpandable({ width: 90 });
   const { loading, setLoading } = useLoading();
@@ -148,14 +148,16 @@
   };
 
   // 删除当前行
-  const deleteRow = async ({ id }: {
+  const deleteRow = async ({ id, logId }: {
-    id: number
+    id: number,
+    logId: number
   }) => {
     try {
       setLoading(true);
       // 调用删除接口
       await deleteExecCommandHostLog(id);
       Message.success('删除成功');
+      emits('refreshHost', logId);
     } catch (e) {
     } finally {
       setLoading(false);

orion-ops-ui/src/views/exec/exec-command-log/components/exec-command-log-table.vue

@@ -62,7 +62,7 @@
       <div class="table-right-bar-handle">
         <a-space>
           <!-- 执行命令 -->
-          <a-button v-permission="['asset:exec:exec-command']"
+          <a-button v-permission="['asset:exec-command:exec']"
                     type="primary"
                     @click="$router.push({ name: 'execCommand' })">
             执行命令
@@ -71,7 +71,7 @@
             </template>
           </a-button>
           <!-- 清空 -->
-          <a-button v-permission="['infra:exec-log:clear']"
+          <a-button v-permission="['asset:exec-command-log:management:clear']"
                     status="danger"
                     @click="openClear">
             清空
@@ -84,7 +84,7 @@
                         position="br"
                         type="warning"
                         @ok="deleteSelectRows">
-            <a-button v-permission="['asset:exec-log:delete']"
+            <a-button v-permission="['asset:exec-command-log:delete']"
                       type="secondary"
                       status="danger"
                       :disabled="selectedKeys.length === 0">
@@ -110,12 +110,13 @@
              :bordered="false"
              @page-change="(page) => fetchTableData(page, pagination.pageSize)"
              @page-size-change="(size) => fetchTableData(1, size)"
-             @expand="loadHostExecData">
+             @expand="loadExecHost">
       <!-- 展开表格 -->
       <template #expand-row="{ record }">
         <exec-command-host-log-table :row="record"
                                      @view-command="s => emits('viewCommand', s)"
-                                     @view-params="s => emits('viewParams', s)" />
+                                     @view-params="s => emits('viewParams', s)"
+                                     @refresh-host="refreshExecHost" />
       </template>
       <!-- 执行命令 -->
       <template #command="{ record }">
@@ -147,7 +148,7 @@
                         position="left"
                         type="warning"
                         @ok="doReExecCommand(record)">
-            <a-button v-permission="['asset:exec:exec-command']"
+            <a-button v-permission="['asset:exec-command:exec']"
                       type="text"
                       size="mini">
               重新执行
@@ -160,7 +161,7 @@
             命令
           </a-button>
           <!-- 日志 -->
-          <a-button v-permission="['asset:exec:exec-command']"
+          <a-button v-permission="['asset:exec-command:exec']"
                     type="text"
                     size="mini"
                     title="ctrl + 左键新页面打开"
@@ -172,7 +173,7 @@
                         position="left"
                         type="warning"
                         @ok="doInterruptExecCommand(record)">
-            <a-button v-permission="['asset:exec:interrupt-exec']"
+            <a-button v-permission="['asset:exec-command:interrupt']"
                       type="text"
                       size="mini"
                       status="danger"
@@ -185,7 +186,7 @@
                         position="left"
                         type="warning"
                         @ok="deleteRow(record)">
-            <a-button v-permission="['asset:exec-log:delete']"
+            <a-button v-permission="['asset:exec-command-log:delete']"
                       type="text"
                       size="mini"
                       status="danger">
@@ -317,9 +318,22 @@
     }
   };
 
+  // 刷新执行主机
+  const refreshExecHost = (id: number) => {
+    // 获取到执行主机
+    const exec = tableRenderData.value.find(s => s.id === id);
+    if (!exec) {
+      return;
+    }
+    // 加载数据
+    getExecCommandHostLogList(id).then(s => {
+      exec.hosts = s.data;
+    });
+  };
+
   // 加载主机数据
-  const loadHostExecData = async (key: number | string, record: TableData) => {
+  const loadExecHost = async (key: number | string, record: TableData) => {
-    if (record.hosts) {
+    if (record.hosts?.length) {
       return;
     }
     // 加载数据

orion-ops-ui/src/views/exec/exec-template/components/exec-template-table.vue

@@ -76,7 +76,7 @@
       <!-- 操作 -->
       <template #handle="{ record }">
         <div class="table-handle-wrapper">
-          <a-button v-permission="['asset:exec:exec-command']"
+          <a-button v-permission="['asset:exec-command:exec']"
                     type="text"
                     size="mini"
                     @click="emits('openExec', record)">

orion-ops-ui/src/views/user/operator-log/components/operator-log-table.vue

@@ -18,7 +18,7 @@
       <div class="table-right-bar-handle">
         <a-space>
           <!-- 清空 -->
-          <a-button v-permission="['infra:operator-log:clear']"
+          <a-button v-permission="['infra:operator-log:management:clear']"
                     status="danger"
                     @click="openClear">
             清空