Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MSLX.Daemon/Controllers/AppInfoController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
["targetFrontendVersion"] = new JObject
{
["desktop"] = "1.0.0",
["panel"] = "1.3.5"
["panel"] = "1.3.5.1"
},
["systemInfo"] = systemInfo
};
Expand Down Expand Up @@ -145,7 +145,7 @@
{
JObject remoteJObj = JObject.Parse(res.Content ?? "{}");
string remoteVerStr = remoteJObj["data"]?["daemonLatestVersion"]?.ToString() ?? "0.0.0";
if (!Version.TryParse(remoteVerStr, out Version remoteVerObj))

Check warning on line 148 in MSLX.Daemon/Controllers/AppInfoController.cs

View workflow job for this annotation

GitHub Actions / 构建发布 (linux, musl-x64, linux-musl-x64, MSLX-Daemon)

Converting null literal or possible null value to non-nullable type.

Check warning on line 148 in MSLX.Daemon/Controllers/AppInfoController.cs

View workflow job for this annotation

GitHub Actions / 构建发布 (osx, x64, osx-x64, MSLX-Daemon)

Converting null literal or possible null value to non-nullable type.

Check warning on line 148 in MSLX.Daemon/Controllers/AppInfoController.cs

View workflow job for this annotation

GitHub Actions / 构建发布 (windows, arm64, win-arm64, MSLX-Daemon.exe)

Converting null literal or possible null value to non-nullable type.

Check warning on line 148 in MSLX.Daemon/Controllers/AppInfoController.cs

View workflow job for this annotation

GitHub Actions / 构建发布 (linux, x64, linux-x64, MSLX-Daemon)

Converting null literal or possible null value to non-nullable type.
{
remoteVerObj = new Version("0.0.0.0");
}
Expand Down Expand Up @@ -337,7 +337,7 @@
string archivePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"update_package{archiveExt}");

// 定义解压后的新文件临时名称
string currentExeName = Path.GetFileName(Process.GetCurrentProcess().MainModule?.FileName);

Check warning on line 340 in MSLX.Daemon/Controllers/AppInfoController.cs

View workflow job for this annotation

GitHub Actions / 构建发布 (linux, musl-x64, linux-musl-x64, MSLX-Daemon)

Converting null literal or possible null value to non-nullable type.

Check warning on line 340 in MSLX.Daemon/Controllers/AppInfoController.cs

View workflow job for this annotation

GitHub Actions / 构建发布 (osx, x64, osx-x64, MSLX-Daemon)

Converting null literal or possible null value to non-nullable type.

Check warning on line 340 in MSLX.Daemon/Controllers/AppInfoController.cs

View workflow job for this annotation

GitHub Actions / 构建发布 (windows, arm64, win-arm64, MSLX-Daemon.exe)

Converting null literal or possible null value to non-nullable type.

Check warning on line 340 in MSLX.Daemon/Controllers/AppInfoController.cs

View workflow job for this annotation

GitHub Actions / 构建发布 (linux, x64, linux-x64, MSLX-Daemon)

Converting null literal or possible null value to non-nullable type.
string newFileTempName = currentExeName + ".new";
string newFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, newFileTempName);

