From 37e8b1a478edca1deb50cfbf9292a553d51372c4 Mon Sep 17 00:00:00 2001 From: Layne Cai <15506906353@163.com> Date: Wed, 23 Mar 2022 15:37:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E7=AB=AF=E5=8F=A3?= =?UTF-8?q?=E5=92=8C=E8=B0=83=E6=95=B4=E5=89=8D=E7=AB=AF=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-auth/src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 4 +-- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- ruoyi-vue3/.env.development | 3 +++ ruoyi-vue3/.env.production | 3 +++ ruoyi-vue3/public/favicon.ico | Bin 5561 -> 16196 bytes ruoyi-vue3/src/permission.js | 11 ++++---- ruoyi-vue3/src/router/index.js | 24 ++++++++++-------- ruoyi-vue3/vite.config.js | 8 +++--- 13 files changed, 37 insertions(+), 28 deletions(-) diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml index e7c0bee6..510f65cc 100644 --- a/ruoyi-auth/src/main/resources/bootstrap.yml +++ b/ruoyi-auth/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9200 + port: 12200 # Spring spring: diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml index 64e149ef..103cfa4c 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 8080 + port: 12080 # Spring spring: @@ -35,7 +35,7 @@ spring: eager: true transport: # 控制台地址 - dashboard: 127.0.0.1:8718 + dashboard: 127.0.0.1:12718 # nacos配置持久化 datasource: ds1: diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml index 5b50fb38..06c92640 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9300 + port: 12300 # Spring spring: diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml index b919923c..666e5317 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9202 + port: 12202 # Spring spring: diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml index 1d3dfda9..f6ba3b65 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9203 + port: 12203 # Spring spring: diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml index b65fe295..e8fb1628 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9201 + port: 12201 # Spring spring: diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml index efc9b998..7fe827ca 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml +++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9100 + port: 12100 # Spring spring: diff --git a/ruoyi-vue3/.env.development b/ruoyi-vue3/.env.development index f10b47c3..af0712c4 100644 --- a/ruoyi-vue3/.env.development +++ b/ruoyi-vue3/.env.development @@ -6,3 +6,6 @@ VITE_APP_ENV = 'development' # pinn个人管理系统/开发环境 VITE_APP_BASE_API = '/dev-api' + +#路由守卫的虚拟目录 +VITE_APP_BASE_DIR = '/dConsole' diff --git a/ruoyi-vue3/.env.production b/ruoyi-vue3/.env.production index 9f15b051..3ffe9e26 100644 --- a/ruoyi-vue3/.env.production +++ b/ruoyi-vue3/.env.production @@ -7,5 +7,8 @@ VITE_APP_ENV = 'production' # pinn个人管理系统/生产环境 VITE_APP_BASE_API = '/prod-api' +#路由守卫的虚拟目录 +VITE_APP_BASE_DIR = '/pConsole' + # 是否在打包时开启压缩，支持 gzip 和 brotli VITE_BUILD_COMPRESS = gzip \ No newline at end of file diff --git a/ruoyi-vue3/public/favicon.ico b/ruoyi-vue3/public/favicon.ico index 121ffe20b5bb79e0f1144d63c256330f384a1b56..0f59d18a474c2def9b70e10b82aedad23c86f3ee 100644 GIT binary patch literal 16196 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 A-~a#s diff --git a/ruoyi-vue3/src/permission.js b/ruoyi-vue3/src/permission.js index accdcf7a..b497ce5d 100644 --- a/ruoyi-vue3/src/permission.js +++ b/ruoyi-vue3/src/permission.js @@ -9,15 +9,16 @@ import { isRelogin } from '@/utils/request' NProgress.configure({ showSpinner: false }); -const whiteList = ['/login', '/auth-redirect', '/bind', '/register']; +const baseDir = import.meta.env.VITE_APP_BASE_DIR; +const whiteList = [baseDir+'/login', baseDir+'/auth-redirect', baseDir+'/bind', baseDir+'/register']; router.beforeEach((to, from, next) => { NProgress.start() if (getToken()) { to.meta.title && store.dispatch('settings/setTitle', to.meta.title) /* has token*/ - if (to.path === '/login') { - next({ path: '/' }) + if (to.path === baseDir+'/login') { + next({ path: baseDir+'/' }) NProgress.done() } else { if (store.getters.roles.length === 0) { @@ -37,7 +38,7 @@ router.beforeEach((to, from, next) => { }).catch(err => { store.dispatch('LogOut').then(() => { ElMessage.error(err) - next({ path: '/' }) + next({ path: baseDir+'/' }) }) }) } else { @@ -50,7 +51,7 @@ router.beforeEach((to, from, next) => { // 在免登录白名单，直接进入 next() } else { - next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页 + next( baseDir + `/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页 NProgress.done() } } diff --git a/ruoyi-vue3/src/router/index.js b/ruoyi-vue3/src/router/index.js index 89017e4d..13f29934 100644 --- a/ruoyi-vue3/src/router/index.js +++ b/ruoyi-vue3/src/router/index.js @@ -21,10 +21,12 @@ import Layout from '@/layout' } */ +const baseDir = import.meta.env.VITE_APP_BASE_DIR; + // 公共路由 export const constantRoutes = [ { - path: '/redirect', + path: baseDir+'/redirect', component: Layout, hidden: true, children: [ @@ -35,29 +37,29 @@ export const constantRoutes = [ ] }, { - path: '/login', + path: baseDir+'/login', component: () => import('@/views/login'), hidden: true }, { - path: '/register', + path: baseDir+'/register', component: () => import('@/views/register'), hidden: true }, { - path: "/:pathMatch(.*)*", + path: baseDir+"/:pathMatch(.*)*", component: () => import('@/views/error/404'), hidden: true }, { - path: '/401', + path: baseDir+'/401', component: () => import('@/views/error/401'), hidden: true }, { - path: '', + path: baseDir+'', component: Layout, - redirect: '/index', + redirect: baseDir+'/index', children: [ { path: '/index', @@ -68,7 +70,7 @@ export const constantRoutes = [ ] }, { - path: '/user', + path: baseDir+'/user', component: Layout, hidden: true, redirect: 'noredirect', @@ -82,7 +84,7 @@ export const constantRoutes = [ ] }, { - path: '/system/user-auth', + path: baseDir+'/system/user-auth', component: Layout, hidden: true, children: [ @@ -95,7 +97,7 @@ export const constantRoutes = [ ] }, { - path: '/system/role-auth', + path: baseDir+'/system/role-auth', component: Layout, hidden: true, children: [ @@ -108,7 +110,7 @@ export const constantRoutes = [ ] }, { - path: '/system/dict-data', + path: baseDir+'/system/dict-data', component: Layout, hidden: true, children: [ diff --git a/ruoyi-vue3/vite.config.js b/ruoyi-vue3/vite.config.js index 2b6f847c..fce1ed18 100644 --- a/ruoyi-vue3/vite.config.js +++ b/ruoyi-vue3/vite.config.js @@ -5,12 +5,12 @@ import createVitePlugins from './vite/plugins' // https://vitejs.dev/config/ export default defineConfig(({ mode, command }) => { const env = loadEnv(mode, process.cwd()) - const { VITE_APP_ENV } = env + const { VITE_APP_ENV, VITE_APP_BASE_DIR } = env return { // 部署生产环境和开发环境下的URL。 // 默认情况下，vite 会假设你的应用是被部署在一个域名的根路径上 // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。 - base: VITE_APP_ENV === 'production' ? '/' : '/', + base: VITE_APP_ENV === 'production' ? VITE_APP_BASE_DIR : VITE_APP_BASE_DIR, plugins: createVitePlugins(env, command === 'build'), resolve: { // https://cn.vitejs.dev/config/#resolve-alias @@ -25,13 +25,13 @@ export default defineConfig(({ mode, command }) => { }, // vite 相关配置 server: { - port: 80, + port: 12008, host: true, open: true, proxy: { // https://cn.vitejs.dev/config/#server-proxy '/dev-api': { - target: 'http://localhost:8080', + target: 'http://localhost:12080', changeOrigin: true, rewrite: (p) => p.replace(/^\/dev-api/, '') }