diff --git a/.env.development b/.env.development index 825915f..db62f58 100644 --- a/.env.development +++ b/.env.development @@ -1,6 +1,5 @@ #基础API 绝对的 VITE_BASE_URL_API = 'http://192.168.2.9:5192' -VITE_BASE_URL_DRAW_API = 'http://192.168.2.9:6555' #当前IP 相对的 VITE_BASE_CURRENT_API = '.' #开发环境 diff --git a/.env.production b/.env.production index 61787de..9f463c7 100644 --- a/.env.production +++ b/.env.production @@ -1,6 +1,5 @@ #基础API 绝对的 VITE_BASE_URL_API = 'https://meeting-api.23544.com/pc' -VITE_BASE_URL_DRAW_API = 'http://192.168.2.9:6555' #当前IP 相对的 VITE_BASE_CURRENT_API = '.' #生产环境 diff --git a/.env.test b/.env.test deleted file mode 100644 index 4c8b009..0000000 --- a/.env.test +++ /dev/null @@ -1,7 +0,0 @@ -#基础API 绝对的 -VITE_BASE_URL_API = 'http://192.168.2.9:5192' -VITE_BASE_URL_DRAW_API = 'http://192.168.2.9:6555' -#当前IP 相对的 -VITE_BASE_CURRENT_API = '.' -#测试环境 -VITE_ENV = 'test' diff --git a/.env.xy b/.env.xy new file mode 100644 index 0000000..45335d0 --- /dev/null +++ b/.env.xy @@ -0,0 +1,6 @@ +#基础API 绝对的 +VITE_BASE_URL_API = 'https://meeting-api.23544.com/pc' +#当前IP 相对的 +VITE_BASE_CURRENT_API = '.' +#测试环境 +VITE_ENV = 'xy' diff --git a/config/xy.json b/config/xy.json new file mode 100644 index 0000000..068d254 --- /dev/null +++ b/config/xy.json @@ -0,0 +1,56 @@ +{ + "appId": "agora.io.ElectronApiExample", + "asar": true, + "asarUnpack": [ + "node_modules/agora-electron-sdk" + ], + "buildDependenciesFromSource": true, + "compression": "normal", + "productName": "湖北襄阳四中-教研平台", + "publish": [ + { + "provider": "generic", + "url": "https://meeting-api.23544.com/meeting/update" + } + ], + "files": [ + "!*.log" + ], + "win": { + "icon": "build/start.ico", + "requestedExecutionLevel": "highestAvailable", + "target": [ + { + "target": "nsis", + "arch": [ + "ia32" + ] + } + ] + }, + "directories": { + "output": "electron" + }, + "extraResources": [ + { + "from": "src/assets/virtualBackground", + "to": "images", + "filter": [ + "**/*" + ] + } + ], + "nsis": { + "oneClick": false, + "installerIcon": "build/install.ico", + "uninstallerIcon": "build/install.ico", + "installerHeaderIcon": "build/install.ico", + "allowToChangeInstallationDirectory": true, + "createDesktopShortcut": true, + "createStartMenuShortcut": true, + "deleteAppDataOnUninstall": true, + "shortcutName": "湖北襄阳四中-教研平台", + "allowElevation": true, + "perMachine": true + } +} \ No newline at end of file diff --git a/main.js b/main.js index f6b030b..24024bf 100644 --- a/main.js +++ b/main.js @@ -82,7 +82,6 @@ function createTray() { // icon: iconPath, }, ]); - tray.setToolTip('智汇享'); tray.setContextMenu(contextMenu); tray.on('click', () => { mainWindow.webContents.send('isOpenWindows'); diff --git a/package.json b/package.json index a8ef529..46d51a6 100644 --- a/package.json +++ b/package.json @@ -7,15 +7,15 @@ "description": "智汇享", "scripts": { "dev": "concurrently \"electron . --env=development\" \"cross-env BROWSER=none vite\"", - "test": "concurrently \"electron . --env=test\" \"cross-env BROWSER=none vite\"", "prod": "concurrently \"electron . --env=production\" \"cross-env BROWSER=none vite\"", + "xy": "concurrently \"electron . --env=xy\" \"cross-env BROWSER=none vite\"", "build": "vite build --mode development", - "build:test": "vite build --mode test", "build:prod": "vite build --mode production", + "build:xy": "vite build --mode xy", "preview": "vite preview", "build:dev-win": "vite build --mode development & electron-builder -w --config=./config/build.json", - "build:test-win": "vite build --mode test & electron-builder -w --config=./config/build.json", - "build:prod-win": "vite build --mode production & electron-builder -w --config=./config/build.json" + "build:prod-win": "vite build --mode production & electron-builder -w --config=./config/build.json", + "build:xy-win": "vite build --mode xy & electron-builder -w --config=./config/xy.json" }, "agora_electron": { "platform": "win32", diff --git a/src/assets/icon53.png b/src/assets/icon53.png new file mode 100644 index 0000000..ff50e9e Binary files /dev/null and b/src/assets/icon53.png differ diff --git a/src/page/Login/index.tsx b/src/page/Login/index.tsx index 6ac5ca2..e722f49 100644 --- a/src/page/Login/index.tsx +++ b/src/page/Login/index.tsx @@ -173,7 +173,7 @@ const Login: React.FC = () => { <>
- +
diff --git a/src/utils/package/imageUrl.ts b/src/utils/package/imageUrl.ts index 3b8e6dc..79651f7 100644 --- a/src/utils/package/imageUrl.ts +++ b/src/utils/package/imageUrl.ts @@ -81,6 +81,7 @@ import virtualBackground5 from '@/assets/virtualBackground/5.png' import virtualBackground6 from '@/assets/virtualBackground/6.png' import icon52 from '@/assets/icon52.png' import icon52Select from '@/assets/icon52-select.png' +import icon53 from '@/assets/icon53.png' export default { loading, icon, @@ -164,5 +165,6 @@ export default { virtualBackground5, virtualBackground6, icon52, - icon52Select + icon52Select, + icon53 } \ No newline at end of file