diff --git a/.env.shenranqi b/.env.shenranqi index a9e8017..8dfa8ca 100644 --- a/.env.shenranqi +++ b/.env.shenranqi @@ -1,2 +1,3 @@ -VITE_h5_client_url=http://10.9.18.138:18900 +### VITE_h5_client_url=http://10.9.18.138:18900 +VITE_h5_client_url=https://bqw-120.ii999.live:20038 VITE_HsAppCode=1 diff --git a/build/icon.ico b/build/icon.ico index 1f3a318..b267ff4 100644 Binary files a/build/icon.ico and b/build/icon.ico differ diff --git a/build/icon.png b/build/icon.png index 242ea89..7a9be5b 100644 Binary files a/build/icon.png and b/build/icon.png differ diff --git a/build/icon_pinshan.ico b/build/icon_pinshan.ico new file mode 100644 index 0000000..1f3a318 Binary files /dev/null and b/build/icon_pinshan.ico differ diff --git a/build/icon_pinshan.png b/build/icon_pinshan.png new file mode 100644 index 0000000..242ea89 Binary files /dev/null and b/build/icon_pinshan.png differ diff --git a/build/icon_shenranqi.ico b/build/icon_shenranqi.ico deleted file mode 100644 index b267ff4..0000000 Binary files a/build/icon_shenranqi.ico and /dev/null differ diff --git a/build/icon_shenranqi.png b/build/icon_shenranqi.png deleted file mode 100644 index 7a9be5b..0000000 Binary files a/build/icon_shenranqi.png and /dev/null differ diff --git a/build/icons/win/icon.ico b/build/icons/win/icon.ico index d07ff75..b267ff4 100644 Binary files a/build/icons/win/icon.ico and b/build/icons/win/icon.ico differ diff --git a/electron-builder.yml b/electron-builder.yml index fdfb0b5..4a9a671 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -1,6 +1,6 @@ appId: com.huashiai.dify-market-manager-gui compression: maximum -productName: 智能体平台 +productName: 深燃智能体平台 directories: buildResources: build files: @@ -12,7 +12,7 @@ files: asarUnpack: - resources/** win: - executableName: 智能体平台 + executableName: 深燃智能体平台 nsis: artifactName: ${name}-${version}-setup.${ext} shortcutName: ${productName} @@ -41,4 +41,4 @@ publish: provider: generic url: "" electronDownload: - mirror: http://172.22.33.66:18900/update_files + mirror: https://npmmirror.com/mirrors/electron/ diff --git a/resources/1024x1024.png b/resources/1024x1024.png index 32afcd4..41ae4c3 100644 Binary files a/resources/1024x1024.png and b/resources/1024x1024.png differ diff --git a/resources/128x128.png b/resources/128x128.png index d4279db..f2ed1d3 100644 Binary files a/resources/128x128.png and b/resources/128x128.png differ diff --git a/resources/16x16.png b/resources/16x16.png index 676f3d0..d9fcafa 100644 Binary files a/resources/16x16.png and b/resources/16x16.png differ diff --git a/resources/24x24.png b/resources/24x24.png index a3f64ea..02c5bcd 100644 Binary files a/resources/24x24.png and b/resources/24x24.png differ diff --git a/resources/256x256.png b/resources/256x256.png index b3e993b..5b5cc20 100644 Binary files a/resources/256x256.png and b/resources/256x256.png differ diff --git a/resources/32x32.png b/resources/32x32.png index e120f7b..0062998 100644 Binary files a/resources/32x32.png and b/resources/32x32.png differ diff --git a/resources/48x48.png b/resources/48x48.png index ae806db..73c2828 100644 Binary files a/resources/48x48.png and b/resources/48x48.png differ diff --git a/resources/512x512.png b/resources/512x512.png index 594230a..691df6e 100644 Binary files a/resources/512x512.png and b/resources/512x512.png differ diff --git a/resources/64x64.png b/resources/64x64.png index 047ec70..605baa6 100644 Binary files a/resources/64x64.png and b/resources/64x64.png differ diff --git a/resources/icon.png b/resources/icon.png index 242ea89..5b5cc20 100644 Binary files a/resources/icon.png and b/resources/icon.png differ diff --git a/resources/img.png b/resources/img.png index 047ec70..605baa6 100644 Binary files a/resources/img.png and b/resources/img.png differ diff --git a/src/main/window.js b/src/main/window.js index 9e603bb..ed00243 100644 --- a/src/main/window.js +++ b/src/main/window.js @@ -65,8 +65,10 @@ export async function createWindow() { // Create the browser window. mainWindow = new BrowserWindow({ - width: 420, - height: 900, + width: 1480, + height: 980, + minWidth: 1480, + minHeight: 980, show: false, media: { audio: true, @@ -161,7 +163,7 @@ export async function createWindow() { setStoreValue("h5_client_url", import.meta.env.VITE_h5_client_url) } - const h5_client_url=getStoreValue("h5_client_url")+"/h5_client/" + const h5_client_url=getStoreValue("h5_client_url")+"/pc_client/" logger.info("==================================== mainWindow.loadURL:"+h5_client_url) // 加载存储的 URL @@ -174,10 +176,10 @@ export async function createWindow() { mainWindow.webContents.on('did-fail-load', async (event, errorCode, errorDescription, validatedURL) => { logger.error(`主窗口页面加载失败: code=${errorCode}, desc=${errorDescription}, url=${validatedURL}, 失败次数: ${failLoadCount + 1}`) - + // 增加失败计数 failLoadCount++; - + if (failLoadCount <= maxRetries) { logger.info(`页面加载失败，${retryDelay}ms后进行第${failLoadCount}次重试...`); setTimeout(async () => { @@ -503,18 +505,18 @@ export async function createNewWindow(url, access_token, refresh_token,sandbox=f difyfullScreenWindow.webContents.on('did-fail-load', async (event, errorCode, errorDescription, validatedURL) => { logger.error(`全屏窗口页面加载失败: code=${errorCode}, desc=${errorDescription}, url=${validatedURL}, 失败次数: ${failLoadCount + 1}`) - + failLoadCount++; - + if (failLoadCount <= maxRetries) { logger.info(`全屏窗口页面加载失败，${retryDelay}ms后进行第${failLoadCount}次重试...`); - + setTimeout(async () => { try { // 在重试前先检查网络连接 const { checkDefaultClientConnection } = await import('./utils/networkUtils.js'); const isNetworkConnected = await checkDefaultClientConnection(3000); - + if (isNetworkConnected) { logger.info('网络连接正常，重新加载全屏窗口页面'); difyfullScreenWindow.reload(); @@ -606,18 +608,18 @@ export function createDrageWindow() { drageWindow.webContents.on('did-fail-load', async (event, errorCode, errorDescription, validatedURL) => { logger.error(`悬浮窗口页面加载失败: code=${errorCode}, desc=${errorDescription}, url=${validatedURL}, 失败次数: ${drageFailLoadCount + 1}`) - + drageFailLoadCount++; - + if (drageFailLoadCount <= drageMaxRetries) { logger.info(`悬浮窗口页面加载失败，${drageRetryDelay}ms后进行第${drageFailLoadCount}次重试...`); - + setTimeout(async () => { try { // 在重试前先检查网络连接 const { checkDefaultClientConnection } = await import('./utils/networkUtils.js'); const isNetworkConnected = await checkDefaultClientConnection(3000); - + if (isNetworkConnected) { logger.info('网络连接正常，重新加载悬浮窗口页面'); drageWindow.reload(); @@ -653,6 +655,8 @@ export async function tokenExpireTimer(){ const LOG_INTERVAL = 60000; // 日志打印间隔，60秒打印一次 const tokenExpireTimer = setInterval(async () => { + return false; + const currentTime = Date.now(); const lastActiveTime = getStoreValue("lastActiveTime")||null