From 661a264fef5d1a23ba850c9f65ac79c0127b3d1d Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 01 四月 2025 15:59:10 +0800
Subject: [PATCH] fix : 样式

---
 app/src/main/java/com/example/firstapp/database/service/ApiService.kt |   29 +++++++++++++++++++++++------
 1 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/example/firstapp/database/service/ApiService.kt b/app/src/main/java/com/example/firstapp/database/service/ApiService.kt
index 0e52267..2fbbb90 100644
--- a/app/src/main/java/com/example/firstapp/database/service/ApiService.kt
+++ b/app/src/main/java/com/example/firstapp/database/service/ApiService.kt
@@ -3,6 +3,7 @@
 import TokenResponse
 import com.example.firstapp.database.entity.ApiResponse
 import com.example.firstapp.database.entity.KeywordConfig
+import com.example.firstapp.database.request.ProductOrdersRequest
 import com.example.firstapp.database.request.SmsLoginRequest
 import com.example.firstapp.database.request.SmsSendRequest
 import com.example.firstapp.database.response.AlipayOrderInfoResponse
@@ -13,7 +14,9 @@
 import com.example.firstapp.database.response.UserInfo
 import com.example.firstapp.model.CategoryConfig
 import com.example.firstapp.model.CategoryConfigSync
+import com.example.firstapp.network.AuthInterceptor
 import okhttp3.MultipartBody
+import okhttp3.OkHttpClient
 import okhttp3.RequestBody
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
@@ -24,6 +27,7 @@
 import retrofit2.http.Path
 import retrofit2.http.Query
 import retrofit2.http.Body
+import java.util.concurrent.TimeUnit
 
 /**
  * API调用接口
@@ -33,29 +37,32 @@
     @GET("keywords")
     suspend fun getKeywords():ApiResponse<List<KeywordConfig>>  //异步挂起
 
-    @GET("cloudContent/getByType")
-    suspend fun getContentByType(@Query("type") type: String): ContentResponse
+    @GET("api/config/content/list/view")
+    suspend fun getContentById(@Query("id") id: String): ContentResponse
 
     @GET("sysDict/getByDictCodeAndItemText")
     suspend fun getDictValue(@Query("dictCode") dictCode: String, @Query("itemText") itemText: String): DictResponse
 
+    // 发送短信验证码
     @POST("api/sms/send/code")
     suspend fun sendVerificationCode(@Body request: SmsSendRequest): LoginResponse
 
+    // 验证短信验证码
     @POST("api/login/customer/phone/v2")
     suspend fun verifyCode(@Body request: SmsLoginRequest): TokenResponse
 
     @GET("config-security/enable-list-all")
     suspend fun getSecurityList(): SecurityResponse
 
-    @GET("alipay/pay-order-info")
-    suspend fun getPayOrderInfo(): AlipayOrderInfoResponse
+    @POST("v2/alipay/pay-order-info")
+    suspend fun getPayOrderInfo(@Body request: ProductOrdersRequest): AlipayOrderInfoResponse
 
-    @GET("flower/api/supplier/info/{phone}")
+    // 获取用户信息
+    @GET("api/customer/info/{phone}")
     suspend fun getUserInfo(@Path("phone") phone: String): ApiResponse<UserInfo>
 
     @Multipart
-    @POST("api/supplier/operation/update")
+    @POST("flower/api/supplier/operation/update")
     suspend fun updateProfile(
         @Part("nickname") nickname: RequestBody,
         @Part avatar: MultipartBody.Part?
@@ -73,9 +80,19 @@
 
     private const val BASE_URL ="http://192.168.1.213:8080/flower/"
 
+    // 创建OkHttpClient,配置拦截器和超时时间
+    private val okHttpClient = OkHttpClient.Builder()
+        .addInterceptor(AuthInterceptor())
+        .connectTimeout(30, TimeUnit.SECONDS)
+        .readTimeout(30, TimeUnit.SECONDS)
+        .writeTimeout(30, TimeUnit.SECONDS)
+        .build()
+
+
     //添加Gson解析器,用于自动将JSON响应转换为Kotlin/Java对象
     private val retrofit = Retrofit
         .Builder()
+        .client(okHttpClient)
         .baseUrl(BASE_URL)
         .addConverterFactory(GsonConverterFactory.create())
         .build()

--
Gitblit v1.9.3