优化

app/src/main/java/io/legado/app/data/AppDatabase.kt

@@ -20,7 +20,7 @@ val appDb by lazy {
 }
 
 @Database(
-    version = 58,
+    version = 59,
     exportSchema = true,
     entities = [Book::class, BookGroup::class, BookSource::class, BookChapter::class,
         ReplaceRule::class, SearchBook::class, SearchKeyword::class, Cookie::class,
@@ -42,7 +42,8 @@ val appDb by lazy {
         AutoMigration(from = 54, to = 55, spec = DatabaseMigrations.Migration_54_55::class),
         AutoMigration(from = 55, to = 56),
         AutoMigration(from = 56, to = 57),
-        AutoMigration(from = 57, to = 58)
+        AutoMigration(from = 57, to = 58),
+        AutoMigration(from = 58, to = 59)
     ]
 )
 abstract class AppDatabase : RoomDatabase() {

app/src/main/java/io/legado/app/data/entities/RssSource.kt

@@ -2,10 +2,7 @@ package io.legado.app.data.entities
 
 import android.os.Parcelable
 import android.text.TextUtils
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.Index
-import androidx.room.PrimaryKey
+import androidx.room.*
 import com.jayway.jsonpath.DocumentContext
 import io.legado.app.constant.AppPattern
 import io.legado.app.utils.*
@@ -30,41 +27,60 @@ data class RssSource(
     var variableComment: String? = null,
     @ColumnInfo(defaultValue = "0")
     override var enabledCookieJar: Boolean? = false,
-    //并发率
+    /**并发率**/
     override var concurrentRate: String? = null,
-    // 请求头
+    /**请求头**/
     override var header: String? = null,
-    // 登录地址
+    /**登录地址**/
     override var loginUrl: String? = null,
-    //登录UI
+    /**登录Ui**/
     override var loginUi: String? = null,
-    //登录检测js
+    /**登录检测js**/
     var loginCheckJs: String? = null,
-    //封面解密js
+    /**封面解密js**/
     var coverDecodeJs: String? = null,
+    /**分类Url**/
     var sortUrl: String? = null,
+    /**是否单url源**/
     var singleUrl: Boolean = false,
     /*列表规则*/
-    //列表样式,0,1,2
+    /**列表样式,0,1,2**/
+    @ColumnInfo(defaultValue = "0")
     var articleStyle: Int = 0,
+    /**列表规则**/
     var ruleArticles: String? = null,
+    /**下一页规则**/
     var ruleNextPage: String? = null,
+    /**标题规则**/
     var ruleTitle: String? = null,
+    /**发布日期规则**/
     var rulePubDate: String? = null,
     /*webView规则*/
+    /**描述规则**/
     var ruleDescription: String? = null,
+    /**图片规则**/
     var ruleImage: String? = null,
+    /**链接规则**/
     var ruleLink: String? = null,
+    /**正文规则**/
     var ruleContent: String? = null,
+    /**正文url白名单**/
+    var contentWhitelist: String? = null,
+    /**正文url黑名单**/
+    var contentBlacklist: String? = null,
+    /**webView样式**/
     var style: String? = null,
+    @ColumnInfo(defaultValue = "1")
     var enableJs: Boolean = true,
+    @ColumnInfo(defaultValue = "1")
     var loadWithBaseUrl: Boolean = true,
     /**注入js**/
     var injectJs: String? = null,
     /*其它规则*/
-    // 最后更新时间，用于排序
+    /**最后更新时间，用于排序**/
     @ColumnInfo(defaultValue = "0")
     var lastUpdateTime: Long = 0,
+    @ColumnInfo(defaultValue = "0")
     var customOrder: Int = 0
 ) : Parcelable, BaseSource {