From 66d33a33b254d9db7a9dfa7c178d0aeb234f4fb8 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期五, 08 八月 2025 14:13:43 +0800 Subject: [PATCH] fix: 修改 --- src/hooks/dic.ts | 1 .eslintrc-auto-import.json | 1 src/services/api/typings.d.ts | 78 +++++++++++++++++++++---- auto-imports.d.ts | 20 ++++++ src/constants/apiEnum.ts | 14 ++++ src/services/api/auth.ts | 12 ++++ types/api.d.ts | 3 src/services/api/user.ts | 15 +++++ src/utils/request/index.ts | 3 + 9 files changed, 131 insertions(+), 16 deletions(-) diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json index 93803cd..6a32a3b 100644 --- a/.eslintrc-auto-import.json +++ b/.eslintrc-auto-import.json @@ -37,6 +37,7 @@ "EnumSettlementCycleText": true, "EnumSmsAccess": true, "EnumSmsAccessText": true, + "EnumSmsTemplateType": true, "EnumTaskCheckReceiveStatus": true, "EnumTaskRecommendStatus": true, "EnumTaskRecommendStatusText": true, diff --git a/auto-imports.d.ts b/auto-imports.d.ts index 263e64b..6536629 100644 --- a/auto-imports.d.ts +++ b/auto-imports.d.ts @@ -11,6 +11,7 @@ const AreaType: typeof import('./src/constants/enum')['AreaType'] const AuthorizeType: typeof import('./src/constants/enum')['AuthorizeType'] const BooleanOptions: typeof import('./src/constants/enum')['BooleanOptions'] + const CallingConventions: typeof import('./src/constants/apiEnum')['CallingConventions'] const CategoryCode: typeof import('./src/constants/dic')['CategoryCode'] const CertificateTypeCodeEnum: typeof import('./src/constants/dic')['CertificateTypeCodeEnum'] const CertificateTypeEnum: typeof import('./src/constants/dic')['CertificateTypeEnum'] @@ -44,6 +45,7 @@ const EnumSettlementCycleText: typeof import('./src/constants/task')['EnumSettlementCycleText'] const EnumSmsAccess: typeof import('./src/constants/apiEnum')['EnumSmsAccess'] const EnumSmsAccessText: typeof import('./src/constants/enterprise')['EnumSmsAccessText'] + const EnumSmsTemplateType: typeof import('./src/constants/apiEnum')['EnumSmsTemplateType'] const EnumTaskCheckReceiveStatus: typeof import('./src/constants/apiEnum')['EnumTaskCheckReceiveStatus'] const EnumTaskRecommendStatus: typeof import('./src/constants/apiEnum')['EnumTaskRecommendStatus'] const EnumTaskRecommendStatusText: typeof import('./src/constants/task')['EnumTaskRecommendStatusText'] @@ -59,10 +61,12 @@ const EnumUserType: typeof import('./src/constants/apiEnum')['EnumUserType'] const EnumUserTypeText: typeof import('./src/constants/apiEnumText')['EnumUserTypeText'] const EnumWebApiMethod: typeof import('./src/constants/apiEnum')['EnumWebApiMethod'] + const EventAttributes: typeof import('./src/constants/apiEnum')['EventAttributes'] const FastButtonMap: typeof import('./src/constants/module')['FastButtonMap'] const FastColumnList: typeof import('./src/constants/module')['FastColumnList'] const FastDataButtonList: typeof import('./src/constants/module')['FastDataButtonList'] const FastPageButtonList: typeof import('./src/constants/module')['FastPageButtonList'] + const FieldAttributes: typeof import('./src/constants/apiEnum')['FieldAttributes'] const FlexEnterpriseCertificationStatus: typeof import('./src/constants/enterprise')['FlexEnterpriseCertificationStatus'] const FlexEnterpriseCertificationStatusText: typeof import('./src/constants/enterprise')['FlexEnterpriseCertificationStatusText'] const FlexEnterpriseSettingStatus: typeof import('./src/constants/enterprise')['FlexEnterpriseSettingStatus'] @@ -75,12 +79,17 @@ const FlexWorkerEleSignEnumText: typeof import('./src/constants/cPerson')['FlexWorkerEleSignEnumText'] const Gender: typeof import('./src/constants/enum')['Gender'] const GenderText: typeof import('./src/constants/enum')['GenderText'] + const GenericParameterAttributes: typeof import('./src/constants/apiEnum')['GenericParameterAttributes'] const IdentityCodeEnum: typeof import('./src/constants/dic')['IdentityCodeEnum'] const IsConfiguredText: typeof import('./src/constants/enterprise')['IsConfiguredText'] const IsRealText: typeof import('./src/constants/enterprise')['IsRealText'] + const LayoutKind: typeof import('./src/constants/apiEnum')['LayoutKind'] + const MemberTypes: typeof import('./src/constants/apiEnum')['MemberTypes'] const MenuSvgIconMap: typeof import('./src/constants/menu')['MenuSvgIconMap'] const MessageChannelEnum: typeof import('./src/constants/enterprise')['MessageChannelEnum'] const MessageChannelEnumText: typeof import('./src/constants/enterprise')['MessageChannelEnumText'] + const MethodAttributes: typeof import('./src/constants/apiEnum')['MethodAttributes'] + const MethodImplAttributes: typeof import('./src/constants/apiEnum')['MethodImplAttributes'] const ModuleColumns: typeof import('./src/constants/module')['ModuleColumns'] const MyRegExp: typeof import('./src/constants/regExp')['MyRegExp'] const OSSBaseURL: typeof import('./src/constants/oss')['OSSBaseURL'] @@ -96,15 +105,21 @@ const OssRich: typeof import('./src/constants/oss')['OssRich'] const OssUser: typeof import('./src/constants/oss')['OssUser'] const OssUserSign: typeof import('./src/constants/oss')['OssUserSign'] + const ParameterAttributes: typeof import('./src/constants/apiEnum')['ParameterAttributes'] + const PropertyAttributes: typeof import('./src/constants/apiEnum')['PropertyAttributes'] const RoleClientType: typeof import('./src/constants/role')['RoleClientType'] const SearchType: typeof import('./src/constants/dic')['SearchType'] const SearchTypeText: typeof import('./src/constants/dic')['SearchTypeText'] + const SecurityRuleSet: typeof import('./src/constants/apiEnum')['SecurityRuleSet'] const SignChannelEnum: typeof import('./src/constants/enterprise')['SignChannelEnum'] const SignChannelEnumText: typeof import('./src/constants/enterprise')['SignChannelEnumText'] const SubModuleKey: typeof import('./src/constants/module')['SubModuleKey'] const SubModuleTitle: typeof import('./src/constants/module')['SubModuleTitle'] const SubModuleType: typeof import('./src/constants/module')['SubModuleType'] + const TaskCreationOptions: typeof import('./src/constants/apiEnum')['TaskCreationOptions'] + const TaskStatus: typeof import('./src/constants/apiEnum')['TaskStatus'] const ThemeColors: typeof import('./src/constants/theme')['ThemeColors'] + const TypeAttributes: typeof import('./src/constants/apiEnum')['TypeAttributes'] const VerifyStatus: typeof import('./src/constants/enterprise')['VerifyStatus'] const VerifyStatusColor: typeof import('./src/constants/enterprise')['VerifyStatusColor'] const VerifyStatusText: typeof import('./src/constants/enterprise')['VerifyStatusText'] @@ -219,7 +234,7 @@ export type { Component, Slot, Slots, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue' import('vue') // @ts-ignore - export type { EnumBillingMethod, EnumClientType, EnumMenuType, EnumMenuVisitLevel, EnumPagedListOrder, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumUserGender, EnumUserStatus, EnumUserType, EnumBillingMethod, EnumClientType, EnumMenuType, EnumMenuVisitLevel, EnumPagedListOrder, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumUserGender, EnumUserStatus, EnumUserType } from './src/constants/apiEnum' + export type { EnumBillingMethod, EnumClientType, EnumMenuType, EnumMenuVisitLevel, EnumPagedListOrder, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumSmsTemplateType, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumUserGender, EnumUserStatus, EnumUserType, EnumBillingMethod, EnumClientType, EnumMenuType, EnumMenuVisitLevel, EnumPagedListOrder, EnumRealAccess, EnumResourceController, EnumResourceMethod, EnumRoleWebApiDataPower, EnumSettlementCycle, EnumSmsAccess, EnumSmsTemplateType, EnumTaskCheckReceiveStatus, EnumTaskRecommendStatus, EnumTaskReleaseStatus, EnumTaskSettlementStatus, EnumTaskStatus, EnumUserGender, EnumUserStatus, EnumUserType } from './src/constants/apiEnum' import('./src/constants/apiEnum') // @ts-ignore export type { FlexWorkerEleSignEnum, FlexTaskWorkerHireEnum, FlexWorkerEleSignEnum, FlexTaskWorkerHireEnum } from './src/constants/cPerson' @@ -294,6 +309,7 @@ readonly EnumSettlementCycleText: UnwrapRef<typeof import('./src/constants/task')['EnumSettlementCycleText']> readonly EnumSmsAccess: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumSmsAccess']> readonly EnumSmsAccessText: UnwrapRef<typeof import('./src/constants/enterprise')['EnumSmsAccessText']> + readonly EnumSmsTemplateType: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumSmsTemplateType']> readonly EnumTaskCheckReceiveStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskCheckReceiveStatus']> readonly EnumTaskRecommendStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskRecommendStatus']> readonly EnumTaskRecommendStatusText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskRecommendStatusText']> @@ -451,4 +467,4 @@ readonly watchPostEffect: UnwrapRef<typeof import('vue')['watchPostEffect']> readonly watchSyncEffect: UnwrapRef<typeof import('vue')['watchSyncEffect']> } -} +} \ No newline at end of file diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts index f260f44..d4ebf8b 100644 --- a/src/constants/apiEnum.ts +++ b/src/constants/apiEnum.ts @@ -125,6 +125,20 @@ AliyunSms = 10, } +/** 鐭俊妯℃澘绫诲瀷 */ +export enum EnumSmsTemplateType { + /**鐧诲綍 */ + Login = 0, + /**娉ㄥ唽 */ + Register = 1, + /**淇敼瀵嗙爜 */ + UpdatePassword = 2, + /**缁戝畾鎵嬫満鍙风爜 */ + BindPhoneNumber = 3, + /**淇敼鎵嬫満鍙风爜 */ + UpdatePhoneNumber = 4, +} + /** 浠诲姟缁撶畻鐘舵�� */ export enum EnumTaskCheckReceiveStatus { /**寰呴獙鏀� */ diff --git a/src/hooks/dic.ts b/src/hooks/dic.ts index 2eb60c5..87aa23b 100644 --- a/src/hooks/dic.ts +++ b/src/hooks/dic.ts @@ -167,6 +167,7 @@ parentCode: '', areaName: item.label, layer: Number(item.data?.field4), + quickQuery: item.data?.field2, sort: item.data?.sort, id: item.data?.id, } as API.AreaTreeNode; diff --git a/src/services/api/auth.ts b/src/services/api/auth.ts index 543ccd0..00b5ddb 100644 --- a/src/services/api/auth.ts +++ b/src/services/api/auth.ts @@ -62,3 +62,15 @@ ...(options || {}), }); } + +/** 鍙戦�侀獙璇佺爜 POST /api/user/auth/sendVerifyCode */ +export async function sendVerifyCode(body: API.SendVerifyCodeCommand, options?: API.RequestConfig) { + return request<string>('/api/user/auth/sendVerifyCode', { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + }); +} diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts index bbbf1ab..5324984 100644 --- a/src/services/api/typings.d.ts +++ b/src/services/api/typings.d.ts @@ -122,13 +122,6 @@ ids: string[]; } - interface DictionaryDataQueryModel { - /** 缂栧彿 */ - code?: string; - /** 鍚嶇О */ - name?: string; - } - enum EnumBillingMethod { /**鎸夋湀 */ Month = 10, @@ -240,6 +233,19 @@ enum EnumSmsAccess { /**闃块噷浜戠煭淇� */ AliyunSms = 10, + } + + enum EnumSmsTemplateType { + /**鐧诲綍 */ + Login = 0, + /**娉ㄥ唽 */ + Register = 1, + /**淇敼瀵嗙爜 */ + UpdatePassword = 2, + /**缁戝畾鎵嬫満鍙风爜 */ + BindPhoneNumber = 3, + /**淇敼鎵嬫満鍙风爜 */ + UpdatePhoneNumber = 4, } enum EnumTaskCheckReceiveStatus { @@ -1159,26 +1165,30 @@ serviceFee?: number; settlementCycle?: EnumSettlementCycle; /** 绂忓埄 */ - benefits?: DictionaryDataQueryModel[]; + benefits?: GetTaskInfoQueryResultBenefit[]; /** 骞撮緞鑼冨洿鏈�灏� */ ageMinLimit?: number; /** 骞撮緞鑼冨洿澶� */ ageMaxLimit?: number; genderLimit?: EnumUserGender; /** 璧勬牸璇佷功绫诲瀷 */ - credentialLimits?: DictionaryDataQueryModel[]; + credentialLimits?: GetTaskInfoQueryResultCredentialLimit[]; /** 浠诲姟鍦扮偣鎵�灞炵渷浠界紪鍙� */ provinceCode?: string; /** 浠诲姟鍦扮偣鎵�灞炵渷浠� */ - provinceName?: string; + provinceContent?: string; /** 浠诲姟鍦扮偣鎵�灞炲煄甯傜紪鍙� */ cityCode?: string; /** 浠诲姟鍦扮偣鎵�灞炲煄甯� */ - cityName?: string; + cityContent?: string; /** 浠诲姟鍦扮偣鍚嶇О */ addressName?: string; /** 浠诲姟鍦扮偣璇︾粏鍦板潃 */ addressDetail?: string; + /** 缁忓害 */ + longitude?: number; + /** 绾害 */ + latitude?: number; /** 浠诲姟寮�濮嬫椂闂� */ beginTime?: string; /** 浠诲姟缁撴潫鏃堕棿 */ @@ -1189,12 +1199,28 @@ isCollected?: boolean; } + interface GetTaskInfoQueryResultBenefit { + /** 绂忓埄缂栧彿 */ + benefitCode?: string; + /** 绂忓埄 */ + benefitContent?: string; + } + + interface GetTaskInfoQueryResultCredentialLimit { + /** 璇佷功绫诲瀷缂栧彿 */ + typeCode?: string; + /** 璇佷功绫诲瀷 */ + typeContent?: string; + } + interface GetTaskInfosQuery { pageModel?: PagedListQueryPageModel; /** 鍏抽敭瀛楋紙浠诲姟鍚嶇О锛� */ keywords?: string; - /** 鍙戝竷鏃堕棿 */ - time?: string; + /** 鍙戝竷鏃堕棿-寮�濮� */ + beginTime?: string; + /** 鍙戝竷鏃堕棿-缁撴潫 */ + endTime?: string; /** 浠诲姟鍦扮偣鎵�灞炲煄甯傜紪鍙� */ cityCode?: string; settlementCycle?: EnumSettlementCycle; @@ -1217,7 +1243,27 @@ /** 鏈嶅姟璐� */ serviceFee?: number; settlementCycle?: EnumSettlementCycle; + /** 绂忓埄 */ + benefits?: GetTaskInfoQueryResultBenefit[]; genderLimit?: EnumUserGender; + /** 璧勬牸璇佷功绫诲瀷 */ + credentialLimits?: GetTaskInfoQueryResultCredentialLimit[]; + /** 浠诲姟鍦扮偣鎵�灞炵渷浠界紪鍙� */ + provinceCode?: string; + /** 浠诲姟鍦扮偣鎵�灞炵渷浠� */ + provinceContent?: string; + /** 浠诲姟鍦扮偣鎵�灞炲煄甯傜紪鍙� */ + cityCode?: string; + /** 浠诲姟鍦扮偣鎵�灞炲煄甯� */ + cityContent?: string; + /** 浠诲姟鍦扮偣鍚嶇О */ + addressName?: string; + /** 浠诲姟鍦扮偣璇︾粏鍦板潃 */ + addressDetail?: string; + /** 缁忓害 */ + longitude?: number; + /** 绾害 */ + latitude?: number; /** 鎶ュ悕浜烘暟 */ userCount?: number; status?: EnumTaskStatus; @@ -1594,6 +1640,12 @@ data?: any; } + interface SendVerifyCodeCommand { + /** 鎵嬫満鍙风爜 */ + phoneNumber?: string; + templateCode?: EnumSmsTemplateType; + } + interface SetDictionaryDataIsDisabledCommand { ids?: string[]; /** 鏄惁宸茬鐢� */ diff --git a/src/services/api/user.ts b/src/services/api/user.ts index 3d4e6e0..a398d43 100644 --- a/src/services/api/user.ts +++ b/src/services/api/user.ts @@ -35,6 +35,21 @@ }); } +/** 鏌ヨ鐢ㄦ埛绠�鍘� GET /api/user/user/getUserResume */ +export async function getUserResume( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: API.APIgetUserResumeParams, + options?: API.RequestConfig +) { + return request<API.GetUserResumeQueryResult>('/api/user/user/getUserResume', { + method: 'GET', + params: { + ...params, + }, + ...(options || {}), + }); +} + /** 璁剧疆鐢ㄦ埛淇℃伅瑙掕壊 PUT /api/user/user/setUserInfoRoles */ export async function setUserInfoRoles( body: API.SetUserInfoRolesCommand, diff --git a/src/utils/request/index.ts b/src/utils/request/index.ts index e4d4068..e11bb12 100644 --- a/src/utils/request/index.ts +++ b/src/utils/request/index.ts @@ -120,6 +120,9 @@ const errorInfo: ErrorInfo | undefined = (error as any).info; if (errorInfo) { const { errorMessage, errorCode } = errorInfo; + if (Number(errorCode) === 401) { + handleLogout(); + } switch (errorInfo.showType) { case ErrorShowType.SILENT: // do nothing diff --git a/types/api.d.ts b/types/api.d.ts index 85afbfe..c70a034 100644 --- a/types/api.d.ts +++ b/types/api.d.ts @@ -39,7 +39,8 @@ layer?: number; /** 鎺掑簭 */ sort?: number; - id?: string + id?: string; + quickQuery?: string } } -- Gitblit v1.9.1