diff --git a/Program.cs b/Program.cs index 41167a1..f40c8da 100644 --- a/Program.cs +++ b/Program.cs @@ -17,7 +17,7 @@ namespace dy.net public class Program { // 常量定义 - private static string DefaultListenUrl = "http://*:10102"; + private static string DefaultListenUrl = "http://*:10101"; private const string SpaRootPath = "app/dist"; private const string SpaSourcePath = "app/"; private const string SwaggerDocTitle = "dy.net WebApi Docs"; @@ -33,14 +33,13 @@ namespace dy.net // 构建Web应用 var builder = WebApplication.CreateBuilder(args); //from docker yaml file 环境变量 或者 dockerfile 或appsettings.json - DefaultListenUrl = builder.Configuration.GetValue("ASPNETCORE_URLS") ?? DefaultListenUrl; - var downImgConfig = builder.Configuration.GetValue("DOWN_IMGVIDEO"); + DefaultListenUrl = builder.Configuration.GetValue(SystemStaticUtil.ASPNETCORE_URLS) ?? DefaultListenUrl; + var downImgConfig = builder.Configuration.GetValue(SystemStaticUtil.DOWN_IMAGE_VIDEO_ENABLE); - Console.WriteLine("DOWN_IMGVIDEO=" + downImgConfig); + //Console.WriteLine("DOWN_IMGVIDEO=" + downImgConfig); if (!string.IsNullOrEmpty(downImgConfig)) { - downImgConfig = downImgConfig.ToLower(); - downImageVideo = downImgConfig == "1" || downImgConfig == "y"||downImgConfig=="t"||downImgConfig=="true"; + downImageVideo = downImgConfig.ToLower() == "1" ; } var isDevelopment = builder.Environment.IsDevelopment(); @@ -196,7 +195,7 @@ namespace dy.net var commonService = services.GetRequiredService(); var config = commonService.InitConfig(downImageVideo); - // 更新收藏视频类型--兼容老版本-原来的旧数据没有这个类型字段 + // 更新视频类型--兼容老版本 commonService.UpdateCollectViedoType(); // 重置博主作品同步状态为未同步 commonService.UpdateAllCookieSyncedToZero(); @@ -204,13 +203,12 @@ namespace dy.net var quartzJobService = services.GetRequiredService(); quartzJobService.StartJob(config?.Cron ?? "30"); - Serilog.Log.Debug("系统初始化完成,会默认将-博主作品同步功能-同步全部作品重置为关闭(若要开启,可以到抖音授权页面中修改)"); - Serilog.Log.Debug($"默认设置的每次读取行数为:{config.BatchCount},可前往系统配置页修改"); + Serilog.Log.Debug("系统初始化,默认将-博主作品-同步全部-配置为关闭,可到授权页面中调整(不建议开启全量同步)"); + Serilog.Log.Debug($"默认每次读取行数为:{config.BatchCount},可前往系统配置修改"); } catch (Exception ex) { - var logger = services.GetRequiredService>(); - logger.LogError(ex, "Failed to initialize services on startup"); + Serilog.Log.Error(ex, "Failed to initialize services on startup"); } } diff --git a/Properties/launchSettings.json b/Properties/launchSettings.json index a492985..d6a40e5 100644 --- a/Properties/launchSettings.json +++ b/Properties/launchSettings.json @@ -8,7 +8,7 @@ "ASPNETCORE_ENVIRONMENT": "Development" }, "dotnetRunMessages": true, - "applicationUrl": "http://localhost:5193" + "applicationUrl": "http://localhost:10101" }, "IIS Express": { "commandName": "IISExpress", diff --git a/app/dist.zip b/app/dist.zip deleted file mode 100644 index c96951f..0000000 Binary files a/app/dist.zip and /dev/null differ diff --git a/app/index.html b/app/index.html index 5a5af33..09a383c 100644 --- a/app/index.html +++ b/app/index.html @@ -5,7 +5,7 @@ - 鎶栭煶鍚屾灏忓府鎵 + 鎶栧皬浜 diff --git a/app/src/App.vue b/app/src/App.vue index 51686fe..be407d4 100644 --- a/app/src/App.vue +++ b/app/src/App.vue @@ -1,6 +1,6 @@ @@ -28,7 +28,7 @@ import avatar from '@/assets/avatar.png'; import { PageFooter, HeaderActions } from '@/components/layout'; import Setting from './components/setting'; import { LoginModal } from '@/pages/login'; -import { MyPersonal, EmailSet } from '@/pages/personal'; +import { MyPersonal } from '@/pages/personal'; import { configTheme, themeList } from '@/theme'; import { ThemeProvider } from 'stepin'; // logout,profile @@ -124,7 +124,8 @@ onMounted(() => { background: theme('backgroundColor.layout'); } .system-name { - // color: #16213e !important; + color: #722ed1 !important; + margin-left: 0em !important; } } diff --git a/app/src/assets/gitee.svg b/app/src/assets/gitee.svg new file mode 100644 index 0000000..8d634c2 --- /dev/null +++ b/app/src/assets/gitee.svg @@ -0,0 +1,15 @@ + + + logo-black + Created with Sketch. + + \ No newline at end of file diff --git a/app/src/components/layout/FrontView copy.vue b/app/src/components/layout/FrontView copy.vue index 7ce8aa3..f1ef6e1 100644 --- a/app/src/components/layout/FrontView copy.vue +++ b/app/src/components/layout/FrontView copy.vue @@ -49,13 +49,13 @@ const navList = [ ];