From 6d1c03ec8506ef6c9f4eb87c9ec5d3c71f511c25 Mon Sep 17 00:00:00 2001
From: grtsinry43 <grtsinry43@outlook.com>
Date: Sun, 5 Oct 2025 11:42:29 +0800
Subject: [PATCH] refactor: change mutable properties to immutable in data
 classes

---
 .idea/deploymentTargetSelector.xml            |  4 ++--
 .idea/gradle.xml                              |  1 +
 .../com/qingshuige/tangyuan/model/Category.kt | 12 ++++------
 .../com/qingshuige/tangyuan/model/Comment.kt  | 14 +++++------
 .../tangyuan/model/CreatPostMetadataDto.kt    | 10 ++++----
 .../tangyuan/model/CreateCommentDto.kt        | 12 +++++-----
 .../tangyuan/model/CreateUserDto.kt           | 10 ++++----
 .../com/qingshuige/tangyuan/model/LoginDto.kt |  4 ++--
 .../tangyuan/model/NewNotification.kt         | 14 +++++------
 .../qingshuige/tangyuan/model/Notification.kt | 16 ++++++-------
 .../com/qingshuige/tangyuan/model/PostBody.kt | 10 ++++----
 .../com/qingshuige/tangyuan/model/User.kt     | 16 ++++++-------
 .../navigation/{Screens.kt => Screen.kt}      |  0
 .../tangyuan/network/JwtAuthenticator.kt      | 24 +++++++++----------
 14 files changed, 72 insertions(+), 75 deletions(-)
 rename app/src/main/java/com/qingshuige/tangyuan/navigation/{Screens.kt => Screen.kt} (100%)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 1bcd215..02a51f8 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-10-04T16:00:07.516752Z">
+        <DropdownSelection timestamp="2025-10-05T02:12:09.761378Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=15947d21" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=6fbe7ac" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 97f0a8e..639c779 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/app/src/main/java/com/qingshuige/tangyuan/model/Category.kt b/app/src/main/java/com/qingshuige/tangyuan/model/Category.kt
index 874bd62..3b7e5fb 100644
--- a/app/src/main/java/com/qingshuige/tangyuan/model/Category.kt
+++ b/app/src/main/java/com/qingshuige/tangyuan/model/Category.kt
@@ -1,11 +1,7 @@
 package com.qingshuige.tangyuan.model
 
 data class Category(
-    var categoryId: Int = 0,
-    var baseName: String? = null,
-    var baseDescription: String? = null
-) {
-    override fun toString(): String {
-        return baseName!!
-    }
-}
+    val categoryId: Int = 0,
+    val baseName: String? = null,
+    val baseDescription: String? = null
+)
diff --git a/app/src/main/java/com/qingshuige/tangyuan/model/Comment.kt b/app/src/main/java/com/qingshuige/tangyuan/model/Comment.kt
index d1c405f..4c3be29 100644
--- a/app/src/main/java/com/qingshuige/tangyuan/model/Comment.kt
+++ b/app/src/main/java/com/qingshuige/tangyuan/model/Comment.kt
@@ -3,11 +3,11 @@ package com.qingshuige.tangyuan.model
 import java.util.Date
 
 data class Comment(
-    var commentId: Int = 0,
-    var parentCommentId: Int = 0,
-    var userId: Int = 0,
-    var postId: Int = 0,
-    var content: String? = null,
-    var imageGuid: String? = null,
-    var commentDateTime: Date? = null
+    val commentId: Int = 0,
+    val parentCommentId: Int = 0,
+    val userId: Int = 0,
+    val postId: Int = 0,
+    val content: String? = null,
+    val imageGuid: String? = null,
+    val commentDateTime: Date? = null
 )
diff --git a/app/src/main/java/com/qingshuige/tangyuan/model/CreatPostMetadataDto.kt b/app/src/main/java/com/qingshuige/tangyuan/model/CreatPostMetadataDto.kt
index abb61b1..83ceea6 100644
--- a/app/src/main/java/com/qingshuige/tangyuan/model/CreatPostMetadataDto.kt
+++ b/app/src/main/java/com/qingshuige/tangyuan/model/CreatPostMetadataDto.kt
@@ -3,9 +3,9 @@ package com.qingshuige.tangyuan.model
 import java.util.Date
 
 data class CreatPostMetadataDto(
-    var isVisible: Boolean = false,
-    var postDateTime: Date? = null,
-    var sectionId: Int = 0,
-    var categoryId: Int = 0,
-    var userId: Int = 0
+    val isVisible: Boolean = false,
+    val postDateTime: Date? = null,
+    val sectionId: Int = 0,
+    val categoryId: Int = 0,
+    val userId: Int = 0
 )
