From 3ca425f3fce11d6ee45d2c1c2b1ad594831489a3 Mon Sep 17 00:00:00 2001 From: wangzenghua <1048523306@qq.com> Date: Thu, 10 Apr 2025 03:12:02 +0100 Subject: [PATCH] fix --- main/.env.development | 2 +- main/.env.production | 2 +- main/.env.test | 2 +- main/src/micro/app.js | 23 +++++++++++++++-------- sub-government-affairs-service/.env.test | 9 +++++++++ sub-government-affairs-service/.gitignore | 1 - sub-government-screen-service/.env.test | 9 +++++++++ sub-government-screen-service/.gitignore | 1 - sub-operation-service/.env.test | 9 +++++++++ sub-operation-service/.gitignore | 1 - 10 files changed, 45 insertions(+), 14 deletions(-) create mode 100644 sub-government-affairs-service/.env.test create mode 100644 sub-government-screen-service/.env.test create mode 100644 sub-operation-service/.env.test diff --git a/main/.env.development b/main/.env.development index 6335034..aa5286e 100644 --- a/main/.env.development +++ b/main/.env.development @@ -5,7 +5,7 @@ VITE_APP_TITLE = '数字农业产业管理平台' VITE_APP_SUB_OS = '//localhost:9526/sub-operation-service/' VITE_APP_SUB_OA = '//localhost:9527/sub-operation-admin/' VITE_APP_SUB_GAS = '//localhost:9528/sub-government-affairs-service/' -VITE_APP_SUB_GAA = '//localhost:9525/sub-government-affairs-admin/' +VITE_APP_SUB_GAA = '//localhost:9525/sub-government-admin/' VITE_APP_SUB_GSS = '//localhost:9529/sub-government-screen-service/' # 接口 VITE_APP_BASE_API = '/apis' diff --git a/main/.env.production b/main/.env.production index 7d32088..500eb93 100644 --- a/main/.env.production +++ b/main/.env.production @@ -4,7 +4,7 @@ VITE_APP_TITLE = '数字农业产业管理平台' VITE_APP_SUB_OS = '//47.109.205.240:80/sub-operation-service/' VITE_APP_SUB_OA = '//47.109.205.240:80/sub-operation-admin/' VITE_APP_SUB_GAS = '//47.109.205.240:80/sub-government-affairs-service/' -VITE_APP_SUB_GAA = '//47.109.205.240:80/sub-government-affairs-admin/' +VITE_APP_SUB_GAA = '//47.109.205.240:80/sub-government-admin/' VITE_APP_SUB_GSS = '//47.109.205.240:80/sub-government-screen-service/' # 接口 VITE_APP_BASE_API = '/apis' diff --git a/main/.env.test b/main/.env.test index 014e47a..8bdf169 100644 --- a/main/.env.test +++ b/main/.env.test @@ -4,7 +4,7 @@ VITE_APP_TITLE = '数字农业产业管理平台' VITE_APP_SUB_OS = '//192.168.18.99:88/sub-operation-service/' VITE_APP_SUB_OA = '//192.168.18.99:88/sub-operation-admin/' VITE_APP_SUB_GAS = '//192.168.18.99:88/sub-government-affairs-service/' -VITE_APP_SUB_GAA = '//192.168.18.99:88/sub-government-affairs-admin/' +VITE_APP_SUB_GAA = '//192.168.18.99:88/sub-government-admin/' VITE_APP_SUB_GSS = '//192.168.18.99:88/sub-government-screen-service/' # 接口 VITE_APP_BASE_API = '/apis' diff --git a/main/src/micro/app.js b/main/src/micro/app.js index 9eb68b3..b871334 100644 --- a/main/src/micro/app.js +++ b/main/src/micro/app.js @@ -1,6 +1,6 @@ import actions from './actions'; -const { VITE_APP_SUB_OS, VITE_APP_SUB_ADMIN, VITE_APP_SUB_GAS, VITE_APP_SUB_GSS } = import.meta.env; +const { VITE_APP_SUB_OS, VITE_APP_SUB_OA, VITE_APP_SUB_ADMIN, VITE_APP_SUB_GAS, VITE_APP_SUB_GSS } = import.meta.env; export const leftApps = [ { @@ -11,9 +11,9 @@ export const leftApps = [ icon: 'images/platform/icon-home.png', }, { - name: 'sub-admin', - entry: VITE_APP_SUB_ADMIN, - activeRule: '/sub-admin', + name: 'sub-operation-admin', + entry: VITE_APP_SUB_OA, + activeRule: '/sub-operation-admin', title: '管理后台', icon: 'images/platform/icon-admin.png', }, @@ -25,9 +25,9 @@ export const leftApps = [ icon: 'images/platform/icon-app.png', }, { - name: 'sub-screen', + name: 'sub-government-screen-service', entry: VITE_APP_SUB_ADMIN, - activeRule: '/sub-screen', + activeRule: '/sub-government-screen-service', title: '数据大屏', icon: 'images/platform/icon-screen.png', }, @@ -49,9 +49,9 @@ export const rightApps = [ icon: 'images/platform/icon-admin.png', }, { - name: 'sub-government-app', + name: 'sub-app', entry: VITE_APP_SUB_ADMIN, - activeRule: '/sub-government-app', + activeRule: '/sub-app', title: 'APP', icon: 'images/platform/icon-app.png', }, @@ -86,6 +86,13 @@ export const defaultApps = [ title: '运营服务', icon: 'images/platform/icon-home.png', }, + { + name: 'sub-operation-admin', + entry: VITE_APP_SUB_OA, + activeRule: '/sub-operation-admin', + title: '运营管理后台', + icon: 'images/platform/icon-admin.png', + }, ]; // export const microApps = [...defaultApps, ...leftApps, ...rightApps]; diff --git a/sub-government-affairs-service/.env.test b/sub-government-affairs-service/.env.test new file mode 100644 index 0000000..aae59b7 --- /dev/null +++ b/sub-government-affairs-service/.env.test @@ -0,0 +1,9 @@ +# 测试环境 +VITE_APP_MIAN = 'daimp-front-main' +VITE_APP_MIAN_URL = 'http://192.168.18.99:88' +VITE_APP_NAME = 'sub-government-affairs-service' +# 接口 +VITE_APP_BASE_API = '/apis' +VITE_APP_BASE_URL = '' +VITE_APP_UPLOAD_API = '/uploadApis' +VITE_APP_UPLOAD_URL = '' diff --git a/sub-government-affairs-service/.gitignore b/sub-government-affairs-service/.gitignore index 1f22b9c..bdeba94 100644 --- a/sub-government-affairs-service/.gitignore +++ b/sub-government-affairs-service/.gitignore @@ -70,7 +70,6 @@ web_modules/ # dotenv environment variables file .env -.env.test # parcel-bundler cache (https://parceljs.org/) .cache diff --git a/sub-government-screen-service/.env.test b/sub-government-screen-service/.env.test new file mode 100644 index 0000000..bedf243 --- /dev/null +++ b/sub-government-screen-service/.env.test @@ -0,0 +1,9 @@ +# 测试环境 +VITE_APP_MIAN = 'daimp-front-main' +VITE_APP_MIAN_URL = 'http://192.168.18.99:88' +VITE_APP_NAME = 'sub-government-screen-service' +# 接口 +VITE_APP_BASE_API = '/apis' +VITE_APP_BASE_URL = '' +VITE_APP_UPLOAD_API = '/uploadApis' +VITE_APP_UPLOAD_URL = '' \ No newline at end of file diff --git a/sub-government-screen-service/.gitignore b/sub-government-screen-service/.gitignore index 1f22b9c..bdeba94 100644 --- a/sub-government-screen-service/.gitignore +++ b/sub-government-screen-service/.gitignore @@ -70,7 +70,6 @@ web_modules/ # dotenv environment variables file .env -.env.test # parcel-bundler cache (https://parceljs.org/) .cache diff --git a/sub-operation-service/.env.test b/sub-operation-service/.env.test new file mode 100644 index 0000000..9a31c6f --- /dev/null +++ b/sub-operation-service/.env.test @@ -0,0 +1,9 @@ +# 测试环境 +VITE_APP_MIAN = 'daimp-front-main' +VITE_APP_MIAN_URL = 'http://192.168.18.99:88' +VITE_APP_NAME = 'sub-operation-service' +# 接口 +VITE_APP_BASE_API = '/apis' +VITE_APP_BASE_URL = '' +VITE_APP_UPLOAD_API = '/uploadApis' +VITE_APP_UPLOAD_URL = '' diff --git a/sub-operation-service/.gitignore b/sub-operation-service/.gitignore index 1f22b9c..bdeba94 100644 --- a/sub-operation-service/.gitignore +++ b/sub-operation-service/.gitignore @@ -70,7 +70,6 @@ web_modules/ # dotenv environment variables file .env -.env.test # parcel-bundler cache (https://parceljs.org/) .cache