⚡ 修改包结构.

orion-visor-launch/src/main/resources/application-dev.yaml

@@ -1,18 +1,18 @@
 spring:
   datasource:
     druid:
-      url: jdbc:mysql://116.62.194.246:3306/orion_visor?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true
+      url: jdbc:mysql://127.0.0.1:3306/orion_visor?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true
       username: root
-      password: Orionsec@123456
+      password: Data@123456
       initial-size: 0
       min-idle: 1
       max-active: 5
       stat-view-servlet:
         enabled: false
   redis:
-    host: 116.62.194.246
+    host: 127.0.0.1
     port: 6379
-    password: Orionsec@123456
+    password: Data@123456
   redisson:
     threads: 2
     netty-threads: 2

orion-visor-ui/src/api/exec/exec-job-log.ts

@@ -7,7 +7,7 @@ import type {
   ExecLogQueryResponse,
   ExecLogStatusResponse,
   ExecLogTailRequest
-} from '../exec/exec-log';
+} from './exec-log';
 import axios from 'axios';
 import qs from 'query-string';
 

orion-visor-ui/src/components/exec/log/panel-modal/index.vue

@@ -36,7 +36,7 @@
   import useLoading from '@/hooks/loading';
   import { nextTick, ref } from 'vue';
   import { getExecCommandLog } from '@/api/exec/exec-command-log';
-  import { getExecJobLog } from '@/api/job/exec-job-log';
+  import { getExecJobLog } from '@/api/exec/exec-job-log';
   import ExecLogPanel from '../panel/index.vue';
 
   const props = defineProps<{

orion-visor-ui/src/components/exec/log/panel/index.vue

@@ -28,7 +28,7 @@
   import type { ExecType, ILogAppender } from '../const';
   import { onUnmounted, ref, nextTick, onMounted } from 'vue';
   import { getExecCommandLogStatus } from '@/api/exec/exec-command-log';
-  import { getExecJobLogStatus } from '@/api/job/exec-job-log';
+  import { getExecJobLogStatus } from '@/api/exec/exec-job-log';
   import { dictKeys, execHostStatus, execStatus } from '../const';
   import { useDictStore } from '@/store';
   import ExecHost from './exec-host.vue';

orion-visor-ui/src/components/exec/log/panel/log-appender.ts

@@ -4,7 +4,7 @@ import type { XtermAddons } from '@/types/xterm';
 import type { ExecLogTailRequest } from '@/api/exec/exec-log';
 import { openExecLogChannel } from '@/api/exec/exec-log';
 import { getExecCommandLogTailToken } from '@/api/exec/exec-command-log';
-import { getExecJobLogTailToken } from '@/api/job/exec-job-log';
+import { getExecJobLogTailToken } from '@/api/exec/exec-job-log';
 import { Message } from '@arco-design/web-vue';
 import { useDebounceFn } from '@vueuse/core';
 import { addEventListen, removeEventListen } from '@/utils/event';

orion-visor-ui/src/components/exec/log/panel/log-item.vue

@@ -173,7 +173,7 @@
   import { formatDuration } from '@/utils';
   import { useDictStore } from '@/store';
   import { downloadExecCommandLogFile } from '@/api/exec/exec-command-log';
-  import { downloadExecJobLogFile } from '@/api/job/exec-job-log';
+  import { downloadExecJobLogFile } from '@/api/exec/exec-job-log';
   import { downloadFile } from '@/utils/file';
   import XtermSearchModal from '@/components/xterm/search-modal/index.vue';
   import '@xterm/xterm/css/xterm.css';

orion-visor-ui/src/router/routes/modules/job.ts

@@ -10,12 +10,12 @@ const JOB: AppRouteRecordRaw[] = [
       {
         name: 'execJob',
         path: '/exec-job',
-        component: () => import('@/views/job/exec-job/index.vue'),
+        component: () => import('@/views/exec/exec-job/index.vue'),
       },
       {
         name: 'execJobLog',
         path: '/exec-job-log',
-        component: () => import('@/views/job/exec-job-log/index.vue'),
+        component: () => import('@/views/exec/exec-job-log/index.vue'),
       },
     ],
   },
@@ -27,7 +27,7 @@ const JOB: AppRouteRecordRaw[] = [
       {
         name: 'execJobLogView',
         path: '/job-log-view',
-        component: () => import('@/views/job/exec-job-log-view/index.vue'),
+        component: () => import('@/views/exec/exec-job-log-view/index.vue'),
       },
     ],
   }

orion-visor-ui/src/store/modules/cache/index.ts

@@ -19,7 +19,7 @@ import { getHostGroupTree } from '@/api/asset/host-group';
 import { getMenuList } from '@/api/system/menu';
 import { getCurrentAuthorizedHostIdentity, getCurrentAuthorizedHostKey } from '@/api/asset/asset-authorized-data';
 import { getCommandSnippetGroupList } from '@/api/asset/command-snippet-group';
-import { getExecJobList } from '@/api/job/exec-job';
+import { getExecJobList } from '@/api/exec/exec-job';
 import { getPathBookmarkGroupList } from '@/api/asset/path-bookmark-group';
 import { getCommandSnippetList } from '@/api/asset/command-snippet';
 import { getPathBookmarkList } from '@/api/asset/path-bookmark';

orion-visor-ui/src/views/exec/exec-job-log-view/index.vue

@@ -17,7 +17,7 @@
 <script lang="ts" setup>
   import { onMounted, ref, nextTick } from 'vue';
   import { useRoute } from 'vue-router';
-  import { getExecJobLog } from '@/api/job/exec-job-log';
+  import { getExecJobLog } from '@/api/exec/exec-job-log';
   import ExecLogPanel from '@/components/exec/log/panel/index.vue';
 
   const route = useRoute();

