From ce1809bfbe6d29ae1a9e7e0b87d19dc666d3e088 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期二, 19 八月 2025 13:29:57 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp

---
 packages/services/apiV2/index.ts                                    |    2 
 packages/services/apiV2/logRecords.ts                               |   69 +++++++++
 apps/bMiniApp/src/pages/mine/index.vue                              |    4 
 apps/cMiniApp/project.config.json                                   |    4 
 apps/cMiniApp/src/subpackages/curriculum/editMineInfo/InnerPage.vue |    2 
 packages/services/apiV2/typings.d.ts                                |  254 +++++++++++++++++++++++++++++++++++-
 apps/bMiniApp/src/components/Avatar/UserAvatar.vue                  |    2 
 apps/cMiniApp/src/components/Avatar/UserAvatar.vue                  |    2 
 packages/constants/apiEnum.ts                                       |   28 ++-
 packages/hooks/task.ts                                              |   11 +
 10 files changed, 351 insertions(+), 27 deletions(-)

diff --git a/apps/bMiniApp/src/components/Avatar/UserAvatar.vue b/apps/bMiniApp/src/components/Avatar/UserAvatar.vue
index 9ddbe34..460464d 100644
--- a/apps/bMiniApp/src/components/Avatar/UserAvatar.vue
+++ b/apps/bMiniApp/src/components/Avatar/UserAvatar.vue
@@ -1,5 +1,5 @@
 <template>
-  <Avatar :src="userDetail?.avatarUrl"></Avatar>
+  <Avatar :src="userDetail?.avatar"></Avatar>
 </template>
 
 <script setup lang="ts">
diff --git a/apps/bMiniApp/src/pages/mine/index.vue b/apps/bMiniApp/src/pages/mine/index.vue
index 27499bb..0f9af53 100644
--- a/apps/bMiniApp/src/pages/mine/index.vue
+++ b/apps/bMiniApp/src/pages/mine/index.vue
@@ -82,11 +82,11 @@
               text="璐㈠姟绠＄悊"
               @click="goFinance"
             ></TaskDetailWelfareItem>
-            <TaskDetailWelfareItem
+            <!-- <TaskDetailWelfareItem
               :icon="IconRealName"
               text="浼佷笟瀹炲悕"
               @click.stop="goAuthentication"
-            ></TaskDetailWelfareItem>
+            ></TaskDetailWelfareItem> -->
             <TaskDetailWelfareItem
               :icon="IconSetting"
               text="璁剧疆"
diff --git a/apps/cMiniApp/project.config.json b/apps/cMiniApp/project.config.json
index cc53dd5..1d057ff 100644
--- a/apps/cMiniApp/project.config.json
+++ b/apps/cMiniApp/project.config.json
@@ -3,8 +3,8 @@
     "description": "",
     "setting": {
         "urlCheck": false,
-        "es6": false,
-        "enhance": false,
+        "es6": true,
+        "enhance": true,
         "postcss": false,
         "preloadBackgroundData": false,
         "minified": false,
diff --git a/apps/cMiniApp/src/components/Avatar/UserAvatar.vue b/apps/cMiniApp/src/components/Avatar/UserAvatar.vue
index 9ddbe34..460464d 100644
--- a/apps/cMiniApp/src/components/Avatar/UserAvatar.vue
+++ b/apps/cMiniApp/src/components/Avatar/UserAvatar.vue
@@ -1,5 +1,5 @@
 <template>
-  <Avatar :src="userDetail?.avatarUrl"></Avatar>
+  <Avatar :src="userDetail?.avatar"></Avatar>
 </template>
 
 <script setup lang="ts">
diff --git a/apps/cMiniApp/src/subpackages/curriculum/editMineInfo/InnerPage.vue b/apps/cMiniApp/src/subpackages/curriculum/editMineInfo/InnerPage.vue
index 3e5993c..d745d5c 100644
--- a/apps/cMiniApp/src/subpackages/curriculum/editMineInfo/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/curriculum/editMineInfo/InnerPage.vue
@@ -5,7 +5,7 @@
         <Uploader v-model:file-list="form.avatar" :maximum="1" class="bole-uploader"> </Uploader>
       </nut-form-item>
       <nut-form-item label="濮撳悕:" class="bole-form-item" prop="name">
-        <nut-input v-model.trim="form.name" placeholder="璇疯緭鍏ュ鍚�" disabled />
+        <nut-input v-model.trim="form.name" placeholder="璇疯緭鍏ュ鍚�" />
       </nut-form-item>
       <nut-form-item label="鎵嬫満鍙�:" class="bole-form-item" prop="contactPhoneNumber" required>
         <nut-input v-model.trim="form.contactPhoneNumber" placeholder="璇疯緭鍏ユ墜鏈哄彿" type="text" />
diff --git a/packages/constants/apiEnum.ts b/packages/constants/apiEnum.ts
index 7f0b90f..3f6b552 100644
--- a/packages/constants/apiEnum.ts
+++ b/packages/constants/apiEnum.ts
@@ -27,6 +27,16 @@
   HumanResources = 10,
 }
 
