From 88b00f3fc74446a1727c93722c7b64179b45a9db Mon Sep 17 00:00:00 2001
From: zhujie <leon.zhu@cloudroam.com.cn>
Date: 星期五, 18 四月 2025 17:40:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/FirstApp2
---
app/src/main/java/com/example/firstapp/database/service/ApiService.kt | 70 ++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 21 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 1d4be56..eaf21cd 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
@@ -1,19 +1,26 @@
package com.example.firstapp.database.service
import TokenResponse
+import android.content.Context
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.AccountCloseResponse
import com.example.firstapp.database.response.AlipayOrderInfoResponse
import com.example.firstapp.database.response.ContentResponse
import com.example.firstapp.database.response.DictResponse
import com.example.firstapp.database.response.LoginResponse
import com.example.firstapp.database.response.SecurityResponse
import com.example.firstapp.database.response.UserInfo
+import com.example.firstapp.entity.InvitationRecord
+import com.example.firstapp.entity.InvitationRecords
import com.example.firstapp.model.CategoryConfig
import com.example.firstapp.model.CategoryConfigSync
import com.example.firstapp.network.AuthInterceptor
+import com.example.firstapp.network.ResponseInterceptor
+import com.example.firstapp.network.TokenExpiredInterceptor
import okhttp3.MultipartBody
import okhttp3.OkHttpClient
import okhttp3.RequestBody
@@ -36,8 +43,8 @@
@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
@@ -53,50 +60,71 @@
@GET("config-security/enable-list-all")
suspend fun getSecurityList(): SecurityResponse
- @GET("v2/alipay/pay-order-info")
- suspend fun getPayOrderInfo(): AlipayOrderInfoResponse
+ @POST("v2/alipay/pay-order-info")
+ suspend fun getPayOrderInfo(@Body request: ProductOrdersRequest): AlipayOrderInfoResponse
// 获取用户信息
@GET("api/customer/info/{phone}")
suspend fun getUserInfo(@Path("phone") phone: String): ApiResponse<UserInfo>
@Multipart
- @POST("flower/api/supplier/operation/update")
+ @POST("api/supplier/operation/update")
suspend fun updateProfile(
@Part("nickname") nickname: RequestBody,
@Part avatar: MultipartBody.Part?
): ApiResponse<Unit>
+ @POST("api/account/close")
+ suspend fun closeAccount(): AccountCloseResponse
- fun getUserCategories(currentUserId: String): List<CategoryConfig>
+ @GET("api/categoryConfig/getByUserId/{userId}")
+ suspend fun getUserCategories(@Path("userId") currentUserId: String): List<CategoryConfig>
- fun saveUserCategories(categoryConfigSync: CategoryConfigSync)
+ @POST("api/categoryConfig/saveOrUpdate/")
+ suspend fun saveUserCategories(@Body categoryConfigSync: CategoryConfigSync)
+
+ @GET("api/customer/center/invitereward")
+ suspend fun getInvitereward(): ApiResponse<InvitationRecords>
}
// 创建Retrofit实例(单例)
object RetrofitClient{
- private const val BASE_URL ="http://192.168.1.213:8080/flower/"
+ //private const val BASE_URL ="http://192.168.1.127:8080/flower/"
+ private const val BASE_URL ="http://14.103.144.28:8080/flower/"
+
+ private lateinit var appContext: Context
+
+ // 初始化方法，需要在Application中调用
+ fun init(context: Context) {
+ appContext = context.applicationContext
+ }
// 创建OkHttpClient，配置拦截器和超时时间
- private val okHttpClient = OkHttpClient.Builder()
- .addInterceptor(AuthInterceptor())
- .connectTimeout(30, TimeUnit.SECONDS)
- .readTimeout(30, TimeUnit.SECONDS)
- .writeTimeout(30, TimeUnit.SECONDS)
- .build()
+ private val okHttpClient by lazy {
+ OkHttpClient.Builder()
+ .addInterceptor(AuthInterceptor())
+ .addInterceptor(TokenExpiredInterceptor(appContext))
+ .addInterceptor(ResponseInterceptor(appContext))
+ .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()
+ private val retrofit by lazy {
+ Retrofit
+ .Builder()
+ .client(okHttpClient)
+ .baseUrl(BASE_URL)
+ .addConverterFactory(GsonConverterFactory.create())
+ .build()
+ }
//通过动态代理技术创建ApiService接口的具体实现类
- val apiService:ApiService = retrofit.create(ApiService::class.java)
+ val apiService by lazy { retrofit.create(ApiService::class.java) }
}
--
Gitblit v1.9.3