diff --git a/orion-visor-launch/src/main/resources/application-dev.yaml b/orion-visor-launch/src/main/resources/application-dev.yaml index 914d5c78..d5a313c7 100644 --- a/orion-visor-launch/src/main/resources/application-dev.yaml +++ b/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 diff --git a/orion-visor-ui/src/api/job/exec-job-log.ts b/orion-visor-ui/src/api/exec/exec-job-log.ts similarity index 99% rename from orion-visor-ui/src/api/job/exec-job-log.ts rename to orion-visor-ui/src/api/exec/exec-job-log.ts index c0fffd68..b3998f46 100644 --- a/orion-visor-ui/src/api/job/exec-job-log.ts +++ b/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'; diff --git a/orion-visor-ui/src/api/job/exec-job.ts b/orion-visor-ui/src/api/exec/exec-job.ts similarity index 100% rename from orion-visor-ui/src/api/job/exec-job.ts rename to orion-visor-ui/src/api/exec/exec-job.ts diff --git a/orion-visor-ui/src/components/exec/log/panel-modal/index.vue b/orion-visor-ui/src/components/exec/log/panel-modal/index.vue index 7bb22859..2be99e30 100644 --- a/orion-visor-ui/src/components/exec/log/panel-modal/index.vue +++ b/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<{ diff --git a/orion-visor-ui/src/components/exec/log/panel/index.vue b/orion-visor-ui/src/components/exec/log/panel/index.vue index 8221497c..b32a4340 100644 --- a/orion-visor-ui/src/components/exec/log/panel/index.vue +++ b/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'; diff --git a/orion-visor-ui/src/components/exec/log/panel/log-appender.ts b/orion-visor-ui/src/components/exec/log/panel/log-appender.ts index 85ca5644..bfe4d87e 100644 --- a/orion-visor-ui/src/components/exec/log/panel/log-appender.ts +++ b/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'; diff --git a/orion-visor-ui/src/components/exec/log/panel/log-item.vue b/orion-visor-ui/src/components/exec/log/panel/log-item.vue index 3f586d21..22baad0d 100644 --- a/orion-visor-ui/src/components/exec/log/panel/log-item.vue +++ b/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'; diff --git a/orion-visor-ui/src/router/routes/modules/job.ts b/orion-visor-ui/src/router/routes/modules/job.ts index d16eddc5..2ee9172b 100644 --- a/orion-visor-ui/src/router/routes/modules/job.ts +++ b/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'), }, ], } diff --git a/orion-visor-ui/src/store/modules/cache/index.ts b/orion-visor-ui/src/store/modules/cache/index.ts index 8c6c5209..9f65b5af 100644 --- a/orion-visor-ui/src/store/modules/cache/index.ts +++ b/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'; diff --git a/orion-visor-ui/src/views/job/exec-job-log-view/index.vue b/orion-visor-ui/src/views/exec/exec-job-log-view/index.vue similarity index 95% rename from orion-visor-ui/src/views/job/exec-job-log-view/index.vue rename to orion-visor-ui/src/views/exec/exec-job-log-view/index.vue index a36cbd3a..7c1aab16 100644 --- a/orion-visor-ui/src/views/job/exec-job-log-view/index.vue +++ b/orion-visor-ui/src/views/exec/exec-job-log-view/index.vue @@ -17,7 +17,7 @@