From 2a681aed4c274560c04ab3699a4ace88abefcb90 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 08 八月 2025 18:16:21 +0800
Subject: [PATCH] fix: 修改
---
src/services/api/task.ts | 31 +++-
src/services/api/index.ts | 28 ++--
src/utils/storage/auth.ts | 4
.eslintrc-auto-import.json | 1
src/services/api/typings.d.ts | 185 +++++++++++++++++++-----------
src/store/modules/user.ts | 4
auto-imports.d.ts | 3
src/constants/apiEnum.ts | 14 --
src/services/api/auth.ts | 50 +++++++
9 files changed, 203 insertions(+), 117 deletions(-)
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index 0d719be..95d5674 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -39,7 +39,6 @@
"EnumSettlementCycleText": true,
"EnumSmsAccess": true,
"EnumSmsAccessText": true,
- "EnumSmsTemplateType": true,
"EnumTaskCheckReceiveStatus": true,
"EnumTaskCheckReceiveStatusText": true,
"EnumTaskRecommendStatus": true,
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index 5307817..f71f35d 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -239,7 +239,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, 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'
+ 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'
import('./src/constants/apiEnum')
// @ts-ignore
export type { FlexWorkerEleSignEnum, FlexTaskWorkerHireEnum, FlexWorkerEleSignEnum, FlexTaskWorkerHireEnum } from './src/constants/cPerson'
@@ -316,7 +316,6 @@
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 EnumTaskCheckReceiveStatusText: UnwrapRef<typeof import('./src/constants/task')['EnumTaskCheckReceiveStatusText']>
readonly EnumTaskRecommendStatus: UnwrapRef<typeof import('./src/constants/apiEnum')['EnumTaskRecommendStatus']>
diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts
index d4ebf8b..f260f44 100644
--- a/src/constants/apiEnum.ts
+++ b/src/constants/apiEnum.ts
@@ -125,20 +125,6 @@
AliyunSms = 10,
}
-/** 鐭俊妯℃澘绫诲瀷 */
-export enum EnumSmsTemplateType {
- /**鐧诲綍 */
- Login = 0,
- /**娉ㄥ唽 */
- Register = 1,
- /**淇敼瀵嗙爜 */
- UpdatePassword = 2,
- /**缁戝畾鎵嬫満鍙风爜 */
- BindPhoneNumber = 3,
- /**淇敼鎵嬫満鍙风爜 */
- UpdatePhoneNumber = 4,
-}
-
/** 浠诲姟缁撶畻鐘舵�� */
export enum EnumTaskCheckReceiveStatus {
/**寰呴獙鏀� */
diff --git a/src/services/api/auth.ts b/src/services/api/auth.ts
index 00b5ddb..6c5340a 100644
--- a/src/services/api/auth.ts
+++ b/src/services/api/auth.ts
@@ -2,6 +2,21 @@
// @ts-ignore
import { request } from '@/utils/request';
+/** 缁戝畾鎵嬫満鍙� POST /api/user/auth/bindPhoneNumber */
+export async function bindPhoneNumber(
+ body: API.BindPhoneNumberCommand,
+ options?: API.RequestConfig
+) {
+ return request<boolean>('/api/user/auth/bindPhoneNumber', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 鑾峰彇闃块噷浜慜SS鎺堟潈淇℃伅 GET /api/user/auth/getAliyunOSSAcs */
export async function getAliyunOSSAcs(
// 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
@@ -53,7 +68,7 @@
/** 瀵嗙爜鐧诲綍 POST /api/user/auth/passwordLogin */
export async function passwordLogin(body: API.PasswordLoginCommand, options?: API.RequestConfig) {
- return request<API.PasswordLoginCommandCallback>('/api/user/auth/passwordLogin', {
+ return request<API.LoginCommandCallback>('/api/user/auth/passwordLogin', {
method: 'POST',
headers: {
'Content-Type': 'application/json-patch+json',
@@ -63,9 +78,36 @@
});
}
-/** 鍙戦�侀獙璇佺爜 POST /api/user/auth/sendVerifyCode */
-export async function sendVerifyCode(body: API.SendVerifyCodeCommand, options?: API.RequestConfig) {
- return request<string>('/api/user/auth/sendVerifyCode', {
+/** 鍙戦�佺櫥褰曟垨娉ㄥ唽鐭俊 POST /api/user/auth/sendLoginOrRegisterVerifyCode */
+export async function sendLoginOrRegisterVerifyCode(
+ body: API.SendLoginOrRegisterVerifyCodeCommand,
+ options?: API.RequestConfig
+) {
+ return request<string>('/api/user/auth/sendLoginOrRegisterVerifyCode', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
+/** 鐭俊鐧诲綍 POST /api/user/auth/smsLogin */
+export async function smsLogin(body: API.SmsLoginCommand, options?: API.RequestConfig) {
+ return request<API.LoginCommandCallback>('/api/user/auth/smsLogin', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
+/** 寰俊灏忕▼搴忕櫥褰� POST /api/user/auth/wxmpLogin */
+export async function wxmpLogin(body: API.WxmpLoginCommand, options?: API.RequestConfig) {
+ return request<API.LoginCommandCallback>('/api/user/auth/wxmpLogin', {
method: 'POST',
headers: {
'Content-Type': 'application/json-patch+json',
diff --git a/src/services/api/index.ts b/src/services/api/index.ts
index dcda25c..3671cc8 100644
--- a/src/services/api/index.ts
+++ b/src/services/api/index.ts
@@ -2,21 +2,21 @@
/* eslint-disable */
// API 鏇存柊鏃堕棿锛�
// API 鍞竴鏍囪瘑锛�
-import * as dictionary from './dictionary';
-import * as menu from './menu';
-import * as enterprise from './enterprise';
-import * as task from './task';
-import * as auth from './auth';
-import * as user from './user';
-import * as role from './role';
import * as resource from './resource';
+import * as user from './user';
+import * as dictionary from './dictionary';
+import * as auth from './auth';
+import * as task from './task';
+import * as enterprise from './enterprise';
+import * as role from './role';
+import * as menu from './menu';
export default {
- dictionary,
- menu,
- enterprise,
- task,
- auth,
- user,
- role,
resource,
+ user,
+ dictionary,
+ auth,
+ task,
+ enterprise,
+ role,
+ menu,
};
diff --git a/src/services/api/task.ts b/src/services/api/task.ts
index 23c1be7..5dd6235 100644
--- a/src/services/api/task.ts
+++ b/src/services/api/task.ts
@@ -2,6 +2,18 @@
// @ts-ignore
import { request } from '@/utils/request';
+/** 鍒犻櫎浠诲姟 DELETE /api/flexjob/task/deleteTaskInfo */
+export async function deleteTaskInfo(body: API.DeleteTaskInfoCommand, options?: API.RequestConfig) {
+ return request<number>('/api/flexjob/task/deleteTaskInfo', {
+ method: 'DELETE',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 鏌ヨ浠诲姟璇︽儏 GET /api/flexjob/task/getTaskInfo */
export async function getTaskInfo(
// 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
@@ -19,17 +31,14 @@
/** 鏌ヨ浠诲姟鍒嗛〉鍒楄〃 POST /api/flexjob/task/getTaskInfos */
export async function getTaskInfos(body: API.GetTaskInfosQuery, options?: API.RequestConfig) {
- return request<API.PagedListQueryResultGetTaskInfosQueryResultItem>(
- '/api/flexjob/task/getTaskInfos',
- {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json-patch+json',
- },
- data: body,
- ...(options || {}),
- }
- );
+ return request<API.GetTaskInfosQueryResult>('/api/flexjob/task/getTaskInfos', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
}
/** 淇濆瓨浠诲姟 POST /api/flexjob/task/saveTaskInfo */
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index 5324984..17bba27 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -110,6 +110,13 @@
userId?: string;
}
+ interface BindPhoneNumberCommand {
+ /** 鎵嬫満鍙风爜 */
+ phoneNumber?: string;
+ /** 楠岃瘉鐮� */
+ verifyCode?: string;
+ }
+
interface DeleteDictionaryCategoryCommand {
ids: string[];
}
@@ -119,6 +126,10 @@
}
interface DeleteRoleCommand {
+ ids: string[];
+ }
+
+ interface DeleteTaskInfoCommand {
ids: string[];
}
@@ -235,19 +246,6 @@
AliyunSms = 10,
}
- enum EnumSmsTemplateType {
- /**鐧诲綍 */
- Login = 0,
- /**娉ㄥ唽 */
- Register = 1,
- /**淇敼瀵嗙爜 */
- UpdatePassword = 2,
- /**缁戝畾鎵嬫満鍙风爜 */
- BindPhoneNumber = 3,
- /**淇敼鎵嬫満鍙风爜 */
- UpdatePhoneNumber = 4,
- }
-
enum EnumTaskCheckReceiveStatus {
/**寰呴獙鏀� */
Wait = 10,
@@ -304,6 +302,25 @@
Enterprise = 20,
/**杩愯惀 */
Operation = 100,
+ }
+
+ interface FriendlyResultBoolean {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ /** 鏁版嵁 */
+ data?: boolean;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
}
interface FriendlyResultGetAliyunOSSAcsQueryResult {
@@ -422,6 +439,24 @@
/** 閿欒鐮� */
errorCode?: string;
data?: GetTaskInfoQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
+ interface FriendlyResultGetTaskInfosQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetTaskInfosQueryResult;
/** 鎵ц鎴愬姛 */
success?: boolean;
/** 閿欒淇℃伅 */
@@ -621,6 +656,24 @@
timestamp?: number;
}
+ interface FriendlyResultLoginCommandCallback {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: LoginCommandCallback;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultPagedListQueryResultGetDictionaryCategoriesQueryResultItem {
/** 璺熻釜Id */
traceId?: string;
@@ -701,42 +754,6 @@
/** 閿欒鐮� */
errorCode?: string;
data?: PagedListQueryResultGetRolesQueryResultItem;
- /** 鎵ц鎴愬姛 */
- success?: boolean;
- /** 閿欒淇℃伅 */
- msg?: any;
- /** 闄勫姞鏁版嵁 */
- extras?: any;
- /** 鏃堕棿鎴� */
- timestamp?: number;
- }
-
- interface FriendlyResultPagedListQueryResultGetTaskInfosQueryResultItem {
- /** 璺熻釜Id */
- traceId?: string;
- /** 鐘舵�佺爜 */
- code?: number;
- /** 閿欒鐮� */
- errorCode?: string;
- data?: PagedListQueryResultGetTaskInfosQueryResultItem;
- /** 鎵ц鎴愬姛 */
- success?: boolean;
- /** 閿欒淇℃伅 */
- msg?: any;
- /** 闄勫姞鏁版嵁 */
- extras?: any;
- /** 鏃堕棿鎴� */
- timestamp?: number;
- }
-
- interface FriendlyResultPasswordLoginCommandCallback {
- /** 璺熻釜Id */
- traceId?: string;
- /** 鐘舵�佺爜 */
- code?: number;
- /** 閿欒鐮� */
- errorCode?: string;
- data?: PasswordLoginCommandCallback;
/** 鎵ц鎴愬姛 */
success?: boolean;
/** 閿欒淇℃伅 */
@@ -868,6 +885,8 @@
contactEmail?: string;
/** 璐﹀彿 */
userName?: string;
+ /** 鍦ㄦ嫑宀椾綅鏁伴噺 */
+ taskCount?: number;
}
interface GetEnterpriseSmsSettingQueryResult {
@@ -1155,7 +1174,7 @@
/** 浼佷笟Id */
enterpriseId?: string;
/** 浼佷笟鍏ㄧО */
- enterpriseName?: string;
+ enterpriseEnterpriseName?: string;
/** 鍦ㄦ嫑宀椾綅鏁伴噺 */
taskCount?: number;
/** 浠诲姟鍚嶇О */
@@ -1197,12 +1216,16 @@
createdTime?: string;
/** 鏄惁宸叉敹钘� */
isCollected?: boolean;
+ status?: EnumTaskStatus;
+ releaseStatus?: EnumTaskReleaseStatus;
}
interface GetTaskInfoQueryResultBenefit {
/** 绂忓埄缂栧彿 */
benefitCode?: string;
- /** 绂忓埄 */
+ /** 绂忓埄鍥炬爣 */
+ benefitField2?: string;
+ /** 绂忓埄鍚嶇О */
benefitContent?: string;
}
@@ -1217,6 +1240,8 @@
pageModel?: PagedListQueryPageModel;
/** 鍏抽敭瀛楋紙浠诲姟鍚嶇О锛� */
keywords?: string;
+ /** 浼佷笟Id */
+ enterpriseId?: string;
/** 鍙戝竷鏃堕棿-寮�濮� */
beginTime?: string;
/** 鍙戝竷鏃堕棿-缁撴潫 */
@@ -1230,6 +1255,13 @@
status?: EnumTaskStatus;
releaseStatus?: EnumTaskReleaseStatus;
recommendStatus?: EnumTaskRecommendStatus;
+ }
+
+ interface GetTaskInfosQueryResult {
+ pageModel?: PagedListQueryResultPageModel;
+ /** 鏁版嵁 */
+ data?: GetTaskInfosQueryResultItem[];
+ objectData?: GetTaskInfosQueryResultObjectData;
}
interface GetTaskInfosQueryResultItem {
@@ -1279,6 +1311,17 @@
createdTime?: string;
}
+ interface GetTaskInfosQueryResultObjectData {
+ /** 寰呭畨鎺掓暟閲� */
+ waitAssignCount?: number;
+ /** 宸插畨鎺掓暟閲� */
+ completedAssignCount?: number;
+ /** 鍙戝竷涓暟閲� */
+ inProcessReleaseCount?: number;
+ /** 宸插仠姝㈡暟閲� */
+ stoppedReleaseCount?: number;
+ }
+
interface GetUserInfoRolesQueryResultItem {
/** 瑙掕壊Id */
id?: string;
@@ -1291,6 +1334,13 @@
}
type GetUserResumeQueryResult = Record<string, any>;
+
+ interface LoginCommandCallback {
+ /** 鐢ㄦ埛璁块棶浠ょ墝 */
+ accessToken?: string;
+ /** 鍒锋柊浠ょ墝 */
+ refreshToken?: string;
+ }
interface PagedListQueryPageModel {
/** 琛屾暟 */
@@ -1337,12 +1387,6 @@
data?: GetRolesQueryResultItem[];
}
- interface PagedListQueryResultGetTaskInfosQueryResultItem {
- pageModel?: PagedListQueryResultPageModel;
- /** 鏁版嵁 */
- data?: GetTaskInfosQueryResultItem[];
- }
-
interface PagedListQueryResultPageModel {
/** 琛屾暟 */
rows?: number;
@@ -1363,13 +1407,6 @@
password: string;
type?: EnumUserType;
clientType?: EnumClientType;
- }
-
- interface PasswordLoginCommandCallback {
- /** 鐢ㄦ埛璁块棶浠ょ墝 */
- accessToken?: string;
- /** 鍒锋柊浠ょ墝 */
- refreshToken?: string;
}
interface SaveDictionaryCategoryCommand {
@@ -1640,10 +1677,9 @@
data?: any;
}
- interface SendVerifyCodeCommand {
+ interface SendLoginOrRegisterVerifyCodeCommand {
/** 鎵嬫満鍙风爜 */
- phoneNumber?: string;
- templateCode?: EnumSmsTemplateType;
+ phoneNumber: string;
}
interface SetDictionaryDataIsDisabledCommand {
@@ -1720,5 +1756,20 @@
status?: EnumUserStatus;
}
+ interface SmsLoginCommand {
+ /** 鎵嬫満鍙风爜 */
+ phoneNumber?: string;
+ /** 楠岃瘉鐮� */
+ verifyCode?: string;
+ type?: EnumUserType;
+ clientType?: EnumClientType;
+ }
+
type SyncHumanResourcesAreaDictionaryDataCommand = Record<string, any>;
+
+ interface WxmpLoginCommand {
+ /** 鐢ㄦ埛鐧诲綍鍑瘉 */
+ code: string;
+ type?: EnumUserType;
+ }
}
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index bf396f3..c9364bf 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -18,7 +18,7 @@
export interface UserState {
token: string;
- userInfo: API.PasswordLoginCommandCallback;
+ userInfo: API.LoginCommandCallback;
}
function getDefaultState() {
@@ -52,7 +52,7 @@
this.token = token;
setToken(token);
},
- setUserInfo(userInfo: API.PasswordLoginCommandCallback) {
+ setUserInfo(userInfo: API.LoginCommandCallback) {
this.userInfo = userInfo;
setUserInfo(userInfo);
},
diff --git a/src/utils/storage/auth.ts b/src/utils/storage/auth.ts
index b5920be..2ba1a31 100644
--- a/src/utils/storage/auth.ts
+++ b/src/utils/storage/auth.ts
@@ -30,11 +30,11 @@
return storageLocal.removeItem(StorageKey.REFRESH_TOKEN_KEY);
}
-export function getUserInfo(): API.PasswordLoginCommandCallback | null {
+export function getUserInfo(): API.LoginCommandCallback | null {
return storageLocal.getItem(StorageKey.USER_INFO_KEY);
}
-export function setUserInfo(userInfo: API.PasswordLoginCommandCallback) {
+export function setUserInfo(userInfo: API.LoginCommandCallback) {
return storageLocal.setItem(StorageKey.USER_INFO_KEY, userInfo);
}
--
Gitblit v1.9.1