Merge branch 'master' of https://github.com/flipped-aurora/gin-vue-admin into gva_workflow

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

@@ -49,8 +49,6 @@ system:
   addr: 8888
   db-type: 'mysql'
   oss-type: 'local'
-  config-env: 'GVA_CONFIG'
-  need-init-data: true
   use-multipoint: false
 
 # captcha configuration
@@ -70,36 +68,6 @@ mysql:
   max-open-conns: 10
   log-mode: false
 
-# sqlite connect configuration (sqlite需要gcc支持 windows用户需要自行安装gcc)
-sqlite:
-  path: 'db.db'
-  max-idle-conns: 10
-  max-open-conns: 10
-  logger: true
-
-# Sqlserver connect configuration
-sqlserver:
-  path: 'localhost:9930'
-  db-name: 'gorm'
-  username: 'gorm'
-  password: 'LoremIpsum86'
-  max-idle-conns: 10
-  max-open-conns: 10
-  logger: true
-
-# Postgresql connect configuration
-postgresql:
-  host: '127.0.0.1'
-  port: '9920'
-  config: 'sslmode=disable TimeZone=Asia/Shanghai'
-  db-name: 'gorm'
-  username: 'gorm'
-  password: 'gorm'
-  max-idle-conns: 10
-  max-open-conns: 10
-  prefer-simple-protocol: true
-  logger: false
-
 # local configuration
 local:
   path: 'uploads/file'

README.md

@@ -12,7 +12,8 @@
 
 [English](./README-en.md) | 简体中文
 
