From b011cd2ef8c364d9bfa96ce3ca23d51c7b372054 Mon Sep 17 00:00:00 2001
From: SliverHorn <503551462@qq.com>
Date: Fri, 7 Aug 2020 10:41:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=81=A2=E5=A4=8Dweb=E7=9A=84=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AFproduction=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E7=9A=84v1=E4=BB=A3=E7=90=86,server=E7=9A=84config.yaml?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8Acore=E6=96=87=E4=BB=B6=E5=A4=B9=E4=B8=8B?=
 =?UTF-8?q?=E7=9A=84server.go=E6=96=87=E4=BB=B6=E6=81=A2=E5=A4=8D=E5=8E=9F?=
 =?UTF-8?q?=E6=A0=B7,=E6=96=B0=E5=A2=9E=E4=B8=A4=E4=B8=AA=E5=91=BD?=
 =?UTF-8?q?=E4=BB=A4=E8=A1=8C=E8=84=9A=E6=9C=AC=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8F=8A=E6=96=87=E4=BB=B6=E5=8F=98=E5=8A=A8?=
 =?UTF-8?q?,=E4=BF=AE=E6=94=B9mysql=E7=9A=843306=E7=AB=AF=E5=8F=A3?=
 =?UTF-8?q?=E4=B8=BA13306?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yaml     |   2 +-
 docker/server-handle.sh | 112 ++++++++++++++++++++++++++++++++++++++++
 docker/web-handle.sh    |  10 ++++
 dockerfile_server       |  16 ++++++
 server/config.yaml      |   6 +--
 server/core/server.go   |   1 -
 web/.env.production     |   2 +-
 7 files changed, 143 insertions(+), 6 deletions(-)
 create mode 100644 docker/server-handle.sh
 create mode 100644 docker/web-handle.sh

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 7d27ef4f..a565c389 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -19,7 +19,7 @@ services:
     command: mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci #设置utf8字符集
     restart: always
     ports:
-      - "3306:3306"  # host物理直接映射端口为6606
+      - "13306:3306"  # host物理直接映射端口为6606
     environment:
       MYSQL_ROOT_PASSWORD: "Aa@6447985" # root管理员用户密码
 
diff --git a/docker/server-handle.sh b/docker/server-handle.sh
new file mode 100644
index 00000000..faf75123
--- /dev/null
+++ b/docker/server-handle.sh
@@ -0,0 +1,112 @@
+#! /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"
+	"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 ", 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())
+}
+EOF
+
+rm -f ./config.yaml
+# 生成config.yaml文件, 用于docker-compose的使用
+touch ./config.yaml
+filename="./config.yaml"
+cat>"${filename}"<<EOF
+# Gin-Vue-Admin Global Configuration
+
+# casbin configuration
+casbin:
+    model-path: './resource/rbac_model.conf'
+
+# jwt configuration
+jwt:
+    signing-key: 'qmPlus'
+
+# mysql connect configuration
+mysql:
+    username: root
+    password: 'Aa@6447985'
+    path: mysql
+    db-name: 'qmPlus'
+    config: 'charset=utf8&parseTime=True&loc=Local'
+    max-idle-conns: 10
+    max-open-conns: 10
+    log-mode: true
+
+#sqlite 配置
+sqlite:
+    path: db.db
+    log-mode: true
+    config: 'loc=Asia/Shanghai'
+
+# oss configuration
+
+# 请自行七牛申请对应的 公钥 私钥 bucket 和 域名地址
+qiniu:
+    access-key: '25j8dYBZ2wuiy0yhwShytjZDTX662b8xiFguwxzZ'
+    secret-key: 'pgdbqEsf7ooZh7W3xokP833h3dZ_VecFXPDeG5JY'
+    bucket: 'qm-plus-img'
+    img-path: 'http://qmplusimg.henrongyi.top'
+
+# redis configuration
+redis:
+    addr: redis:6379
+    password: ''
+    db: 0
+
+# system configuration
+system:
+    use-multipoint: true
+    env: 'public'  # Change to "develop" to skip authentication for development mode
+    addr: 8888
+    db-type: "mysql"  # support mysql/sqlite
+
+# captcha configuration
+captcha:
+    key-long: 6
+    img-width: 240
+    img-height: 80
+
+# logger configuration
+log:
+    prefix: '[GIN-VUE-ADMIN]'
+    log-file: true
+    stdout: 'DEBUG'
+    file: 'DEBUG'
+EOF
+
diff --git a/docker/web-handle.sh b/docker/web-handle.sh
new file mode 100644
index 00000000..f4c969ed
--- /dev/null
+++ b/docker/web-handle.sh
@@ -0,0 +1,10 @@
+#! /bin/bash
+
+rm -f .env.production
+touch .env.production
+filename="./.env.production"
+cat>"${filename}"<<EOF
+ENV = 'production'
+VUE_APP_BASE_API = ''
+EOF
+
diff --git a/dockerfile_server b/dockerfile_server
index 683846f2..018f0d53 100644
--- a/dockerfile_server
+++ b/dockerfile_server
@@ -2,6 +2,13 @@ FROM node:12.16.1 as gva-web
 
 WORKDIR /gva_web/
 COPY web/ .
+
+RUN cat .env.production
+COPY docker/web-handle.sh .
+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
@@ -12,6 +19,15 @@ 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/server-handle.sh .
+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 .
 
 
diff --git a/server/config.yaml b/server/config.yaml
index f56d2993..42be755c 100644
--- a/server/config.yaml
+++ b/server/config.yaml
@@ -12,7 +12,7 @@ jwt:
 mysql:
     username: root
     password: 'Aa@6447985'
-    path: mysql
+    path: '127.0.0.1:3306'
     db-name: 'qmPlus'
     config: 'charset=utf8&parseTime=True&loc=Local'
     max-idle-conns: 10
@@ -36,13 +36,13 @@ qiniu:
 
 # redis configuration
 redis:
-    addr: redis:6379
+    addr: '127.0.0.1:6379'
     password: ''
     db: 0
 
 # system configuration
 system:
-    use-multipoint: true
+    use-multipoint: false
     env: 'public'  # Change to "develop" to skip authentication for development mode
     addr: 8888
     db-type: "mysql"  # support mysql/sqlite
diff --git a/server/core/server.go b/server/core/server.go
index c3da2b45..f855aede 100644
--- a/server/core/server.go
+++ b/server/core/server.go
@@ -18,7 +18,6 @@ func RunWindowsServer() {
 	}
 	Router := initialize.Routers()
 	Router.Static("/form-generator", "./resource/page")
-	Router.Static("/admin", "./resource/dist")
 
 	//InstallPlugs(Router)
 	// end 插件描述
diff --git a/web/.env.production b/web/.env.production
index ad9185dc..7fa06da5 100644
--- a/web/.env.production
+++ b/web/.env.production
@@ -1,2 +1,2 @@
 ENV = 'production'
-VUE_APP_BASE_API = ''
\ No newline at end of file
+VUE_APP_BASE_API = '/v1'
\ No newline at end of file