orion-visor-ui/src/views/exec/exec-job-log/components/exec-job-host-log-table.vue

@@ -102,14 +102,14 @@
 
 <script lang="ts" setup>
   import type { ExecLogQueryResponse, ExecHostLogQueryResponse } from '@/api/exec/exec-log';
-  import { deleteExecJobHostLog, interruptHostExecJob } from '@/api/job/exec-job-log';
+  import { deleteExecJobHostLog, interruptHostExecJob } from '@/api/exec/exec-job-log';
   import { execHostStatusKey, execHostStatus } from '@/components/exec/log/const';
   import { useDictStore } from '@/store';
   import useLoading from '@/hooks/loading';
   import columns from '@/views/exec/exec-command-log/types/host-table.columns';
   import { useExpandable } from '@/hooks/table';
   import { dateFormat, formatDuration } from '@/utils';
-  import { downloadExecJobLogFile } from '@/api/job/exec-job-log';
+  import { downloadExecJobLogFile } from '@/api/exec/exec-job-log';
   import { copy } from '@/hooks/copy';
   import { downloadFile } from '@/utils/file';
   import { Message } from '@arco-design/web-vue';

orion-visor-ui/src/views/exec/exec-job-log/components/exec-job-log-clear-modal.vue

@@ -68,7 +68,7 @@
   import useLoading from '@/hooks/loading';
   import useVisible from '@/hooks/visible';
   import { execStatusKey } from '@/components/exec/log/const';
-  import { getExecJobLogCount, clearExecJobLog } from '@/api/job/exec-job-log';
+  import { getExecJobLogCount, clearExecJobLog } from '@/api/exec/exec-job-log';
   import { Message, Modal } from '@arco-design/web-vue';
   import { useDictStore } from '@/store';
   import { maxClearLimit } from '../types/const';

orion-visor-ui/src/views/exec/exec-job-log/components/exec-job-log-table.vue

@@ -198,7 +198,7 @@
     getExecJobHostLogList,
     getExecJobLogPage,
     getExecJobLogStatus
-  } from '@/api/job/exec-job-log';
+  } from '@/api/exec/exec-job-log';
   import { Message } from '@arco-design/web-vue';
   import useLoading from '@/hooks/loading';
   import columns from '../types/table.columns';
@@ -206,7 +206,7 @@
   import { useExpandable, useTablePagination, useRowSelection } from '@/hooks/table';
   import { useDictStore } from '@/store';
   import { dateFormat, formatDuration } from '@/utils';
-  import { interruptExecJob } from '@/api/job/exec-job-log';
+  import { interruptExecJob } from '@/api/exec/exec-job-log';
   import ExecJobHostLogTable from './exec-job-host-log-table.vue';
 
   const emits = defineEmits(['viewCommand', 'viewParams', 'viewLog', 'openClear']);

orion-visor-ui/src/views/exec/exec-job/components/exec-job-detail-drawer.vue

@@ -97,14 +97,14 @@
 </script>
 
 <script lang="ts" setup>
-  import type { ExecJobQueryResponse } from '@/api/job/exec-job';
+  import type { ExecJobQueryResponse } from '@/api/exec/exec-job';
   import { ref } from 'vue';
   import useLoading from '@/hooks/loading';
   import useVisible from '@/hooks/visible';
   import { useDictStore } from '@/store';
   import { dateFormat } from '@/utils';
   import { copy } from '@/hooks/copy';
-  import { getExecJob } from '@/api/job/exec-job';
+  import { getExecJob } from '@/api/exec/exec-job';
   import { EnabledStatus } from '@/types/const';
   import { execJobStatusKey } from '../types/const';
 

orion-visor-ui/src/views/exec/exec-job/components/exec-job-form-drawer.vue

@@ -192,7 +192,7 @@
 </script>
 
 <script lang="ts" setup>
-  import type { ExecJobUpdateRequest } from '@/api/job/exec-job';
+  import type { ExecJobUpdateRequest } from '@/api/exec/exec-job';
   import type { ExecTemplateQueryResponse } from '@/api/exec/exec-template';
   import type { TemplateParam } from '@/components/view/exec-editor/const';
   import { onUnmounted, ref } from 'vue';
@@ -200,7 +200,7 @@
   import useVisible from '@/hooks/visible';
   import formRules from '../types/form.rules';
   import { jobBuiltinParams } from '../types/const';
-  import { createExecJob, getExecJob, updateExecJob } from '@/api/job/exec-job';
+  import { createExecJob, getExecJob, updateExecJob } from '@/api/exec/exec-job';
   import { getExecTemplateWithAuthorized } from '@/api/exec/exec-template';
   import { Message } from '@arco-design/web-vue';
   import { EnabledStatus } from '@/types/const';

orion-visor-ui/src/views/exec/exec-job/components/exec-job-table.vue

@@ -189,9 +189,9 @@
 </script>
 
 <script lang="ts" setup>
-  import type { ExecJobQueryRequest, ExecJobQueryResponse } from '@/api/job/exec-job';
+  import type { ExecJobQueryRequest, ExecJobQueryResponse } from '@/api/exec/exec-job';
   import { reactive, ref, onMounted } from 'vue';
-  import { deleteExecJob, batchDeleteExecJob, getExecJobPage, triggerExecJob, updateExecJobStatus } from '@/api/job/exec-job';
+  import { deleteExecJob, batchDeleteExecJob, getExecJobPage, triggerExecJob, updateExecJobStatus } from '@/api/exec/exec-job';
   import { Message } from '@arco-design/web-vue';
   import usePermission from '@/hooks/permission';
   import useLoading from '@/hooks/loading';