Bladeren bron

build: 更新环境变量配置并调整路由相关代码

- 修改 .env.development 和 .env.production 中的 VITE_PROXY 和 VITE_GLOB_DOMAIN_URL 配置
- 更新 routeHelper.ts 中的国际化处理和 URL 占位符替换逻辑
- 调整 createRouter 函数的参数传递方式
zhangtao 1 week geleden
bovenliggende
commit
11fa37cd7e
5 gewijzigde bestanden met toevoegingen van 21 en 13 verwijderingen
  1. 4 2
      .env.development
  2. 2 1
      .env.production
  3. BIN
      dist.rar
  4. 7 5
      src/router/helper/routeHelper.ts
  5. 8 5
      src/router/index.ts

+ 4 - 2
.env.development

@@ -8,15 +8,17 @@ VITE_PUBLIC_PATH = /
 
 # 跨域代理,您可以配置多个 ,请注意,没有换行符
 # VITE_PROXY = [["/jeecgboot","http://192.168.1.34:8080/jeecg-boot"],["/upload","http://192.168.1.34:8080/jeecg-boot"]]
-VITE_PROXY = [["/jeecgboot","http://192.168.0.11:8080/jeecg-boot"],["/upload","http://192.168.0.11:8080/upload"]]
+# VITE_PROXY = [["/jeecgboot","http://192.168.0.11:8080/jeecg-boot"],["/upload","http://192.168.0.11:8080/upload"]]
 # VITE_PROXY = [["/jeecgboot","http://192.168.1.253:8080/jeecg-boot"],["/upload","http://192.168.1.253:8080/upload"]]
 # VITE_PROXY = [["/jeecgboot","http://192.168.1.166:8080/jeecg-boot"],["/upload","http://192.168.1.166:8080/upload"]]
+VITE_PROXY = [["/jeecgboot","http://47.109.18.141:8080/jeecg-boot"],["/upload","http://47.109.18.141:8080/upload"]]
 
 #后台接口全路径地址(必填)
 # VITE_GLOB_DOMAIN_URL=http://192.168.1.34:8080/jeecg-boot #//黄、
-VITE_GLOB_DOMAIN_URL=http://192.168.0.11:8080/jeecg-boot  #李
+# VITE_GLOB_DOMAIN_URL=http://192.168.0.11:8080/jeecg-boot  #李
 # VITE_GLOB_DOMAIN_URL=http://192.168.1.253:8080/jeecg-boot  #张
 # VITE_GLOB_DOMAIN_URL=http://192.168.1.166:8080/jeecg-boot  #张
+VITE_GLOB_DOMAIN_URL=http://47.109.18.141:8080/jeecg-boot  #fwq
 
 
 #后台接口父地址(必填)

+ 2 - 1
.env.production

@@ -16,7 +16,8 @@ VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
 VITE_GLOB_API_URL=/jeecgboot
 
 #后台接口全路径地址(必填)
-VITE_GLOB_DOMAIN_URL=http://jeecg-boot-system:8080/jeecg-boot
+# VITE_GLOB_DOMAIN_URL=https://api.qlapp.cn/jeecg-boot
+VITE_GLOB_DOMAIN_URL=http://47.109.18.141:8080/jeecg-boot
 
 # 接口父路径前缀
 VITE_GLOB_API_URL_PREFIX=

BIN
dist.rar


+ 7 - 5
src/router/helper/routeHelper.ts

@@ -5,11 +5,11 @@ import { getParentLayout, LAYOUT, EXCEPTION_COMPONENT } from '/@/router/constant
 import { cloneDeep, omit } from 'lodash-es';
 import { warn } from '/@/utils/log';
 import { createRouter, createWebHashHistory } from 'vue-router';
-import { getTenantId, getToken } from "/@/utils/auth";
+import { getTenantId, getToken } from '/@/utils/auth';
 import { URL_HASH_TAB, _eval } from '/@/utils';
 //引入online lib路由
 import { packageViews } from '/@/utils/monorepo/dynamicRouter';
-import {useI18n} from "/@/hooks/web/useI18n";
+import { useI18n } from '/@/hooks/web/useI18n';
 
 export type LayoutMapKey = 'LAYOUT';
 const IFRAME = () => import('/@/views/sys/iframe/FrameBlank.vue');
@@ -33,12 +33,11 @@ function asyncImportRoute(routes: AppRouteRecordRaw[] | undefined) {
   }
   if (!routes) return;
   routes.forEach((item) => {
-
     //【jeecg-boot/issues/I5N2PN】左侧动态菜单怎么做国际化处理  2022-10-09
     //菜单支持国际化翻译
     if (item?.meta?.title) {
       const { t } = useI18n();
-      if(item.meta.title.includes('t(\'') && t){
+      if (item.meta.title.includes("t('") && t) {
         // update-begin--author:liaozhiyang---date:20230906---for:【QQYUN-6390】eval替换成new Function,解决build警告
         item.meta.title = new Function('t', `return ${item.meta.title}`)(t);
         // update-end--author:liaozhiyang---date:20230906---for:【QQYUN-6390】eval替换成new Function,解决build警告
@@ -61,7 +60,10 @@ function asyncImportRoute(routes: AppRouteRecordRaw[] | undefined) {
     let tenantId = getTenantId();
     // URL支持{{ window.xxx }}占位符变量
     //update-begin---author:wangshuai ---date:20220711  for:[VUEN-1638]菜单tenantId需要动态生成------------
-    item.component = (item.component || '').replace(/{{([^}}]+)?}}/g, (s1, s2) => _eval(s2)).replace('${token}', token).replace('${tenantId}', tenantId);
+    item.component = (item.component || '')
+      .replace(/{{([^}}]+)?}}/g, (s1, s2) => _eval(s2))
+      .replace('${token}', token)
+      .replace('${tenantId}', tenantId);
     //update-end---author:wangshuai ---date:20220711  for:[VUEN-1638]菜单tenantId需要动态生成------------
     // 适配 iframe
     if (/^\/?http(s)?/.test(item.component as string)) {

+ 8 - 5
src/router/index.ts

@@ -17,11 +17,14 @@ getRouteNames(basicRoutes);
  * 创建路由实例
  */
 export function createRouter() {
-  let router = createVueRouter({
-    routes: basicRoutes as unknown as RouteRecordRaw[],
-    strict: true,
-    scrollBehavior: () => ({ left: 0, top: 0 }),
-  });
+  let router = createVueRouter(
+    {
+      routes: basicRoutes as unknown as RouteRecordRaw[],
+      strict: true,
+      scrollBehavior: () => ({ left: 0, top: 0 }),
+    },
+    true
+  );
 
   // TODO 【QQYUN-4517】【表单设计器】记录分享路由守卫测试
   // @ts-ignore