diff --git a/.dockerignore b/.dockerignore index cf70988..4e92fdf 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1 +1,2 @@ **/node_modules +exporter diff --git a/Dockerfile b/Dockerfile index f781d69..56b66d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,11 +2,14 @@ FROM docker.hub.ipao.vip/golang:1.22-alpine as builder COPY . /app +WORKDIR /app + RUN go env -w GOPROXY=https://go.hub.ipao.vip,direct && \ go env -w GO111MODULE=on && \ cd /app && \ - go mod tidy && \ - go build -o /app/exporter . + go mod tidy + +RUN go build -o /app/exporter . FROM docker.hub.ipao.vip/alpine:3.20 diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js index 050ff8d..4b31fee 100644 --- a/frontend/src/router/index.js +++ b/frontend/src/router/index.js @@ -1,5 +1,6 @@ import { createRouter, createWebHistory } from 'vue-router' +import NotFound from '@/views/NotFound.vue' const router = createRouter({ history: createWebHistory(import.meta.env.BASE_URL), @@ -10,21 +11,26 @@ const router = createRouter({ component: () => import('@/views/Home.vue'), }, { - path: '/favorites/:offset(\d+)?', + path: '/favorites/:offset?', name: 'favorite-messages', component: () => import('@/views/FavoriteMessages.vue'), }, { - path: '/channels/:channel/messages/:offset(\d+)?', + path: '/channels/:channel/messages/:offset?', name: 'channel-messages', component: () => import('@/views/ChannelMessages.vue'), }, { path: '/:pathMatch(.*)*', name: 'NotFound', - component: import('@/views/NotFound.vue'), + component: NotFound, }, ] }) +// router.beforeEach((to, from, next) => { +// console.log(to) +// next() +// }) + export default router