关注博主列表同步bug修复

model/dto/DouyinCookieStopDto.cs

@@ -13,6 +13,6 @@
 
         public bool Sync { get; set; }
 
-        public string Folder { get; set; }
+        public string SaveFolder { get; set; }
     }
 }

model/dto/VideoTypeEnum.cs

@@ -7,38 +7,38 @@ namespace dy.net.model.dto
         /// <summary>
         ///喜欢的
         /// </summary>
-        [Description("喜欢的")]
+        //[Description("喜欢的")]
         dy_favorite = 1,
         /// <summary>
         ///收藏的
         /// </summary>
-        [Description("收藏的")]
+        //[Description("收藏的")]
         dy_collects = 2,
         /// <summary>
         /// 关注的
         /// </summary>
-        [Description("关注的")]
+        //[Description("关注的")]
         dy_follows = 3,
         /// <summary>
         ///  图文视频，无用了，但是不能删...
         /// </summary>
-        [Description("图片视频")]
+        //[Description("图片视频")]
         ImageVideo = 4,
 
         /// <summary>
         /// 自定义收藏夹
         /// </summary>
-        [Description("收藏短剧")]
+        //[Description("收藏短剧")]
         dy_custom_collect = 5,
         /// <summary>
         /// 收藏合集
         /// </summary>
-        [Description("收藏合集")]
+        //[Description("收藏合集")]
         dy_mix = 6,
         /// <summary>
         /// 收藏短剧
         /// </summary>
-        [Description("收藏短剧")]
+        //[Description("收藏短剧")]
         dy_series = 7,
 
     }

model/entity/AppConfig.cs

@@ -100,6 +100,17 @@ namespace dy.net.model.entity
         /// 保留原动态视频文件
         /// </summary>
         public bool KeepDynamicVideo { get; set; }
+
+        /// <summary>
+        /// 合集路径
+        /// </summary>
+        [SugarColumn(Length = 500, IsNullable = true)]
+        public string MixPath { get; set; }
+        /// <summary>
+        /// 短剧路径
+        /// </summary>
+        [SugarColumn(Length = 500, IsNullable = true)]
+        public string SeriesPath { get; set; }
     }
 
 }

model/entity/DouyinCookie.cs

@@ -75,9 +75,14 @@ namespace dy.net.model.entity
         /// 如果是0，则同步时会获取全部数据；如果是1，则同步时只获取最新的数据（也就是只查一次）
         /// 接口可以将该值改为0，下次开始同步就会重新获取全部数据
         /// </summary>
-        //public int CollHasSyncd { get; set; }
-        //public int FavHasSyncd { get; set; }
-        //public int UperSyncd { get; set; }
+        [SugarColumn(IsNullable = true)]
+        public int CollHasSyncd { get; set; }
+
+        [SugarColumn(IsNullable = true)]
+        public int FavHasSyncd { get; set; }
+
+        [SugarColumn(IsNullable = true)]
+        public int UperSyncd { get; set; }
         /// <summary>
         /// 关注的用户sec_user_id列表 json字符串存储
         /// </summary>
@@ -116,16 +121,16 @@ namespace dy.net.model.entity
         [SugarColumn(Length = 100, IsNullable = true, ColumnName = "useSinglePath")]
         public bool UseSinglePath { get; set; } = true;//默认true
 
-        ///// <summary>
-        ///// 合集存储路径
-        ///// </summary>
-        //[SugarColumn(Length = 500, IsNullable = true)]
-        //public string MixPath { get; set; }
+        /// <summary>
+        /// 合集存储路径
+        /// </summary>
+        [SugarColumn(Length = 500, IsNullable = true)]
+        public string MixPath { get; set; }
 
-        ///// <summary>
-        ///// 短剧存储路径
-        ///// </summary>
-        //[SugarColumn(Length = 500, IsNullable = true)]
-        //public string SeriesPath { get; set; }
+        /// <summary>
+        /// 短剧存储路径
+        /// </summary>
+        [SugarColumn(Length = 500, IsNullable = true)]
+        public string SeriesPath { get; set; }
     }
 }

model/entity/DouyinVideo.cs

@@ -1,5 +1,6 @@
 using dy.net.extension;
 using dy.net.model.dto;
+using dy.net.utils;
 using SqlSugar;
 
 namespace dy.net.model.entity
@@ -145,7 +146,7 @@ namespace dy.net.model.entity
         public int IsMergeVideo { get; set; }
 
         [SugarColumn(IsIgnore = true)]
-        public string ViedoTypeStr  => ViedoType.GetDescription();
+        public string ViedoTypeStr  => ViedoType.GetDesc();
 
         [SugarColumn(IsIgnore = true)]
         public string ViedoCate =>(string.IsNullOrWhiteSpace(Tag1) ? "" : Tag1) + "/" + (string.IsNullOrWhiteSpace(Tag2) ? "" : Tag2);