u

code/base-project/base-app/src/request/api/auth.ts

@@ -1,28 +1,12 @@
+import type { LoginDefaultParams, LoginDefaultResult, RegisterDefaultParams } from '@/types/auth'
 import alovaInstance from '../index'
 
 const API_PREFIX = '/auth'
 
-interface RegisterDefaultParams {
-  account: string
-  password: string
-}
-
 export function registerDefaultApi(params: RegisterDefaultParams) {
   return alovaInstance.Post<ResponseData<any>>(`${API_PREFIX}/register/default`, params)
 }
 
-interface LoginDefaultParams {
-  account: string
-  password: string
-}
-interface LoginDefaultResult {
-  token: string
-  refreshToken: string
-  userId: number
-  username: string
-  seqNo: number
-  gender: number
-}
 export function loginDefaultApi(params: LoginDefaultParams) {
   return alovaInstance.Post<ResponseData<LoginDefaultResult>>(`${API_PREFIX}/login/default`, params)
 }

code/base-project/base-app/src/request/index.ts

@@ -1,5 +1,6 @@
 import type { Method } from 'alova'
 import type { AxiosError } from 'axios'
+import type { RefreshTokenResult } from '@/types/auth'
 import { axiosRequestAdapter } from '@alova/adapter-axios'
 import { createAlova } from 'alova'
 import { router } from 'expo-router'
@@ -62,11 +63,11 @@ const alovaInstance = createAlova({
           }
 
           // 调用刷新接口
-          const res = await alovaInstance.Get<ResponseData<string>>('/auth/refresh/token', {
+          const res = await alovaInstance.Get<ResponseData<RefreshTokenResult>>('/auth/refreshToken', {
             headers: { refreshToken },
           }).send()
 
-          const newToken = res.data
+          const newToken = res.data.refreshToken
 
           // 更新 store
           useUserStore.getState().setUserInfo({

code/base-project/base-app/src/store/moneyCategory.ts

@@ -44,7 +44,7 @@ export const useMoneyCategoryStore = create<MoneyCategoryStore>()(
         try {
           const res = await queryMoneyCategoryApi()
           if (res.isSuccess) {
-            set({ categories: res.data || [] })
+            set({ categories: res.data.categories || [] })
           }
         }
         catch (e) {

code/base-project/base-app/src/types/auth.ts

@@ -0,0 +1,22 @@
+export interface RefreshTokenResult {
+  refreshToken: string
+}
+
+export interface RegisterDefaultParams {
+  account: string
+  password: string
+}
+
+export interface LoginDefaultParams {
+  account: string
+  password: string
+}
+
+export interface LoginDefaultResult {
+  token: string
+  refreshToken: string
+  userId: number
+  username: string
+  seqNo: number
+  gender: number
+}

code/base-project/base-app/src/types/money/category.ts

@@ -8,11 +8,13 @@ export interface MoneyCategoryBase {
 }
 
 // 查询
-export interface MoneyCategoryItem extends MoneyCategoryBase {
+export interface MoneyCategoryItem extends Omit<MoneyCategoryBase, 'user_id'> {
 
 }
 
-export type QueryMoneyCategoryResult = MoneyCategoryBase[]
+export interface QueryMoneyCategoryResult {
+  categories: MoneyCategoryItem[]
+}
 
 export interface DeleteMoneyCategoryParams {
   id: number