grtsinry43/Tangyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: change mutable properties to immutable in data classes

Browse Source
This commit is contained in:
grtsinry43 2025-10-05 11:42:29 +08:00
parent 586425998d
commit 6d1c03ec85
Signed by: grtsinry43
GPG Key ID: F3305FB3A978C934
14 changed files with 72 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/deploymentTargetSelector.xml generated
View File

@ -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>

1
.idea/gradle.xml generated
View File

@ -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>

12
app/src/main/java/com/qingshuige/tangyuan/model/Category.kt
View File

@ -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
)

14
app/src/main/java/com/qingshuige/tangyuan/model/Comment.kt
View File

@ -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
)

10
app/src/main/java/com/qingshuige/tangyuan/model/CreatPostMetadataDto.kt
View File

@ -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
)

12
app/src/main/java/com/qingshuige/tangyuan/model/CreateCommentDto.kt
View File

@ -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
)

10
app/src/main/java/com/qingshuige/tangyuan/model/CreateUserDto.kt
View File

@ -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
)

4
app/src/main/java/com/qingshuige/tangyuan/model/LoginDto.kt
View File

@ -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
)

14
app/src/main/java/com/qingshuige/tangyuan/model/NewNotification.kt
View File

@ -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
)

16
app/src/main/java/com/qingshuige/tangyuan/model/Notification.kt
View File

@ -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
)

10
app/src/main/java/com/qingshuige/tangyuan/model/PostBody.kt
View File

@ -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
)

16
app/src/main/java/com/qingshuige/tangyuan/model/User.kt
View File

@ -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 = ""
)

0
app/src/main/java/com/qingshuige/tangyuan/navigation/Screens.kt → app/src/main/java/com/qingshuige/tangyuan/navigation/Screen.kt
View File

24
app/src/main/java/com/qingshuige/tangyuan/network/JwtAuthenticator.kt
View File

@ -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")