diff --git a/server/service/system/sys_auto_code.go b/server/service/system/sys_auto_code.go index 9feeab25b..e8cabc57c 100644 --- a/server/service/system/sys_auto_code.go +++ b/server/service/system/sys_auto_code.go @@ -234,9 +234,9 @@ func (autoCodeService *AutoCodeService) CreateTemp(autoCode system.AutoCodeStruc } if global.GVA_CONFIG.AutoCode.TransferRestart { - go func() { - _ = utils.Reload() - }() + // endless 会复用之前的指令 + // 如果是你 goland debug/run 后用的还是之前打包的文件,没有做到真正意义上的重启 + // 故此,拿掉迁移后的重启功能 } } else { // 打包 if err = utils.ZipFiles("./ginvueadmin.zip", fileList, ".", "."); err != nil { diff --git a/web/src/pinia/modules/router.js b/web/src/pinia/modules/router.js index 28e79c292..db27c99b9 100644 --- a/web/src/pinia/modules/router.js +++ b/web/src/pinia/modules/router.js @@ -7,14 +7,15 @@ import { ref } from 'vue' const routerListArr = [] const keepAliveRoutersArr = [] -const formatRouter = (routes) => { +const formatRouter = (routes, routeMap) => { routes && routes.forEach(item => { if ((!item.children || item.children.every(ch => ch.hidden)) && item.name !== '404' && !item.hidden) { routerListArr.push({ label: item.meta.title, value: item.name }) } item.meta.hidden = item.hidden + routeMap[item.name] = item if (item.children && item.children.length > 0) { - formatRouter(item.children) + formatRouter(item.children, routeMap) } }) } @@ -35,6 +36,7 @@ export const useRouterStore = defineStore('router', () => { const asyncRouters = ref([]) const routerList = ref(routerListArr) const keepAliveRouters = ref(keepAliveRoutersArr) + const routeMap = ({}) // 从后台获取动态路由 const SetAsyncRouter = async() => { const baseRouter = [{ @@ -57,7 +59,7 @@ export const useRouterStore = defineStore('router', () => { }, component: 'view/error/index.vue' }) - formatRouter(asyncRouter) + formatRouter(asyncRouter, routeMap) baseRouter[0].children = asyncRouter baseRouter.push({ path: '/:catchAll(.*)', @@ -76,7 +78,8 @@ export const useRouterStore = defineStore('router', () => { asyncRouters, routerList, keepAliveRouters, - SetAsyncRouter + SetAsyncRouter, + routeMap } }) diff --git a/web/src/view/layout/aside/asideComponent/menuItem.vue b/web/src/view/layout/aside/asideComponent/menuItem.vue index 24716a453..d288f0d89 100644 --- a/web/src/view/layout/aside/asideComponent/menuItem.vue +++ b/web/src/view/layout/aside/asideComponent/menuItem.vue @@ -1,5 +1,5 @@