-[国内仓库地址](https://gitee.com/FLIPPED-AURORA/gin-vue-admin)
+[gitee地址](https://gitee.com/pixelmax/gin-vue-admin)
+[github地址](https://github.com/flipped-aurora/gin-vue-admin)
 
 # 项目文档
 [在线文档](https://www.gin-vue-admin.com/) : https://www.gin-vue-admin.com/

dockerfile_server

@@ -12,6 +12,7 @@ RUN sh ./server-handle.sh
 RUN rm -f server-handle.sh
 RUN cat ./config.yaml
 
+RUN go build -o gva cmd/main.go
 RUN go env && go build -o server .
 
 
@@ -20,24 +21,11 @@ LABEL MAINTAINER="SliverHorn@sliver_horn@qq.com"
 
 WORKDIR /go/src/gin-vue-admin
 
+COPY --from=0 /go/src/gin-vue-admin/gva ./
 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
 
 EXPOSE 8888
 
-ENTRYPOINT ./server
-
-# 根据Dockerfile生成Docker镜像
-
-# docker build -t gva-server:1.0 .
-
-#- 根据Docker镜像启动Docker容器
-#    - 后台运行
-#    - ```
-#    docker run -d -p 8888:8888 --name gva-server-v1 gva-server:1.0
-#      ```
-#    - 以可交互模式运行, Ctrl + p + q
-#    - ```
-#    docker run -it -p 8888:8888 --name gva-server-v1 gva-server:1.0
-#      ```
+ENTRYPOINT ./gva initdb && ./server

server/Dockerfile

@@ -1,19 +1,20 @@
-FROM golang:alpine as builder
+FROM golang:alpine
 
-# 设置go mod proxy 国内代理
-# 设置golang path
-ENV GOPROXY=https://goproxy.cn,https://goproxy.io,direct \
-    GO111MODULE=on \
-    CGO_ENABLED=1
-WORKDIR /ginvue
-RUN go env -w GOPROXY=https://goproxy.cn,https://goproxy.io,direct
+ENV GO111MODULE=on
+ENV GOPROXY=https://goproxy.io,direct
+
+WORKDIR /go/src/gin-vue-admin
 COPY . .
-RUN go env && go list && go build -o app main.go
+RUN go env && go build -o server .
+
+FROM alpine:latest
+LABEL MAINTAINER="SliverHorn@sliver_horn@qq.com"
+
+WORKDIR /go/src/gin-vue-admin
+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
 
 EXPOSE 8888
-ENTRYPOINT /ginvue/app
 
-# 根据Dockerfile生成Docker镜像
-# docker build -t ginvue .
-# 根据Docker镜像启动Docker容器
-# docker run -itd -p 8888:8888 --name ginvue ginvue
+ENTRYPOINT ./server

server/Makefile

@@ -32,7 +32,9 @@ clean:
 	@if [ -f ${GVA} ] ; then rm ${GVA} ; fi
 
 help:
-	@echo "make - 生成gva终端工具,初始化数据后删除gva终端工具"
+	@echo "make - 构建gva终端工具并初始化数据,初始化数据后删除gva终端工具,启动server项目"
+	@echo "make gva - 构建gva终端工具"
+	@echo "make initdb - 如果有gva终端工具就初始化数据,初始化数据后删除gva终端工具,没有则不会执行"
 	@echo "make linux-build - 编译 Go 代码, 生成Linux系统的二进制文件"
 	@echo "make windows-build - 编译 Go 代码, 生成Windows系统的exe文件"
 	@echo "make mac-build - 编译 Go 代码, 生成Mac系统的二进制文件"

server/cmd/datas/apis.go

@@ -9,7 +9,7 @@ import (
 
 var Apis = []model.SysApi{
 	{gorm.Model{ID: 1, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/base/login", "用户登录", "base", "POST"},
-	{gorm.Model{ID: 2, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/base/register", "用户注册", "base", "POST"},
+	{gorm.Model{ID: 2, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/user/register", "用户注册", "user", "POST"},
 	{gorm.Model{ID: 3, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/api/createApi", "创建api", "api", "POST"},
 	{gorm.Model{ID: 4, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/api/getApiList", "获取api列表", "api", "POST"},
 	{gorm.Model{ID: 5, CreatedAt: time.Now(), UpdatedAt: time.Now()}, "/api/getApiById", "获取api详细信息", "api", "POST"},

server/cmd/datas/casbins.go

@@ -7,7 +7,7 @@ import (
 
 var Carbines = []gormadapter.CasbinRule{
 	{PType: "p", V0: "888", V1: "/base/login", V2: "POST"},
-	{PType: "p", V0: "888", V1: "/base/register", V2: "POST"},
+	{PType: "p", V0: "888", V1: "/user/register", V2: "POST"},
 	{PType: "p", V0: "888", V1: "/api/createApi", V2: "POST"},
 	{PType: "p", V0: "888", V1: "/api/getApiList", V2: "POST"},
 	{PType: "p", V0: "888", V1: "/api/getApiById", V2: "POST"},
@@ -74,7 +74,7 @@ var Carbines = []gormadapter.CasbinRule{
 	{PType: "p", V0: "888", V1: "/simpleUploader/checkFileMd5", V2: "GET"},
 	{PType: "p", V0: "888", V1: "/simpleUploader/mergeFileMd5", V2: "GET"},
 	{PType: "p", V0: "8881", V1: "/base/login", V2: "POST"},
-	{PType: "p", V0: "8881", V1: "/base/register", V2: "POST"},
+	{PType: "p", V0: "8881", V1: "/user/register", V2: "POST"},
 	{PType: "p", V0: "8881", V1: "/api/createApi", V2: "POST"},
 	{PType: "p", V0: "8881", V1: "/api/getApiList", V2: "POST"},
 	{PType: "p", V0: "8881", V1: "/api/getApiById", V2: "POST"},
@@ -111,7 +111,7 @@ var Carbines = []gormadapter.CasbinRule{
 	{PType: "p", V0: "8881", V1: "/customer/customer", V2: "GET"},
 	{PType: "p", V0: "8881", V1: "/customer/customerList", V2: "GET"},
 	{PType: "p", V0: "9528", V1: "/base/login", V2: "POST"},
-	{PType: "p", V0: "9528", V1: "/base/register", V2: "POST"},
+	{PType: "p", V0: "9528", V1: "/user/register", V2: "POST"},
 	{PType: "p", V0: "9528", V1: "/api/createApi", V2: "POST"},
 	{PType: "p", V0: "9528", V1: "/api/getApiList", V2: "POST"},
 	{PType: "p", V0: "9528", V1: "/api/getApiById", V2: "POST"},

server/core/server.go

@@ -29,7 +29,7 @@ func RunWindowsServer() {
 
 	fmt.Printf(`
 	欢迎使用 Gin-Vue-Admin
-	当前版本:V2.3.3
+	当前版本:V2.3.4
 	默认自动化文档地址:http://127.0.0.1%s/swagger/index.html
 	默认前端文件运行地址:http://127.0.0.1:8080
 `, address)

web/src/api/user.js

@@ -110,4 +110,4 @@ export const setUserInfo = (data) => {
         method: 'put',
         data: data
     })
-}
+}

web/src/main.js

@@ -66,7 +66,7 @@ Vue.prototype.$echarts = echarts;
 
 console.log(`
        欢迎使用 Gin-Vue-Admin
-       当前版本:V2.3.3
+       当前版本:V2.3.4
        默认自动化文档地址:http://127.0.0.1%s/swagger/index.html
        默认前端文件运行地址:http://127.0.0.1:8080
 `)