+/** 鏁版嵁搴撳璁℃棩蹇楁搷浣� */
+export enum EnumDbAuditOperate {
+  /**娣诲姞 */
+  Added = 10,
+  /**淇敼 */
+  Modified = 20,
+  /**鍒犻櫎 */
+  Deleted = 30,
+}
+
 /** 浼佷笟瀹炲悕鏂瑰紡 */
 export enum EnumEnterpriseRealMethod {
   /**浼佷笟涓夎绱� */
@@ -137,22 +147,24 @@
   FileUtils = 4,
   /**鏂囧瓧璇嗗埆 */
   OcrUtils = 5,
+  /**鏃ュ織璁板綍 */
+  LogRecords = 6,
   /**鐢ㄦ埛璁よ瘉 */
-  Auth = 6,
+  Auth = 7,
   /**鐢ㄦ埛鑿滃崟 */
-  Menu = 7,
+  Menu = 8,
   /**鐢ㄦ埛璧勬簮 */
-  Resource = 8,
+  Resource = 9,
   /**鐢ㄦ埛瑙掕壊 */
-  Role = 9,
+  Role = 10,
   /**鐢ㄦ埛淇℃伅 */
-  User = 10,
+  User = 11,
   /**鐢ㄦ埛绠�鍘� */
-  UserResume = 11,
+  UserResume = 12,
   /**浼佷笟淇℃伅 */
-  Enterprise = 12,
+  Enterprise = 13,
   /**鐏靛伐淇℃伅 */
-  EnterpriseEmployee = 13,
+  EnterpriseEmployee = 14,
 }
 
 /** 璧勬簮璇锋眰鏂瑰紡 */
diff --git a/packages/hooks/task.ts b/packages/hooks/task.ts
index 474681a..8257f5f 100644
--- a/packages/hooks/task.ts
+++ b/packages/hooks/task.ts
@@ -72,10 +72,13 @@
           rows: 20,
           page: pageParam,
           orderInput: [
-            queryState.orderType === HomeOrderType.Recommend
-              ? { property: 'recommendStatus', order: EnumPagedListOrder.Desc }
-              : { property: 'createdTime', order: EnumPagedListOrder.Desc },
-          ],
+            queryState.orderType === HomeOrderType.Recommend && {
+              property: 'recommendStatus',
+              order: EnumPagedListOrder.Desc,
+            },
+            { property: 'createdTime', order: EnumPagedListOrder.Desc },
+            { property: 'releaseStatus', order: EnumPagedListOrder.Asc },
+          ].filter(Boolean),
         },
         keywords: queryState.searchValueTrim,
         cityCode: unref(cityCode),
