diff --git a/Dockerfile b/Dockerfile index 350c762..3339e34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,5 +18,4 @@ RUN ffmpeg -version COPY . . ENV ASPNETCORE_URLS=http://*:10101 ENV TZ=Asia/Shanghai -ENV DOWN_IMGVIDEO=1 ENTRYPOINT ["dotnet", "dy.net.dll"] diff --git a/Dockerfile-arm b/Dockerfile-arm index a3af9c2..d3ee250 100644 --- a/Dockerfile-arm +++ b/Dockerfile-arm @@ -1,13 +1,17 @@ -#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. - -FROM mcr.microsoft.com/dotnet/aspnet:6.0-focal-arm64v8 AS base +# 使用 Ubuntu 20.04 的 .NET 6 运行时镜像 +FROM mcr.microsoft.com/dotnet/aspnet:6.0-focal AS base WORKDIR /app EXPOSE 10101 +# 安装 ffmpeg (Ubuntu 的 universe 仓库包含 ffmpeg) +RUN apt-get update && \ + apt-get install -y --no-install-recommends ffmpeg && \ + rm -rf /var/lib/apt/lists/* + +RUN ffmpeg -version + COPY . . ENV ASPNETCORE_URLS=http://*:10101 ENV TZ=Asia/Shanghai -ENV DOWN_IMGVIDEO=0 -ENTRYPOINT ["dotnet", "dy.net.dll"] - +ENTRYPOINT ["dotnet", "dy.net.dll"] \ No newline at end of file diff --git a/Dockerfile-arm-img b/Dockerfile-arm-img deleted file mode 100644 index db3ffcc..0000000 --- a/Dockerfile-arm-img +++ /dev/null @@ -1,18 +0,0 @@ -# 使用 Ubuntu 20.04 的 .NET 6 运行时镜像 -FROM mcr.microsoft.com/dotnet/aspnet:6.0-focal AS base -WORKDIR /app -EXPOSE 10101 - -# 安装 ffmpeg (Ubuntu 的 universe 仓库包含 ffmpeg) -RUN apt-get update && \ - apt-get install -y --no-install-recommends ffmpeg && \ - rm -rf /var/lib/apt/lists/* - -RUN ffmpeg -version - -COPY . . - -ENV ASPNETCORE_URLS=http://*:10101 -ENV TZ=Asia/Shanghai -ENV DOWN_IMGVIDEO=1 -ENTRYPOINT ["dotnet", "dy.net.dll"] \ No newline at end of file diff --git a/Dockerfile-dev b/Dockerfile-dev deleted file mode 100644 index c1a9815..0000000 --- a/Dockerfile-dev +++ /dev/null @@ -1,13 +0,0 @@ -#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. - -FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base -WORKDIR /app -EXPOSE 10101 - -COPY . . - -ENV TZ=Asia/Shanghai -ENV DOWN_IMGVIDEO=0 -ENV ASPNETCORE_URLS=http://*:10101 -ENTRYPOINT ["dotnet", "dy.net.dll"] - diff --git a/Program.cs b/Program.cs index 25d02c2..967cf78 100644 --- a/Program.cs +++ b/Program.cs @@ -25,7 +25,6 @@ namespace dy.net /// /// 打包时注意，如果是false,前端不允许修改开启下载图片和视频的选项 /// - private static bool downImageVideo = false; public static void Main(string[] args) { //Console.ForegroundColor = ConsoleColor.Yellow; @@ -36,13 +35,7 @@ namespace dy.net var builder = WebApplication.CreateBuilder(args); //from docker yaml file 环境变量 或者 dockerfile 或appsettings.json DefaultListenUrl = builder.Configuration.GetValue(SystemStaticUtil.ASPNETCORE_URLS) ?? DefaultListenUrl; - var downImgConfig = builder.Configuration.GetValue(SystemStaticUtil.DOWN_IMAGE_VIDEO_ENABLE); - - //Console.WriteLine("DOWN_IMGVIDEO=" + downImgConfig); - if (!string.IsNullOrEmpty(downImgConfig)) - { - downImageVideo = downImgConfig.ToLower() == "1" ; - } + var isDevelopment = builder.Environment.IsDevelopment(); // 配置主机 @@ -53,8 +46,7 @@ namespace dy.net // 构建应用 var app = builder.Build(); - if (downImageVideo) - Log.Debug("ffmpeg is on"); + Log.Debug("ffmpeg is on"); // 配置中间件 ConfigureMiddleware(app, builder.Environment); @@ -206,7 +198,7 @@ ____/ _|_)_____/ _| _| \_|\____| // 初始化配置 var commonService = services.GetRequiredService(); - var config = commonService.InitConfig(downImageVideo); + var config = commonService.InitConfig(); // 更新视频类型--兼容老版本 commonService.UpdateCollectViedoType(); diff --git a/Properties/PublishProfiles/FolderProfile.pubxml.user b/Properties/PublishProfiles/FolderProfile.pubxml.user index ac5ac7d..a28c60e 100644 --- a/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>E:\code\dysync\bin\Release\net6.0\publish\ - True|2025-11-30T17:11:11.0210582Z||;True|2025-12-01T01:04:04.3307782+08:00||;True|2025-12-01T00:55:49.8018864+08:00||;True|2025-12-01T00:27:25.1323561+08:00||;True|2025-11-30T23:58:20.7284116+08:00||;True|2025-11-30T23:57:58.3027622+08:00||;True|2025-11-30T23:57:43.0829614+08:00||;False|2025-11-30T23:57:33.5606716+08:00||;True|2025-11-30T23:54:29.6203368+08:00||;True|2025-11-30T23:54:27.5383120+08:00||;False|2025-11-30T23:54:17.0823982+08:00||;True|2025-11-30T22:41:11.4538820+08:00||;True|2025-11-30T22:38:19.7064566+08:00||;True|2025-11-30T22:37:35.2889186+08:00||;True|2025-11-30T21:42:31.1408314+08:00||;True|2025-11-30T21:42:19.5385333+08:00||;False|2025-11-30T21:42:13.3290237+08:00||;True|2025-11-30T21:33:28.0806806+08:00||;True|2025-11-30T21:16:56.7088027+08:00||;False|2025-11-30T21:16:46.1444944+08:00||;True|2025-11-30T20:21:24.4059664+08:00||;False|2025-11-30T20:21:17.6006098+08:00||;True|2025-11-30T20:20:08.2030141+08:00||;False|2025-11-30T20:16:12.3608968+08:00||;True|2025-11-30T20:15:35.6048313+08:00||;True|2025-11-30T19:45:18.7229552+08:00||;True|2025-11-30T19:45:08.6083368+08:00||;False|2025-11-30T19:44:54.7824905+08:00||;True|2025-11-30T19:44:17.0179491+08:00||;True|2025-11-30T19:44:06.7073484+08:00||;False|2025-11-30T19:43:58.2896556+08:00||;True|2025-11-30T19:42:08.2261927+08:00||;True|2025-11-30T19:28:15.7115077+08:00||;False|2025-11-30T19:28:10.2280725+08:00||;True|2025-11-30T19:23:31.7859158+08:00||;True|2025-11-30T19:23:20.7788277+08:00||;True|2025-11-30T19:17:11.8583296+08:00||;False|2025-11-30T19:10:41.8369574+08:00||;True|2025-11-30T19:02:08.8184758+08:00||;False|2025-11-30T19:01:59.4711045+08:00||;True|2025-11-30T18:16:01.8372242+08:00||;True|2025-11-30T14:50:31.9356543+08:00||;True|2025-11-30T14:48:27.1833064+08:00||;True|2025-11-30T02:06:06.6099669+08:00||;True|2025-11-30T01:49:46.4358206+08:00||;False|2025-11-30T01:49:34.4884036+08:00||;True|2025-11-30T01:43:41.1028753+08:00||;True|2025-11-30T01:38:18.2856609+08:00||;True|2025-11-30T01:23:02.4378259+08:00||;True|2025-11-30T01:08:29.4041159+08:00||;True|2025-11-30T00:56:33.4172007+08:00||;False|2025-11-30T00:56:21.2777389+08:00||;True|2025-11-27T13:37:08.6884390+08:00||;False|2025-11-27T13:36:54.2595622+08:00||;True|2025-11-27T11:03:33.8401644+08:00||;False|2025-11-27T11:02:48.8942827+08:00||;True|2025-11-26T23:48:02.3957186+08:00||;True|2025-11-26T23:43:06.8154188+08:00||;False|2025-11-26T23:42:05.9191485+08:00||;True|2025-11-26T23:30:11.1295861+08:00||;True|2025-11-26T00:00:42.1507258+08:00||;True|2025-11-26T00:00:17.0107229+08:00||;True|2025-11-25T23:42:07.4349629+08:00||;False|2025-11-25T23:41:56.9328658+08:00||;True|2025-11-25T23:19:32.5262917+08:00||;True|2025-11-25T14:08:53.3850967+08:00||;True|2025-11-24T23:53:54.4283003+08:00||;True|2025-11-24T23:41:15.8248332+08:00||;True|2025-11-24T23:33:57.1844427+08:00||;True|2025-11-24T23:31:54.9228836+08:00||;True|2025-11-24T23:24:15.8681502+08:00||;True|2025-11-24T23:22:57.9046229+08:00||;True|2025-11-24T23:18:04.1131647+08:00||;True|2025-11-24T22:47:54.1336448+08:00||;True|2025-11-24T22:47:18.3613833+08:00||;True|2025-11-24T08:17:50.3994607+08:00||;True|2025-11-24T08:07:00.9951205+08:00||;True|2025-11-23T23:34:50.0030826+08:00||;True|2025-11-23T23:32:36.7452616+08:00||;True|2025-11-22T23:18:56.3202345+08:00||;True|2025-11-22T22:52:51.7203302+08:00||;True|2025-11-22T22:52:42.9620946+08:00||;True|2025-11-22T22:52:09.8257640+08:00||;True|2025-11-22T22:39:31.5894141+08:00||;True|2025-11-22T22:31:11.0704815+08:00||;True|2025-11-22T22:20:36.4579131+08:00||;True|2025-11-22T22:19:10.2281364+08:00||;True|2025-11-22T19:34:45.9336901+08:00||;True|2025-11-12T23:06:38.7834109+08:00||;False|2025-11-12T23:01:02.2269478+08:00||;True|2025-10-22T22:08:11.6423148+08:00||;True|2025-10-22T21:54:24.7180547+08:00||;True|2025-10-22T21:40:03.5194315+08:00||;True|2025-10-22T21:28:28.8962766+08:00||;True|2025-10-22T21:22:47.9631689+08:00||;True|2025-10-22T21:18:24.5274318+08:00||;True|2025-10-22T21:14:51.6386326+08:00||;False|2025-10-22T21:14:07.6282769+08:00||;True|2025-10-22T21:03:48.9892860+08:00||;True|2025-10-22T21:00:56.3617243+08:00||; + True|2025-11-30T17:29:59.6975567Z||;True|2025-12-01T01:29:45.1898652+08:00||;False|2025-12-01T01:29:33.1787721+08:00||;True|2025-12-01T01:27:33.1297605+08:00||;True|2025-12-01T01:27:27.3976862+08:00||;False|2025-12-01T01:27:20.5193052+08:00||;True|2025-12-01T01:11:11.0210582+08:00||;True|2025-12-01T01:04:04.3307782+08:00||;True|2025-12-01T00:55:49.8018864+08:00||;True|2025-12-01T00:27:25.1323561+08:00||;True|2025-11-30T23:58:20.7284116+08:00||;True|2025-11-30T23:57:58.3027622+08:00||;True|2025-11-30T23:57:43.0829614+08:00||;False|2025-11-30T23:57:33.5606716+08:00||;True|2025-11-30T23:54:29.6203368+08:00||;True|2025-11-30T23:54:27.5383120+08:00||;False|2025-11-30T23:54:17.0823982+08:00||;True|2025-11-30T22:41:11.4538820+08:00||;True|2025-11-30T22:38:19.7064566+08:00||;True|2025-11-30T22:37:35.2889186+08:00||;True|2025-11-30T21:42:31.1408314+08:00||;True|2025-11-30T21:42:19.5385333+08:00||;False|2025-11-30T21:42:13.3290237+08:00||;True|2025-11-30T21:33:28.0806806+08:00||;True|2025-11-30T21:16:56.7088027+08:00||;False|2025-11-30T21:16:46.1444944+08:00||;True|2025-11-30T20:21:24.4059664+08:00||;False|2025-11-30T20:21:17.6006098+08:00||;True|2025-11-30T20:20:08.2030141+08:00||;False|2025-11-30T20:16:12.3608968+08:00||;True|2025-11-30T20:15:35.6048313+08:00||;True|2025-11-30T19:45:18.7229552+08:00||;True|2025-11-30T19:45:08.6083368+08:00||;False|2025-11-30T19:44:54.7824905+08:00||;True|2025-11-30T19:44:17.0179491+08:00||;True|2025-11-30T19:44:06.7073484+08:00||;False|2025-11-30T19:43:58.2896556+08:00||;True|2025-11-30T19:42:08.2261927+08:00||;True|2025-11-30T19:28:15.7115077+08:00||;False|2025-11-30T19:28:10.2280725+08:00||;True|2025-11-30T19:23:31.7859158+08:00||;True|2025-11-30T19:23:20.7788277+08:00||;True|2025-11-30T19:17:11.8583296+08:00||;False|2025-11-30T19:10:41.8369574+08:00||;True|2025-11-30T19:02:08.8184758+08:00||;False|2025-11-30T19:01:59.4711045+08:00||;True|2025-11-30T18:16:01.8372242+08:00||;True|2025-11-30T14:50:31.9356543+08:00||;True|2025-11-30T14:48:27.1833064+08:00||;True|2025-11-30T02:06:06.6099669+08:00||;True|2025-11-30T01:49:46.4358206+08:00||;False|2025-11-30T01:49:34.4884036+08:00||;True|2025-11-30T01:43:41.1028753+08:00||;True|2025-11-30T01:38:18.2856609+08:00||;True|2025-11-30T01:23:02.4378259+08:00||;True|2025-11-30T01:08:29.4041159+08:00||;True|2025-11-30T00:56:33.4172007+08:00||;False|2025-11-30T00:56:21.2777389+08:00||;True|2025-11-27T13:37:08.6884390+08:00||;False|2025-11-27T13:36:54.2595622+08:00||;True|2025-11-27T11:03:33.8401644+08:00||;False|2025-11-27T11:02:48.8942827+08:00||;True|2025-11-26T23:48:02.3957186+08:00||;True|2025-11-26T23:43:06.8154188+08:00||;False|2025-11-26T23:42:05.9191485+08:00||;True|2025-11-26T23:30:11.1295861+08:00||;True|2025-11-26T00:00:42.1507258+08:00||;True|2025-11-26T00:00:17.0107229+08:00||;True|2025-11-25T23:42:07.4349629+08:00||;False|2025-11-25T23:41:56.9328658+08:00||;True|2025-11-25T23:19:32.5262917+08:00||;True|2025-11-25T14:08:53.3850967+08:00||;True|2025-11-24T23:53:54.4283003+08:00||;True|2025-11-24T23:41:15.8248332+08:00||;True|2025-11-24T23:33:57.1844427+08:00||;True|2025-11-24T23:31:54.9228836+08:00||;True|2025-11-24T23:24:15.8681502+08:00||;True|2025-11-24T23:22:57.9046229+08:00||;True|2025-11-24T23:18:04.1131647+08:00||;True|2025-11-24T22:47:54.1336448+08:00||;True|2025-11-24T22:47:18.3613833+08:00||;True|2025-11-24T08:17:50.3994607+08:00||;True|2025-11-24T08:07:00.9951205+08:00||;True|2025-11-23T23:34:50.0030826+08:00||;True|2025-11-23T23:32:36.7452616+08:00||;True|2025-11-22T23:18:56.3202345+08:00||;True|2025-11-22T22:52:51.7203302+08:00||;True|2025-11-22T22:52:42.9620946+08:00||;True|2025-11-22T22:52:09.8257640+08:00||;True|2025-11-22T22:39:31.5894141+08:00||;True|2025-11-22T22:31:11.0704815+08:00||;True|2025-11-22T22:20:36.4579131+08:00||;True|2025-11-22T22:19:10.2281364+08:00||;True|2025-11-22T19:34:45.9336901+08:00||;True|2025-11-12T23:06:38.7834109+08:00||;False|2025-11-12T23:01:02.2269478+08:00||;True|2025-10-22T22:08:11.6423148+08:00||;True|2025-10-22T21:54:24.7180547+08:00||;True|2025-10-22T21:40:03.5194315+08:00||;True|2025-10-22T21:28:28.8962766+08:00||; diff --git a/README.md b/README.md index fb2896c..9ddd70e 100644 --- a/README.md +++ b/README.md @@ -91,8 +91,8 @@ Cookie 鍙 `sec_user_id` 鏄悓姝ュ姛鑳界殑鏍稿績锛岄渶涓ユ牸鎸夋楠よ幏鍙栵紝 | 闀滃儚鏍囩 | 鏋舵瀯 | | ----------------- | -------------- | -| `beta_1.6.0` | x86_64 (amd64) | -| `arm_1.6.0` | ARM64 | +| `beta_1.6.2` | x86_64 (amd64) | +| `arm_1.6.2` | ARM64 | ### 鏈鏂伴暅鍍忔煡鐪 [闀滃儚鍒楄〃](http://nas.synology2023.online:10108/api/docker/dysync/1) @@ -110,7 +110,7 @@ docker run -d --restart=always \ -v /opt/dysync/uper:/app/uper \ -p 10103:10101 \ --name dysync2025 \ - ccr.ccs.tencentyun.com/jianzhichu/dysync:beta_1.6.0 + ccr.ccs.tencentyun.com/jianzhichu/dysync:beta_1.6.2 # 娉ㄦ剰锛-p 鍚庨潰鐨勫鍣ㄧ鍙,鍙互鐢ㄧ幆澧冨彉閲忕被浼硷細ASPNETCORE_URLS = http://+:10108 鎸囧畾 ``` @@ -124,7 +124,7 @@ version: '3.8' services: dysync: - image: ccr.ccs.tencentyun.com/jianzhichu/dysync:beta_1.6.0 + image: ccr.ccs.tencentyun.com/jianzhichu/dysync:beta_1.6.2 container_name: dysync2025 # 瀹瑰櫒鍚嶇О restart: unless-stopped # 濮嬬粓閲嶅惎瀹瑰櫒锛岄櫎闈炲鍣ㄨ鎵嬪姩鍋滄鎴朌ocker鏈嶅姟鍋滄 ports: diff --git a/appsettings.json b/appsettings.json index 51f5ed5..3693fa1 100644 --- a/appsettings.json +++ b/appsettings.json @@ -1,6 +1,5 @@ { "dbconn": "", "dbtype": "Sqlite", - "DOWN_IMGVIDEO": "1", "tagName": "beta_1.6.2" } \ No newline at end of file diff --git a/dy.net.csproj b/dy.net.csproj index f675fda..328c499 100644 --- a/dy.net.csproj +++ b/dy.net.csproj @@ -90,12 +90,6 @@ Always - - Always - - - Always - Always diff --git a/model/AppConfig.cs b/model/AppConfig.cs index 80cc0b4..1f3d9a4 100644 --- a/model/AppConfig.cs +++ b/model/AppConfig.cs @@ -66,8 +66,8 @@ namespace dy.net.model /// public bool ImageViedoSaveAlone { get; set; } - [SugarColumn(IsIgnore=true)] - public bool DownImageVideoFromEnv { get; set; } + [SugarColumn(IsIgnore = true)] + public bool DownImageVideoFromEnv => DownImageVideo; /// /// 鑷姩鍘婚噸-閫昏緫鏄亣鍒扮浉鍚孖D鐨勮棰戠洿鎺ヨ烦杩 diff --git a/service/DouyinCommonService.cs b/service/DouyinCommonService.cs index eb4fa19..e9b25c7 100644 --- a/service/DouyinCommonService.cs +++ b/service/DouyinCommonService.cs @@ -19,28 +19,18 @@ namespace dy.net.service public AppConfig GetConfig() { - var config = sqlSugarClient.Queryable().First(); - - var downImgConfig = Appsettings.Get(SystemStaticUtil.DOWN_IMAGE_VIDEO_ENABLE); - if (config != null && !string.IsNullOrEmpty(downImgConfig)) - { - downImgConfig = downImgConfig.ToLower(); - config.DownImageVideoFromEnv = downImgConfig == "1"; - } - return config; + return sqlSugarClient.Queryable().First(); } /// /// 鍒濆鍖栧苟杩斿洖閰嶇疆 /// /// /// - public AppConfig InitConfig(bool downLoadImage) + public AppConfig InitConfig() { var conf = GetConfig(); if (conf != null) { - conf.DownImageVideo = downLoadImage; - sqlSugarClient.Updateable(conf).ExecuteCommand(); return conf; } else @@ -53,14 +43,14 @@ namespace dy.net.service LogKeepDay = 10, UperSaveTogether = false,//鍗氫富瑙嗛锛歵rue-->姣忎釜瑙嗛鍗曠嫭涓涓枃浠跺す false-->鎵鏈夎棰戞斁鍦ㄥ悓涓涓枃浠跺す UperUseViedoTitle = false,//鍗氫富瑙嗛锛歵rue-->浣跨敤瑙嗛鏍囬浣滀负鏂囦欢鍚 false-->浣跨敤瑙嗛id浣滀负鏂囦欢鍚 - DownImageVideo = downLoadImage, + DownImageVideo = false,//榛樿涓嶄笅杞藉浘鏂囪棰 DownMp3 = false, DownImage = false, ImageViedoSaveAlone = true, - FollowedTitleTemplate ="", - FullFollowedTitleTemplate="", - FollowedTitleSeparator="", - AutoDistinct=true,//榛樿寮鍚 + FollowedTitleTemplate = "", + FullFollowedTitleTemplate = "", + FollowedTitleSeparator = "", + AutoDistinct = true//榛樿寮鍚 }; sqlSugarClient.Insertable(config).ExecuteCommand(); return config; diff --git a/utils/SystemStaticUtil.cs b/utils/SystemStaticUtil.cs index 037e0bf..acd21e9 100644 --- a/utils/SystemStaticUtil.cs +++ b/utils/SystemStaticUtil.cs @@ -2,7 +2,7 @@ { public class SystemStaticUtil { - public static string DOWN_IMAGE_VIDEO_ENABLE="DOWN_IMGVIDEO"; + //public static string DOWN_IMAGE_VIDEO_ENABLE="DOWN_IMGVIDEO"; public static string ASPNETCORE_URLS = "ASPNETCORE_URLS";