diff --git a/app/src/main/java/com/qingshuige/tangyuan/model/CreateCommentDto.kt b/app/src/main/java/com/qingshuige/tangyuan/model/CreateCommentDto.kt
index 8814ae8..e185f8c 100644
--- a/app/src/main/java/com/qingshuige/tangyuan/model/CreateCommentDto.kt
+++ b/app/src/main/java/com/qingshuige/tangyuan/model/CreateCommentDto.kt
@@ -3,10 +3,10 @@ package com.qingshuige.tangyuan.model
 import java.util.Date
 
 data class CreateCommentDto(
-    var commentDateTime: Date? = null,
-    var content: String? = null,
-    var imageGuid: String? = null,
-    var parentCommentId: Long = 0,
-    var postId: Long = 0,
-    var userId: Long = 0
+    val commentDateTime: Date? = null,
+    val content: String? = null,
+    val imageGuid: String? = null,
+    val parentCommentId: Long = 0,
+    val postId: Long = 0,
+    val userId: Long = 0
 )
diff --git a/app/src/main/java/com/qingshuige/tangyuan/model/CreateUserDto.kt b/app/src/main/java/com/qingshuige/tangyuan/model/CreateUserDto.kt
index b387811..899e6f9 100644
--- a/app/src/main/java/com/qingshuige/tangyuan/model/CreateUserDto.kt
+++ b/app/src/main/java/com/qingshuige/tangyuan/model/CreateUserDto.kt
@@ -1,9 +1,9 @@
 package com.qingshuige.tangyuan.model
 
 data class CreateUserDto(
-    var avatarGuid: String? = null,
-    var isoRegionName: String? = null,
-    var nickName: String? = null,
-    var password: String? = null,
-    var phoneNumber: String? = null
+    val avatarGuid: String? = null,
+    val isoRegionName: String? = null,
+    val nickName: String? = null,
+    val password: String? = null,
+    val phoneNumber: String? = null
 )
diff --git a/app/src/main/java/com/qingshuige/tangyuan/model/LoginDto.kt b/app/src/main/java/com/qingshuige/tangyuan/model/LoginDto.kt
index 1f1dc8c..84760e9 100644
--- a/app/src/main/java/com/qingshuige/tangyuan/model/LoginDto.kt
+++ b/app/src/main/java/com/qingshuige/tangyuan/model/LoginDto.kt
@@ -1,6 +1,6 @@
 package com.qingshuige.tangyuan.model
 
 data class LoginDto(
-    var password: String? = null,
-    var phoneNumber: String? = null
+    val password: String? = null,
+    val phoneNumber: String? = null
 )
diff --git a/app/src/main/java/com/qingshuige/tangyuan/model/NewNotification.kt b/app/src/main/java/com/qingshuige/tangyuan/model/NewNotification.kt
index 5e5758f..4e46eb2 100644
--- a/app/src/main/java/com/qingshuige/tangyuan/model/NewNotification.kt
+++ b/app/src/main/java/com/qingshuige/tangyuan/model/NewNotification.kt
@@ -3,11 +3,11 @@ package com.qingshuige.tangyuan.model
 import java.util.Date
 
 data class NewNotification(
-    var notificationId: Int = 0,
-    var type: String? = null,
-    var targetUserId: Int = 0,
-    var sourceId: Int = 0,
-    var sourceType: String? = null,
-    var isRead: Boolean = false,
-    var createDate: Date? = null
+    val notificationId: Int = 0,
+    val type: String? = null,
+    val targetUserId: Int = 0,
+    val sourceId: Int = 0,
+    val sourceType: String? = null,
+    val isRead: Boolean = false,
+    val createDate: Date? = null
 )
diff --git a/app/src/main/java/com/qingshuige/tangyuan/model/Notification.kt b/app/src/main/java/com/qingshuige/tangyuan/model/Notification.kt
index 0984af4..1cd25c2 100644
--- a/app/src/main/java/com/qingshuige/tangyuan/model/Notification.kt
+++ b/app/src/main/java/com/qingshuige/tangyuan/model/Notification.kt
@@ -3,12 +3,12 @@ package com.qingshuige.tangyuan.model
 import java.util.Date
 
 data class Notification(
-    var notificationId: Int = 0,
-    var targetUserId: Int = 0,
-    var targetPostId: Int = 0,
-    var targetCommentId: Int = 0,
-    var sourceCommentId: Int = 0,
-    var sourceUserId: Int = 0,
-    var isRead: Boolean = false,
-    var notificationDateTime: Date? = null
+    val notificationId: Int = 0,
+    val targetUserId: Int = 0,
+    val targetPostId: Int = 0,
+    val targetCommentId: Int = 0,
+    val sourceCommentId: Int = 0,
+    val sourceUserId: Int = 0,
+    val isRead: Boolean = false,
+    val notificationDateTime: Date? = null
 )