diff --git a/packages/services/apiV2/index.ts b/packages/services/apiV2/index.ts
index 57f4663..9639827 100644
--- a/packages/services/apiV2/index.ts
+++ b/packages/services/apiV2/index.ts
@@ -15,6 +15,7 @@
 import * as taskCheckReceive from './taskCheckReceive';
 import * as taskUser from './taskUser';
 import * as menu from './menu';
+import * as logRecords from './logRecords';
 import * as fileUtils from './fileUtils';
 export default {
   enterpriseEmployee,
@@ -30,5 +31,6 @@
   taskCheckReceive,
   taskUser,
   menu,
+  logRecords,
   fileUtils,
 };
diff --git a/packages/services/apiV2/logRecords.ts b/packages/services/apiV2/logRecords.ts
new file mode 100644
index 0000000..ed70d74
--- /dev/null
+++ b/packages/services/apiV2/logRecords.ts
@@ -0,0 +1,69 @@
+/* eslint-disable */
+// @ts-ignore
+import { request } from '@/utils/request';
+
+/** 鏌ヨ鏁版嵁搴撳璁℃棩蹇楀垎椤靛垪琛� POST /api/common/logRecords/getDbAuditLogs */
+export async function getDbAuditLogs(body: API.GetDbAuditLogsQuery, options?: API.RequestConfig) {
+  return request<API.GetDbAuditLogsQueryResult>('/api/common/logRecords/getDbAuditLogs', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json-patch+json',
+    },
+    data: body,
+    ...(options || {}),
+  });
+}
+
+/** 寮傚父鏃ュ織鍒嗛〉鍒楄〃鏌ヨ POST /api/common/logRecords/getExceptionLogs */
+export async function getExceptionLogs(
+  body: API.GetExceptionLogsQuery,
+  options?: API.RequestConfig
+) {
+  return request<API.GetExceptionLogsQueryResult>('/api/common/logRecords/getExceptionLogs', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json-patch+json',
+    },
+    data: body,
+    ...(options || {}),
+  });
+}
+
+/** 璧勬簮鏃ュ織鍒嗛〉鍒楄〃鏌ヨ POST /api/common/logRecords/getResourceLogs */
+export async function getResourceLogs(body: API.GetResourceLogsQuery, options?: API.RequestConfig) {
+  return request<API.GetResourceLogsQueryResult>('/api/common/logRecords/getResourceLogs', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json-patch+json',
+    },
+    data: body,
+    ...(options || {}),
+  });
+}
+
+/** 璺熻釜Id鏃ュ織鏌ヨ GET /api/common/logRecords/getTraceIdLog */
+export async function getTraceIdLog(
+  // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+  params: API.APIgetTraceIdLogParams,
+  options?: API.RequestConfig
+) {
+  return request<API.GetTraceIdLogQueryResult>('/api/common/logRecords/getTraceIdLog', {
+    method: 'GET',
+    params: {
+      ...params,
+    },
+    ...(options || {}),
+  });
+}
+
+/** 閲嶆柊鍙戦�佽祫婧� POST /api/common/logRecords/resendResource */
+export async function resendResource(body: API.ResendResourceCommand, options?: API.RequestConfig) {
+  return request<string>('/api/common/logRecords/resendResource', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json-patch+json',
+    },
+    data: body,
+    ...(options || {}),
+  });
+}
diff --git a/packages/services/apiV2/typings.d.ts b/packages/services/apiV2/typings.d.ts
index f2a02ca..090a520 100644
--- a/packages/services/apiV2/typings.d.ts
+++ b/packages/services/apiV2/typings.d.ts
@@ -166,6 +166,11 @@
     userId?: string;
   }
 
+  interface APIgetTraceIdLogParams {
+    /** 璺熻釜Id */
+    traceId?: string;
+  }
+
   interface APIgetUserInfoRolesParams {
     /** 鐢ㄦ埛Id */
     userInfoId?: string;
@@ -342,6 +347,15 @@
     HumanResources = 10,
   }
 
