Merge remote-tracking branch 'origin/gva_gormv2_dev' into gva_gormv2_dev

.docker-compose/nginx/conf.d/my.conf

+server {
+    listen       8000;
+    server_name localhost;
+
+    #charset koi8-r;
+    #access_log  logs/host.access.log  main;
+
+    location / {
+        root /usr/share/nginx/html;
+        add_header Cache-Control 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0';
+        try_files $uri $uri/ /index.html;
+    }
+
+    location /api {
+        proxy_set_header Host $http_host;
+        proxy_set_header  X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        rewrite ^/api/(.*)$ /$1 break;  #重写
+        proxy_pass http://177.7.0.12:8888; # 设置代理服务器的协议和地址
+     }
+
+    location /api/swagger/index.html {
+        proxy_pass http://127.0.0.1:8888/swagger/index.html;
+     }
+ }
\ No newline at end of file

.docker-compose/shell/server-handle.sh

 #! /bin/bash
 
-rm -f ./core/server.go
-# 生成server.go文件, 添加Router.Static("/admin", "./resource/dist")这个代码
-touch ./core/server.go
-filename="./core/server.go"
-cat>"${filename}"<<EOF
-package core
-
-import (
-	"fmt"
-	"gin-vue-admin/global"
-	"gin-vue-admin/initialize"
-	"go.uber.org/zap"
-	"time"
-)
-
-type server interface {
-	ListenAndServe() error
-}
-
-func RunWindowsServer() {
-	if global.GVA_CONFIG.System.UseMultipoint {
-		// 初始化redis服务
-		initialize.Redis()
-	}
-	Router := initialize.Routers()
-	Router.Static("/form-generator", "./resource/page")
-	Router.Static("/admin", "./resource/dist")
-
-	//InstallPlugs(Router)
-	// end 插件描述
-
-	address := fmt.Sprintf(":%d", global.GVA_CONFIG.System.Addr)
-	s := initServer(address, Router)
-	// 保证文本顺序输出
-	// In order to ensure that the text order output can be deleted
-	time.Sleep(10 * time.Microsecond)
-	global.GVA_LOG.Debug("server run success on ", zap.String("address", address))
-
-	fmt.Printf("欢迎使用 Gin-Vue-Admin默认自动化文档地址:http://127.0.0.1%s/swagger/index.html\n 默认前端文件运行地址:http://127.0.0.1:8888/admin\n", address)
-	global.GVA_LOG.Error(s.ListenAndServe().Error())
-}
-EOF
-
 rm -f ./config.yaml
 # 生成config.yaml文件, 用于docker-compose的使用
 touch ./config.yaml
@@ -123,5 +80,14 @@ zap:
   encode_level: 'LowercaseColorLevelEncoder'
   stacktrace_key: 'stacktrace'
   log_in_console: true
+
+email:
+  email_from: 'xxx@163.com'
+  email_nick_name: 'test'
+  email_secret: 'xxx'
+  email_to: 'xxx@qq.com'
+  email_host: 'smtp.163.com'
+  email_port: 465
+  email_isSSL: true
 EOF
 

.docker-compose/shell/web-handle.sh

-#! /bin/bash
-
-rm -f .env.production
-touch .env.production
-filename="./.env.production"
-cat>"${filename}"<<EOF
-ENV = 'production'
-VUE_APP_BASE_API = ''
-EOF
-

README-en.md

-
+
 <div align=center>
 <img src="http://qmplusimg.henrongyi.top/gvalogo.jpg" width=300" height="300" />
 </div>
@@ -62,18 +62,20 @@ We are excited that you are interested in contributing to gin-vue-admin. Before
 ### 1.3 Version list
 
 - master: 2.0 code, for prod
-
 - develop: 2.0 dev code, for test
