create-aomex 0.0.79 → 0.0.81

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-aomex",
-  "version": "0.0.79",
+  "version": "0.0.81",
   "repository": "git@github.com:aomex/create-aomex.git",
   "license": "MIT",
   "type": "module",

package/templates/docker-compose.yml

@@ -2,17 +2,26 @@ services:
   mysql:
     image: mysql:8.4
     environment:
-      MYSQL_ROOT_PASSWORD: 'abcde'
+      MYSQL_ROOT_PASSWORD: "abcde"
       # 修改后需要同步修改.env里的参数
-      MYSQL_DATABASE: '{{projectName}}'
+      MYSQL_DATABASE: "{{projectName}}"
     volumes:
       - ./volumes/mysql:/var/lib/mysql
     ports:
       - 3306:3306
-    command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
+    command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --skip-log-bin
     healthcheck:
       test:
-        ['CMD', 'mysqladmin', 'ping', '-h', 'localhost', '-u', 'root', '-p$$MYSQL_ROOT_PASSWORD']
+        [
+          "CMD",
+          "mysqladmin",
+          "ping",
+          "-h",
+          "localhost",
+          "-u",
+          "root",
+          "-p$$MYSQL_ROOT_PASSWORD",
+        ]
       interval: 5s
       timeout: 3s
       retries: 10

package/templates/src/cli.ts

@@ -4,9 +4,9 @@ import { destroyServices } from '@aomex/common';
 import { commanders, ConsoleApp } from '@aomex/console';
 import { crons } from '@aomex/cron';
 import { openapi } from '@aomex/openapi';
-import { configs } from '@configs';
-import { services } from '@services';
-import { logger } from '@services/logger';
+import { configs } from '@/configs';
+import { services } from '@/services';
+import { logger } from '@/services/logger';
 
 const app = new ConsoleApp({
   language: 'zh_CN',

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

@@ -1,7 +1,7 @@
 import { rule } from '@aomex/common';
 import { body, response, Router } from '@aomex/web';
-import { services } from '@services';
-import { prismaInput, prismaOutput } from '../generated/aomex/prisma';
+import { services } from '@/services';
+import { prismaInput, prismaOutput } from '@/generated/aomex/prisma';
 
 export const router = new Router({
   prefix: '/users',

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

@@ -1,7 +1,7 @@
 import { Service } from '@aomex/common';
 import { Caching } from '@aomex/cache';
 import { redisAdapter } from '@aomex/cache-redis-adapter';
-import { configs } from '@configs';
+import { configs } from '@/configs';
 
 export const cache = new Caching(redisAdapter(configs.redis));
 

package/templates/src/services/prisma.ts

@@ -1,16 +1,8 @@
-import { PrismaClient } from '../generated/prisma/client';
+import { PrismaClient } from '@/generated/prisma/client';
 import * as runtime from '@prisma/client/runtime/client';
-
 import { PrismaMariaDb } from '@prisma/adapter-mariadb';
 
-const config = new URL(process.env['DATABASE_URL']!);
-const adapter = new PrismaMariaDb({
-  host: config.hostname,
-  port: parseInt(config.port),
-  user: config.username,
-  password: config.password,
-  database: config.pathname.slice(1),
-});
+const adapter = new PrismaMariaDb(process.env['DATABASE_URL']!);
 
 export const prisma = new PrismaClient({
   adapter,

package/templates/src/web.ts

@@ -4,10 +4,10 @@ import { compress } from '@aomex/compress';
 import { etag } from '@aomex/etag';
 import { helmet } from '@aomex/helmet';
 import { responseTime } from '@aomex/response-time';
-import { swagger } from '@middleware/swagger.md';
-import { slowTrace } from '@middleware/slow-trace.md';
-import { httpLogger } from '@middleware/http-logger.md';
-import { logger } from '@services/logger';
+import { swagger } from '@/middleware/swagger.md';
+import { slowTrace } from '@/middleware/slow-trace.md';
+import { httpLogger } from '@/middleware/http-logger.md';
+import { logger } from '@/services/logger';
 import cluster from 'node:cluster';
 import { cpus } from 'node:os';
 
@@ -38,11 +38,16 @@ if (cluster.isWorker) {
       message: ctx.response.body,
     };
   });
-  app.listen(process.env['PORT'] || 3000);
+  app
+    .http({
+      // 对应 nginx 的 keepalive_timeout
+      keepAliveTimeout: 60_000,
+    })
+    .listen(process.env['PORT'] || 3000);
 }
 
 if (cluster.isPrimary) {
-  for (let i = cpus().length; i-- > 0; ) {
+  for (let i = Math.max(5, Math.min(2, cpus().length)); i-- > 0; ) {
     cluster.fork();
   }
 

package/templates/tsconfig.json

@@ -34,15 +34,7 @@
     "resolveJsonModule": true,
     "typeRoots": ["./typings", "node_modules/@types"],
     "paths": {
-      "@configs": ["./src/configs/index.ts"],
-      "@configs/*": ["./src/configs/*"],
-      "@middleware/*": ["./src/middleware/*"],
-      "@services": ["./src/services/index.ts"],
-      "@services/*": ["./src/services/*"],
-      "@constants/*": ["./src/constants/*"],
-      "@models/*": ["./src/models/*"],
-      "@utils/*": ["./src/utils/*"],
-      "@generated/*": ["./src/generated/*"]
+      "@/*": ["./src/*"]
     }
   }
 }