-
Notifications
You must be signed in to change notification settings - Fork 1.1k
fix(electron): 修复开发环境下的本地主机地址配置问题 #1027
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
laoshuikaixue
wants to merge
1
commit into
imsyy:dev
Choose a base branch
from
laoshuikaixue:fix/electron-dev-host-address
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+14
−9
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,6 +32,11 @@ export const appName = app.getName() || "SPlayer"; | |
| */ | ||
| export const port = Number(import.meta.env["VITE_SERVER_PORT"] || 25884); | ||
|
|
||
| const devRendererUrl = process.env["ELECTRON_RENDERER_URL"]?.replace( | ||
| "://localhost", | ||
| "://127.0.0.1", | ||
| ); | ||
|
|
||
| /** | ||
| * 默认 AMLL TTML DB Server | ||
| * @returns string | ||
|
|
@@ -43,24 +48,22 @@ export const defaultAMLLDbServer = "https://amlldb.bikonoo.com/ncm-lyrics/%s.ttm | |
| * @returns string | ||
| */ | ||
| export const mainWinUrl = | ||
| isDev && process.env["ELECTRON_RENDERER_URL"] | ||
| ? process.env["ELECTRON_RENDERER_URL"] | ||
| : `http://localhost:${port}`; | ||
| isDev && devRendererUrl ? devRendererUrl : `http://127.0.0.1:${port}`; | ||
|
|
||
| /** | ||
| * 歌词窗口加载地址 | ||
| * @returns string | ||
| */ | ||
| export const lyricWinUrl = | ||
| isDev && process.env["ELECTRON_RENDERER_URL"] | ||
| ? `${process.env["ELECTRON_RENDERER_URL"]}/#/desktop-lyric` | ||
| : `http://localhost:${port}/#/desktop-lyric`; | ||
| isDev && devRendererUrl | ||
| ? `${devRendererUrl}/#/desktop-lyric` | ||
| : `http://127.0.0.1:${port}/#/desktop-lyric`; | ||
|
|
||
| /** | ||
| * 加载窗口地址 | ||
| * @returns string | ||
| */ | ||
| export const loadWinUrl = | ||
| isDev && process.env["ELECTRON_RENDERER_URL"] | ||
| ? `${process.env["ELECTRON_RENDERER_URL"]}/web/loading/index.html` | ||
| : `http://localhost:${port}/web/loading/index.html`; | ||
| isDev && devRendererUrl | ||
| ? `${devRendererUrl}/web/loading/index.html` | ||
| : `http://127.0.0.1:${port}/web/loading/index.html`; | ||
|
Comment on lines
50
to
+69
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 建议利用 mainWinUrl 作为基础路径来简化 lyricWinUrl 和 loadWinUrl 的定义,减少重复代码。此外,在开发环境下(isDev 为 true)如果 devRendererUrl 缺失,应回退到渲染进程端口(webPort)而非后端服务端口(port)。 export const mainWinUrl =
isDev ? (devRendererUrl || "http://127.0.0.1:" + webPort) : "http://127.0.0.1:" + port;
/**
* 歌词窗口加载地址
* @returns string
*/
export const lyricWinUrl = mainWinUrl + "/#/desktop-lyric";
/**
* 加载窗口地址
* @returns string
*/
export const loadWinUrl = mainWinUrl + "/web/loading/index.html"; |
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
建议同时引入渲染进程的开发端口 VITE_WEB_PORT,以便在 ELECTRON_RENDERER_URL 环境变量缺失时,能为开发环境提供更准确的回退地址。在进行字符串替换时,遵循项目惯例使用简单的 string.replace 方式。
References