Dev

.gitignore

@@ -1,6 +1,11 @@
-package-lock.json
 npm-debug.log
 node_modules/
 dist/
 .nyc_output/
-coverage/
+coverage/
+server/static/
+server/upload/
+server/report/
+server/yarn-error.log
+.vscode/
+data/

docker-compose-build.yml

@@ -0,0 +1,39 @@
+# 离线构建版本,减少pull镜像时间
+version: "2"
+services:
+  web:
+    build:
+      context: ./web
+      dockerfile: Dockerfile
+    container_name: api-web
+    working_dir: /etc/nginx/
+    tty: true
+    stdin_open: true
+    restart: always
+    ports:
+      - 2017:2017
+    depends_on: 
+      - server
+  server:
+    build:
+      context: ./server
+      dockerfile: Dockerfile
+    container_name: api-server
+    working_dir: /app
+    tty: true
+    stdin_open: true
+    restart: always
+    ports:
+      - 2018:2018
+    depends_on: 
+      - db
+  db:
+    image: mongo:3
+    container_name: api-db
+    tty: true
+    stdin_open: true
+    restart: always
+    volumes:
+      - ./data:/data
+    ports:
+      - 27001:27017

docker-compose-dev.yml

@@ -0,0 +1,45 @@
+# 开发环境
+version: "2"
+services:
+  api-web-dev:
+    build:
+      context: ./web
+      dockerfile: Dockerfile4dev
+    image: bestapi_web:dev
+    container_name: api-web-dev
+    working_dir: /app
+    tty: true
+    stdin_open: true
+    environment:
+      SERVER_HOST: api-server-dev 
+    volumes: 
+      - ./web:/app
+    ports:
+      - 20170:2017
+    depends_on:
+      - api-server-dev
+  api-server-dev:
+    build:
+      context: ./server
+      dockerfile: Dockerfile4dev
+    image: bestapi_server:dev
+    container_name: api-server-dev
+    working_dir: /app
+    tty: true
+    stdin_open: true
+    volumes:
+      - ./server:/app
+    ports:
+      - 20180:2018
+      - 8102:5858
+    depends_on: 
+      - api-db-dev
+  api-db-dev:
+    image: mongo:3
+    container_name: api-db-dev
+    volumes:
+      - api_db_data:/data
+    ports:
+      - 27000:27017
+volumes:
+  api_db_data:

docker-compose.yml

@@ -1,39 +1,28 @@
-version: "3"
+#  生产环境
+version: "2"
 services:
-  web:
-    build:
-      context: ./web
+  api-web:
+    image: yalishizhude/bestapi-web
     container_name: api-web
-    working_dir: /app
     tty: true
     stdin_open: true
-    volumes: 
-      - api_web_modules:/app/node_modules
-      - ./web:/app
-    ports:
-      - 2017:2017
-    command: npm run compose
-  server:
-    build:
-      context: ./server
+    restart: always
+    network_mode: host
+    depends_on:
+      - api-server
+  api-server:
+    image: yalishizhude/bestapi-server
     container_name: api-server
-    working_dir: /app
     tty: true
     stdin_open: true
-    volumes:
-      - api_server_modules:/app/node_modules
-      - ./server:/app
-    ports:
-      - 2018:2018
-      - 8102:5858
-    command: npm run compose
+    restart: always
+    network_mode: host
     depends_on: 
-      - db
-  db:
-    image: mongo:latest
+      - api-db
+  api-db:
+    image: mongo:3
     container_name: api-db
-    ports:
-      - 27018:27017
-volumes:
-  api_web_modules:
-  api_server_modules:
+    restart: always
+    network_mode: host
+    volumes:
+      - ./data:/data

readme.md

@@ -1,9 +1,3 @@
 # 功能点
-* API模板。可以通过模板来创建新的API
 * 导出模板。可以通过html模板导出成想要文档
 * 开放API。支持调用接口访问API信息
-* API参数增加枚举类型。
-* API版本信息可编辑
-
-# 
-### element-ui官方未提供 d.ts模块声明文件，若在src里添加vue-shimes.d.ts，会造成karma测试不通过，暂时手动在node_module/element-ui/下，添加index.d.ts文件

server/Dockerfile

@@ -1,11 +1,14 @@
 # api-server
-FROM node:7-alpine
+FROM node:8
 RUN mkdir /app
 RUN chmod 777 /app
 WORKDIR /app
 VOLUME ["/app"]
 EXPOSE 2018
-
 COPY ./Hongkong /etc/localtime
 RUN npm set registry https://registry.npm.taobao.org
-RUN npm i -g pm2 nodemon typescript
+RUN yarn global add pm2
+COPY ./template /app/template
+COPY ./node_modules /app/node_modules
+COPY ./dist /app
+ENTRYPOINT pm2-docker start ./app.js

server/Dockerfile4dev

@@ -0,0 +1,12 @@
+# api-server
+FROM node:8
+RUN mkdir /app
+RUN chmod 777 /app
+WORKDIR /app
+VOLUME ["/app"]
+EXPOSE 2018
+ENV DB_HOST=api-db-dev
+COPY ./Hongkong /etc/localtime
+RUN npm set registry https://registry.npm.taobao.org
+RUN yarn global add nodemon typescript@2.4
+RUN echo "请执行 npm run init 安装依赖"

server/_Dockerfile

@@ -0,0 +1,13 @@
+# api-server
+FROM node:8
+RUN mkdir /app
+RUN chmod 777 /app
+WORKDIR /app
+EXPOSE 2018
+
+COPY ./Hongkong /etc/localtime
+RUN npm set registry https://registry.npm.taobao.org
+RUN npm i -g pm2
+ENV DB_HOST=api-db
+COPY ./ /app
+ENTRYPOINT pm2 start --name api-server ./dist/app.js && bash