+  enum EnumDbAuditOperate {
+    /**娣诲姞 */
+    Added = 10,
+    /**淇敼 */
+    Modified = 20,
+    /**鍒犻櫎 */
+    Deleted = 30,
+  }
+
   enum EnumEnterpriseRealMethod {
     /**浼佷笟涓夎绱� */
     Identity3 = 10,
@@ -441,22 +455,24 @@
     FileUtils = 4,
     /**鏂囧瓧璇嗗埆 */
     OcrUtils = 5,
+    /**鏃ュ織璁板綍 */
+    LogRecords = 6,
     /**鐢ㄦ埛璁よ瘉 */
-    Auth = 6,
+    Auth = 7,
     /**鐢ㄦ埛鑿滃崟 */
-    Menu = 7,
+    Menu = 8,
     /**鐢ㄦ埛璧勬簮 */
-    Resource = 8,
+    Resource = 9,
     /**鐢ㄦ埛瑙掕壊 */
-    Role = 9,
+    Role = 10,
     /**鐢ㄦ埛淇℃伅 */
-    User = 10,
+    User = 11,
     /**鐢ㄦ埛绠�鍘� */
-    UserResume = 11,
+    UserResume = 12,
     /**浼佷笟淇℃伅 */
-    Enterprise = 12,
+    Enterprise = 13,
     /**鐏靛伐淇℃伅 */
-    EnterpriseEmployee = 13,
+    EnterpriseEmployee = 14,
   }
 
   enum EnumResourceMethod {
@@ -738,6 +754,24 @@
     timestamp?: number;
   }
 
+  interface FriendlyResultGetDbAuditLogsQueryResult {
+    /** 璺熻釜Id */
+    traceId?: string;
+    /** 鐘舵�佺爜 */
+    code?: number;
+    /** 閿欒鐮� */
+    errorCode?: string;
+    data?: GetDbAuditLogsQueryResult;
+    /** 鎵ц鎴愬姛 */
+    success?: boolean;
+    /** 閿欒淇℃伅 */
+    msg?: any;
+    /** 闄勫姞鏁版嵁 */
+    extras?: any;
+    /** 鏃堕棿鎴� */
+    timestamp?: number;
+  }
+
   interface FriendlyResultGetEnterpriseElectronSignSettingQueryResult {
     /** 璺熻釜Id */
     traceId?: string;
@@ -836,6 +870,24 @@
     /** 閿欒鐮� */
     errorCode?: string;
     data?: GetEnterpriseSmsSettingQueryResult;
+    /** 鎵ц鎴愬姛 */
+    success?: boolean;
+    /** 閿欒淇℃伅 */
+    msg?: any;
+    /** 闄勫姞鏁版嵁 */
+    extras?: any;
+    /** 鏃堕棿鎴� */
+    timestamp?: number;
+  }
+
+  interface FriendlyResultGetExceptionLogsQueryResult {
+    /** 璺熻釜Id */
+    traceId?: string;
+    /** 鐘舵�佺爜 */
+    code?: number;
+    /** 閿欒鐮� */
+    errorCode?: string;
+    data?: GetExceptionLogsQueryResult;
     /** 鎵ц鎴愬姛 */
     success?: boolean;
     /** 閿欒淇℃伅 */
@@ -990,6 +1042,24 @@
     timestamp?: number;
   }
 
