create-dp-koa 1.1.2 → 1.1.4

package/template/src/migrations/1700000000000-InitialDatabaseStructure.ts

@@ -1,172 +0,0 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
-
-/**
- * 初始数据库结构迁移
- * 创建所有基础表结构
- */
-export class InitialDatabaseStructure1700000000000 implements MigrationInterface {
-    name = 'InitialDatabaseStructure1700000000000';
-
-    public async up(queryRunner: QueryRunner): Promise<void> {
-        // 创建用户表
-        await queryRunner.query(`
-            CREATE TABLE \`yt_user\` (
-                \`id\` int NOT NULL AUTO_INCREMENT,
-                \`nickName\` varchar(255) NOT NULL DEFAULT '',
-                \`telnumber\` varchar(255) NOT NULL DEFAULT '',
-                \`email\` varchar(255) NOT NULL DEFAULT '',
-                \`password\` varchar(255) NOT NULL DEFAULT '',
-                \`userType\` varchar(50) NOT NULL DEFAULT 'CUSTOMER',
-                \`gender\` int NOT NULL DEFAULT '0',
-                \`age\` int NOT NULL DEFAULT '0',
-                \`constellation\` varchar(255) NOT NULL DEFAULT '',
-                \`avatar\` varchar(255) NOT NULL DEFAULT '',
-                \`status\` varchar(50) NOT NULL DEFAULT 'normal',
-                \`updateDate\` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6),
-                \`createDate\` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6),
-                PRIMARY KEY (\`id\`),
-                UNIQUE KEY \`IDX_yt_user_email\` (\`email\`),
-                UNIQUE KEY \`IDX_yt_user_telnumber\` (\`telnumber\`),
-                KEY \`IDX_yt_user_status\` (\`status\`),
-                KEY \`IDX_yt_user_userType\` (\`userType\`)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
-        `);
-
-        // 创建店铺表
-        await queryRunner.query(`
-            CREATE TABLE \`shop\` (
-                \`id\` int NOT NULL AUTO_INCREMENT,
-                \`name\` varchar(255) NOT NULL DEFAULT '',
-                \`description\` varchar(255) NOT NULL DEFAULT '',
-                \`status\` varchar(50) NOT NULL DEFAULT 'NORMAL',
-                \`updateDate\` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6),
-                \`createDate\` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6),
-                PRIMARY KEY (\`id\`),
-                KEY \`IDX_shop_status\` (\`status\`)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
-        `);
-
-        // 创建店铺用户关联表
-        await queryRunner.query(`
-            CREATE TABLE \`shop_and_user\` (
-                \`id\` int NOT NULL AUTO_INCREMENT,
-                \`shopId\` int NOT NULL DEFAULT '0',
-                \`userId\` int NOT NULL DEFAULT '0',
-                \`updateDate\` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6),
-                \`createDate\` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6),
-                PRIMARY KEY (\`id\`),
-                UNIQUE KEY \`IDX_shop_and_user_shopId\` (\`shopId\`),
-                UNIQUE KEY \`IDX_shop_and_user_userId\` (\`userId\`),
-                KEY \`IDX_shop_and_user_shopId_userId\` (\`shopId\`, \`userId\`)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
-        `);
-
-        // 创建商品表
-        await queryRunner.query(`
-            CREATE TABLE \`yt_goods\` (
-                \`id\` int NOT NULL AUTO_INCREMENT,
-                \`name\` varchar(255) NOT NULL DEFAULT '',
-                \`shopId\` int NOT NULL DEFAULT '0',
-                \`albums\` text NOT NULL,
-                \`price\` decimal(10,2) NOT NULL DEFAULT '0.00',
-                \`tags\` text NOT NULL,
-                \`description\` varchar(255) NOT NULL DEFAULT '',
-                \`content\` text NOT NULL,
-                \`imagesContent\` text NOT NULL,
-                \`status\` varchar(50) NOT NULL DEFAULT 'NORMAL',
-                \`updateDate\` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6),
-                \`createDate\` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6),
-                PRIMARY KEY (\`id\`),
-                KEY \`IDX_yt_goods_name\` (\`name\`),
-                KEY \`IDX_yt_goods_shopId\` (\`shopId\`),
-                KEY \`IDX_yt_goods_status\` (\`status\`)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
-        `);
-
-        // 创建商品解锁记录表
-        await queryRunner.query(`
-            CREATE TABLE \`yt_goods_unlock\` (
-                \`id\` int NOT NULL AUTO_INCREMENT,
-                \`goodsId\` int NOT NULL DEFAULT '0',
-                \`ytUserId\` int NOT NULL DEFAULT '0',
-                \`updateDate\` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6),
-                \`createDate\` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6),
-                PRIMARY KEY (\`id\`),
-                KEY \`IDX_yt_goods_unlock_goodsId\` (\`goodsId\`),
-                KEY \`IDX_yt_goods_unlock_ytUserId\` (\`ytUserId\`),
-                UNIQUE KEY \`IDX_yt_goods_unlock_goods_user\` (\`goodsId\`, \`ytUserId\`)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
-        `);
-
-        // 创建商品图片解锁密钥表
-        await queryRunner.query(`
-            CREATE TABLE \`goods_images_unlock_key\` (
-                \`id\` int NOT NULL AUTO_INCREMENT,
-                \`key\` varchar(255) NOT NULL DEFAULT '',
-                \`goodsId\` int NOT NULL DEFAULT '0',
-                \`isUse\` tinyint(1) NOT NULL DEFAULT '0',
-                \`updateDate\` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6),
-                \`createDate\` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6),
-                PRIMARY KEY (\`id\`),
-                UNIQUE KEY \`IDX_goods_images_unlock_key_key\` (\`key\`),
-                KEY \`IDX_goods_images_unlock_key_goodsId\` (\`goodsId\`),
-                KEY \`IDX_goods_images_unlock_key_isUse\` (\`isUse\`)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
-        `);
-
-        // 添加外键约束
-        await queryRunner.query(`
-            ALTER TABLE \`shop_and_user\` 
-            ADD CONSTRAINT \`FK_shop_and_user_shopId\` 
-            FOREIGN KEY (\`shopId\`) REFERENCES \`shop\`(\`id\`) ON DELETE CASCADE ON UPDATE CASCADE
-        `);
-
-        await queryRunner.query(`
-            ALTER TABLE \`shop_and_user\` 
-            ADD CONSTRAINT \`FK_shop_and_user_userId\` 
-            FOREIGN KEY (\`userId\`) REFERENCES \`yt_user\`(\`id\`) ON DELETE CASCADE ON UPDATE CASCADE
-        `);
-
-        await queryRunner.query(`
-            ALTER TABLE \`yt_goods\` 
-            ADD CONSTRAINT \`FK_yt_goods_shopId\` 
-            FOREIGN KEY (\`shopId\`) REFERENCES \`shop\`(\`id\`) ON DELETE CASCADE ON UPDATE CASCADE
-        `);
-
-        await queryRunner.query(`
-            ALTER TABLE \`yt_goods_unlock\` 
-            ADD CONSTRAINT \`FK_yt_goods_unlock_goodsId\` 
-            FOREIGN KEY (\`goodsId\`) REFERENCES \`yt_goods\`(\`id\`) ON DELETE CASCADE ON UPDATE CASCADE
-        `);
-
-        await queryRunner.query(`
-            ALTER TABLE \`yt_goods_unlock\` 
-            ADD CONSTRAINT \`FK_yt_goods_unlock_ytUserId\` 
-            FOREIGN KEY (\`ytUserId\`) REFERENCES \`yt_user\`(\`id\`) ON DELETE CASCADE ON UPDATE CASCADE
-        `);
-
-        await queryRunner.query(`
-            ALTER TABLE \`goods_images_unlock_key\` 
-            ADD CONSTRAINT \`FK_goods_images_unlock_key_goodsId\` 
-            FOREIGN KEY (\`goodsId\`) REFERENCES \`yt_goods\`(\`id\`) ON DELETE CASCADE ON UPDATE CASCADE
-        `);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<void> {
-        // 删除外键约束
-        await queryRunner.query(`ALTER TABLE \`goods_images_unlock_key\` DROP FOREIGN KEY \`FK_goods_images_unlock_key_goodsId\``);
-        await queryRunner.query(`ALTER TABLE \`yt_goods_unlock\` DROP FOREIGN KEY \`FK_yt_goods_unlock_ytUserId\``);
-        await queryRunner.query(`ALTER TABLE \`yt_goods_unlock\` DROP FOREIGN KEY \`FK_yt_goods_unlock_goodsId\``);
-        await queryRunner.query(`ALTER TABLE \`yt_goods\` DROP FOREIGN KEY \`FK_yt_goods_shopId\``);
-        await queryRunner.query(`ALTER TABLE \`shop_and_user\` DROP FOREIGN KEY \`FK_shop_and_user_userId\``);
-        await queryRunner.query(`ALTER TABLE \`shop_and_user\` DROP FOREIGN KEY \`FK_shop_and_user_shopId\``);
-
-        // 删除表
-        await queryRunner.query(`DROP TABLE \`goods_images_unlock_key\``);
-        await queryRunner.query(`DROP TABLE \`yt_goods_unlock\``);
-        await queryRunner.query(`DROP TABLE \`yt_goods\``);
-        await queryRunner.query(`DROP TABLE \`shop_and_user\``);
-        await queryRunner.query(`DROP TABLE \`shop\``);
-        await queryRunner.query(`DROP TABLE \`yt_user\``);
-    }
-}

package/template/src/migrations/index.ts

@@ -1,6 +0,0 @@
-import { InitialDatabaseStructure1700000000000 } from "./1700000000000-InitialDatabaseStructure";
-
-/**
- * 显式注册迁移类，避免仅靠文件路径扫描导致 webpack 单文件部署下无法发现迁移。
- */
-export const APP_MIGRATIONS = [InitialDatabaseStructure1700000000000];

package/template/src/repository/base/BaseRepository.ts

@@ -1,124 +0,0 @@
-import { Repository, EntityTarget, FindManyOptions, FindOneOptions, UpdateResult, DeleteResult, ObjectLiteral } from 'typeorm';
-import { IBaseRepository } from '@src/repository/interfaces/IBaseRepository';
-import { logger } from '@src/framework/utils/logger';
-
-/**
- * 基础Repository实现
- * 提供通用的数据访问操作
- */
-export abstract class BaseRepository<T extends ObjectLiteral> implements IBaseRepository<T> {
-    protected repository: Repository<T>;
-
-    constructor(entity: EntityTarget<T>, repository: Repository<T>) {
-        this.repository = repository;
-    }
-
-    async findById(id: number): Promise<T | null> {
-        try {
-            return await this.repository.findOneBy({ id } as any);
-        } catch (error) {
-            logger.error(`查找实体失败 (ID: ${id}):`, error as Error);
-            throw error;
-        }
-    }
-
-    async findAll(options?: FindManyOptions<T>): Promise<T[]> {
-        try {
-            return await this.repository.find(options);
-        } catch (error) {
-            logger.error('查找所有实体失败:', error as Error);
-            throw error;
-        }
-    }
-
-    async findOne(options: FindOneOptions<T>): Promise<T | null> {
-        try {
-            return await this.repository.findOne(options);
-        } catch (error) {
-            logger.error('查找单个实体失败:', error as Error);
-            throw error;
-        }
-    }
-
-    async findMany(options: FindManyOptions<T>): Promise<T[]> {
-        try {
-            return await this.repository.find(options);
-        } catch (error) {
-            logger.error('查找多个实体失败:', error as Error);
-            throw error;
-        }
-    }
-
-    async save(entity: Partial<T>): Promise<T> {
-        try {
-            return await this.repository.save(entity as any);
-        } catch (error) {
-            logger.error('保存实体失败:', error as Error);
-            throw error;
-        }
-    }
-
-    async saveMany(entities: Partial<T>[]): Promise<T[]> {
-        try {
-            return await this.repository.save(entities as any);
-        } catch (error) {
-            logger.error('批量保存实体失败:', error as Error);
-            throw error;
-        }
-    }
-
-    async update(id: number, updateData: Partial<T>): Promise<UpdateResult> {
-        try {
-            return await this.repository.update(id, updateData as any);
-        } catch (error) {
-            logger.error(`更新实体失败 (ID: ${id}):`, error as Error);
-            throw error;
-        }
-    }
-
-    async delete(id: number): Promise<DeleteResult> {
-        try {
-            return await this.repository.delete(id);
-        } catch (error) {
-            logger.error(`删除实体失败 (ID: ${id}):`, error as Error);
-            throw error;
-        }
-    }
-
-    async softDelete(id: number): Promise<UpdateResult> {
-        try {
-            return await this.repository.softDelete(id);
-        } catch (error) {
-            logger.error(`软删除实体失败 (ID: ${id}):`, error as Error);
-            throw error;
-        }
-    }
-
-    async exists(id: number): Promise<boolean> {
-        try {
-            const count = await this.repository.count({ where: { id } as any });
-            return count > 0;
-        } catch (error) {
-            logger.error(`检查实体存在性失败 (ID: ${id}):`, error as Error);
-            throw error;
-        }
-    }
-
-    async count(options?: FindManyOptions<T>): Promise<number> {
-        try {
-            return await this.repository.count(options);
-        } catch (error) {
-            logger.error('统计实体数量失败:', error as Error);
-            throw error;
-        }
-    }
-
-    async findAndCount(options: FindManyOptions<T>): Promise<[T[], number]> {
-        try {
-            return await this.repository.findAndCount(options);
-        } catch (error) {
-            logger.error('分页查询失败:', error as Error);
-            throw error;
-        }
-    }
-}

package/template/src/repository/interfaces/IBaseRepository.ts

@@ -1,67 +0,0 @@
-import { EntityTarget, FindManyOptions, FindOneOptions, UpdateResult, DeleteResult } from 'typeorm';
-
-/**
- * 基础Repository接口
- * 定义通用的数据访问操作
- */
-export interface IBaseRepository<T> {
-    /**
-     * 根据ID查找实体
-     */
-    findById(id: number): Promise<T | null>;
-
-    /**
-     * 查找所有实体
-     */
-    findAll(options?: FindManyOptions<T>): Promise<T[]>;
-
-    /**
-     * 根据条件查找单个实体
-     */
-    findOne(options: FindOneOptions<T>): Promise<T | null>;
-
-    /**
-     * 根据条件查找多个实体
-     */
-    findMany(options: FindManyOptions<T>): Promise<T[]>;
-
-    /**
-     * 保存实体
-     */
-    save(entity: Partial<T>): Promise<T>;
-
-    /**
-     * 批量保存实体
-     */
-    saveMany(entities: Partial<T>[]): Promise<T[]>;
-
-    /**
-     * 更新实体
-     */
-    update(id: number, updateData: Partial<T>): Promise<UpdateResult>;
-
-    /**
-     * 删除实体
-     */
-    delete(id: number): Promise<DeleteResult>;
-
-    /**
-     * 软删除实体
-     */
-    softDelete(id: number): Promise<UpdateResult>;
-
-    /**
-     * 检查实体是否存在
-     */
-    exists(id: number): Promise<boolean>;
-
-    /**
-     * 统计实体数量
-     */
-    count(options?: FindManyOptions<T>): Promise<number>;
-
-    /**
-     * 分页查询
-     */
-    findAndCount(options: FindManyOptions<T>): Promise<[T[], number]>;
-}

package/template/src/service/base.service.ts

@@ -1,116 +0,0 @@
-import { Injectable } from "dp-ioc2";
-import { getDataSource } from "@src/framework/utils/db"
-import { ObjectLiteral, EntityTarget, Repository } from "typeorm"
-import { CommonServiceResultCode, CommonServiceResult } from "@src/framework/types/ServiceResult"
-
-@Injectable()
-export class BaseService {
-
-    /**
-     * 获取数据仓库
-     * 延迟初始化，避免在数据库未初始化时出错
-     */
-    getDataRepository<T extends ObjectLiteral>(entity: EntityTarget<T>): Repository<T> {
-        const dbDataSource = getDataSource();
-        if (!dbDataSource || !dbDataSource.isInitialized) {
-            throw new Error("数据库未初始化，请等待数据库初始化完成");
-        }
-        return dbDataSource.getRepository(entity);
-    }
-
-    /**
-     * 创建懒加载的 Repository Getter
-     * 通用方法，用于实例化自定义 Repository
-     * 
-     * @template T Repository 类型
-     * @template R Repository 构造函数类型
-     * @param entity 实体类型
-     * @param RepositoryClass Repository 类
-     * @param cache Map 缓存对象
-     * @returns Getter 函数
-     * 
-     * @example
-     * ```typescript
-     * export class YtUserService extends BaseService {
-     *     private repositoryCache = new Map<string, any>();
-     *     
-     *     private get userRepository(): IUserRepository {
-     *         return this.createLazyRepository(
-     *             YtUserEntity,
-     *             UserRepository,
-     *             this.repositoryCache
-     *         );
-     *     }
-     * }
-     * ```
-     */
-    protected createLazyRepository<T extends ObjectLiteral, R>(
-        entity: EntityTarget<T>,
-        RepositoryClass: new (repository: Repository<T>) => R,
-        cache: Map<string, R>
-    ): R {
-        // 使用 RepositoryClass 名称作为缓存键
-        const cacheKey = RepositoryClass.name;
-        
-        if (!cache.has(cacheKey)) {
-            const dataSource = getDataSource();
-            if (!dataSource || !dataSource.isInitialized) {
-                throw new Error("数据库未初始化，请等待数据库初始化完成");
-            }
-            
-            const repository = dataSource.getRepository(entity);
-            const instance = new RepositoryClass(repository);
-            cache.set(cacheKey, instance);
-        }
-        
-        return cache.get(cacheKey)!;
-    }
-
-    /**
-     * 获取数据库管理器
-     */
-    getDbManager() {
-        const dbDataSource = getDataSource();
-        if (!dbDataSource || !dbDataSource.isInitialized) {
-            throw new Error("数据库未初始化，请等待数据库初始化完成");
-        }
-        return dbDataSource.manager;
-    }
-
-    async add<T>(data: T): Promise<T> {
-        return await this.getDbManager().save(data);
-        // return {
-        //     code: CommonServiceResultCode.SUCCESS,
-        //     data: result,
-        // }
-    }
-
-    async getById<T extends ObjectLiteral>(
-        entity: EntityTarget<T>,
-        id: number
-    ): Promise<T | null> {
-        const repository: Repository<T> = this.getDataRepository(entity);
-        return await repository.findOneBy({ id } as any);
-        
-        // if (!result) {
-        //     return {
-        //         code: CommonServiceResultCode.NOT_FOUND,
-        //         data: null,
-        //         message: "数据不存在"
-        //     };
-        // }
-
-        // return {
-        //     code: CommonServiceResultCode.SUCCESS,
-        //     data: result
-        // };
-    }
-
-    /**
-     * 清理资源
-     * 在应用关闭时调用，防止内存泄漏
-     */
-    cleanup(): void {
-        // BaseService 本身不需要清理，子类可以重写此方法
-    }
-}