Browse Source

优化 vue2 的前端,登出系统时,拼接 BASE PATH

YunaiV 3 years ago
parent
commit
4944f65905
43 changed files with 85 additions and 37 deletions
  1. 0 0
      yudao-server/src/main/resources/admin-ui/static/js/0.js
  2. BIN
      yudao-server/src/main/resources/admin-ui/static/js/0.js.gz
  3. 2 2
      yudao-server/src/main/resources/admin-ui/static/js/10.js
  4. BIN
      yudao-server/src/main/resources/admin-ui/static/js/10.js.gz
  5. 2 2
      yudao-server/src/main/resources/admin-ui/static/js/11.js
  6. BIN
      yudao-server/src/main/resources/admin-ui/static/js/11.js.gz
  7. 0 0
      yudao-server/src/main/resources/admin-ui/static/js/12.js
  8. BIN
      yudao-server/src/main/resources/admin-ui/static/js/12.js.gz
  9. 2 2
      yudao-server/src/main/resources/admin-ui/static/js/13.js
  10. BIN
      yudao-server/src/main/resources/admin-ui/static/js/13.js.gz
  11. 2 2
      yudao-server/src/main/resources/admin-ui/static/js/14.js
  12. BIN
      yudao-server/src/main/resources/admin-ui/static/js/14.js.gz
  13. 0 0
      yudao-server/src/main/resources/admin-ui/static/js/15.js
  14. BIN
      yudao-server/src/main/resources/admin-ui/static/js/15.js.gz
  15. 2 2
      yudao-server/src/main/resources/admin-ui/static/js/16.js
  16. BIN
      yudao-server/src/main/resources/admin-ui/static/js/16.js.gz
  17. 0 0
      yudao-server/src/main/resources/admin-ui/static/js/17.js
  18. BIN
      yudao-server/src/main/resources/admin-ui/static/js/17.js.gz
  19. 2 2
      yudao-server/src/main/resources/admin-ui/static/js/18.js
  20. BIN
      yudao-server/src/main/resources/admin-ui/static/js/18.js.gz
  21. 2 2
      yudao-server/src/main/resources/admin-ui/static/js/20.js
  22. BIN
      yudao-server/src/main/resources/admin-ui/static/js/20.js.gz
  23. 2 2
      yudao-server/src/main/resources/admin-ui/static/js/21.js
  24. BIN
      yudao-server/src/main/resources/admin-ui/static/js/21.js.gz
  25. 8 8
      yudao-server/src/main/resources/admin-ui/static/js/4.js
  26. BIN
      yudao-server/src/main/resources/admin-ui/static/js/4.js.gz
  27. 0 0
      yudao-server/src/main/resources/admin-ui/static/js/5.js
  28. BIN
      yudao-server/src/main/resources/admin-ui/static/js/5.js.gz
  29. 0 0
      yudao-server/src/main/resources/admin-ui/static/js/6.js
  30. BIN
      yudao-server/src/main/resources/admin-ui/static/js/6.js.gz
  31. 6 6
      yudao-server/src/main/resources/admin-ui/static/js/7.js
  32. BIN
      yudao-server/src/main/resources/admin-ui/static/js/7.js.gz
  33. 2 2
      yudao-server/src/main/resources/admin-ui/static/js/8.js
  34. BIN
      yudao-server/src/main/resources/admin-ui/static/js/8.js.gz
  35. 2 2
      yudao-server/src/main/resources/admin-ui/static/js/9.js
  36. BIN
      yudao-server/src/main/resources/admin-ui/static/js/9.js.gz
  37. 0 0
      yudao-server/src/main/resources/admin-ui/static/js/app.js
  38. BIN
      yudao-server/src/main/resources/admin-ui/static/js/app.js.gz
  39. 22 0
      yudao-server/src/main/resources/admin-ui/static/js/chunk-vendors.js
  40. BIN
      yudao-server/src/main/resources/admin-ui/static/js/chunk-vendors.js.gz
  41. 2 1
      yudao-ui-admin/src/layout/components/Navbar.vue
  42. 2 2
      yudao-ui-admin/src/utils/request.js
  43. 25 0
      yudao-ui-admin/src/utils/ruoyi.js

File diff suppressed because it is too large
+ 0 - 0
yudao-server/src/main/resources/admin-ui/static/js/0.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/0.js.gz


File diff suppressed because it is too large
+ 2 - 2
yudao-server/src/main/resources/admin-ui/static/js/10.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/10.js.gz


File diff suppressed because it is too large
+ 2 - 2
yudao-server/src/main/resources/admin-ui/static/js/11.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/11.js.gz


File diff suppressed because it is too large
+ 0 - 0
yudao-server/src/main/resources/admin-ui/static/js/12.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/12.js.gz