-
-- [gin-vue-admin_v2.0_dev](https://github.com/flipped-aurora/gin-vue-admin/tree/gin-vue-admin_v2_dev) （v2.0 is no longer compatible with v1.0）
-
-- [gin-vue-admin_v1.0_stable](https://github.com/flipped-aurora/gin-vue-admin/tree/gin-vue-admin_v1_stable) （stop maintenance）
-
-- [gin-vue-admin_v1.0_dev](https://github.com/flipped-aurora/gin-vue-admin/tree/gin-vue-admin_v1_dev) （stop maintenance）
-
+- [gin-vue-admin_v2_dev](https://github.com/flipped-aurora/gin-vue-admin/tree/gin-vue-admin_v2_dev) (v2.0 [GormV1](https://v1.gorm.io) Stable branch)
+- [gva_gormv2_dev](https://github.com/flipped-aurora/gin-vue-admin/tree/gva_gormv2_dev) (v2.0 [GormV2](https://v2.gorm.io) Development branch)
 
 ## 2. Getting started
 
+```
+- node version > v8.6.0
+- golang version >= v1.11
+- IDE recommendation: Goland
+- After you clone the project, use the scripts in directory db to create your own database.
+- We recommend you to apply for your own cloud service in QINIU. Replace the public key, private key, warehouse name and default url address with your own, so as not to mess up the test database.
+```
+
 > Use docker-compose to experience this project
 - Installation docker-compose [Official document](https://docs.docker.com/compose/install/)
     - ```shell script
@@ -95,6 +97,7 @@ We are excited that you are interested in contributing to gin-vue-admin. Before
     - ```git
         git clone https://github.com/flipped-aurora/gin-vue-admin.git
       ```
+    
 - Use docker-compose up to start the startup project with one click
     - ```shell script
       # Use docker-compose to start four containers
@@ -105,17 +108,31 @@ We are excited that you are interested in contributing to gin-vue-admin. Before
       docker-compose up -d
       ```
 
-    - Web project preview [http://127.0.0.1:8888/admin](http://127.0.0.1:8888/admin)
+    - Web project preview [http://127.0.0.1:8000](http://127.0.0.1:8000)
 
     - swagger APIs [http://127.0.0.1:8888/swagger/index.html](http://127.0.0.1:8888/swagger/index.html)
 
-```
-- node version > v8.6.0
-- golang version >= v1.11
-- IDE recommendation: Goland
-- After you clone the project, use the scripts in directory db to create your own database.
-- We recommend you to apply for your own cloud service in QINIU. Replace the public key, private key, warehouse name and default url address with your own, so as not to mess up the test database.
-```
+- If the internal ip of the server's 177.7.0.12 container is occupied, the place to be modified is
+
+  - Replace 177.7.0.12 on line 39 of [docker-compose.yaml](./docker-compose.yaml) with the ip you want
+  - Replace 177.7.0.12 in line 20 of [.docker-compose/nginx/conf.d/my.conf](./.docker-compose/nginx/conf.d/my.conf) with the ip you want
+
+- docker-compose uses a custom docker network
+
+    - ```dockerfile
+        networks:
+          network:
+            ipam:
+              driver: default
+              config:
+                - subnet: '177.7.0.0/16' 
+        ```
+
+    - Subnet address, the default gateway is 177.7.0.1 (docker-compose V2 needs to write, V3 does not need),For specific information, see the [official document](https://docs.docker.com/compose/compose-file/#ipv4_address-ipv6_address)
+
+    - The default network name is gin-vue-admin_network, and the default is bridge mode
+
+    - If the subnet is modified, the ipv4_address of each service needs to be modified, and the ip of the server on line 20 of [.docker-compose/nginx/conf.d/my.conf](.docker-compose/nginx/conf.d/my.conf) also needs to be modified
 
 ### 2.1 Web
 
@@ -155,7 +172,7 @@ go get -u github.com/swaggo/swag/cmd/swag
 ````
 
 ##### (2) In mainland China
- 
+
 In mainland China, access to go.org/x is prohibited，we recommend [goproxy.io](https://goproxy.io/zh/)
 
 ````bash
@@ -278,7 +295,7 @@ backend code file: model\dnModel\api.go
 
 (1) Development environment course
 > Bilibili：https://www.bilibili.com/video/BV1Fg4y187Bw/
-    
+
 (2) Template course
 > Bilibili：https://www.bilibili.com/video/BV16K4y1r7BD/
 
@@ -293,8 +310,8 @@ backend code file: model\dnModel\api.go
 ### 8.1 Groups
 #### QQ group: 622360840
 
-| QQ group | 
-|  :---:  |  
+| QQ group |
+|  :---:  |
 | <img src="http://qmplusimg.henrongyi.top/qq.jpg" width="180"/> |
 
 

README.md

@@ -57,15 +57,9 @@ Gin-vue-admin 的成长离不开大家的支持，如果你愿意为 gin-vue-adm
 ### 1.3 版本列表
 
 - master: 2.0, 用于生产环境
-
 - develop: 2.0, 用于测试环境
-
-- [gin-vue-admin_v2.0_dev](https://github.com/flipped-aurora/gin-vue-admin/tree/gin-vue-admin_v2_dev) （v2.0 不再兼容 v1.0）
-
-- [gin-vue-admin_v1.0_stable](https://github.com/flipped-aurora/gin-vue-admin/tree/gin-vue-admin_v1_stable) （v1.0停止维护）
-
-- [gin-vue-admin_v1.0_dev](https://github.com/flipped-aurora/gin-vue-admin/tree/gin-vue-admin_v1_dev) （v1.0停止维护）
-
+- [gin-vue-admin_v2_dev](https://github.com/flipped-aurora/gin-vue-admin/tree/gin-vue-admin_v2_dev) (v2.0 [GormV1版本](https://v1.gorm.io)稳定分支)
+- [gva_gormv2_dev](https://github.com/flipped-aurora/gin-vue-admin/tree/gva_gormv2_dev) (v2.0 [GormV2版本](https://v2.gorm.io)开发分支)
 
 ## 2. 使用说明
 
@@ -99,6 +93,7 @@ Gin-vue-admin 的成长离不开大家的支持，如果你愿意为 gin-vue-adm
     - ```git
         git clone https://github.com/flipped-aurora/gin-vue-admin.git
       ```
+    
 - 使用docker-compose up一键启动启动项目
     - ```shell script
       # 使用docker-compose启动四个容器
@@ -109,11 +104,31 @@ Gin-vue-admin 的成长离不开大家的支持，如果你愿意为 gin-vue-adm
       docker-compose up -d
       ```
 
-    - web项目预览 [http://127.0.0.1:8888/admin](http://127.0.0.1:8888/admin)
+    - web项目预览 [http://127.0.0.1:8000](http://127.0.0.1:8000)
 
     - swagger文档 [http://127.0.0.1:8888/swagger/index.html](http://127.0.0.1:8888/swagger/index.html)
 
+- 如果server的177.7.0.12这个容器内部ip被占用了,需要修改地方为
+
+	- [docker-compose.yaml](./docker-compose.yaml)的第39行的177.7.0.12更换为你想要的ip
+	- [.docker-compose/nginx/conf.d/my.conf](./.docker-compose/nginx/conf.d/my.conf)的第20行的177.7.0.12更换为你想要的ip
 
+- docker-compose使用自定义的一个docker网络
+
+	- ```dockerfile
+		networks:
+		  network:
+		    ipam:
+		      driver: default
+		      config:
+		        - subnet: '177.7.0.0/16' 
+		```
+
+	- 子网地址, 默认网关是177.7.0.1(docker-compose V2需要写,V3则不需要),具体信息看[官方文档](https://docs.docker.com/compose/compose-file/#ipv4_address-ipv6_address)
+
+	- 默认的network名为gin-vue-admin_network,默认是bridge模式
+
+	- 如果修改了子网,对应的每个service的ipv4_address都需要修改,还有[.docker-compose/nginx/conf.d/my.conf](./.docker-compose/nginx/conf.d/my.conf)的第20行的server的ip也需要修改
 
 ### 2.1 web端
 
@@ -270,7 +285,7 @@ swag init
 
 （1）环境搭建
 > Bilibili：https://www.bilibili.com/video/BV1Fg4y187Bw/ (v1.0版本视频，v2.0操作相同目录不同)
-    
+
 （2）模板使用
 > Bilibili：https://www.bilibili.com/video/BV16K4y1r7BD/ (v1.0版本视频，v2.0操作相同目录不同)
 
@@ -286,7 +301,7 @@ swag init
 
 ### QQ交流群：622360840
 | QQ 群(满) |
-|  :---:  |   
+|  :---:  |
 | <img src="http://qmplusimg.henrongyi.top/qq.jpg" width="180"/> |
 
 ### 微信交流群

docker-compose.yaml

 version: "3.8"
 
+networks:
+  network:
+    ipam:
+      driver: default
+      config:
+        - subnet: '177.7.0.0/16'
+
 services:
+  web:
+    build:
+      context: ./
+      dockerfile: ./dockerfile_web
+    container_name: gva-web
+    restart: always
+    ports:
+      - '8000:8000'
+    depends_on:
+      - server
+    command: [ 'nginx-debug', '-g', 'daemon off;' ]
+    networks:
+      network:
+        ipv4_address: 177.7.0.11
+
   server:
     build:
       context: ./
       dockerfile: ./dockerfile_server
-    container_name: gva-server # 容器名
+    container_name: gva-server
     restart: always
     ports:
       - '8888:8888'
     depends_on:
       - mysql
       - redis
+    networks:
+      network:
+        ipv4_address: 177.7.0.12
 
   mysql:
     image: mysql:8.0.21
@@ -19,16 +44,22 @@ services:
     command: mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci #设置utf8字符集
     restart: always
     ports:
-      - "13306:3306"  # host物理直接映射端口为6606
+      - "13306:3306"  # host物理直接映射端口为13306
     environment:
       MYSQL_DATABASE: 'qmPlus' # 初始化启动时要创建的数据库的名称
       MYSQL_ROOT_PASSWORD: 'Aa@6447985' # root管理员用户密码
     volumes:
-    - '.docker-compose/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d'
+      - '.docker-compose/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d'
+    networks:
+      network:
+        ipv4_address: 177.7.0.13
 
   redis:
     image: redis:6.0.6
     container_name: gva-redis # 容器名
     restart: always
     ports:
-      - '6379:6379'
\ No newline at end of file
+      - '6379:6379'
+    networks:
+      network:
+        ipv4_address: 177.7.0.14
\ No newline at end of file

dockerfile_server

-FROM node:12.16.1 as gva-web
-
-WORKDIR /gva_web/
-COPY web/ .
-
-RUN cat .env.production
-COPY .docker-compose/shell/web-handle.sh .
-RUN ls -al
-RUN sh ./web-handle.sh
-RUN cat .env.production
-RUN rm -f web-handle.sh
-
-RUN npm install -g cnpm --registry=https://registry.npm.taobao.org
-RUN cnpm install || npm install
-RUN npm run build
-
-FROM golang:alpine as gva-server
+FROM golang:alpine
 
 ENV GO111MODULE=on
 ENV GOPROXY=https://goproxy.io,direct
 WORKDIR /go/src/gin-vue-admin
 COPY server/ ./
 
-RUN cat ./core/server.go
 RUN cat ./config.yaml
 COPY .docker-compose/shell/server-handle.sh .
 RUN ls -al
 RUN sh ./server-handle.sh
 RUN rm -f server-handle.sh
-RUN cat ./core/server.go
 RUN cat ./config.yaml
 
-RUN go env && go list && go build -o gva-server .
-
+RUN go env && go build -o server .
 
-FROM nginx:alpine
-LABEL MAINTAINER="SliverHorn"
 
-WORKDIR gva/
-
-# copy web
-COPY --from=gva-web /gva_web/dist ./resource/dist
-# copy server
-COPY --from=gva-server /go/src/gin-vue-admin/gva-server ./
-COPY --from=gva-server /go/src/gin-vue-admin/config.yaml ./
-COPY --from=gva-server /go/src/gin-vue-admin/resource ./resource
+FROM alpine:latest
+LABEL MAINTAINER="SliverHorn@sliver_horn@qq.com"
 
+WORKDIR /go/src/gin-vue-admin
 
-EXPOSE 8888
+COPY --from=0 /go/src/gin-vue-admin/server ./
+COPY --from=0 /go/src/gin-vue-admin/config.yaml ./
+COPY --from=0 /go/src/gin-vue-admin/resource ./resource
 
-ENTRYPOINT ./gva-server
+ENTRYPOINT ./server
 
 # 根据Dockerfile生成Docker镜像
 

dockerfile_web

+FROM node:12.16.1
+
+WORKDIR /gva_web/
+COPY web/ .
+
+RUN npm install -g cnpm --registry=https://registry.npm.taobao.org
+RUN cnpm install || npm install
+RUN npm run build
+
+FROM nginx:alpine
+LABEL MAINTAINER="SliverHorn@sliver_horn@qq.com"
+
+COPY .docker-compose/nginx/conf.d/my.conf /etc/nginx/conf.d/my.conf
+COPY --from=0 /gva_web/dist /usr/share/nginx/html
+RUN cat /etc/nginx/nginx.conf
+RUN cat /etc/nginx/conf.d/my.conf
+RUN ls -al /usr/share/nginx/html
+CMD ls -al /usr/share/nginx/html

server/core/server.go

@@ -29,7 +29,7 @@ func RunWindowsServer() {
 
 	fmt.Printf(`欢迎使用 Gin-Vue-Admin
 	默认自动化文档地址:http://127.0.0.1%s/swagger/index.html
-	默认前端文件运行地址:http://127.0.0.1:8080
+	默认前端文件运行地址:http://127.0.0.1:8000
 `, address)
 	global.GVA_LOG.Error(s.ListenAndServe().Error())
 }