Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp

wupengfei

昨天 ce1809bfbe6d29ae1a9e7e0b87d19dc666d3e088

Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp

 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">

 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="设置"

 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,

 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">

 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" />

 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,
}

/** 资源请求方式 */

 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),

 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,
};

 packages/services/apiV2/logRecords.ts

New file
@@ -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(
  // 叠加生成的Param类型 (非body参数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 || {}),
  });
}

 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;
    /** 操作人Id */
    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;
    /** 操作人Id */
    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;
    /** 客户端IP地址 */
    clientIpAddress?: string;
    /** 来源地址 */
    refererUrl?: string;
    /** 控制台日志 */
    consoleLogs?: string;
    /** 耗时毫秒数 */
    elapsedMilliseconds?: number;
    /** 操作人Id */
    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;