create-aomex 0.0.27 → 0.0.28

package/package.json

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

package/templates/package.json

@@ -8,8 +8,8 @@
   },
   "scripts": {
     "start": "node scripts/start.mjs",
-    "deploy:production": "sh scripts/deploy-production.sh",
-    "deploy:integration": "sh scripts/deploy-integration.sh",
+    "deploy:production": "sh scripts/deploy.sh production",
+    "deploy:integration": "sh scripts/deploy.sh integration",
     "prepare": "npx husky",
     "preinstall": "npx only-allow {{packageManager}}"
   },

package/templates/prisma/schema.prisma

@@ -8,10 +8,11 @@ generator client {
   provider = "prisma-client-js"
 }
 
-model User {
+model user {
   id         Int      @id @default(autoincrement())
-  name       String
-  age        Int
-  created_at DateTime @default(now())
-  updated_at DateTime @default(now()) @updatedAt()
+  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/scripts/{deploy-production.sh → deploy.sh}

@@ -2,13 +2,15 @@
 
 set -ex
 
-sudo docker build --tag {{projectName}}:production --file Dockerfile.production .
+env="$1"
 
-cron_container_name={{projectName}}-cron-production
+sudo docker build --tag "{{projectName}}:$env" --file "Dockerfile.$env" .
+
+cron_container_name="{{projectName}}-cron-$env"
 container_exist=$(sudo docker ps | { grep $cron_container_name || :; })
 if [ -n "$container_exist" ];
 then
   sudo docker exec it $cron_container_name /bin/sh -c "npx aomex cron:stop"
 fi
 
-sudo docker compose --file docker-compose-production.yml up -d --timeout=1
+sudo docker compose --file "docker-compose-$env.yml" up -d --timeout=1

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

@@ -1,11 +1,17 @@
 import { Commander, options } from '@aomex/console';
 import { rule } from '@aomex/core';
+import { cron } from '@aomex/cron';
+import timers from 'node:timers/promises';
 
 export const commander = new Commander();
 
-// npx aomex hello
-// npx aomex hello --user World
-// npx aomex hello -u aomex.js
+/**
+ * 指令示例
+ *
+ * npx aomex hello
+ * npx aomex hello --user World
+ * npx aomex hello -u aomex.js
+ */
 commander.create('hello', {
   mount: [
     options(
@@ -22,3 +28,30 @@ commander.create('hello', {
     console.log(`Hello ${user}`);
   },
 });
+
+/**
+ * 定时任务示例
+ *
+ * npx aomex cron:start 启动
+ * npx aomex cron:stop 结束
+ * npx aomex cron:stats 运行状态
+ * npx aomex cron:eject 查看列表
+ */
+commander.create('hello:cron', {
+  docs: {
+    summary: '执行 npx aomex -h 可以看到我',
+    description: '执行 npx aomex hello:cron -h 可以看到我',
+  },
+  mount: [
+    // cron({ second: '*/15' }),
+    cron({ minute: '*', args: ['--user', 'Boss'] }),
+    options({
+      user: rule.string().default('World'),
+    }),
+  ],
+  action: async (ctx) => {
+    const { user } = ctx.options;
+    console.log(`Hello ${user}`);
+    await timers.setTimeout(5_000);
+  },
+});

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

@@ -7,7 +7,7 @@ export const zh = I18n.define({
       plural: {
         '1': '这是你第一次访问',
         '2-4': '你表现的很熟练',
-        'n': '你是个老司机',
+        '5-n': '去看看其他功能吧',
       },
     },
   }),

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

@@ -14,6 +14,7 @@ router.get('/', {
         id: rule.int(),
         name: rule.string(),
         age: rule.int(),
+        address: rule.string().nullable(),
       }),
     }),
   ],
@@ -34,6 +35,7 @@ router.get('/:id', {
         id: rule.int(),
         name: rule.string(),
         age: rule.int(),
+        address: rule.string().nullable(),
       },
     }),
     response({
@@ -56,14 +58,14 @@ router.post('/', {
     body({
       name: rule.string(),
       age: rule.number(),
+      address: rule.string().optional(),
     }),
     response({
       statusCode: 201,
     }),
   ],
   action: async (ctx) => {
-    const { name, age } = ctx.body;
-    await services.user.createUser(name, age);
+    await services.user.createUser(ctx.body);
     ctx.send(201, null);
   },
 });

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

@@ -4,7 +4,7 @@ import { Prisma } from '@prisma/client';
 import { traceMethod } from '@aomex/async-trace';
 
 export class UserService extends Service {
-  @traceMethod('User.findAll')
+  @traceMethod()
   async findAll() {
     return prisma.user.findMany({
       orderBy: [
@@ -20,12 +20,9 @@ export class UserService extends Service {
     return prisma.user.findUnique({ where: { id: userId } });
   }
 
-  async createUser(name: string, age: number) {
+  async createUser(data: Prisma.UserCreateArgs['data']) {
     await prisma.user.create({
-      data: {
-        name,
-        age,
-      },
+      data: data,
     });
   }
 }

package/templates/scripts/deploy-integration.sh

@@ -1,14 +0,0 @@
-#!/usr/bin/env sh
-
-set -ex
-
-sudo docker build --tag {{projectName}}:integration --file Dockerfile.integration .
-
-cron_container_name={{projectName}}-cron-integration
-container_exist=$(sudo docker ps | { grep $cron_container_name || :; })
-if [ -n "$container_exist" ];
-then
-  sudo docker exec it $cron_container_name /bin/sh -c "npx aomex cron:stop"
-fi
-
-sudo docker compose --file docker-compose-integration.yml up -d --timeout=1

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

@@ -1,31 +0,0 @@
-import { Commander, options } from '@aomex/console';
-import { rule } from '@aomex/core';
-import { cron } from '@aomex/cron';
-
-export const commander = new Commander();
-
-commander.create('schedule', {
-  docs: {
-    summary: '执行 npx aomex -h 可以看到我',
-    description: '执行 npx aomex schedule -h 可以看到我',
-  },
-  mount: [
-    // cron({
-    //   second: '*/15',
-    // }),
-    cron({
-      minute: '*/2',
-      args: ['--user', 'Boss'],
-    }),
-    options({
-      user: rule.string().default('World'),
-    }),
-  ],
-  action: async (ctx) => {
-    const { user } = ctx.options;
-    console.log(`Hello ${user}`);
-    await new Promise((resolve) => {
-      setTimeout(resolve, 5_000);
-    });
-  },
-});