File diff suppressed because it is too large
+ 2 - 2
yudao-server/src/main/resources/admin-ui/static/js/13.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/13.js.gz


File diff suppressed because it is too large
+ 2 - 2
yudao-server/src/main/resources/admin-ui/static/js/14.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/14.js.gz


File diff suppressed because it is too large
+ 0 - 0
yudao-server/src/main/resources/admin-ui/static/js/15.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/15.js.gz


File diff suppressed because it is too large
+ 2 - 2
yudao-server/src/main/resources/admin-ui/static/js/16.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/16.js.gz


File diff suppressed because it is too large
+ 0 - 0
yudao-server/src/main/resources/admin-ui/static/js/17.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/17.js.gz


File diff suppressed because it is too large
+ 2 - 2
yudao-server/src/main/resources/admin-ui/static/js/18.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/18.js.gz


File diff suppressed because it is too large
+ 2 - 2
yudao-server/src/main/resources/admin-ui/static/js/20.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/20.js.gz


File diff suppressed because it is too large
+ 2 - 2
yudao-server/src/main/resources/admin-ui/static/js/21.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/21.js.gz


File diff suppressed because it is too large
+ 8 - 8
yudao-server/src/main/resources/admin-ui/static/js/4.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/4.js.gz


File diff suppressed because it is too large
+ 0 - 0
yudao-server/src/main/resources/admin-ui/static/js/5.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/5.js.gz


File diff suppressed because it is too large
+ 0 - 0
yudao-server/src/main/resources/admin-ui/static/js/6.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/6.js.gz


File diff suppressed because it is too large
+ 6 - 6
yudao-server/src/main/resources/admin-ui/static/js/7.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/7.js.gz


File diff suppressed because it is too large
+ 2 - 2
yudao-server/src/main/resources/admin-ui/static/js/8.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/8.js.gz


File diff suppressed because it is too large
+ 2 - 2
yudao-server/src/main/resources/admin-ui/static/js/9.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/9.js.gz


File diff suppressed because it is too large
+ 0 - 0
yudao-server/src/main/resources/admin-ui/static/js/app.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/app.js.gz


File diff suppressed because it is too large
+ 22 - 0
yudao-server/src/main/resources/admin-ui/static/js/chunk-vendors.js


BIN
yudao-server/src/main/resources/admin-ui/static/js/chunk-vendors.js.gz


+ 2 - 1
yudao-ui-admin/src/layout/components/Navbar.vue

@@ -56,6 +56,7 @@ import SizeSelect from '@/components/SizeSelect'
 import Search from '@/components/HeaderSearch'
 import RuoYiGit from '@/components/RuoYi/Git'
 import RuoYiDoc from '@/components/RuoYi/Doc'
+import {getPath} from "@/utils/ruoyi";
 
 export default {
   components: {
@@ -98,7 +99,7 @@ export default {
     async logout() {
       this.$modal.confirm('确定注销并退出系统吗?', '提示').then(() => {
         this.$store.dispatch('LogOut').then(() => {
-          location.href = '/index';
+          location.href = getPath('/index');
         })
       }).catch(() => {});
     }

+ 2 - 2
yudao-ui-admin/src/utils/request.js

@@ -4,7 +4,7 @@ import store from '@/store'
 import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
 import Cookies from "js-cookie";
-import {getTenantEnable} from "@/utils/ruoyi";
+import {getPath, getTenantEnable} from "@/utils/ruoyi";
 
 // 是否显示重新登录
 export let isRelogin = { show: false };
@@ -76,7 +76,7 @@ service.interceptors.response.use(res => {
         ).then(() => {
           isRelogin.show = false;
           store.dispatch('LogOut').then(() => {
-            location.href = '/index';
+            location.href = getPath('/index');
           })
         }).catch(() => {
           isRelogin.show = false;

+ 25 - 0
yudao-ui-admin/src/utils/ruoyi.js

@@ -197,3 +197,28 @@ export function getDocEnable() {
   }
   return process.env.VUE_APP_DOC_ENABLE || false;
 }
+
+/**
+ * 获得 Vue 应用的基础路径
+ */
+export function getBasePath() {
+  return process.env.VUE_APP_APP_NAME || '/';
+}
+
+/**
+ * 获得 Vue 应用的访问路径
+ *
+ * @param path 路径
+ */
+export function getPath(path) {
+  // 基础路径,必须以 / 结尾
+  let basePath = getBasePath();
+  if (!basePath.endsWith('/')) {
+    return basePath + '/';
+  }
+  // 访问路径,必须不能以 / 开头
+  if (path.startsWith('/')) {
+    path = path.substring(1);
+  }
+  return basePath + path;
+}

Some files were not shown because too many files changed in this diff