create-aomex 0.0.32 → 0.0.34

package/package.json

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

package/templates/.dockerignore

@@ -1,3 +1,7 @@
 volumes/
 node_modules/
 coverage/
+.git/
+.vscode/
+.husky/
+.idea/

package/templates/docker-compose-integration.yml

@@ -1,7 +1,7 @@
 services:
   migration:
     image: {{projectName}}:integration
-    command: prisma migrate deploy
+    command: npx prisma migrate deploy
   api:
     image: {{projectName}}:integration
     restart: always
@@ -9,5 +9,4 @@ services:
       - 3000:3000
   cron:
     image: {{projectName}}:integration
-    container_name: {{projectName}}-cron-integration
-    command: aomex cron:start
+    command: npx aomex cron:start

package/templates/docker-compose-production.yml

@@ -1,7 +1,7 @@
 services:
   migration:
     image: {{projectName}}:production
-    command: prisma migrate deploy
+    command: npx prisma migrate deploy
   api:
     image: {{projectName}}:production
     restart: always
@@ -9,5 +9,4 @@ services:
       - 3000:3000
   cron:
     image: {{projectName}}:production
-    container_name: {{projectName}}-cron-production
-    command: aomex cron:start
+    command: npx aomex cron:start

package/templates/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
-  db:
-    image: mysql:8.4
+  mysql:
+    image: mysql:8
     environment:
       # 修改后需要同步修改.env里的参数
       MYSQL_DATABASE: '{{projectName}}'
@@ -10,8 +10,17 @@ services:
     ports:
       - 3306:3306
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
+  mongo:
+    image: mongo:7
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: root
+      MONGO_INITDB_ROOT_PASSWORD: abcde
+    volumes:
+      - ./volumes/mongo:/data/db
+    ports:
+      - 27017:27017
   redis:
-    image: redis:7.4
+    image: redis:7
     volumes:
       - ./volumes/redis:/data
     ports:

package/templates/package.json

@@ -8,6 +8,7 @@
   },
   "scripts": {
     "start": "node scripts/start.mjs",
+    "cron:stats": "sh scripts/docker-cron-stats.sh",
     "deploy:production": "sh scripts/deploy.sh production",
     "deploy:integration": "sh scripts/deploy.sh integration",
     "prepare": "npx husky",

package/templates/scripts/build-in-docker.sh

@@ -11,5 +11,3 @@ rm -rf src
 mv build/src .
 pnpm install --prod
 rm -rf node_modules/@types node_modules/*/*.d.ts
-ln -s $PWD/node_modules/.bin/aomex /usr/local/bin/aomex
-ln -s $PWD/node_modules/.bin/prisma /usr/local/bin/prisma

package/templates/scripts/deploy.sh

@@ -3,15 +3,16 @@
 set -ex
 
 env="$1"
-projectName="{{projectName}}"
+project_name="{{projectName}}"
+docker_compose_file="docker-compose-$env.yml"
 
-sudo docker build --tag "$projectName:$env" --file "Dockerfile.$env" .
+sudo docker build --tag "$project_name:$env" --file "Dockerfile.$env" .
 
-cron_container_name="$projectName-cron-$env"
-container_exist=$(sudo docker ps | { grep $cron_container_name || :; })
-if [ -n "$container_exist" ];
+cron_service_name=cron
+if [ -n "$(sudo docker compose --file $docker_compose_file ps | { grep $cron_service_name || :; })" ]
 then
-  sudo docker exec it $cron_container_name /bin/sh -c "aomex cron:stop"
+  # exit 137 SIGKILL
+  { sudo docker compose --file $docker_compose_file exec -it $cron_service_name /bin/sh -c "npx aomex cron:stop" || :; }
 fi
 
-sudo docker compose --file "docker-compose-$env.yml" up -d --timeout=1 --remove-orphans
+sudo docker compose --file $docker_compose_file up -d --timeout=1 --remove-orphans

package/templates/scripts/docker-cron-stats.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+
+# exit 130 SIGINT
+{ sudo docker compose exec -it cron /bin/sh -c "npx aomex cron:stats" || :; }

package/templates/scripts/start.mjs

@@ -5,7 +5,7 @@ execSync('docker compose -f docker-compose.yml down', { stdio: 'inherit' });
 
 const docker = spawn('docker compose -f docker-compose.yml up', {
   stdio: ['inherit', 'inherit', 'pipe'],
-  shell: 'zsh',
+  shell: true,
 });
 
 await new Promise((resolve) => {
@@ -19,10 +19,10 @@ await new Promise((resolve) => {
 
 const server = spawn(
   'npx prisma migrate deploy && npx prisma generate && node --import tsx/esm --watch src/web.ts',
-  { stdio: 'inherit', shell: 'zsh' },
+  { stdio: 'inherit', shell: true },
 );
 
-const cron = spawn('npx', ['aomex', 'cron:start'], { stdio: 'inherit', shell: 'zsh' });
+const cron = spawn('npx aomex cron:start', { stdio: 'inherit', shell: true });
 
 // 防止被其它逻辑清除监听
 setTimeout(() => {

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

@@ -3,9 +3,11 @@ import { Caching } from '@aomex/cache';
 import { redisAdapter } from '@aomex/cache-redis-adapter';
 import { configs } from '@configs';
 
-export const cache = new Caching(redisAdapter(configs.redis));
+const cache = new Caching(redisAdapter(configs.redis));
 
 export class CacheService extends Service {
+  public readonly instance = cache;
+
   protected readonly demoKey = 'demo';
 
   getHotRankings() {