Skip to content

Commit

Permalink
Merge pull request #183 from suyuan32/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
suyuan32 authored Feb 21, 2024
2 parents e58c500 + 64ad577 commit 554cc20
Show file tree
Hide file tree
Showing 464 changed files with 1,353 additions and 1,361 deletions.
2 changes: 1 addition & 1 deletion internal/vite-config/src/config/application.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function defineApplicationConfig(defineOptions: DefineOptions = {}) {
find: 'vue-i18n',
replacement: 'vue-i18n/dist/vue-i18n.cjs.js',
},
// /@/xxxx => src/xxxx
// @/xxxx => src/xxxx
{
find: /\/@\//,
replacement: pathResolve('src') + '/',
Expand Down
2 changes: 1 addition & 1 deletion mock/_util.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Interface data format used to return a unified format
import { ResultEnum } from '/@/enums/httpEnum';
import { ResultEnum } from '@/enums/httpEnum';

export function resultSuccess<T = Recordable>(data: T, { msg = 'ok' } = {}) {
return {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "simple-admin",
"version": "1.3.7",
"version": "1.3.8",
"homepage": "https://github.com/suyuan32/simple-admin-backend-ui",
"bugs": {
"url": "https://github.com/suyuan32/simple-admin-backend-ui/issues"
Expand Down
4 changes: 2 additions & 2 deletions src/api/fms/cloudFile.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { defHttp } from '/@/utils/http/axios';
import { defHttp } from '@/utils/http/axios';
import { ErrorMessageMode, UploadFileParams } from '/#/axios';
import {
BaseDataResp,
BaseListReq,
BaseResp,
BaseUUIDsReq,
BaseUUIDReq,
} from '/@/api/model/baseModel';
} from '@/api/model/baseModel';
import { CloudFileInfo, CloudFileListResp } from './model/cloudFileModel';
import { AxiosProgressEvent } from 'axios';
import { UploadApiResp } from '../sys/model/uploadModel';
Expand Down
4 changes: 2 additions & 2 deletions src/api/fms/cloudFileTag.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { defHttp } from '/@/utils/http/axios';
import { defHttp } from '@/utils/http/axios';
import { ErrorMessageMode } from '/#/axios';
import { BaseDataResp, BaseListReq, BaseResp, BaseIDsReq, BaseIDReq } from '/@/api/model/baseModel';
import { BaseDataResp, BaseListReq, BaseResp, BaseIDsReq, BaseIDReq } from '@/api/model/baseModel';
import { CloudFileTagInfo, CloudFileTagListResp } from './model/cloudFileTagModel';

enum Api {
Expand Down
4 changes: 2 additions & 2 deletions src/api/fms/file.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { UploadApiResp } from '/@/api/sys/model/uploadModel';
import { defHttp } from '/@/utils/http/axios';
import { UploadApiResp } from '@/api/sys/model/uploadModel';
import { defHttp } from '@/utils/http/axios';
import { ErrorMessageMode, UploadFileParams } from '/#/axios';
import { BaseDataResp, BaseListReq, BaseResp, BaseUUIDsReq } from '../model/baseModel';
import { FileListResp, updateFileInfoReq } from './model/fileModel';
Expand Down
4 changes: 2 additions & 2 deletions src/api/fms/fileTag.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { defHttp } from '/@/utils/http/axios';
import { defHttp } from '@/utils/http/axios';
import { ErrorMessageMode } from '/#/axios';
import { BaseDataResp, BaseListReq, BaseResp, BaseIDsReq, BaseIDReq } from '/@/api/model/baseModel';
import { BaseDataResp, BaseListReq, BaseResp, BaseIDsReq, BaseIDReq } from '@/api/model/baseModel';
import { TagInfo, TagListResp } from './model/fileTagModel';

enum Api {
Expand Down
4 changes: 2 additions & 2 deletions src/api/fms/initialize.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defHttp } from '/@/utils/http/axios';
import { BaseResp } from '/@/api/model/baseModel';
import { defHttp } from '@/utils/http/axios';
import { BaseResp } from '@/api/model/baseModel';

enum Api {
InitializeDatabase = '/fms-api/init/database',
Expand Down
2 changes: 1 addition & 1 deletion src/api/fms/model/cloudFileModel.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BaseListResp } from '/@/api/model/baseModel';
import { BaseListResp } from '@/api/model/baseModel';

/**
* @description: CloudFile info response
Expand Down
2 changes: 1 addition & 1 deletion src/api/fms/model/cloudFileTagModel.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BaseListResp } from '/@/api/model/baseModel';
import { BaseListResp } from '@/api/model/baseModel';

/**
* @description: CloudFileTag info response
Expand Down
2 changes: 1 addition & 1 deletion src/api/fms/model/fileTagModel.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BaseListResp } from '/@/api/model/baseModel';
import { BaseListResp } from '@/api/model/baseModel';

/**
* @description: Tag info response
Expand Down
2 changes: 1 addition & 1 deletion src/api/fms/model/storageProviderModel.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BaseListResp } from '/@/api/model/baseModel';
import { BaseListResp } from '@/api/model/baseModel';

/**
* @description: StorageProvider info response
Expand Down
4 changes: 2 additions & 2 deletions src/api/fms/storageProvider.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { defHttp } from '/@/utils/http/axios';
import { defHttp } from '@/utils/http/axios';
import { ErrorMessageMode } from '/#/axios';
import { BaseDataResp, BaseListReq, BaseResp, BaseIDsReq, BaseIDReq } from '/@/api/model/baseModel';
import { BaseDataResp, BaseListReq, BaseResp, BaseIDsReq, BaseIDReq } from '@/api/model/baseModel';
import { StorageProviderInfo, StorageProviderListResp } from './model/storageProviderModel';

enum Api {
Expand Down
4 changes: 2 additions & 2 deletions src/api/mcms/emailLog.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { defHttp } from '/@/utils/http/axios';
import { defHttp } from '@/utils/http/axios';
import { ErrorMessageMode } from '/#/axios';
import {
BaseDataResp,
BaseListReq,
BaseResp,
BaseUUIDsReq,
BaseUUIDReq,
} from '/@/api/model/baseModel';
} from '@/api/model/baseModel';
import { EmailLogInfo, EmailLogListResp } from './model/emailLogModel';

enum Api {
Expand Down
4 changes: 2 additions & 2 deletions src/api/mcms/emailProvider.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { defHttp } from '/@/utils/http/axios';
import { defHttp } from '@/utils/http/axios';
import { ErrorMessageMode } from '/#/axios';
import { BaseDataResp, BaseListReq, BaseResp, BaseIDsReq, BaseIDReq } from '/@/api/model/baseModel';
import { BaseDataResp, BaseListReq, BaseResp, BaseIDsReq, BaseIDReq } from '@/api/model/baseModel';
import { EmailProviderInfo, EmailProviderListResp } from './model/emailProviderModel';

enum Api {
Expand Down
4 changes: 2 additions & 2 deletions src/api/mcms/messageSender.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { defHttp } from '/@/utils/http/axios';
import { defHttp } from '@/utils/http/axios';
import { ErrorMessageMode } from '/#/axios';
import { BaseResp } from '/@/api/model/baseModel';
import { BaseResp } from '@/api/model/baseModel';
import { SendEmailReq, SendSmsReq } from './model/messageModel';

enum Api {
Expand Down
2 changes: 1 addition & 1 deletion src/api/mcms/model/emailLogModel.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BaseListResp } from '/@/api/model/baseModel';
import { BaseListResp } from '@/api/model/baseModel';

/**
* @description: EmailLog info response
Expand Down
2 changes: 1 addition & 1 deletion src/api/mcms/model/emailProviderModel.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BaseListResp } from '/@/api/model/baseModel';
import { BaseListResp } from '@/api/model/baseModel';

/**
* @description: EmailProvider info response
Expand Down
2 changes: 1 addition & 1 deletion src/api/mcms/model/smsLogModel.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BaseListResp } from '/@/api/model/baseModel';
import { BaseListResp } from '@/api/model/baseModel';

/**
* @description: SmsLog info response
Expand Down
2 changes: 1 addition & 1 deletion src/api/mcms/model/smsProviderModel.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BaseListResp } from '/@/api/model/baseModel';
import { BaseListResp } from '@/api/model/baseModel';

/**
* @description: SmsProvider info response
Expand Down
4 changes: 2 additions & 2 deletions src/api/mcms/smsLog.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { defHttp } from '/@/utils/http/axios';
import { defHttp } from '@/utils/http/axios';
import { ErrorMessageMode } from '/#/axios';
import {
BaseDataResp,
BaseListReq,
BaseResp,
BaseUUIDsReq,
BaseUUIDReq,
} from '/@/api/model/baseModel';
} from '@/api/model/baseModel';
import { SmsLogInfo, SmsLogListResp } from './model/smsLogModel';

enum Api {
Expand Down
4 changes: 2 additions & 2 deletions src/api/mcms/smsProvider.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { defHttp } from '/@/utils/http/axios';
import { defHttp } from '@/utils/http/axios';
import { ErrorMessageMode } from '/#/axios';
import { BaseDataResp, BaseListReq, BaseResp, BaseIDsReq, BaseIDReq } from '/@/api/model/baseModel';
import { BaseDataResp, BaseListReq, BaseResp, BaseIDsReq, BaseIDReq } from '@/api/model/baseModel';
import { SmsProviderInfo, SmsProviderListResp } from './model/smsProviderModel';

enum Api {
Expand Down
4 changes: 2 additions & 2 deletions src/api/member/initialize.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defHttp } from '/@/utils/http/axios';
import { BaseResp } from '/@/api/model/baseModel';
import { defHttp } from '@/utils/http/axios';
import { BaseResp } from '@/api/model/baseModel';

enum Api {
InitializeMMSDatabase = '/mms-api/init/database',
Expand Down
4 changes: 2 additions & 2 deletions src/api/member/member.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { defHttp } from '/@/utils/http/axios';
import { defHttp } from '@/utils/http/axios';
import { ErrorMessageMode } from '/#/axios';
import {
BaseDataResp,
BaseListReq,
BaseResp,
BaseUUIDsReq,
BaseUUIDReq,
} from '/@/api/model/baseModel';
} from '@/api/model/baseModel';
import { MemberInfo, MemberListResp } from './model/memberModel';

enum Api {
Expand Down
4 changes: 2 additions & 2 deletions src/api/member/memberRank.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { defHttp } from '/@/utils/http/axios';
import { defHttp } from '@/utils/http/axios';
import { ErrorMessageMode } from '/#/axios';
import { BaseDataResp, BaseListReq, BaseResp, BaseIDsReq, BaseIDReq } from '/@/api/model/baseModel';
import { BaseDataResp, BaseListReq, BaseResp, BaseIDsReq, BaseIDReq } from '@/api/model/baseModel';
import { MemberRankInfo, MemberRankListResp } from '../member/model/memberRankModel';

enum Api {
Expand Down
2 changes: 1 addition & 1 deletion src/api/member/model/memberModel.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BaseListResp } from '/@/api/model/baseModel';
import { BaseListResp } from '@/api/model/baseModel';

/**
* @description: Member info response
Expand Down
2 changes: 1 addition & 1 deletion src/api/member/model/memberRankModel.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BaseListResp } from '/@/api/model/baseModel';
import { BaseListResp } from '@/api/model/baseModel';

/**
* @description: MemberRank info response
Expand Down
4 changes: 2 additions & 2 deletions src/api/member/oauthProvider.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { defHttp } from '/@/utils/http/axios';
import { defHttp } from '@/utils/http/axios';
import { ErrorMessageMode } from '/#/axios';
import { BaseDataResp, BaseListReq, BaseResp, BaseIDsReq, BaseIDReq } from '/@/api/model/baseModel';
import { BaseDataResp, BaseListReq, BaseResp, BaseIDsReq, BaseIDReq } from '@/api/model/baseModel';
import { OauthProviderInfo, OauthProviderListResp } from '../sys/model/oauthProviderModel';

enum Api {
Expand Down
4 changes: 2 additions & 2 deletions src/api/member/token.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { defHttp } from '/@/utils/http/axios';
import { defHttp } from '@/utils/http/axios';
import { ErrorMessageMode } from '/#/axios';
import {
BaseDataResp,
BaseListReq,
BaseResp,
BaseUUIDsReq,
BaseUUIDReq,
} from '/@/api/model/baseModel';
} from '@/api/model/baseModel';
import { TokenInfo, TokenListResp } from '../sys/model/tokenModel';

enum Api {
Expand Down
4 changes: 2 additions & 2 deletions src/api/sys/api.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { defHttp } from '/@/utils/http/axios';
import { defHttp } from '@/utils/http/axios';
import { ErrorMessageMode } from '/#/axios';
import { BaseDataResp, BaseListReq, BaseResp, BaseIDsReq, BaseIDReq } from '/@/api/model/baseModel';
import { BaseDataResp, BaseListReq, BaseResp, BaseIDsReq, BaseIDReq } from '@/api/model/baseModel';
import { ApiInfo, ApiListResp } from './model/apiModel';

enum Api {
Expand Down
4 changes: 2 additions & 2 deletions src/api/sys/authority.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { defHttp } from '/@/utils/http/axios';
import { defHttp } from '@/utils/http/axios';
import { ErrorMessageMode } from '/#/axios';
import { BaseDataResp, BaseIDReq, BaseResp } from '/@/api/model/baseModel';
import { BaseDataResp, BaseIDReq, BaseResp } from '@/api/model/baseModel';
import { ApiListResp } from './model/apiModel';
import {
ApiAuthorityReq,
Expand Down
2 changes: 1 addition & 1 deletion src/api/sys/captcha.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { BaseDataResp } from '../model/baseModel';
import { CaptchaResp, GetEmailCaptchaReq, GetSmsCaptchaReq } from './model/captcha';
import { ErrorMessageMode } from '/#/axios';
import { defHttp } from '/@/utils/http/axios';
import { defHttp } from '@/utils/http/axios';

enum Api {
GetCaptcha = '/sys-api/captcha',
Expand Down
4 changes: 2 additions & 2 deletions src/api/sys/department.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { defHttp } from '/@/utils/http/axios';
import { defHttp } from '@/utils/http/axios';
import { ErrorMessageMode } from '/#/axios';
import { BaseDataResp, BaseListReq, BaseResp, BaseIDsReq, BaseIDReq } from '/@/api/model/baseModel';
import { BaseDataResp, BaseListReq, BaseResp, BaseIDsReq, BaseIDReq } from '@/api/model/baseModel';
import { DepartmentInfo, DepartmentListResp } from './model/departmentModel';

enum Api {
Expand Down
4 changes: 2 additions & 2 deletions src/api/sys/dictionary.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { defHttp } from '/@/utils/http/axios';
import { defHttp } from '@/utils/http/axios';
import { ErrorMessageMode } from '/#/axios';
import { BaseDataResp, BaseListReq, BaseResp, BaseIDsReq, BaseIDReq } from '/@/api/model/baseModel';
import { BaseDataResp, BaseListReq, BaseResp, BaseIDsReq, BaseIDReq } from '@/api/model/baseModel';
import { DictionaryInfo, DictionaryListResp } from './model/dictionaryModel';

enum Api {
Expand Down
4 changes: 2 additions & 2 deletions src/api/sys/dictionaryDetail.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { defHttp } from '/@/utils/http/axios';
import { defHttp } from '@/utils/http/axios';
import { ErrorMessageMode } from '/#/axios';
import { BaseDataResp, BaseListReq, BaseResp, BaseIDsReq, BaseIDReq } from '/@/api/model/baseModel';
import { BaseDataResp, BaseListReq, BaseResp, BaseIDsReq, BaseIDReq } from '@/api/model/baseModel';
import {
DictionaryDetailInfo,
DictionaryDetailListResp,
Expand Down
4 changes: 2 additions & 2 deletions src/api/sys/initialize.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defHttp } from '/@/utils/http/axios';
import { BaseResp } from '/@/api/model/baseModel';
import { defHttp } from '@/utils/http/axios';
import { BaseResp } from '@/api/model/baseModel';

enum Api {
InitializeDatabase = '/sys-api/core/init/database',
Expand Down
4 changes: 2 additions & 2 deletions src/api/sys/menu.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { defHttp } from '/@/utils/http/axios';
import { defHttp } from '@/utils/http/axios';
import { ErrorMessageMode } from '/#/axios';
import { BaseDataResp, BaseResp, BaseIDReq } from '/@/api/model/baseModel';
import { BaseDataResp, BaseResp, BaseIDReq } from '@/api/model/baseModel';
import { MenuInfoPlain, MenuPlainListResp, RoleMenuResp } from './model/menuModel';

enum Api {
Expand Down
2 changes: 1 addition & 1 deletion src/api/sys/model/apiModel.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BaseListResp } from '/@/api/model/baseModel';
import { BaseListResp } from '@/api/model/baseModel';

/**
* @description: Api info response
Expand Down
2 changes: 1 addition & 1 deletion src/api/sys/model/departmentModel.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BaseListResp } from '/@/api/model/baseModel';
import { BaseListResp } from '@/api/model/baseModel';

/**
* @description: Department info response
Expand Down
2 changes: 1 addition & 1 deletion src/api/sys/model/dictionaryDetailModel.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BaseListResp } from '/@/api/model/baseModel';
import { BaseListResp } from '@/api/model/baseModel';

/**
* @description: DictionaryDetail info response
Expand Down
2 changes: 1 addition & 1 deletion src/api/sys/model/dictionaryModel.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BaseListResp } from '/@/api/model/baseModel';
import { BaseListResp } from '@/api/model/baseModel';

/**
* @description: Dictionary info response
Expand Down
2 changes: 1 addition & 1 deletion src/api/sys/model/oauthProviderModel.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BaseDataResp, BaseListResp } from '/@/api/model/baseModel';
import { BaseDataResp, BaseListResp } from '@/api/model/baseModel';

/**
* @description: OauthProvider info response
Expand Down
2 changes: 1 addition & 1 deletion src/api/sys/model/positionModel.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BaseListResp } from '/@/api/model/baseModel';
import { BaseListResp } from '@/api/model/baseModel';

/**
* @description: Position info response
Expand Down
2 changes: 1 addition & 1 deletion src/api/sys/model/roleModel.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BaseListResp } from '/@/api/model/baseModel';
import { BaseListResp } from '@/api/model/baseModel';

/**
* @description: Role info response
Expand Down
2 changes: 1 addition & 1 deletion src/api/sys/model/taskLogModel.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BaseListResp } from '/@/api/model/baseModel';
import { BaseListResp } from '@/api/model/baseModel';

/**
* @description: TaskLog info response
Expand Down
2 changes: 1 addition & 1 deletion src/api/sys/model/taskModel.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BaseListResp } from '/@/api/model/baseModel';
import { BaseListResp } from '@/api/model/baseModel';

/**
* @description: Task info response
Expand Down
2 changes: 1 addition & 1 deletion src/api/sys/model/tokenModel.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BaseListResp } from '/@/api/model/baseModel';
import { BaseListResp } from '@/api/model/baseModel';

/**
* @description: Token info response
Expand Down
2 changes: 1 addition & 1 deletion src/api/sys/model/userModel.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BaseListResp } from '/@/api/model/baseModel';
import { BaseListResp } from '@/api/model/baseModel';

/**
* @description: User info response
Expand Down
Loading

0 comments on commit 554cc20

Please sign in to comment.