+  interface FriendlyResultGetResourceLogsQueryResult {
+    /** 璺熻釜Id */
+    traceId?: string;
+    /** 鐘舵�佺爜 */
+    code?: number;
+    /** 閿欒鐮� */
+    errorCode?: string;
+    data?: GetResourceLogsQueryResult;
+    /** 鎵ц鎴愬姛 */
+    success?: boolean;
+    /** 閿欒淇℃伅 */
+    msg?: any;
+    /** 闄勫姞鏁版嵁 */
+    extras?: any;
+    /** 鏃堕棿鎴� */
+    timestamp?: number;
+  }
+
   interface FriendlyResultGetRoleQueryResult {
     /** 璺熻釜Id */
     traceId?: string;
@@ -1088,6 +1158,24 @@
     /** 閿欒鐮� */
     errorCode?: string;
     data?: GetTaskUsersQueryResult;
+    /** 鎵ц鎴愬姛 */
+    success?: boolean;
+    /** 閿欒淇℃伅 */
+    msg?: any;
+    /** 闄勫姞鏁版嵁 */
+    extras?: any;
+    /** 鏃堕棿鎴� */
+    timestamp?: number;
+  }
+
+  interface FriendlyResultGetTraceIdLogQueryResult {
+    /** 璺熻釜Id */
+    traceId?: string;
+    /** 鐘舵�佺爜 */
+    code?: number;
+    /** 閿欒鐮� */
+    errorCode?: string;
+    data?: GetTraceIdLogQueryResult;
     /** 鎵ц鎴愬姛 */
     success?: boolean;
     /** 閿欒淇℃伅 */
@@ -1852,6 +1940,41 @@
 
   type GetCurrentLogierMenusQuery = Record<string, any>;
 
+  interface GetDbAuditLogsQuery {
+    /** 璺熻釜Id */
+    traceId?: string;
+    /** 鍏抽敭瀛� */
+    keywords?: string;
+    /** 鍒涘缓鏃堕棿-璧峰 */
+    createdTimeBegin?: string;
+    /** 鍒涘缓鏃堕棿-鎴 */
+    createdTimeEnd?: string;
+    pageModel?: PagedListQueryPageModel;
+  }
+
+  interface GetDbAuditLogsQueryResult {
+    pageModel?: PagedListQueryResultPageModel;
+    /** 鏁版嵁 */
+    data?: GetDbAuditLogsQueryResultItem[];
+  }
+
+  interface GetDbAuditLogsQueryResultItem {
+    /** 琛ㄥ悕 */
+    tableName?: string;
+    /** 涓婚敭 */
+    primaryKey?: string;
+    operate?: EnumDbAuditOperate;
+    /** 鏃у�� */
+    oldValues?: string;
+    /** 鏂板�� */
+    newValues?: string;
+    /** 鎿嶄綔浜篒d */
+    createdUserId?: string;
+    createdUser?: GetResourceLogsQueryResultItemCreatedUser;
+    /** 鍒涘缓鏃堕棿 */
+    createdTime?: string;
+  }
+
   interface GetDictionaryCategoriesQuery {
     /** 鍏抽敭瀛� */
     keywords?: string;
@@ -2167,6 +2290,40 @@
     industryTypeContent?: string;
     /** 鏄惁宸查厤缃� */
     isConfigured?: boolean;
+  }
+
+  interface GetExceptionLogsQuery {
+    /** 璺熻釜Id */
+    traceId?: string;
+    /** 鍏抽敭瀛� */
+    keywords?: string;
+    /** 鍒涘缓鏃堕棿-璧峰 */
+    createdTimeBegin?: string;
+    /** 鍒涘缓鏃堕棿-鎴 */
+    createdTimeEnd?: string;
+    pageModel?: PagedListQueryPageModel;
+  }
+
+  interface GetExceptionLogsQueryResult {
+    pageModel?: PagedListQueryResultPageModel;
+    /** 鏁版嵁 */
+    data?: GetExceptionLogsQueryResultItem[];
+  }
+
+  interface GetExceptionLogsQueryResultItem {
+    /** 绫诲瀷 */
+    type?: string;
+    /** 浠ｇ爜 */
+    code?: string;
+    /** 娑堟伅 */
+    message?: string;
+    /** 鍫嗘爤璺熻釜 */
+    stackTrace?: string;
+    /** 鎿嶄綔浜篒d */
+    createdUserId?: string;
+    createdUser?: GetResourceLogsQueryResultItemCreatedUser;
+    /** 鍒涘缓鏃堕棿 */
+    createdTime?: string;
   }
 
   interface GetLicenseOcrCommandResult {
@@ -2585,6 +2742,71 @@
     name?: string;
   }
 
+  interface GetResourceLogsQuery {
+    /** 璺熻釜Id */
+    traceId?: string;
+    /** 鍏抽敭瀛� */
+    keywords?: string;
+    /** 鍒涘缓鏃堕棿-璧峰 */
+    createdTimeBegin?: string;
+    /** 鍒涘缓鏃堕棿-鎴 */
+    createdTimeEnd?: string;
+    pageModel?: PagedListQueryPageModel;
+  }
+
+  interface GetResourceLogsQueryResult {
+    pageModel?: PagedListQueryResultPageModel;
+    /** 鏁版嵁 */
+    data?: GetResourceLogsQueryResultItem[];
+  }
+
+  interface GetResourceLogsQueryResultItem {
+    /** Id */
+    id?: string;
+    method?: EnumResourceMethod;
+    /** 鍩熷悕 */
+    domain?: string;
+    /** 鍦板潃 */
+    path?: string;
+    /** 璇锋眰澶� */
+    requestHeaders?: string;
+    /** 璇锋眰鍙傛暟 */
+    request?: string;
+    /** 璇锋眰澶� */
+    responseHeaders?: string;
+    /** 鍝嶅簲缁撴灉 */
+    response?: string;
+    /** 鏄惁鎴愬姛 */
+    isSuccess?: boolean;
+    /** 瀹㈡埛绔疘P鍦板潃 */
+    clientIpAddress?: string;
+    /** 鏉ユ簮鍦板潃 */
+    refererUrl?: string;
+    /** 鎺у埗鍙版棩蹇� */
+    consoleLogs?: string;
+    /** 鑰楁椂姣鏁� */
+    elapsedMilliseconds?: number;
+    /** 鎿嶄綔浜篒d */
+    createdUserId?: string;
+    createdUser?: GetResourceLogsQueryResultItemCreatedUser;
+    /** 鍒涘缓鏃堕棿 */
+    createdTime?: string;
+  }
+
+  interface GetResourceLogsQueryResultItemCreatedUser {
+    /** Id */
+    id?: string;
+    type?: EnumUserType;
+    /** 濮撳悕 */
+    name?: string;
+    /** 鐢ㄦ埛鍚� */
+    userName?: string;
+    /** 浼佷笟Id */
+    enterpriseId?: string;
+    /** 浼佷笟鍏ㄧО */
+    enterpriseName?: string;
+  }
+
   interface GetResourcesQueryResultItem {
     /** Id */
     id?: string;
@@ -2863,6 +3085,8 @@
     checkReceiveStatus?: EnumTaskCheckReceiveStatus;
     settlementStatus?: EnumTaskSettlementStatus;
     recommendStatus?: EnumTaskRecommendStatus;
+    /** 鎺ㄨ崘鏃堕棿 */
+    recommendTime?: string;
     hireStatus?: EnumTaskUserHireStatus;
     /** 鍙戝竷鏃堕棿 */
     createdTime?: string;
@@ -2932,6 +3156,15 @@
     /** 宸ヤ綔缁忛獙 */
     workExperience?: string;
     hireStatus?: EnumTaskUserHireStatus;
+  }
+
+  interface GetTraceIdLogQueryResult {
+    /** 璧勬簮鏃ュ織 */
+    resourceLogs?: GetResourceLogsQueryResultItem[];
+    /** 寮傚父鏃ュ織 */
+    exceptionLogs?: GetExceptionLogsQueryResultItem[];
+    /** 鏁版嵁搴撳璁℃棩蹇� */
+    dbAuditLogs?: GetDbAuditLogsQueryResultItem[];
   }
 
   interface GetUserInfoRolesQueryResultItem {
@@ -3319,6 +3552,11 @@
     verifyCode: string;
   }
 
+  interface ResendResourceCommand {
+    /** 璧勬簮鏃ュ織Id */
+    id?: string;
+  }
+
   interface SaveDictionaryCategoryCommand {
     /** 缂栧彿 */
     code: string;

--
Gitblit v1.9.1