gemer zhang преди 6 месеца
родител
ревизия
6e6dcab18b
променени са 8 файла, в които са добавени 58 реда и са изтрити 19 реда
  1. 30 0
      docker-compose.yml
  2. 5 4
      package.json
  3. 3 0
      packages/backend/.dockerignore
  4. 5 4
      Dockerfile
  5. 3 0
      packages/backend/README.md
  6. 1 1
      packages/backend/ecosystem.config.js
  7. 5 4
      packages/backend/package.json
  8. 6 6
      pnpm-lock.yaml

+ 30 - 0
docker-compose.yml

@@ -0,0 +1,30 @@
+services:
+  backend:
+    image: gemer/helper_backend:latest
+    environment:
+      NODE_ENV: "production"
+      DB_HOST: "192.168.10.82" # 设置 root 用户密码
+      DB_PWD: "gemer...123"
+      DB_USER: "gemer"
+      DB_DATABASE: "helper_center"
+      REDIS_URL: "redis://redis:6379"
+    networks:
+      - backend
+    ports:
+      - "8085:8085"
+  redis:
+    image: redis:latest
+    # command: --requirepass "12345678"  # Uncomment if you need a password
+    restart: always
+    environment:
+      TZ: Asia/Shanghai # 指定时区
+    # volumes:
+    #   - ./data/redis/:/data/
+    networks:
+      - backend
+    ports:
+      - 6379:6379
+
+networks:
+  backend:
+    driver: bridge

+ 5 - 4
package.json

@@ -2,12 +2,13 @@
   "name": "helpercenter",
   "version": "1.0.0",
   "description": "helpercenter",
-  "dependencies": {
-  },
+  "dependencies": {},
   "devDependencies": {},
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "build-backend": "pnpm --filter @4dkankan/helperbackend run build",
+    "build-backend-html": "pnpm --filter @4dkankan/helperfrontend run build",
+    "build-web": "pnpm --filter @4dkankan/helperweb run build"
   },
   "author": "gemercheung@gmail.com",
   "license": "ISC"
-}
+}

+ 3 - 0
packages/backend/.dockerignore

@@ -0,0 +1,3 @@
+node_modules
+**/node_modules
+**/*/node_modules

+ 5 - 4
Dockerfile

@@ -1,8 +1,9 @@
-FROM node:18-alpine3.20
+FROM node:20-alpine
 
-ENV NODE_ENV=production
+# ENV NODE_ENV=production
 ENV APP_PORT=8085
 ENV DB_HOST=127.0.0.1
+ENV DB_USER=root
 ENV DB_PWD=""
 ENV DB_DATABASE=4dkankan_motion
 ENV REDIS_URL=''
@@ -10,9 +11,9 @@ ENV OSS_DOMAIN=https://ossxiaoan.4dage.com
 ENV OSS_FOLDER=/helperCenter
 
 WORKDIR /usr/src/app
-COPY ./packages/backend /usr/src/app
+COPY ./ /usr/src/app
 
-RUN cd ${WORKDIR} 
+RUN cd ${WORKDIR}
 RUN npm install pnpm -g
 RUN npm install pm2 -g
 RUN pnpm install

+ 3 - 0
packages/backend/README.md

@@ -23,3 +23,6 @@
 - 复制、修改和发行本项目代码需包含原作者的版权及许可信息,包括但不限于文件头注释、协议等
 
 简单来说,作者只想保留版权,没有任何其他限制。
+
+
+docker run -d --name test -e "DB_HOST=192.168.10.82" -e "REDIS_PASSWORD="  gemer/helper_backend

+ 1 - 1
packages/backend/ecosystem.config.js

@@ -2,7 +2,7 @@ module.exports = {
   apps: [
     {
       name: 'helper-backend',
-      exec_mode: 'cluster',
+      exec_mode: 'fork',
       instances: '4',
       script: './dist/main.js',
       args: '',

+ 5 - 4
packages/backend/package.json

@@ -45,7 +45,9 @@
     "svg-captcha": "^1.4.0",
     "typeorm": "^0.3.17",
     "typeorm-i18n": "0.2.0-rc.1",
-    "typeorm-translatable": "^0.2.0"
+    "typeorm-translatable": "^0.2.0",
+    "@nestjs/cli": "^10.4.9",
+    "typescript": "^5.7.3"
   },
   "devDependencies": {
     "@nestjs/cli": "^10.4.9",
@@ -71,7 +73,6 @@
     "ts-jest": "^29.1.0",
     "ts-loader": "^9.4.3",
     "ts-node": "^10.9.1",
-    "tsconfig-paths": "^4.2.0",
-    "typescript": "^5.7.3"
+    "tsconfig-paths": "^4.2.0"
   }
-}
+}

+ 6 - 6
pnpm-lock.yaml

@@ -10,6 +10,9 @@ importers:
 
   packages/backend:
     dependencies:
+      '@nestjs/cli':
+        specifier: ^10.4.9
+        version: 10.4.9
       '@nestjs/common':
         specifier: ^10.0.0
         version: 10.4.15(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1)
@@ -103,10 +106,10 @@ importers:
       typeorm-translatable:
         specifier: ^0.2.0
         version: 0.2.0(typeorm@0.3.20(mysql2@3.12.0)(redis@4.7.0)(ts-node@10.9.2(@types/node@20.17.11)(typescript@5.7.3)))
+      typescript:
+        specifier: ^5.7.3
+        version: 5.7.3
     devDependencies:
-      '@nestjs/cli':
-        specifier: ^10.4.9
-        version: 10.4.9
       '@nestjs/schematics':
         specifier: ^10.0.0
         version: 10.2.3(chokidar@3.6.0)(typescript@5.7.3)
@@ -176,9 +179,6 @@ importers:
       tsconfig-paths:
         specifier: ^4.2.0
         version: 4.2.0
-      typescript:
-        specifier: ^5.7.3
-        version: 5.7.3
 
   packages/frontend:
     dependencies: