diff --git a/.env.development b/.env.development index bd2005c..dfd0e0a 100644 --- a/.env.development +++ b/.env.development @@ -2,4 +2,4 @@ # 开发环境 VITE_API_BASE_URL=http://localhost:3000/api -VITE_CESIUM_ION_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI3ZWYyYWYyZi05YmQxLTQzODQtYTIyZi1mMTg2NTAxZGY4NGIiLCJpZCI6MTgzNTU5LCJpYXQiOjE3MDIyMTA3NDZ9.ngQ_4Jd-HsbK_MpofsFs9lUnpRcYCdOcObRVqoOS56U +VITE_CESIUM_ION_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIyMGE2MTYzOS02OTA3LTRhZDEtYmFmYi01YWZmNDJmZGRlODgiLCJpZCI6MTEwNDE2LCJpYXQiOjE3NjY3MTE5MzR9.MtiUq510xS8C3Wm1rgHCloJqv0dlxIL0CfOIHj4uHBY diff --git a/.env.production b/.env.production index ef716ff..5f13972 100644 --- a/.env.production +++ b/.env.production @@ -2,4 +2,4 @@ # 生产环境 VITE_API_BASE_URL=https://api.example.com -VITE_CESIUM_ION_TOKEN= +VITE_CESIUM_ION_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIyMGE2MTYzOS02OTA3LTRhZDEtYmFmYi01YWZmNDJmZGRlODgiLCJpZCI6MTEwNDE2LCJpYXQiOjE3NjY3MTE5MzR9.MtiUq510xS8C3Wm1rgHCloJqv0dlxIL0CfOIHj4uHBY diff --git a/packages/screen/src/map/components/MapViewport.vue b/packages/screen/src/map/components/MapViewport.vue index 31ecb22..b20c99b 100644 --- a/packages/screen/src/map/components/MapViewport.vue +++ b/packages/screen/src/map/components/MapViewport.vue @@ -20,10 +20,7 @@ const mapStore = useMapStore() const route = useRoute() let viewer = null -const ionToken = import.meta.env.VITE_CESIUM_ION_TOKEN -if (ionToken) { - Cesium.Ion.defaultAccessToken = ionToken -} +Cesium.Ion.defaultAccessToken = import.meta.env.VITE_CESIUM_ION_TOKEN || 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIyMGE2MTYzOS02OTA3LTRhZDEtYmFmYi01YWZmNDJmZGRlODgiLCJpZCI6MTEwNDE2LCJpYXQiOjE3NjY3MTE5MzR9.MtiUq510xS8C3Wm1rgHCloJqv0dlxIL0CfOIHj4uHBY' onMounted(() => { initViewer() diff --git a/packages/screen/src/views/airSkyLand/components/MapCenter/MapCenter.vue b/packages/screen/src/views/airSkyLand/components/MapCenter/MapCenter.vue index a3defd8..6166a1d 100644 --- a/packages/screen/src/views/airSkyLand/components/MapCenter/MapCenter.vue +++ b/packages/screen/src/views/airSkyLand/components/MapCenter/MapCenter.vue @@ -12,10 +12,8 @@ import { useMapStore } from '../../../../map/index.js' const emit = defineEmits() const mapStore = useMapStore() -const ionToken = import.meta.env.VITE_CESIUM_ION_TOKEN -if (ionToken) { - Cesium.Ion.defaultAccessToken = ionToken -} +Cesium.Ion.defaultAccessToken = import.meta.env.VITE_CESIUM_ION_TOKEN || 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIyMGE2MTYzOS02OTA3LTRhZDEtYmFmYi01YWZmNDJmZGRlODgiLCJpZCI6MTEwNDE2LCJpYXQiOjE3NjY3MTE5MzR9.MtiUq510xS8C3Wm1rgHCloJqv0dlxIL0CfOIHj4uHBY' + const mapContainer = ref(null); const viewerRef = ref(null); diff --git a/packages/screen/vite.config.js b/packages/screen/vite.config.js index d7aca9a..2bc4c17 100644 --- a/packages/screen/vite.config.js +++ b/packages/screen/vite.config.js @@ -45,7 +45,7 @@ const resolveCliBase = () => { } export default defineConfig(({ command, mode }) => { - const env = loadEnv(mode, process.cwd(), '') + const env = loadEnv(mode, resolve(__dirname, '../..'), '') const baseCandidate = command === 'build' ? resolveCliBase() ?? @@ -59,6 +59,7 @@ export default defineConfig(({ command, mode }) => { const cesiumBaseUrl = resolvedBase === '/' ? '/cesium' : `/cesium` return { + envDir: resolve(__dirname, '../..'), base: resolvedBase, plugins: [ vue(),