Merge feature/merge-upstream: Modal 小屏 + 视频播放 + Docker Alpine(冲突以 feature 为准)
部署到群晖 / deploy (push) Failing after 3h9m39s

# Conflicts:
#	Dockerfile
#	Dockerfile-arm
#	dto/VideoPageRequestDTO.cs
#	model/AppConfig.cs
#	repository/DyCollectVideoRepository.cs
#	service/CommonService.cs
#	service/DyCollectVideoService.cs
#	service/DyHttpClientService.cs
This commit is contained in:
yuming
2026-07-03 20:03:46 +08:00
203 changed files with 28876 additions and 10250 deletions
+6 -1
View File
@@ -22,7 +22,9 @@ const prodRollupOptions = {
},
},
};
// vite 配置
// vite 配置
// net stop winnat
// net start winnat
export default ({ command, mode }) => {
// 获取环境变量
const env = loadEnv(mode, process.cwd());
@@ -32,6 +34,9 @@ export default ({ command, mode }) => {
cors: true,
port: 8001,
open: false, //自动打开
watch: {
usePolling: true, // 绕过 fsevents 架构不兼容问题(arm64 Mac)
},
proxy: {
'/api': {
target: env.VITE_API_URL || 'http://localhost:10101',