create-aomex 0.0.38 → 0.0.40

package/dist/index.js

@@ -183,7 +183,7 @@ var { error } = await terminal3.runTasks([
         {
           label: "dependencies",
           pkgs: [
-            "@aomex/core",
+            "@aomex/common",
             "@aomex/web",
             "@aomex/cors",
             "@aomex/etag",

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts","../src/input-project.ts","../src/select-node-version.ts"],"sourcesContent":["#!/usr/bin/env node\n\nimport path from 'node:path/posix';\nimport yargsParser from 'yargs-parser';\nimport {\n  cp,\n  mkdir,\n  readdir,\n  readFile,\n  rename,\n  stat,\n  writeFile,\n} from 'node:fs/promises';\nimport { terminal } from '@aomex/console';\nimport { execSync, spawn } from 'node:child_process';\nimport { setTimeout } from 'node:timers/promises';\nimport { inputProject } from './input-project';\nimport { selectNodeVersion } from './select-node-version';\n\nconst runShell = async (command: string) => {\n  await new Promise((resolve, reject) => {\n    const stream = spawn(command, {\n      cwd: process.cwd(),\n      env: process.env,\n      shell: true,\n    });\n    stream.on('close', resolve);\n    stream.on('error', reject);\n  });\n};\n\nconst argv = yargsParser(process.argv.slice(2));\nconst templateDir = path.join(import.meta.dirname, '..', 'templates');\nconst projectName = await inputProject(argv);\nconst pnpmVersion =\n  execSync(`npm view pnpm version`, {\n    encoding: 'utf8',\n  }).replaceAll('\\n', '') || '0.0.0';\n\nconst nodeVersion = await selectNodeVersion(argv);\nconst targetDir = path.resolve(projectName);\n\nconst { error } = await terminal.runTasks([\n  {\n    title: '创建目录',\n    task: async () => {\n      await mkdir(targetDir, { recursive: true });\n      process.chdir(targetDir);\n      await setTimeout(500);\n    },\n  },\n  {\n    title: '复制模板文件',\n    task: async () => {\n      const variables = {\n        projectName,\n        nodeVersion,\n        pnpmVersion,\n      };\n      await cp(templateDir, targetDir, { recursive: true });\n      const files = await readdir(targetDir, { recursive: true });\n      for (const file of files) {\n        const isFile = (await stat(path.join(targetDir, file))).isFile();\n        if (!isFile) continue;\n        const fileAbsolutePath = path.resolve(file);\n        let fileContent = await readFile(fileAbsolutePath, 'utf8');\n        Object.entries(variables).forEach(([key, value]) => {\n          fileContent = fileContent.replaceAll(`{{${key}}}`, value);\n        });\n        await writeFile(fileAbsolutePath, fileContent);\n      }\n      // .gitignore这个文件在安装的时候总是被忽略\n      await rename(\n        path.join(targetDir, 'gitignore'),\n        path.join(targetDir, '.gitignore'),\n      );\n      await setTimeout(500);\n    },\n  },\n  {\n    title: 'git初始化',\n    skip: async () => {\n      return !/\\d\\.\\d/.test(execSync('git -v', { encoding: 'utf8' }));\n    },\n    task: async () => {\n      await runShell('git init');\n      await setTimeout(500);\n    },\n  },\n  {\n    title: '增加volta配置',\n    skip: async () => {\n      return !/\\d\\.\\d/.test(execSync('volta -v', { encoding: 'utf8' }));\n    },\n    task: async () => {\n      await runShell(`volta pin node@${nodeVersion}`);\n      await runShell(`volta pin pnpm@${pnpmVersion}`);\n    },\n  },\n  {\n    title: '安装插件',\n    task: async (_, task) => {\n      const packages: { label: string; pkgs: string[]; dev?: boolean }[] = [\n        {\n          label: 'dependencies',\n          pkgs: [\n            '@aomex/core',\n            '@aomex/web',\n            '@aomex/cors',\n            '@aomex/etag',\n            '@aomex/compress',\n            '@aomex/http-logger',\n            '@aomex/response-time',\n            '@aomex/console',\n            '@aomex/cron',\n            '@aomex/helmet',\n            '@aomex/openapi',\n            '@aomex/swagger-ui',\n            '@aomex/async-trace',\n            '@prisma/client',\n            '@aomex/cache',\n            '@aomex/cache-redis-adapter',\n            '@aomex/auth',\n            'ioredis',\n          ],\n        },\n        {\n          label: 'dev dependencies',\n          pkgs: [\n            'prisma',\n            'typescript',\n            'tsx',\n            'tsc-alias',\n            '@types/node',\n            'husky',\n            'prettier',\n            '@commitlint/cli',\n            '@commitlint/config-conventional',\n            'eslint',\n            '@typescript-eslint/eslint-plugin',\n            '@typescript-eslint/parser',\n            'eslint-plugin-check-file',\n          ],\n          dev: true,\n        },\n      ];\n\n      for (let i = 0; i < packages.length; ++i) {\n        const { pkgs, dev, label } = packages[i]!;\n        task.suffix = terminal.style('gray', label);\n        await runShell(`pnpm add ${pkgs.join(' ')} ${dev ? '-D' : ''}`);\n      }\n      task.suffix = '';\n    },\n  },\n  {\n    title: '生成prisma客户端',\n    task: async () => {\n      await runShell('npx prisma generate');\n    },\n  },\n]);\n\nif (error) process.exit(1);\n\nconsole.log(\n  '\\n项目创建成功：' +\n    terminal.style(['blue', 'underline'], process.cwd()) +\n    '\\n' +\n    '启动项目可执行如下指令：' +\n    '\\n\\n' +\n    terminal.style('green', `cd ${projectName} && pnpm start`) +\n    '\\n',\n);\n","import { terminal } from '@aomex/console';\nimport { input } from '@inquirer/prompts';\nimport { existsSync, readdirSync } from 'node:fs';\nimport sanitize from 'sanitize-filename';\nimport path from 'path';\n\nconst kebabCase = (value: string) => {\n  value = sanitize(value);\n  if (!value.length) return '';\n  value = value[0]!.toLowerCase() + value.slice(1);\n  return value\n    .replace(/[A-Z]/g, (i) => '-' + i.toLowerCase())\n    .replace(/_/g, '-')\n    .replace(/-+/g, '-');\n};\n\nexport const inputProject = async (argv: Record<string, any>) => {\n  let projectName: string = argv['project'];\n  if (projectName) {\n    projectName = kebabCase(projectName);\n    const available = isProjectDirAvailable(projectName);\n    if (typeof available === 'string') {\n      terminal.printError(available);\n      process.exit(1);\n    }\n  } else {\n    projectName = await input({\n      message: '请输入项目',\n      validate(value) {\n        return isProjectDirAvailable(value);\n      },\n      transformer(value) {\n        return kebabCase(value);\n      },\n    });\n    projectName = kebabCase(projectName);\n  }\n\n  return projectName;\n};\n\nconst isProjectDirAvailable = (projectName: string): string | true => {\n  projectName = projectName.trim();\n  if (!projectName.trim()) return '项目名不能为空';\n  const targetDir = path.resolve(projectName);\n  if (!existsSync(targetDir)) return true;\n  if (!readdirSync(targetDir).length) return true;\n  return `目录 \"${targetDir}\" 包含其它文件，请手动删除或选择新的项目名`;\n};\n","import { terminal } from '@aomex/console';\nimport { select } from '@inquirer/prompts';\n\nexport const selectNodeVersion = async (argv: Record<string, any>) => {\n  let nodeVersion: string = argv['node'];\n  if (!nodeVersion) {\n    const nodes = await promise;\n    nodeVersion = await select({\n      message: '请选择node.js稳定版本',\n      choices: nodes.map((item) => {\n        return {\n          name: `${item.version} ${terminal.style(['gray', 'dim'], item.date)}`,\n          value: item.version,\n          short: item.version,\n        };\n      }),\n      loop: false,\n    });\n  }\n\n  return nodeVersion.replace(/^v/, '');\n};\n\nconst fetchNodes = async () => {\n  const response = await fetch(\n    'https://nodejs.org/download/release/index.json',\n  );\n  const nodes = (await response.json()) as {\n    version: string;\n    lts: boolean;\n    date: string;\n  }[];\n\n  return nodes\n    .map((item) => {\n      return {\n        ...item,\n        versions: item.version.slice(1).split('.').map(Number) as [\n          number,\n          number,\n          number,\n        ],\n      };\n    })\n    .filter((item) => {\n      if (!item.lts) return false;\n      if (item.versions[0] === 20 && item.versions[1] >= 13) return true;\n      if (item.versions[0] >= 22) return true;\n      return false;\n    });\n};\n\nconst promise = fetchNodes();\n"],"mappings":"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","names":["path","terminal","argv","projectName","targetDir","terminal","argv","nodeVersion","path","terminal"]}
+{"version":3,"sources":["../src/index.ts","../src/input-project.ts","../src/select-node-version.ts"],"sourcesContent":["#!/usr/bin/env node\n\nimport path from 'node:path/posix';\nimport yargsParser from 'yargs-parser';\nimport {\n  cp,\n  mkdir,\n  readdir,\n  readFile,\n  rename,\n  stat,\n  writeFile,\n} from 'node:fs/promises';\nimport { terminal } from '@aomex/console';\nimport { execSync, spawn } from 'node:child_process';\nimport { setTimeout } from 'node:timers/promises';\nimport { inputProject } from './input-project';\nimport { selectNodeVersion } from './select-node-version';\n\nconst runShell = async (command: string) => {\n  await new Promise((resolve, reject) => {\n    const stream = spawn(command, {\n      cwd: process.cwd(),\n      env: process.env,\n      shell: true,\n    });\n    stream.on('close', resolve);\n    stream.on('error', reject);\n  });\n};\n\nconst argv = yargsParser(process.argv.slice(2));\nconst templateDir = path.join(import.meta.dirname, '..', 'templates');\nconst projectName = await inputProject(argv);\nconst pnpmVersion =\n  execSync(`npm view pnpm version`, {\n    encoding: 'utf8',\n  }).replaceAll('\\n', '') || '0.0.0';\n\nconst nodeVersion = await selectNodeVersion(argv);\nconst targetDir = path.resolve(projectName);\n\nconst { error } = await terminal.runTasks([\n  {\n    title: '创建目录',\n    task: async () => {\n      await mkdir(targetDir, { recursive: true });\n      process.chdir(targetDir);\n      await setTimeout(500);\n    },\n  },\n  {\n    title: '复制模板文件',\n    task: async () => {\n      const variables = {\n        projectName,\n        nodeVersion,\n        pnpmVersion,\n      };\n      await cp(templateDir, targetDir, { recursive: true });\n      const files = await readdir(targetDir, { recursive: true });\n      for (const file of files) {\n        const isFile = (await stat(path.join(targetDir, file))).isFile();\n        if (!isFile) continue;\n        const fileAbsolutePath = path.resolve(file);\n        let fileContent = await readFile(fileAbsolutePath, 'utf8');\n        Object.entries(variables).forEach(([key, value]) => {\n          fileContent = fileContent.replaceAll(`{{${key}}}`, value);\n        });\n        await writeFile(fileAbsolutePath, fileContent);\n      }\n      // .gitignore这个文件在安装的时候总是被忽略\n      await rename(\n        path.join(targetDir, 'gitignore'),\n        path.join(targetDir, '.gitignore'),\n      );\n      await setTimeout(500);\n    },\n  },\n  {\n    title: 'git初始化',\n    skip: async () => {\n      return !/\\d\\.\\d/.test(execSync('git -v', { encoding: 'utf8' }));\n    },\n    task: async () => {\n      await runShell('git init');\n      await setTimeout(500);\n    },\n  },\n  {\n    title: '增加volta配置',\n    skip: async () => {\n      return !/\\d\\.\\d/.test(execSync('volta -v', { encoding: 'utf8' }));\n    },\n    task: async () => {\n      await runShell(`volta pin node@${nodeVersion}`);\n      await runShell(`volta pin pnpm@${pnpmVersion}`);\n    },\n  },\n  {\n    title: '安装插件',\n    task: async (_, task) => {\n      const packages: { label: string; pkgs: string[]; dev?: boolean }[] = [\n        {\n          label: 'dependencies',\n          pkgs: [\n            '@aomex/common',\n            '@aomex/web',\n            '@aomex/cors',\n            '@aomex/etag',\n            '@aomex/compress',\n            '@aomex/http-logger',\n            '@aomex/response-time',\n            '@aomex/console',\n            '@aomex/cron',\n            '@aomex/helmet',\n            '@aomex/openapi',\n            '@aomex/swagger-ui',\n            '@aomex/async-trace',\n            '@prisma/client',\n            '@aomex/cache',\n            '@aomex/cache-redis-adapter',\n            '@aomex/auth',\n            'ioredis',\n          ],\n        },\n        {\n          label: 'dev dependencies',\n          pkgs: [\n            'prisma',\n            'typescript',\n            'tsx',\n            'tsc-alias',\n            '@types/node',\n            'husky',\n            'prettier',\n            '@commitlint/cli',\n            '@commitlint/config-conventional',\n            'eslint',\n            '@typescript-eslint/eslint-plugin',\n            '@typescript-eslint/parser',\n            'eslint-plugin-check-file',\n          ],\n          dev: true,\n        },\n      ];\n\n      for (let i = 0; i < packages.length; ++i) {\n        const { pkgs, dev, label } = packages[i]!;\n        task.suffix = terminal.style('gray', label);\n        await runShell(`pnpm add ${pkgs.join(' ')} ${dev ? '-D' : ''}`);\n      }\n      task.suffix = '';\n    },\n  },\n  {\n    title: '生成prisma客户端',\n    task: async () => {\n      await runShell('npx prisma generate');\n    },\n  },\n]);\n\nif (error) process.exit(1);\n\nconsole.log(\n  '\\n项目创建成功：' +\n    terminal.style(['blue', 'underline'], process.cwd()) +\n    '\\n' +\n    '启动项目可执行如下指令：' +\n    '\\n\\n' +\n    terminal.style('green', `cd ${projectName} && pnpm start`) +\n    '\\n',\n);\n","import { terminal } from '@aomex/console';\nimport { input } from '@inquirer/prompts';\nimport { existsSync, readdirSync } from 'node:fs';\nimport sanitize from 'sanitize-filename';\nimport path from 'path';\n\nconst kebabCase = (value: string) => {\n  value = sanitize(value);\n  if (!value.length) return '';\n  value = value[0]!.toLowerCase() + value.slice(1);\n  return value\n    .replace(/[A-Z]/g, (i) => '-' + i.toLowerCase())\n    .replace(/_/g, '-')\n    .replace(/-+/g, '-');\n};\n\nexport const inputProject = async (argv: Record<string, any>) => {\n  let projectName: string = argv['project'];\n  if (projectName) {\n    projectName = kebabCase(projectName);\n    const available = isProjectDirAvailable(projectName);\n    if (typeof available === 'string') {\n      terminal.printError(available);\n      process.exit(1);\n    }\n  } else {\n    projectName = await input({\n      message: '请输入项目',\n      validate(value) {\n        return isProjectDirAvailable(value);\n      },\n      transformer(value) {\n        return kebabCase(value);\n      },\n    });\n    projectName = kebabCase(projectName);\n  }\n\n  return projectName;\n};\n\nconst isProjectDirAvailable = (projectName: string): string | true => {\n  projectName = projectName.trim();\n  if (!projectName.trim()) return '项目名不能为空';\n  const targetDir = path.resolve(projectName);\n  if (!existsSync(targetDir)) return true;\n  if (!readdirSync(targetDir).length) return true;\n  return `目录 \"${targetDir}\" 包含其它文件，请手动删除或选择新的项目名`;\n};\n","import { terminal } from '@aomex/console';\nimport { select } from '@inquirer/prompts';\n\nexport const selectNodeVersion = async (argv: Record<string, any>) => {\n  let nodeVersion: string = argv['node'];\n  if (!nodeVersion) {\n    const nodes = await promise;\n    nodeVersion = await select({\n      message: '请选择node.js稳定版本',\n      choices: nodes.map((item) => {\n        return {\n          name: `${item.version} ${terminal.style(['gray', 'dim'], item.date)}`,\n          value: item.version,\n          short: item.version,\n        };\n      }),\n      loop: false,\n    });\n  }\n\n  return nodeVersion.replace(/^v/, '');\n};\n\nconst fetchNodes = async () => {\n  const response = await fetch(\n    'https://nodejs.org/download/release/index.json',\n  );\n  const nodes = (await response.json()) as {\n    version: string;\n    lts: boolean;\n    date: string;\n  }[];\n\n  return nodes\n    .map((item) => {\n      return {\n        ...item,\n        versions: item.version.slice(1).split('.').map(Number) as [\n          number,\n          number,\n          number,\n        ],\n      };\n    })\n    .filter((item) => {\n      if (!item.lts) return false;\n      if (item.versions[0] === 20 && item.versions[1] >= 13) return true;\n      if (item.versions[0] >= 22) return true;\n      return false;\n    });\n};\n\nconst promise = fetchNodes();\n"],"mappings":"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","names":["path","terminal","argv","projectName","targetDir","terminal","argv","nodeVersion","path","terminal"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-aomex",
-  "version": "0.0.38",
+  "version": "0.0.40",
   "repository": "git@github.com:aomex/create-aomex.git",
   "license": "MIT",
   "type": "module",
@@ -30,27 +30,27 @@
   "bin": "dist/index.js",
   "packageManager": "pnpm@9.4.0",
   "dependencies": {
-    "@aomex/console": "^3.3.0",
-    "@aomex/core": "^3.3.0",
+    "@aomex/common": "^3.9.0",
+    "@aomex/console": "^3.9.0",
     "@inquirer/prompts": "^6.0.1",
     "sanitize-filename": "^1.6.3",
     "yargs-parser": "^21.1.1"
   },
   "devDependencies": {
-    "@aomex/async-trace": "^3.3.0",
+    "@aomex/async-trace": "^3.9.0",
     "@aomex/auth": "^3.4.0",
-    "@aomex/cache": "^3.3.0",
-    "@aomex/cache-redis-adapter": "^3.3.0",
-    "@aomex/compress": "^3.3.0",
-    "@aomex/cors": "^3.3.0",
-    "@aomex/cron": "^3.3.0",
-    "@aomex/etag": "^3.3.0",
-    "@aomex/helmet": "^3.3.0",
-    "@aomex/http-logger": "^3.3.0",
-    "@aomex/openapi": "^3.3.0",
-    "@aomex/response-time": "^3.3.0",
-    "@aomex/swagger-ui": "^3.3.0",
-    "@aomex/web": "^3.3.0",
+    "@aomex/cache": "^3.9.0",
+    "@aomex/cache-redis-adapter": "^3.9.0",
+    "@aomex/compress": "^3.9.0",
+    "@aomex/cors": "^3.9.0",
+    "@aomex/cron": "^3.9.0",
+    "@aomex/etag": "^3.9.0",
+    "@aomex/helmet": "^3.9.0",
+    "@aomex/http-logger": "^3.9.0",
+    "@aomex/openapi": "^3.9.0",
+    "@aomex/response-time": "^3.9.0",
+    "@aomex/swagger-ui": "^3.9.0",
+    "@aomex/web": "^3.9.0",
     "@prisma/client": "^5.17.0",
     "@types/lodash.kebabcase": "^4.1.9",
     "@types/node": "^20.14.12",

package/templates/docker-compose-integration.yml

@@ -4,9 +4,10 @@ services:
     command: npx prisma migrate deploy
   api:
     image: {{projectName}}:integration
-    restart: always
     ports:
       - 3000:3000
   cron:
     image: {{projectName}}:integration
     command: npx aomex cron:start
+    environment:
+      - NODE_COMPILE_CACHE=/tmp

package/templates/docker-compose-production.yml

@@ -4,9 +4,10 @@ services:
     command: npx prisma migrate deploy
   api:
     image: {{projectName}}:production
-    restart: always
     ports:
       - 3000:3000
   cron:
     image: {{projectName}}:production
     command: npx aomex cron:start
+    environment:
+      - NODE_COMPILE_CACHE=/tmp

package/templates/gitignore

@@ -6,4 +6,5 @@ build/
 coverage/
 .DS_Store
 *.log
-volumes/
+volumes/
+logs/

package/templates/prisma/schema.prisma

@@ -8,11 +8,11 @@ generator client {
   provider = "prisma-client-js"
 }
 
-model user {
-  id         Int      @id @default(autoincrement())
-  name       String   @unique
-  age        Int      @default(17)
-  address    String?
-  created_at DateTime @default(now()) @db.Timestamp(0)
-  updated_at DateTime @default(now()) @updatedAt() @db.Timestamp(0)
-}
+// model user {
+//   id         Int      @id @default(autoincrement())
+//   name       String   @unique
+//   age        Int      @default(17)
+//   address    String?
+//   created_at DateTime @default(now()) @db.Timestamp(0)
+//   updated_at DateTime @default(now()) @updatedAt() @db.Timestamp(0)
+// }

package/templates/src/cli.ts

@@ -1,26 +1,23 @@
 import { commanders, ConsoleApp } from '@aomex/console';
 import { crons } from '@aomex/cron';
-import { traceMiddleware } from '@aomex/async-trace';
-import { services } from '@services';
+import { redisCache } from '@services/cache.service';
+import { openapi } from '@aomex/openapi';
+import { logger } from '@services/logger';
 
 const app = new ConsoleApp({
   language: 'zh_CN',
   mount: [
     crons({
       commanders: './src/commanders',
-      cache: services.cache.instance,
-    }),
-    traceMiddleware('生命周期', async (_record) => {
-      // 根据 record.delta 上报慢日志
-      // console.log(record);
+      cache: redisCache,
     }),
+    openapi({ routers: './src/routers' }),
     commanders('./src/commanders'),
   ],
 });
 
 app.on('error', (err) => {
-  // 上报错误日志
-  app.log(err);
+  logger.error(err.stack || '');
 });
 
 const code = await app.run();

package/templates/src/commanders/hello.cmd.ts

@@ -1,5 +1,5 @@
 import { Commander, options } from '@aomex/console';
-import { rule } from '@aomex/core';
+import { rule } from '@aomex/common';
 import { cron } from '@aomex/cron';
 import timers from 'node:timers/promises';
 

package/templates/src/i18n/index.ts

@@ -1,4 +1,4 @@
-import { I18n } from '@aomex/core';
+import { I18n } from '@aomex/common';
 import { resources } from './locales';
 
 export const i18n = new I18n({

package/templates/src/i18n/locales/en-us.ts

@@ -1,6 +1,15 @@
-import { I18n } from '@aomex/core';
+import { I18n } from '@aomex/common';
 import { zh } from './zh-cn';
 
 export const en = I18n.satisfies(zh).define({
-  hello: 'Hello World',
+  hello: I18n.message('Hello World. {{count}}', {
+    count: {
+      type: 'plural',
+      plural: {
+        '1': 'You are first here',
+        '2-4': 'Good job',
+        '5-n': 'Research other features plz',
+      },
+    },
+  }),
 });

package/templates/src/i18n/locales/zh-cn.ts

@@ -1,4 +1,4 @@
-import { I18n } from '@aomex/core';
+import { I18n } from '@aomex/common';
 
 export const zh = I18n.define({
   hello: I18n.message('你好，世界。{{count}}', {

package/templates/src/middleware/counter.md.ts

@@ -1,4 +1,4 @@
-import { middleware } from '@aomex/core';
+import { middleware } from '@aomex/common';
 
 let _counter = 0;
 

package/templates/src/middleware/http-logger.md.ts

@@ -0,0 +1,9 @@
+import { Logger } from '@aomex/common';
+import { httpLogger as aomexHttpLogger } from '@aomex/http-logger';
+
+export const httpLogger = aomexHttpLogger({
+  transports: [
+    new Logger.transport.Console(),
+    new Logger.transport.File({ file: 'logs/http/%year%-%month%-%day%/%hour%.log' }),
+  ],
+});

package/templates/src/middleware/i18n-provider.md.ts

@@ -1,4 +1,4 @@
-import { middleware, I18n } from '@aomex/core';
+import { middleware, I18n } from '@aomex/common';
 
 export const i18nProvider = middleware.web((ctx, next) => {
   // 动态选择i18n语言包

package/templates/src/middleware/trace.md.ts

@@ -1,6 +1,7 @@
 import { traceMiddleware } from '@aomex/async-trace';
+import type { WebContext } from '@aomex/web';
 
-export const trace = traceMiddleware('生命周期', async (_record) => {
+export const trace = traceMiddleware('生命周期', async (_record, _ctx: WebContext) => {
   // 根据 record.delta 上报慢日志
   // console.log(record);
 });

package/templates/src/routers/hello.router.ts

@@ -1,4 +1,4 @@
-import { rule } from '@aomex/core';
+import { rule } from '@aomex/common';
 import { response, Router } from '@aomex/web';
 import { counter } from '@middleware/counter.md';
 import { i18n } from '../i18n';

package/templates/src/services/cache.service.ts

@@ -1,25 +1,8 @@
-import { Service } from '@aomex/core';
+import { Service } from '@aomex/common';
 import { Caching } from '@aomex/cache';
 import { redisAdapter } from '@aomex/cache-redis-adapter';
 import { configs } from '@configs';
 
-const cache = new Caching(redisAdapter(configs.redis));
+export const redisCache = new Caching(redisAdapter(configs.redis));
 
-export class CacheService extends Service {
-  public readonly instance = cache;
-
-  protected readonly demoKey = 'demo';
-
-  getHotRankings() {
-    return cache.get<DemoItem[]>(this.demoKey, []);
-  }
-
-  setHotRankings(value: DemoItem[]) {
-    return cache.set(this.demoKey, value, 30_000);
-  }
-}
-
-interface DemoItem {
-  id: number;
-  name: string;
-}
+export class CacheService extends Service {}

package/templates/src/services/index.ts

@@ -1,13 +1,11 @@
-import { combineServices } from '@aomex/core';
-import { UserService } from './user.service';
+import { combineServices } from '@aomex/common';
 import { CacheService } from './cache.service';
 
 export const services = await combineServices({
-  user: UserService,
   cache: CacheService,
 });
 
-declare module '@aomex/core' {
+declare module '@aomex/common' {
   type T = typeof services;
   export interface CombinedServices extends T {}
 }

package/templates/src/services/logger.ts

@@ -0,0 +1,17 @@
+import { Logger } from '@aomex/common';
+
+export const logger = Logger.create({
+  levels: ['debug', 'info', 'warn', 'error'],
+  transports: [
+    {
+      transport: new Logger.transport.Console(),
+      level: { from: 'debug' },
+    },
+    {
+      transport: new Logger.transport.File({
+        file: `logs/error-%year%-%month%-%day%.log`,
+      }),
+      level: ['error'],
+    },
+  ],
+});

package/templates/src/services/prisma.ts

@@ -2,7 +2,7 @@ import { PrismaClient } from '@prisma/client';
 import * as runtime from '@prisma/client/runtime/library';
 
 export const prisma = new PrismaClient({
-  log: ['error'],
+  log: ['warn'],
 });
 
 export type PrismaTX = Omit<PrismaClient, runtime.ITXClientDenyList>;

package/templates/src/web.ts

@@ -1,33 +1,33 @@
 import { routers, WebApp } from '@aomex/web';
 import { cors } from '@aomex/cors';
 import { compress } from '@aomex/compress';
-import { httpLogger } from '@aomex/http-logger';
 import { etag } from '@aomex/etag';
 import { helmet } from '@aomex/helmet';
 import { responseTime } from '@aomex/response-time';
 import { swagger } from '@middleware/swagger.md';
 import { i18nProvider } from '@middleware/i18n-provider.md';
 import { trace } from '@middleware/trace.md';
+import { httpLogger } from '@middleware/http-logger.md';
+import { logger } from '@services/logger';
 
 export const app = new WebApp({
   language: 'zh_CN',
   mount: [
     i18nProvider,
-    httpLogger(),
+    httpLogger,
     responseTime,
-    trace,
     cors(),
     compress(),
     etag(),
     swagger,
     helmet(),
+    trace,
     routers('./src/routers'),
   ],
 });
 
 app.on('error', (err, ctx) => {
-  // 上报错误日志
-  app.log(err, ctx);
+  logger.error(err.stack || '');
   ctx.response.body = {
     status: ctx.response.statusCode,
     message: ctx.response.body,

package/templates/src/routers/user.router.ts

@@ -1,71 +0,0 @@
-import { services } from '@services';
-import { body, params, response, Router } from '@aomex/web';
-import { rule } from '@aomex/core';
-
-export const router = new Router({
-  prefix: '/users',
-});
-
-router.get('/', {
-  mount: [
-    response({
-      statusCode: 200,
-      content: rule.array({
-        id: rule.int(),
-        name: rule.string(),
-        age: rule.int(),
-        address: rule.string().nullable(),
-      }),
-    }),
-  ],
-  action: async (ctx) => {
-    const users = await services.user.findAll();
-    ctx.send(200, users);
-  },
-});
-
-router.get('/:id', {
-  mount: [
-    params({
-      id: rule.int().min(1),
-    }),
-    response({
-      statusCode: 200,
-      content: {
-        id: rule.int(),
-        name: rule.string(),
-        age: rule.int(),
-        address: rule.string().nullable(),
-      },
-    }),
-    response({
-      statusCode: 404,
-      description: '用户不存在',
-    }),
-  ],
-  action: async (ctx) => {
-    const { id } = ctx.params;
-    const user = await services.user.findById(id);
-    if (!user) {
-      return ctx.throw(404, '用户不存在');
-    }
-    ctx.send(user);
-  },
-});
-
-router.post('/', {
-  mount: [
-    body({
-      name: rule.string(),
-      age: rule.number(),
-      address: rule.string().optional(),
-    }),
-    response({
-      statusCode: 201,
-    }),
-  ],
-  action: async (ctx) => {
-    await services.user.createUser(ctx.body);
-    ctx.send(201, null);
-  },
-});

package/templates/src/services/user.service.ts

@@ -1,28 +0,0 @@
-import { Service } from '@aomex/core';
-import { prisma } from './prisma';
-import { Prisma } from '@prisma/client';
-import { traceMethod } from '@aomex/async-trace';
-
-export class UserService extends Service {
-  @traceMethod()
-  async findAll() {
-    return prisma.user.findMany({
-      orderBy: [
-        {
-          id: Prisma.SortOrder.desc,
-        },
-      ],
-    });
-  }
-
-  @traceMethod((userId) => `User.find(${userId})`)
-  async findById(userId: number) {
-    return prisma.user.findUnique({ where: { id: userId } });
-  }
-
-  async createUser(data: Prisma.userCreateArgs['data']) {
-    await prisma.user.create({
-      data: data,
-    });
-  }
-}