✨ 新页面打开执行日志.

2024-03-21 19:20:37 +08:00
parent 31971b4e06
commit c7e520d34b
22 changed files with 214 additions and 84 deletions
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/dao/ExecLogDAO.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/dao/ExecLogDAO.java
@@ -3,6 +3,9 @@ package com.orion.ops.module.asset.dao;
 import com.orion.ops.framework.mybatis.core.mapper.IMapper;
 import com.orion.ops.module.asset.entity.domain.ExecLogDO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;

 /**
 * 批量执行日志 Mapper 接口
@@ -14,4 +17,16 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
 public interface ExecLogDAO extends IMapper<ExecLogDO> {

+    /**
+     * 获取执行历史
+     *
+     * @param source source
+     * @param userId userId
+     * @param limit  limit
+     * @return rows
+     */
+    List<ExecLogDO> getExecHistory(@Param("source") String source,
+                                   @Param("userId") Long userId,
+                                   @Param("limit") Integer limit);
+
 }
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/ExecLogServiceImpl.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/ExecLogServiceImpl.java
@@ -86,24 +86,18 @@ public class ExecLogServiceImpl implements ExecLogService {
    @Override
    public List<ExecLogVO> getExecHistory(ExecLogQueryRequest request) {
        // 查询执行记录
-        List<ExecLogVO> logs = execLogDAO.of()
-                .createWrapper()
-                .eq(ExecLogDO::getSource, request.getSource())
-                .eq(ExecLogDO::getUserId, request.getUserId())
-                .groupBy(ExecLogDO::getDescription)
-                .orderByDesc(ExecLogDO::getId)
-                .then()
-                .limit(request)
-                .list(ExecLogConvert.MAPPER::to);
-        if (logs.isEmpty()) {
-            return logs;
+        List<ExecLogDO> rows = execLogDAO.getExecHistory(request.getSource(), request.getUserId(), request.getLimit());
+        if (rows.isEmpty()) {
+            return Lists.empty();
        }
+        List<ExecLogVO> logs = ExecLogConvert.MAPPER.to(rows);
        List<Long> logIdList = logs.stream()
                .map(ExecLogVO::getId)
                .collect(Collectors.toList());
        // 设置执行主机id
        Map<Long, List<Long>> hostIdRel = execHostLogDAO.of()
                .createWrapper()
+                .select(ExecHostLogDO::getId, ExecHostLogDO::getLogId, ExecHostLogDO::getHostId)
                .in(ExecHostLogDO::getLogId, logIdList)
                .then()
                .stream()
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/resources/mapper/ExecLogMapper.xml
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/resources/mapper/ExecLogMapper.xml
@@ -28,4 +28,17 @@
        id, user_id, username, source, source_id, description, command, parameter_schema, timeout, status, start_time, finish_time, create_time, update_time, creator, updater, deleted
    </sql>

+    <select id="getExecHistory" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        , max(id) max_id
+        FROM exec_log
+        WHERE deleted = 0
+        AND source = #{source}
+        AND user_id = #{userId}
+        GROUP BY description
+        ORDER BY max_id DESC
+        LIMIT #{limit}
+    </select>
+
 </mapper>
--- a/orion-ops-ui/src/components/app/footer/index.vue
+++ b/orion-ops-ui/src/components/app/footer/index.vue
@@ -8,7 +8,7 @@
        <a-link target="_blank" href="https://gitee.com/lijiahangmax/orion-ops-pro">gitee</a-link>
        <a-link target="_blank" href="https://lijiahangmax.gitee.io/orion-ops-pro">文档</a-link>
        <a-link target="_blank" href="https://github.com/lijiahangmax/orion-ops-pro/blob/main/LICENSE">License</a-link>
-        <span title="当前版本">v{{ version }}</span>
+        <a-link target="_blank" :href="`https://github.com/lijiahangmax/orion-ops-pro/releases/tag/v${version}`">v{{ version }} 开源版</a-link>
      </a-space>
      <span class="copyright">
          Copyright<icon-copyright /> 2024 Li Jiahang All rights reserved.
--- a/orion-ops-ui/src/components/app/navbar/index.vue
+++ b/orion-ops-ui/src/components/app/navbar/index.vue
@@ -31,7 +31,7 @@
          <a-button class="nav-btn"
                    type="outline"
                    shape="circle"
-                    @click="openNewRoute('terminal')">
+                    @click="openNewRoute({ name: 'terminal' })">
            <template #icon>
              <icon-code-square />
            </template>
@@ -213,10 +213,10 @@
  import { openAppSettingKey, toggleDrawerMenuKey } from '@/types/symbol';
  import { preferenceTipsKey } from './const';
  import { REDIRECT_ROUTE_NAME, routerToTag } from '@/router/constants';
-  import { openWindow } from '@/utils';
+  import { openNewRoute } from '@/router';
  import MenuTree from '@/components/system/menu/tree/index.vue';
-  import UpdatePasswordModal from '@/components/user/user/update-password-modal/index.vue';
  import MessageBox from '@/components/system/message-box/index.vue';
+  import UpdatePasswordModal from '@/components/user/user/update-password-modal/index.vue';

  const tipsStore = useTipsStore();
  const appStore = useAppStore();
@@ -280,12 +280,6 @@
    triggerMouseEvent(localeRef);
  };

-  // 打开新页面
-  const openNewRoute = (name: string) => {
-    const { href } = router.resolve({ name });
-    openWindow(href);
-  };
-
  // 刷新页面
  const reloadCurrent = async () => {
    if (appStore.tabBar) {
--- a/orion-ops-ui/src/components/asset/host/authorized-host-modal/index.vue
+++ b/orion-ops-ui/src/components/asset/host/authorized-host-modal/index.vue
@@ -241,7 +241,7 @@

  // 加载字典值
  onMounted(async () => {
-    await loadKeys([...dictKeys]);
+    await loadKeys(dictKeys);
  });

 </script>
--- a/orion-ops-ui/src/components/exec/log/panel/index.vue
+++ b/orion-ops-ui/src/components/exec/log/panel/index.vue
@@ -25,12 +25,13 @@
 <script lang="ts" setup>
  import type { ExecLogQueryResponse } from '@/api/exec/exec-log';
  import type { ILogAppender } from './const';
-  import { onUnmounted, ref, nextTick } from 'vue';
+  import { onUnmounted, ref, nextTick, onMounted } from 'vue';
  import { getExecLogStatus } from '@/api/exec/exec-log';
-  import { execHostStatus, execStatus } from './const';
+  import { dictKeys, execHostStatus, execStatus } from './const';
  import ExecHost from './exec-host.vue';
  import LogView from './log-view.vue';
  import LogAppender from '@/components/exec/log/panel/log-appender';
+  import { useDictStore } from '@/store';

  const props = defineProps<{
    visibleBack: boolean
@@ -145,12 +146,18 @@
    clearInterval(finishIntervalId.value);
  };

+  // 加载字典值
+  onMounted(async () => {
+    const dictStore = useDictStore();
+    await dictStore.loadKeys(dictKeys);
+  });
+
  onUnmounted(closeAll);

 </script>

 <style lang="less" scoped>
-  @host-width: 420px;
+  @host-width: 380px;
  @host-real-width: @host-width + 16px;

  .log-panel-container {
--- a/orion-ops-ui/src/components/system/menu/tree/index.vue
+++ b/orion-ops-ui/src/components/system/menu/tree/index.vue
@@ -5,6 +5,7 @@
  import { useAppStore } from '@/store';
  import { listenerRouteChange } from '@/utils/route-listener';
  import { openWindow, regexUrl } from '@/utils';
+  import { openNewRoute } from '@/router';
  import useMenuTree from './use-menu-tree';

  export default defineComponent({
@@ -39,10 +40,9 @@
        const { hideInMenu, activeMenu, newWindow } = item.meta as RouteMeta;
        // 新页面打开
        if (newWindow || e.ctrlKey) {
-          const { href } = router.resolve({
+          openNewRoute({
            name: item.name,
          });
-          openWindow(href);
          return;
        }
        // 设置 selectedKey
--- a/orion-ops-ui/src/router/index.ts
+++ b/orion-ops-ui/src/router/index.ts
@@ -1,9 +1,11 @@
+import type { RouteLocationRaw } from 'vue-router';
 import { createRouter, createWebHistory } from 'vue-router';
 import NProgress from 'nprogress';
-import 'nprogress/nprogress.css';
 import { appRoutes } from './routes';
 import BASE_ROUTERS from './routes/base';
 import createRouteGuard from './guard';
+import { openWindow } from '@/utils';
+import 'nprogress/nprogress.css';

 NProgress.configure({ showSpinner: false });

@@ -22,4 +24,10 @@ const router = createRouter({
 // 创建路由守卫
 createRouteGuard(router);

+// 新页面打开路由
+export const openNewRoute = (route: RouteLocationRaw) => {
+  const { href } = router.resolve(route);
+  openWindow(href);
+};
+
 export default router;
--- a/orion-ops-ui/src/router/routes/modules/exec.ts
+++ b/orion-ops-ui/src/router/routes/modules/exec.ts
@@ -1,27 +1,41 @@
 import type { AppRouteRecordRaw } from '../types';
-import { DEFAULT_LAYOUT } from '../base';
+import { DEFAULT_LAYOUT, FULL_LAYOUT } from '../base';

-const EXEC: AppRouteRecordRaw = {
-  name: 'execModule',
-  path: '/exec-module',
-  component: DEFAULT_LAYOUT,
-  children: [
-    {
-      name: 'execCommand',
-      path: '/exec-command',
-      component: () => import('@/views/exec/exec-command/index.vue'),
-    },
-    {
-      name: 'execLog',
-      path: '/exec-log',
-      component: () => import('@/views/exec/exec-log/index.vue'),
-    },
-    {
-      name: 'execTemplate',
-      path: '/exec-template',
-      component: () => import('@/views/exec/exec-template/index.vue'),
-    },
-  ],
-};
+const EXEC: AppRouteRecordRaw[] = [
+  {
+    name: 'execModule',
+    path: '/exec-module',
+    component: DEFAULT_LAYOUT,
+    children: [
+      {
+        name: 'execCommand',
+        path: '/exec-command',
+        component: () => import('@/views/exec/exec-command/index.vue'),
+      },
+      {
+        name: 'execLog',
+        path: '/exec-log',
+        component: () => import('@/views/exec/exec-log/index.vue'),
+      },
+      {
+        name: 'execTemplate',
+        path: '/exec-template',
+        component: () => import('@/views/exec/exec-template/index.vue'),
+      },
+    ],
+  },
+  {
+    name: 'execFullModule',
+    path: '/exec-full-module',
+    component: FULL_LAYOUT,
+    children: [
+      {
+        name: 'execLogView',
+        path: '/exec-log-view',
+        component: () => import('@/views/exec/exec-log-view/index.vue'),
+      },
+    ],
+  }
+];

 export default EXEC;
--- a/orion-ops-ui/src/views/asset-audit/connect-log/components/connect-log-clear-modal.vue
+++ b/orion-ops-ui/src/views/asset-audit/connect-log/components/connect-log-clear-modal.vue
@@ -17,6 +17,13 @@
              label-align="right"
              :label-col-props="{ span: 5 }"
              :wrapper-col-props="{ span: 18 }">
+        <!-- 开始时间 -->
+        <a-form-item field="startTimeRange" label="开始时间">
+          <a-range-picker v-model="formModel.startTimeRange"
+                          :time-picker-props="{ defaultValue: ['00:00:00', '23:59:59'] }"
+                          show-time
+                          format="YYYY-MM-DD HH:mm:ss" />
+        </a-form-item>
        <!-- 连接用户 -->
        <a-form-item field="userId" label="连接用户">
          <user-selector v-model="formModel.userId"
@@ -49,13 +56,6 @@
                    :options="toOptions(connectTypeKey)"
                    allow-clear />
        </a-form-item>
-        <!-- 开始时间 -->
-        <a-form-item field="startTimeRange" label="开始时间">
-          <a-range-picker v-model="formModel.startTimeRange"
-                          :time-picker-props="{ defaultValue: ['00:00:00', '23:59:59'] }"
-                          show-time
-                          format="YYYY-MM-DD HH:mm:ss" />
-        </a-form-item>
      </a-form>
    </a-spin>
  </a-modal>
--- a/orion-ops-ui/src/views/asset/host-list/components/config/host-config-drawer.vue
+++ b/orion-ops-ui/src/views/asset/host-list/components/config/host-config-drawer.vue
@@ -58,7 +58,7 @@
      setVisible(true);
      // 加载字典值
      const dictStore = useDictStore();
-      await dictStore.loadKeys([...sshDictKeys]);
+      await dictStore.loadKeys(sshDictKeys);
      // 加载配置
      const { data } = await getHostConfigList(record.value.id);
      data.forEach(s => {
--- a/orion-ops-ui/src/views/dashboard/workplace/components/quick-operation.vue
+++ b/orion-ops-ui/src/views/dashboard/workplace/components/quick-operation.vue
@@ -23,8 +23,8 @@
 <script lang="ts" setup>
  import type { RouteRecordNormalized } from 'vue-router';
  import { useRouter } from 'vue-router';
-  import { openWindow } from '@/utils';
  import { useMenuStore } from '@/store';
+  import { openNewRoute } from '@/router';

  const router = useRouter();
  const { appMenus } = useMenuStore();
@@ -40,10 +40,9 @@
  const openRoute = (e: any, route: RouteRecordNormalized) => {
    // 新页面打开
    if (route.meta.newWindow || e.ctrlKey) {
-      const { href } = router.resolve({
+      openNewRoute({
        name: route.name as string,
      });
-      openWindow(href);
      return;
    }
    // 触发跳转
--- a/orion-ops-ui/src/views/exec/exec-command/components/exec-panel-history.vue
+++ b/orion-ops-ui/src/views/exec/exec-command/components/exec-panel-history.vue
@@ -7,7 +7,14 @@
        展示最近 {{ historyCount }} 条执行记录
      </span>
    </div>
-    <div v-if="!historyLogs.length" class="flex-center mt16">
+    <!-- 加载中 -->
+    <a-skeleton v-if="loading" :animation="true">
+      <a-skeleton-line :rows="4"
+                       :line-height="40"
+                       :line-spacing="8" />
+    </a-skeleton>
+    <!-- 无数据 -->
+    <div v-else-if="!historyLogs.length" class="flex-center mt16">
      <a-empty description="无执行记录" />
    </div>
    <!-- 执行记录 -->
@@ -41,9 +48,12 @@
  import { onMounted, ref } from 'vue';
  import { getExecLogHistory } from '@/api/exec/exec-log';
  import { historyCount } from '../types/const';
+  import useLoading from '@/hooks/loading';

  const emits = defineEmits(['selected']);

+  const { loading, setLoading } = useLoading(true);
+
  const historyLogs = ref<Array<ExecLogQueryResponse>>([]);

  // 添加
@@ -76,8 +86,14 @@

  // 加载执行记录
  const fetchExecHistory = async () => {
-    const { data } = await getExecLogHistory(historyCount);
-    historyLogs.value = data;
+    setLoading(true);
+    try {
+      const { data } = await getExecLogHistory(historyCount);
+      historyLogs.value = data;
+    } catch (e) {
+    } finally {
+      setLoading(false);
+    }
  };

  // 加载执行记录
--- a/orion-ops-ui/src/views/exec/exec-command/components/exec-panel.vue
+++ b/orion-ops-ui/src/views/exec/exec-command/components/exec-panel.vue
@@ -216,7 +216,7 @@
 </script>

 <style lang="less" scoped>
-  @form-width: 380px;
+  @form-width: 420px;
  @history-width: 320px;
  @command-gap: @form-width + @history-width + 32px;

--- a/orion-ops-ui/src/views/exec/exec-command/index.vue
+++ b/orion-ops-ui/src/views/exec/exec-command/index.vue
@@ -29,7 +29,6 @@
  import ExecLogPanel from '@/components/exec/log/panel/index.vue';

  const { visible: logVisible, setVisible: setLogVisible } = useVisible();
-  const { loadKeys } = useDictStore();

  const log = ref();

@@ -43,7 +42,8 @@

  // 加载字典值
  onMounted(async () => {
-    await loadKeys(dictKeys);
+    const dictStore = useDictStore();
+    await dictStore.loadKeys(dictKeys);
  });

 </script>
--- a/orion-ops-ui/src/views/exec/exec-log-view/index.vue
+++ b/orion-ops-ui/src/views/exec/exec-log-view/index.vue
@@ -0,0 +1,59 @@
+<template>
+  <div class="container">
+    <div class="wrapper">
+      <exec-log-panel ref="log" :visible-back="false" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+  export default {
+    name: 'execExecLogView'
+  };
+</script>
+
+<script lang="ts" setup>
+  import { onMounted, ref, nextTick } from 'vue';
+  import { useRoute } from 'vue-router';
+  import { getExecLog } from '@/api/exec/exec-log';
+  import ExecLogPanel from '@/components/exec/log/panel/index.vue';
+
+  const route = useRoute();
+  const log = ref();
+
+  // 初始化
+  const init = async (id: number) => {
+    // 获取执行日志
+    const { data } = await getExecLog(id);
+    // 打开日志
+    await nextTick(() => {
+      setTimeout(() => {
+        log.value.open(data);
+      }, 50);
+    });
+  };
+
+  onMounted(() => {
+    const isParam = route.query.id;
+    if (isParam) {
+      init(Number.parseInt(isParam as string));
+    }
+  });
+
+</script>
+
+<style lang="less" scoped>
+  .container {
+    width: 100%;
+    height: 100%;
+    position: relative;
+    padding: 16px;
+    background: var(--color-fill-2);
+
+    .wrapper {
+      width: 100%;
+      height: 100%;
+      position: relative;
+    }
+  }
+</style>
--- a/orion-ops-ui/src/views/exec/exec-log/components/exec-log-clear-modal.vue
+++ b/orion-ops-ui/src/views/exec/exec-log/components/exec-log-clear-modal.vue
@@ -18,6 +18,13 @@
              label-align="right"
              :label-col-props="{ span: 5 }"
              :wrapper-col-props="{ span: 18 }">
+        <!-- 执行时间 -->
+        <a-form-item field="startTimeRange" label="执行时间">
+          <a-range-picker v-model="formModel.startTimeRange"
+                          :time-picker-props="{ defaultValue: ['00:00:00', '23:59:59'] }"
+                          show-time
+                          format="YYYY-MM-DD HH:mm:ss" />
+        </a-form-item>
        <!-- 执行用户 -->
        <a-form-item field="userId" label="执行用户">
          <user-selector v-model="formModel.userId"
@@ -42,13 +49,6 @@
                    :options="toOptions(execStatusKey)"
                    placeholder="请选择执行状态" />
        </a-form-item>
-        <!-- 执行时间 -->
-        <a-form-item field="startTimeRange" label="执行时间">
-          <a-range-picker v-model="formModel.startTimeRange"
-                          :time-picker-props="{ defaultValue: ['00:00:00', '23:59:59'] }"
-                          show-time
-                          format="YYYY-MM-DD HH:mm:ss" />
-        </a-form-item>
      </a-form>
    </a-spin>
  </a-modal>
--- a/orion-ops-ui/src/views/exec/exec-log/components/exec-log-table.vue
+++ b/orion-ops-ui/src/views/exec/exec-log/components/exec-log-table.vue
@@ -163,6 +163,7 @@
          <a-button v-permission="['asset:exec:exec-command']"
                    type="text"
                    size="mini"
+                    title="ctrl + 左键新页面打开"
                    @click="(e) => emits('viewLog', record.id, e.ctrlKey)">
            日志
          </a-button>
--- a/orion-ops-ui/src/views/exec/exec-log/index.vue
+++ b/orion-ops-ui/src/views/exec/exec-log/index.vue
@@ -36,6 +36,10 @@
  import JsonEditorModal from '@/components/view/json-editor/modal/index.vue';
  import ShellEditorModal from '@/components/view/shell-editor/modal/index.vue';
  import ExecLogPanelModal from '@/components/exec/log/panel-modal/index.vue';
+  import { useRouter } from 'vue-router';
+  import { openNewRoute } from '@/router';
+
+  const router = useRouter();

  const render = ref(false);
  const tableRef = ref();
@@ -62,7 +66,13 @@
  // 查看日志
  const viewLog = (id: number, newWindow: boolean) => {
    if (newWindow) {
-      // TODO openLog
+      // 跳转新页面
+      openNewRoute({
+        name: 'execLogView',
+        query: {
+          id
+        }
+      });
    } else {
      logModal.value.open(id);
    }
--- a/orion-ops-ui/src/views/host/terminal/index.vue
+++ b/orion-ops-ui/src/views/host/terminal/index.vue
@@ -70,7 +70,7 @@

  // 加载字典值
  onBeforeMount(async () => {
-    await dictStore.loadKeys([...dictKeys]);
+    await dictStore.loadKeys(dictKeys);
  });

  // 加载主机信息
--- a/orion-ops-ui/src/views/user/operator-log/components/operator-log-clear-modal.vue
+++ b/orion-ops-ui/src/views/user/operator-log/components/operator-log-clear-modal.vue
@@ -17,6 +17,13 @@
              label-align="right"
              :label-col-props="{ span: 5 }"
              :wrapper-col-props="{ span: 18 }">
+        <!-- 执行时间 -->
+        <a-form-item field="startTimeRange" label="执行时间">
+          <a-range-picker v-model="formModel.startTimeRange"
+                          :time-picker-props="{ defaultValue: ['00:00:00', '23:59:59'] }"
+                          show-time
+                          format="YYYY-MM-DD HH:mm:ss" />
+        </a-form-item>
        <!-- 操作用户 -->
        <a-form-item field="userId" label="操作用户">
          <user-selector v-model="formModel.userId"
@@ -55,13 +62,6 @@
                    placeholder="请选择执行结果"
                    allow-clear />
        </a-form-item>
-        <!-- 执行时间 -->
-        <a-form-item field="startTimeRange" label="执行时间">
-          <a-range-picker v-model="formModel.startTimeRange"
-                          :time-picker-props="{ defaultValue: ['00:00:00', '23:59:59'] }"
-                          show-time
-                          format="YYYY-MM-DD HH:mm:ss" />
-        </a-form-item>
      </a-form>
    </a-spin>
  </a-modal>