From 5638c19434d89a041c0a8a58d7b9b2ec672aa2c2 Mon Sep 17 00:00:00 2001 From: COOL Date: Sat, 8 Feb 2025 15:06:41 +0800 Subject: [PATCH] beta.2 --- core/package.json | 2 +- core/src/exception/base.ts | 9 ++++++++- core/src/exception/comm.ts | 5 +++-- core/src/exception/core.ts | 5 +++-- core/src/exception/validate.ts | 5 +++-- core/src/service/mysql.ts | 6 +++--- core/src/service/postgres.ts | 6 +++--- core/src/service/sqlite.ts | 6 +++--- 8 files changed, 27 insertions(+), 17 deletions(-) diff --git a/core/package.json b/core/package.json index 2954709..5f7144c 100644 --- a/core/package.json +++ b/core/package.json @@ -1,6 +1,6 @@ { "name": "@cool-midway/core", - "version": "8.0.0-beta.1", + "version": "8.0.0-beta.2", "description": "cool-admin midway core", "main": "dist/index.js", "typings": "index.d.ts", diff --git a/core/src/exception/base.ts b/core/src/exception/base.ts index 177b46b..ec23539 100644 --- a/core/src/exception/base.ts +++ b/core/src/exception/base.ts @@ -3,11 +3,18 @@ */ export class BaseException extends Error { status: number; + statusCode: number; - constructor(name: string, code: number, message: string) { + constructor( + name: string, + code: number, + message: string, + statusCode?: number + ) { super(message); this.name = name; this.status = code; + this.statusCode = statusCode; } } diff --git a/core/src/exception/comm.ts b/core/src/exception/comm.ts index d2c9525..83c43b7 100644 --- a/core/src/exception/comm.ts +++ b/core/src/exception/comm.ts @@ -5,12 +5,13 @@ import { BaseException } from './base'; * 通用异常 */ export class CoolCommException extends BaseException { - constructor(message: string) { + constructor(message: string, statusCode?: number) { const { RESCODE, RESMESSAGE } = GlobalConfig.getInstance(); super( 'CoolCommException', RESCODE.COMMFAIL, - message ? message : RESMESSAGE.COMMFAIL + message ? message : RESMESSAGE.COMMFAIL, + statusCode ); } } diff --git a/core/src/exception/core.ts b/core/src/exception/core.ts index 9dc3a7e..a1a6e13 100644 --- a/core/src/exception/core.ts +++ b/core/src/exception/core.ts @@ -5,12 +5,13 @@ import { BaseException } from './base'; * 核心异常 */ export class CoolCoreException extends BaseException { - constructor(message: string) { + constructor(message: string, statusCode?: number) { const { RESCODE, RESMESSAGE } = GlobalConfig.getInstance(); super( 'CoolCoreException', RESCODE.COREFAIL, - message ? message : RESMESSAGE.COREFAIL + message ? message : RESMESSAGE.COREFAIL, + statusCode ); } } diff --git a/core/src/exception/validate.ts b/core/src/exception/validate.ts index da023ca..b1a2400 100644 --- a/core/src/exception/validate.ts +++ b/core/src/exception/validate.ts @@ -5,12 +5,13 @@ import { BaseException } from './base'; * 校验异常 */ export class CoolValidateException extends BaseException { - constructor(message: string) { + constructor(message: string, statusCode?: number) { const { RESCODE, RESMESSAGE } = GlobalConfig.getInstance(); super( 'CoolValidateException', RESCODE.VALIDATEFAIL, - message ? message : RESMESSAGE.VALIDATEFAIL + message ? message : RESMESSAGE.VALIDATEFAIL, + statusCode ); } } diff --git a/core/src/service/mysql.ts b/core/src/service/mysql.ts index 8e2f231..5339c0b 100644 --- a/core/src/service/mysql.ts +++ b/core/src/service/mysql.ts @@ -146,7 +146,7 @@ export abstract class BaseMysqlService { const { size = this._coolConfig.crud.pageSize, page = 1, - order = 'createTime', + order = 'id', sort = 'desc', isExport = false, maxExportLimit, @@ -182,7 +182,7 @@ export abstract class BaseMysqlService { const { size = this._coolConfig.crud.pageSize, page = 1, - order = 'createTime', + order = 'id', sort = 'desc', isExport = false, maxExportLimit, @@ -360,7 +360,7 @@ export abstract class BaseMysqlService { * @param option */ async getOptionFind(query, option: QueryOp) { - let { order = 'createTime', sort = 'desc', keyWord = '' } = query; + let { order = 'id', sort = 'desc', keyWord = '' } = query; const sqlArr = ['SELECT']; const selects = ['a.*']; const find = this.entity.createQueryBuilder('a'); diff --git a/core/src/service/postgres.ts b/core/src/service/postgres.ts index 73c581f..adad641 100644 --- a/core/src/service/postgres.ts +++ b/core/src/service/postgres.ts @@ -175,7 +175,7 @@ export abstract class BasePgService { const { size = this._coolConfig.crud.pageSize, page = 1, - order = 'createTime', + order = 'id', sort = 'desc', isExport = false, maxExportLimit, @@ -233,7 +233,7 @@ export abstract class BasePgService { const { size = this._coolConfig.crud.pageSize, page = 1, - order = 'createTime', + order = 'id', sort = 'desc', isExport = false, maxExportLimit, @@ -416,7 +416,7 @@ export abstract class BasePgService { * @param option */ async getOptionFind(query, option: QueryOp) { - let { order = 'createTime', sort = 'desc', keyWord = '' } = query; + let { order = 'id', sort = 'desc', keyWord = '' } = query; const sqlArr = ['SELECT']; const selects = ['a.*']; const find = this.entity.createQueryBuilder('a'); diff --git a/core/src/service/sqlite.ts b/core/src/service/sqlite.ts index 34aacdd..1eef45a 100644 --- a/core/src/service/sqlite.ts +++ b/core/src/service/sqlite.ts @@ -177,7 +177,7 @@ export abstract class BaseSqliteService { const { size = this._coolConfig.crud.pageSize, page = 1, - order = 'createTime', + order = 'id', sort = 'desc', isExport = false, maxExportLimit, @@ -213,7 +213,7 @@ export abstract class BaseSqliteService { const { size = this._coolConfig.crud.pageSize, page = 1, - order = 'createTime', + order = 'id', sort = 'desc', isExport = false, maxExportLimit, @@ -418,7 +418,7 @@ export abstract class BaseSqliteService { * @param option */ async getOptionFind(query, option: QueryOp) { - let { order = 'createTime', sort = 'desc', keyWord = '' } = query; + let { order = 'id', sort = 'desc', keyWord = '' } = query; const sqlArr = ['SELECT']; const selects = ['a.*']; const find = this.entity.createQueryBuilder('a');