diff --git a/electron-builder.js b/electron-builder.js index 873262a..008c22c 100644 --- a/electron-builder.js +++ b/electron-builder.js @@ -8,12 +8,14 @@ export default { asar: true, mac: { target: [ - { target: 'zip', arch: ['arm64', 'x64'] }, - { target: 'dmg', arch: ['arm64', 'x64'] }, + { target: 'zip', arch: ['arm64'] }, + { target: 'dmg', arch: ['arm64'] }, ], - icon: 'public/icons/mac.icns', - artifactName: 'findyourfile-${version}-mac-${arch}.${ext}', + icon: 'dist/icons/mac/icon.icns', + artifactName: 'findyourfile-${version}-mac-arm64.${ext}', category: 'public.app-category.productivity', + // 使用自签名配置 + identity: 'ApplePine', hardenedRuntime: false, notarize: false, }, @@ -22,7 +24,7 @@ export default { { target: 'zip', arch: ['x64'] }, { target: 'nsis', arch: ['x64'] }, ], - icon: 'public/icons/win.ico', + icon: 'dist/icons/win/icon.ico', artifactName: 'findyourfile-${version}-win-x64.${ext}', }, nsis: { diff --git a/electron/main.cjs b/electron/main.cjs index d7486db..f63ec16 100644 --- a/electron/main.cjs +++ b/electron/main.cjs @@ -17,9 +17,9 @@ let db function createWindow() { // 设置应用图标路径 - const iconPath = process.platform === 'darwin' - ? path.join(__dirname, '../public/icons/mac.icns') - : path.join(__dirname, '../public/icons/win.ico') + const iconPath = process.platform === 'darwin' + ? path.join(__dirname, '../dist/icons/mac/icon.icns') + : path.join(__dirname, '../dist/icons/win/icon.ico') mainWindow = new BrowserWindow({ width: 1200, diff --git a/public/icons/favicon.jpeg b/public/icons/favicon.jpeg deleted file mode 100644 index f5e7319..0000000 Binary files a/public/icons/favicon.jpeg and /dev/null differ diff --git a/public/icons/mac.icns b/public/icons/mac.icns deleted file mode 100644 index 02f5aa6..0000000 Binary files a/public/icons/mac.icns and /dev/null differ diff --git a/public/icons/mac/icon.icns b/public/icons/mac/icon.icns new file mode 100644 index 0000000..db8bbaa Binary files /dev/null and b/public/icons/mac/icon.icns differ diff --git a/public/icons/png/1024x1024.png b/public/icons/png/1024x1024.png new file mode 100644 index 0000000..cae4727 Binary files /dev/null and b/public/icons/png/1024x1024.png differ diff --git a/public/icons/png/128x128.png b/public/icons/png/128x128.png new file mode 100644 index 0000000..8f77e4f Binary files /dev/null and b/public/icons/png/128x128.png differ diff --git a/public/icons/png/16x16.png b/public/icons/png/16x16.png new file mode 100644 index 0000000..b180145 Binary files /dev/null and b/public/icons/png/16x16.png differ diff --git a/public/icons/png/24x24.png b/public/icons/png/24x24.png new file mode 100644 index 0000000..747bcc1 Binary files /dev/null and b/public/icons/png/24x24.png differ diff --git a/public/icons/png/256x256.png b/public/icons/png/256x256.png new file mode 100644 index 0000000..266bbdb Binary files /dev/null and b/public/icons/png/256x256.png differ diff --git a/public/icons/png/32x32.png b/public/icons/png/32x32.png new file mode 100644 index 0000000..09a17f3 Binary files /dev/null and b/public/icons/png/32x32.png differ diff --git a/public/icons/png/48x48.png b/public/icons/png/48x48.png new file mode 100644 index 0000000..e63dbe3 Binary files /dev/null and b/public/icons/png/48x48.png differ diff --git a/public/icons/png/512x512.png b/public/icons/png/512x512.png new file mode 100644 index 0000000..aa71dde Binary files /dev/null and b/public/icons/png/512x512.png differ diff --git a/public/icons/png/64x64.png b/public/icons/png/64x64.png new file mode 100644 index 0000000..b3bb3ca Binary files /dev/null and b/public/icons/png/64x64.png differ diff --git a/public/icons/win.ico b/public/icons/win.ico deleted file mode 100644 index e137fdc..0000000 Binary files a/public/icons/win.ico and /dev/null differ diff --git a/public/icons/win/icon.ico b/public/icons/win/icon.ico new file mode 100644 index 0000000..76bbe08 Binary files /dev/null and b/public/icons/win/icon.ico differ diff --git a/public/index.html b/public/index.html index 45ee8c2..3d1066c 100644 --- a/public/index.html +++ b/public/index.html @@ -3,7 +3,7 @@ - + 文件位置查询