lkddi/certd
1
0
Fork 0
mirror of https://github.com/certd/certd.git synced 2026-04-23 11:37:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'server_sync' into v2

Browse Source 
# Conflicts:
#	packages/ui/certd-server/.eslintrc.json
#	packages/ui/certd-server/.gitignore
#	packages/ui/certd-server/LICENSE
#	packages/ui/certd-server/README.md
#	packages/ui/certd-server/bootstrap.js
#	packages/ui/certd-server/package.json
#	packages/ui/certd-server/src/basic/base-service.ts
#	packages/ui/certd-server/src/basic/crud-controller.ts
#	packages/ui/certd-server/src/config/config.default.ts
#	packages/ui/certd-server/src/configuration.ts
#	packages/ui/certd-server/src/middleware/authority.ts
#	packages/ui/certd-server/src/middleware/global-exception.ts
#	packages/ui/certd-server/src/middleware/preview.ts
#	packages/ui/certd-server/src/middleware/report.ts
#	packages/ui/certd-server/src/modules/authority/controller/permission-controller.ts
#	packages/ui/certd-server/src/modules/authority/controller/role-controller.ts
#	packages/ui/certd-server/src/modules/authority/controller/user-controller.ts
#	packages/ui/certd-server/src/modules/authority/service/permission-service.ts
#	packages/ui/certd-server/src/modules/authority/service/role-permission-service.ts
#	packages/ui/certd-server/src/modules/authority/service/role-service.ts
#	packages/ui/certd-server/src/modules/authority/service/user-role-service.ts
#	packages/ui/certd-server/src/modules/authority/service/user-service.ts
#	packages/ui/certd-server/src/modules/basic/controller/basic-controller.ts
#	packages/ui/certd-server/src/modules/login/controller/login-controller.ts
#	packages/ui/certd-server/tsconfig.json
This commit is contained in:
xiaojunnuo
2023-01-29 16:06:34 +08:00
parent b15b2edcdf fbde7cbd93
commit 146d106991
17 changed files with 76 additions and 707 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/ui/certd-server/src/basic/base-service.ts
+3 -2
View File
@@ -23,8 +23,9 @@ export abstract class BaseService<T> {
if (!id) {
throw new ValidateException('id不能为空');
}
// @ts-ignore
const info = await this.getRepository().findOne({ where: { id } });
const info = await this.getRepository().findOne({
where:{ id }
});
if (info && infoIgnoreProperty) {
for (const property of infoIgnoreProperty) {
delete info[property];
packages/ui/certd-server/src/basic/crud-controller.ts
+5 -1
View File
@@ -1,7 +1,10 @@
import { ALL, Body, Post, Query } from '@midwayjs/decorator';
import { BaseService } from './base-service';
import { BaseController } from './base-controller';
export abstract class CrudController extends BaseController {
export abstract class CrudController<
T extends BaseService
> extends BaseController {
abstract getService();
@Post('/page')
@@ -62,3 +65,4 @@ export abstract class CrudController extends BaseController {
return this.ok(null);
}
}