diff --git a/app/src/main/java/com/qingshuige/tangyuan/model/PostBody.kt b/app/src/main/java/com/qingshuige/tangyuan/model/PostBody.kt
index 3986725..600fd60 100644
--- a/app/src/main/java/com/qingshuige/tangyuan/model/PostBody.kt
+++ b/app/src/main/java/com/qingshuige/tangyuan/model/PostBody.kt
@@ -1,9 +1,9 @@
 package com.qingshuige.tangyuan.model
 
 data class PostBody(
-    var postId: Int = 0,
-    var textContent: String? = null,
-    var image1UUID: String? = null,
-    var image2UUID: String? = null,
-    var image3UUID: String? = null
+    val postId: Int = 0,
+    val textContent: String? = null,
+    val image1UUID: String? = null,
+    val image2UUID: String? = null,
+    val image3UUID: String? = null
 )
diff --git a/app/src/main/java/com/qingshuige/tangyuan/model/User.kt b/app/src/main/java/com/qingshuige/tangyuan/model/User.kt
index ec498d6..c4afa4f 100644
--- a/app/src/main/java/com/qingshuige/tangyuan/model/User.kt
+++ b/app/src/main/java/com/qingshuige/tangyuan/model/User.kt
@@ -1,12 +1,12 @@
 package com.qingshuige.tangyuan.model
 
 data class User(
-    var userId: Int = 0,
-    var nickName: String = "",
-    var phoneNumber: String = "",
-    var isoRegionName: String = "",
-    var email: String = "",
-    var bio: String = "",
-    var avatarGuid: String = "",
-    var password: String = ""
+    val userId: Int = 0,
+    val nickName: String = "",
+    val phoneNumber: String = "",
+    val isoRegionName: String = "",
+    val email: String = "",
+    val bio: String = "",
+    val avatarGuid: String = "",
+    val password: String = ""
 )
\ No newline at end of file
diff --git a/app/src/main/java/com/qingshuige/tangyuan/navigation/Screens.kt b/app/src/main/java/com/qingshuige/tangyuan/navigation/Screen.kt
similarity index 100%
rename from app/src/main/java/com/qingshuige/tangyuan/navigation/Screens.kt
rename to app/src/main/java/com/qingshuige/tangyuan/navigation/Screen.kt
diff --git a/app/src/main/java/com/qingshuige/tangyuan/network/JwtAuthenticator.kt b/app/src/main/java/com/qingshuige/tangyuan/network/JwtAuthenticator.kt
index 659186b..50e4183 100644
--- a/app/src/main/java/com/qingshuige/tangyuan/network/JwtAuthenticator.kt
+++ b/app/src/main/java/com/qingshuige/tangyuan/network/JwtAuthenticator.kt
@@ -9,46 +9,46 @@ import java.io.IOException
 
 class JwtAuthenticator(private val tm: TokenManager, private val baseUrl: String) :
     Authenticator {
-    
+
     private val gson = Gson()
     private val mediaType = "application/json; charset=utf-8".toMediaType()
-    
+
     @Throws(IOException::class)
     override fun authenticate(route: Route?, response: Response): Request? {
         // 创建登录请求体
-        val loginDto = LoginDto().apply {
+        val loginDto = LoginDto(
+            password = tm.password,
             phoneNumber = tm.phoneNumber
-            password = tm.password
-        }
-        
+        )
+
         val json = gson.toJson(loginDto)
         val requestBody = json.toRequestBody(mediaType)
-        
+
         // 创建登录请求
         val loginRequest = Request.Builder()
             .url("${baseUrl}auth/login")
             .post(requestBody)
             .build()
-        
+
         // 创建新的 OkHttpClient 用于登录请求（避免递归）
         val client = OkHttpClient.Builder()
             .connectTimeout(30, java.util.concurrent.TimeUnit.SECONDS)
             .readTimeout(30, java.util.concurrent.TimeUnit.SECONDS)
             .build()
-        
+
         return try {
             // 执行登录请求
             val loginResponse = client.newCall(loginRequest).execute()
-            
+
             if (loginResponse.isSuccessful) {
                 val responseBody = loginResponse.body?.string()
                 val tokenResponse = gson.fromJson(responseBody, Map::class.java)
                 val newToken = tokenResponse?.values?.firstOrNull() as? String
-                
+
                 if (newToken != null) {
                     // 更新 token
                     tm.token = newToken
-                    
+
                     // 重试原始请求，添加新的 access token
                     response.request.newBuilder()
                         .header("Authorization", "Bearer $newToken")