diff --git a/apps/designer/src/constants/env.ts b/apps/designer/src/constants/env.ts new file mode 100644 index 0000000..cf60819 --- /dev/null +++ b/apps/designer/src/constants/env.ts @@ -0,0 +1,2 @@ +// @ts-ignore +export const currentEnv = __APP_ENV__; diff --git a/apps/designer/src/constants/index.ts b/apps/designer/src/constants/index.ts new file mode 100644 index 0000000..c1532d6 --- /dev/null +++ b/apps/designer/src/constants/index.ts @@ -0,0 +1 @@ +export * from './env'; diff --git a/apps/platform/src/constants/env.ts b/apps/platform/src/constants/env.ts index 01ae758..fc35351 100644 --- a/apps/platform/src/constants/env.ts +++ b/apps/platform/src/constants/env.ts @@ -2,6 +2,15 @@ export const devMode = 'development'; export const prodMode = 'production'; -export const isDevMode = import.meta.env.DEV; +export const stagingMode = 'staging'; -export const isProdMode = import.meta.env.PROD; +// @ts-ignore +export const currentEnv = __APP_ENV__; + +export const isDevMode = import.meta.env.MODE === devMode; +export const isProdMode = import.meta.env.MODE === prodMode; +export const isStagingMode = import.meta.env.MODE === stagingMode; + +export const Y_CODE_RENDERER_URL = currentEnv.Y_CODE_RENDERER_URL; +export const Y_CODE_DESIGNER_URL = currentEnv.Y_CODE_DESIGNER_URL; +export const Y_CODE_PLATFORM_URL = currentEnv.Y_CODE_PLATFORM_URL; diff --git a/apps/platform/src/constants/index.ts b/apps/platform/src/constants/index.ts index 8f879e5..91670ea 100644 --- a/apps/platform/src/constants/index.ts +++ b/apps/platform/src/constants/index.ts @@ -1 +1,2 @@ -export * from '@sy/low-code-shared/constants'; +// export * from '@sy/low-code-shared/constants'; +export * from './env'; diff --git a/apps/platform/src/router/routes/modules/application.ts b/apps/platform/src/router/routes/modules/application.ts index fcb362b..ab354d9 100644 --- a/apps/platform/src/router/routes/modules/application.ts +++ b/apps/platform/src/router/routes/modules/application.ts @@ -1,4 +1,5 @@ import type { RouteRecordRaw } from 'vue-router'; +import { Y_CODE_RENDERER_URL } from '@/constants'; // 微前端路由 const moduleName = 'application'; @@ -20,11 +21,11 @@ const routes: Array = [ keepAlive: true, icon: 'ant-design:list', app: { - url: 'https://localhost:10010', + url: Y_CODE_RENDERER_URL, name: 'y-code-platform-application-list', - sync: true, - alive: true, - degrade: true, + // sync: true, + // alive: true, + // degrade: true, applicationId: 0, projectId: 4, fileId: 'b91n1y9yr', diff --git a/apps/platform/src/router/routes/modules/micro.ts b/apps/platform/src/router/routes/modules/micro.ts index d3ca6b6..a7a5e93 100644 --- a/apps/platform/src/router/routes/modules/micro.ts +++ b/apps/platform/src/router/routes/modules/micro.ts @@ -1,4 +1,5 @@ import type { RouteRecordRaw } from 'vue-router'; +import { Y_CODE_DESIGNER_URL } from '@/constants'; // 微前端路由 const moduleName = 'micro'; @@ -19,7 +20,7 @@ const routes: Array = [ title: '低代码编辑器', icon: 'ant-design:edit-outlined', app: { - url: 'https://localhost:10011', + url: Y_CODE_DESIGNER_URL, name: 'y-code-designer', applicationId: 4, // sync: true, diff --git a/apps/platform/src/router/routes/modules/project.ts b/apps/platform/src/router/routes/modules/project.ts index 87e34ac..9ba3305 100644 --- a/apps/platform/src/router/routes/modules/project.ts +++ b/apps/platform/src/router/routes/modules/project.ts @@ -1,4 +1,5 @@ import type { RouteRecordRaw } from 'vue-router'; +import { Y_CODE_RENDERER_URL } from '@/constants'; // 微前端路由 const moduleName = 'project'; @@ -20,7 +21,7 @@ const routes: Array = [ keepAlive: true, icon: 'ant-design:list', app: { - url: 'https://localhost:10010', + url: Y_CODE_RENDERER_URL, name: 'y-code-platform-project-list', // sync: true, // alive: true, diff --git a/apps/platform/vite.config.ts b/apps/platform/vite.config.ts index 69f87d8..5a0b286 100644 --- a/apps/platform/vite.config.ts +++ b/apps/platform/vite.config.ts @@ -26,7 +26,8 @@ const __APP_INFO__ = { export default ({ command, mode }: ConfigEnv): UserConfig => { console.log('mode', mode); // 环境变量 - const env = loadEnv(mode, process.cwd(), ['VITE_', 'VTJ_', 'SY_']); + const env = loadEnv(mode, process.cwd(), ['VITE_', 'VTJ_', 'SY_', 'Y_CODE_']); + console.log('env', env); const isDev = command === 'serve'; return { @@ -46,6 +47,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => { server: { open: true, host: true, + port: Number(env.VITE_PORT), proxy: { '/api': { target: 'https://custom-chart-pre-api.shiyue.com', diff --git a/apps/renderer/.env.development b/apps/renderer/.env.development index 02db692..58cfa92 100644 --- a/apps/renderer/.env.development +++ b/apps/renderer/.env.development @@ -5,7 +5,7 @@ VITE_NODE_ENV = 'development' VITE_BASE_URL = / # 前端可见变量(必须以 VITE_ 开头) -VITE_PORT = 10010 +VITE_PORT = 10012 # VITE_BASE_API_URL = 'https://custom-chart-pre-api.shiyue.com/' VITE_BASE_API_URL = 'https://custom-chart-api.shiyuegame.com/' diff --git a/apps/renderer/farm.config.ts b/apps/renderer/farm.config.ts index 8da52c5..5a175ed 100644 --- a/apps/renderer/farm.config.ts +++ b/apps/renderer/farm.config.ts @@ -7,7 +7,7 @@ import path from "path"; // @ts-ignore export default defineConfig(({ mode }) => { console.log("mode", mode); - const env = loadEnv(mode, process.cwd(), ["VITE_"]); + const env = loadEnv(mode, process.cwd(), ["VITE_", "Y_CODE_"]); return { server: { diff --git a/apps/renderer/src/constants/env.ts b/apps/renderer/src/constants/env.ts new file mode 100644 index 0000000..cf60819 --- /dev/null +++ b/apps/renderer/src/constants/env.ts @@ -0,0 +1,2 @@ +// @ts-ignore +export const currentEnv = __APP_ENV__; diff --git a/apps/renderer/src/constants/index.ts b/apps/renderer/src/constants/index.ts new file mode 100644 index 0000000..77b0d3c --- /dev/null +++ b/apps/renderer/src/constants/index.ts @@ -0,0 +1 @@ +export * from "./env"; diff --git a/apps/y-code-v1/.env.development b/apps/y-code-v1/.env.development index 68252f4..7a1ad10 100644 --- a/apps/y-code-v1/.env.development +++ b/apps/y-code-v1/.env.development @@ -1,7 +1,7 @@ # .env.development VITE_NODE_ENV = development -VITE_PORT = 10012 +VITE_PORT = 10013 VITE_OA_BASEURL = https://oa-pre.shiyue.com