code/IM
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Codex/merge feature nxdev #70

Merged
nanxun merged 16 commits from codex/merge-feature-nxdev into main 2026-09-11 18:38:41 +08:00
Conversation 0 Commits 16 Files Changed 145
+13 -4
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9e7609d6b4 - Show all commits
backend/IMTest/obj/Debug/net8.0/IMTest.AssemblyInfo.cs
+4
View File
@@ -14,7 +14,11 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("IMTest")] [assembly: System.Reflection.AssemblyCompanyAttribute("IMTest")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
<<<<<<< HEAD
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+eb8455e141ea496a2134ad7c7d9b759b6029dd75")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+eb8455e141ea496a2134ad7c7d9b759b6029dd75")]
=======
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+f7223dc5904286fdf8e117b56c37f58dc431d68b")]
>>>>>>> eb8455e141ea496a2134ad7c7d9b759b6029dd75
[assembly: System.Reflection.AssemblyProductAttribute("IMTest")] [assembly: System.Reflection.AssemblyProductAttribute("IMTest")]
[assembly: System.Reflection.AssemblyTitleAttribute("IMTest")] [assembly: System.Reflection.AssemblyTitleAttribute("IMTest")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
backend/IMTest/obj/Debug/net8.0/IMTest.AssemblyInfoInputs.cache
+4
View File
@@ -1 +1,5 @@
<<<<<<< HEAD
546570633bb9288fc2957cbb29a807a45f3e48ba127ec13bc3956d28f5e6ed5b 546570633bb9288fc2957cbb29a807a45f3e48ba127ec13bc3956d28f5e6ed5b
=======
3c0a5335719f892c65744a9df7eae9fd7b12de9067131f5c9f4cb65f2b27b8d4
>>>>>>> eb8455e141ea496a2134ad7c7d9b759b6029dd75
frontend/pc/IM/.env
+4 -4
View File
@@ -1,8 +1,8 @@
# VITE_API_BASE_URL = http://localhost:5202/api VITE_API_BASE_URL = http://localhost:5202/api
# VITE_SIGNALR_BASE_URL = http://localhost:5202/chat/ VITE_SIGNALR_BASE_URL = http://localhost:5202/chat/
# VITE_API_BASE_URL = https://im.test.nxsir.cn/api # VITE_API_BASE_URL = https://im.test.nxsir.cn/api
# VITE_SIGNALR_BASE_URL = https://im.test.nxsir.cn/chat/ # VITE_SIGNALR_BASE_URL = https://im.test.nxsir.cn/chat/
VITE_API_BASE_URL = http://192.168.5.116:7070/api # VITE_API_BASE_URL = http://192.168.5.116:7070/api
VITE_SIGNALR_BASE_URL = http://192.168.5.116:7070/chat/ # VITE_SIGNALR_BASE_URL = http://192.168.5.116:7070/chat/
frontend/pc/IM/src/renderer/src/components/WindowControls.vue
+1
View File
@@ -50,6 +50,7 @@ function toggleMaximize() {
function close() { function close() {
window.api.window.close() window.api.window.close()
emits('close') emits('close')
emits('close')
} }
</script> </script>