Expand Down Expand Up @@ -414,7 +414,7 @@
{
System.Formats.Tar.TarReader reader = new System.Formats.Tar.TarReader(gzipStream);
System.Formats.Tar.TarEntry entry;
while ((entry = reader.GetNextEntry()) != null)

Check warning on line 417 in MSLX.Daemon/Controllers/AppInfoController.cs

View workflow job for this annotation

GitHub Actions / 构建发布 (linux, musl-x64, linux-musl-x64, MSLX-Daemon)

Converting null literal or possible null value to non-nullable type.

Check warning on line 417 in MSLX.Daemon/Controllers/AppInfoController.cs

View workflow job for this annotation

GitHub Actions / 构建发布 (osx, x64, osx-x64, MSLX-Daemon)

Converting null literal or possible null value to non-nullable type.

Check warning on line 417 in MSLX.Daemon/Controllers/AppInfoController.cs

View workflow job for this annotation

GitHub Actions / 构建发布 (windows, arm64, win-arm64, MSLX-Daemon.exe)

Converting null literal or possible null value to non-nullable type.

Check warning on line 417 in MSLX.Daemon/Controllers/AppInfoController.cs

View workflow job for this annotation

GitHub Actions / 构建发布 (linux, x64, linux-x64, MSLX-Daemon)

Converting null literal or possible null value to non-nullable type.
{
if (entry.EntryType == System.Formats.Tar.TarEntryType.Directory) continue;
await entry.ExtractToFileAsync(destinationPath, overwrite: true);
Expand All @@ -434,8 +434,8 @@
string scriptPath;

var currentProcess = Process.GetCurrentProcess();
string currentModuleFileName = currentProcess.MainModule?.FileName;

Check warning on line 437 in MSLX.Daemon/Controllers/AppInfoController.cs

View workflow job for this annotation

GitHub Actions / 构建发布 (linux, musl-x64, linux-musl-x64, MSLX-Daemon)

Converting null literal or possible null value to non-nullable type.

Check warning on line 437 in MSLX.Daemon/Controllers/AppInfoController.cs

View workflow job for this annotation

GitHub Actions / 构建发布 (osx, x64, osx-x64, MSLX-Daemon)

Converting null literal or possible null value to non-nullable type.

Check warning on line 437 in MSLX.Daemon/Controllers/AppInfoController.cs

View workflow job for this annotation

GitHub Actions / 构建发布 (linux, x64, linux-x64, MSLX-Daemon)

Converting null literal or possible null value to non-nullable type.
string currentExeName = Path.GetFileName(currentModuleFileName);

Check warning on line 438 in MSLX.Daemon/Controllers/AppInfoController.cs

View workflow job for this annotation

GitHub Actions / 构建发布 (linux, musl-x64, linux-musl-x64, MSLX-Daemon)

Converting null literal or possible null value to non-nullable type.

Check warning on line 438 in MSLX.Daemon/Controllers/AppInfoController.cs

View workflow job for this annotation

GitHub Actions / 构建发布 (osx, x64, osx-x64, MSLX-Daemon)

Converting null literal or possible null value to non-nullable type.

bool isDotnetDll = currentModuleFileName != null && currentModuleFileName.EndsWith(".dll");
bool isMacOS = RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
Expand Down
2 changes: 2 additions & 0 deletions MSLX.Daemon/Frontend/assets/css/mslx-app-main.KGY2rMx0.css

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

68 changes: 34 additions & 34 deletions MSLX.Daemon/Frontend/build.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": "1.3.5",
"buildTime": "2026-04-05 17:10:36",
"version": "1.3.5.1",
"buildTime": "2026-04-05 17:25:31",
"dependencies": {
"@codemirror/lang-javascript": "^6.2.4",
"@codemirror/lang-json": "^6.0.2",
Expand Down Expand Up @@ -74,10 +74,40 @@
"vite-svg-loader": "^5.1.0",
"vue-tsc": "^2.0.26"
},
"commitId": "89086442333f955353a835b9330c3527a3a5699a",
"commitMsg": "fix(webpanel): 修复部分输入框的异常样式",
"commitId": "5f60e847653ef56543b803880a92bd60b350d0c6",
"commitMsg": "Merge remote-tracking branch 'origin/master' into dev",
"commitAuthor": "luluxiaoyu",
"history": [
{
"commitId": "5f60e847653ef56543b803880a92bd60b350d0c6",
"commitTime": "2026-04-05 17:15:42 +0800",
"commitAuthor": "luluxiaoyu",
"commitMsg": "Merge remote-tracking branch 'origin/master' into dev"
},
{
"commitId": "b7762d4ef05c4db2f5ba4b4fe893d29751c7b1d2",
"commitTime": "2026-04-05 17:13:46 +0800",
"commitAuthor": "小宇",
"commitMsg": "Merge pull request #104 from MSLTeam/dev"
},
{
"commitId": "d22cbe0652bbca6d60f33aa3f7984bc0e225460a",
"commitTime": "2026-04-05 17:12:27 +0800",
"commitAuthor": "luluxiaoyu",
"commitMsg": "Merge remote-tracking branch 'origin/dev' into dev"
},
{
"commitId": "f523ae2a4d6864267bfcec97c255420f9d62d888",
"commitTime": "2026-04-05 17:12:08 +0800",
"commitAuthor": "luluxiaoyu",
"commitMsg": "bumpver(webpanel & daemon): 更新到v1.3.5版本"
},
{
"commitId": "0ebd6e1deab2138fbb42ea95aa21deb1ed1430f3",
"commitTime": "2026-04-05 17:11:46 +0800",
"commitAuthor": "luluxiaoyu",
"commitMsg": "bumpver(webpanel & daemon): 更新到v1.3.5版本"
},
{
"commitId": "89086442333f955353a835b9330c3527a3a5699a",
"commitTime": "2026-04-05 17:09:09 +0800",
Expand Down Expand Up @@ -347,36 +377,6 @@
"commitTime": "2026-03-15 20:10:55 +0800",
"commitAuthor": "小宇",
"commitMsg": "Merge pull request #89 from MSLTeam/dev"
},
{
"commitId": "558fb06df97d94e6ceb9b5a2877577ee59a87c6f",
"commitTime": "2026-03-15 20:10:21 +0800",
"commitAuthor": "luluxiaoyu",
"commitMsg": "bumpver(daemon): 更新版本号到v1.3.2.1 - hotfix"
},
{
"commitId": "3b1ad5b16dd8df7d06d029de69f127bcefa1fc8f",
"commitTime": "2026-03-15 20:07:51 +0800",
"commitAuthor": "luluxiaoyu",
"commitMsg": "fix(daemon & desktop): 修复设备ID生成逻辑"
},
{
"commitId": "c2b90d80a445025ad522cdfad717d2be71c101b3",
"commitTime": "2026-03-15 19:05:46 +0800",
"commitAuthor": "小宇",
"commitMsg": "Merge pull request #88 from MSLTeam/dev"
},
{
"commitId": "0d45b15eb4acf9ddb7f9a5cd31c9b8bc3fc4c613",
"commitTime": "2026-03-15 19:04:05 +0800",
"commitAuthor": "luluxiaoyu",
"commitMsg": "bumpver(daemon & webpanel): 更新到v1.3.2-release版本"
},
{
"commitId": "714cd36da2546115625fe76f2e9e1f2977034343",
"commitTime": "2026-03-15 18:06:09 +0800",
"commitAuthor": "luluxiaoyu",
"commitMsg": "fix(webpanel): 修复实例设置-更多功能内容无法正常重载的问题"
}
]
}
4 changes: 2 additions & 2 deletions MSLX.Daemon/Frontend/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<link rel="icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>MSLX Web Panel</title>
<script type="module" crossorigin src="/assets/js/mslx-entry.rmwTM72S.js"></script>
<script type="module" crossorigin src="/assets/js/mslx-entry.DOv2xkjK.js"></script>
<link rel="modulepreload" crossorigin href="/assets/js/mslx-libs.BfFW5N8o.js">
<link rel="modulepreload" crossorigin href="/assets/js/mslx-editor.DiM-SrP0.js">
<link rel="modulepreload" crossorigin href="/assets/js/mslx-core.DZWTbFWd.js">
<link rel="modulepreload" crossorigin href="/assets/js/mslx-charts.ByXhkWPm.js">
<link rel="modulepreload" crossorigin href="/assets/js/mslx-formatter.DCunR7Lr.js">
<link rel="modulepreload" crossorigin href="/assets/js/mslx-app-main.Cdym3WOG.js">
<link rel="modulepreload" crossorigin href="/assets/js/mslx-app-main.mQdZM5Pc.js">
<link rel="stylesheet" crossorigin href="/assets/css/mslx-libs.CPsQRpQt.css">
<link rel="stylesheet" crossorigin href="/assets/css/mslx-core.D9pUfBh0.css">
<link rel="stylesheet" crossorigin href="/assets/css/mslx-app-main.KGY2rMx0.css">
Expand Down
6 changes: 3 additions & 3 deletions MSLX.Daemon/MSLX.Daemon.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<ImplicitUsings>enable</ImplicitUsings>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
<ApplicationIcon>icon.ico</ApplicationIcon>
<Version>1.3.5-release</Version>
<FileVersion>1.3.5</FileVersion>
<AssemblyVersion>1.3.5</AssemblyVersion>
<Version>1.3.5.1-release</Version>
<FileVersion>1.3.5.1</FileVersion>
<AssemblyVersion>1.3.5.1</AssemblyVersion>
<Copyright>Copyright © 2021 - 2026 MSLTeam</Copyright>
<AssemblyName>MSLX-Daemon</AssemblyName>
<AssemblyTitle>MSLX.Daemon</AssemblyTitle>
Expand Down
2 changes: 1 addition & 1 deletion MSLX.WebPanel/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mslx-webpanel",
"version": "1.3.5",
"version": "1.3.5.1",
"scripts": {
"dev": "vite --mode development",
"dev:linux": "vite --mode development",
Expand Down
Loading