修复mixins路径，调整目录结构

Author: QM303176530

.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'

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@[email protected]"
 
 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@[email protected]"
+
+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/api/v1/exa_breakpoint_continue.go

@@ -38,6 +38,7 @@ func BreakpointContinue(c *gin.Context) {
 	defer f.Close()
 	cen, _ := ioutil.ReadAll(f)
 	if flag := utils.CheckMd5(cen, chunkMd5); !flag {
+		response.FailWithMessage(err.Error(), c)
 		return
 	}
 	err, file := service.FindOrCreateFile(fileMd5, fileName, chunkTotal)

server/api/v1/exa_customer.go

@@ -57,7 +57,7 @@ func DeleteExaCustomer(c *gin.Context) {
 	CustomerVerify := utils.Rules{
 		"ID": {utils.NotEmpty()},
 	}
-	CustomerVerifyErr := utils.Verify(cu.Model, CustomerVerify)
+	CustomerVerifyErr := utils.Verify(cu.GVA_MODEL, CustomerVerify)
 	if CustomerVerifyErr != nil {
 		response.FailWithMessage(CustomerVerifyErr.Error(), c)
 		return
@@ -84,7 +84,7 @@ func UpdateExaCustomer(c *gin.Context) {
 	IdCustomerVerify := utils.Rules{
 		"ID": {utils.NotEmpty()},
 	}
-	IdCustomerVerifyErr := utils.Verify(cu.Model, IdCustomerVerify)
+	IdCustomerVerifyErr := utils.Verify(cu.GVA_MODEL, IdCustomerVerify)
 	if IdCustomerVerifyErr != nil {
 		response.FailWithMessage(IdCustomerVerifyErr.Error(), c)
 		return
@@ -120,7 +120,7 @@ func GetExaCustomer(c *gin.Context) {
 	IdCustomerVerify := utils.Rules{
 		"ID": {utils.NotEmpty()},
 	}
-	IdCustomerVerifyErr := utils.Verify(cu.Model, IdCustomerVerify)
+	IdCustomerVerifyErr := utils.Verify(cu.GVA_MODEL, IdCustomerVerify)
 	if IdCustomerVerifyErr != nil {
 		response.FailWithMessage(IdCustomerVerifyErr.Error(), c)
 		return

server/api/v1/sys_api.go

@@ -55,7 +55,7 @@ func DeleteApi(c *gin.Context) {
 	ApiVerify := utils.Rules{
 		"ID": {utils.NotEmpty()},
 	}
-	ApiVerifyErr := utils.Verify(a.Model, ApiVerify)
+	ApiVerifyErr := utils.Verify(a.GVA_MODEL, ApiVerify)
 	if ApiVerifyErr != nil {
 		response.FailWithMessage(ApiVerifyErr.Error(), c)
 		return

server/cmd/datas/AuthorityMenu.go

@@ -1,7 +1,13 @@
 package datas
 
-import "gorm.io/gorm"
+import (
+	"github.com/gookit/color"
+	"gorm.io/gorm"
+)
 
 func InitAuthorityMenu(db *gorm.DB) (err error) {
-	return db.Exec("CREATE ALGORITHM = UNDEFINED SQL SECURITY DEFINER VIEW `authority_menu` AS select `sys_base_menus`.`id` AS `id`,`sys_base_menus`.`created_at` AS `created_at`, `sys_base_menus`.`updated_at` AS `updated_at`, `sys_base_menus`.`deleted_at` AS `deleted_at`, `sys_base_menus`.`menu_level` AS `menu_level`,`sys_base_menus`.`parent_id` AS `parent_id`,`sys_base_menus`.`path` AS `path`,`sys_base_menus`.`name` AS `name`,`sys_base_menus`.`hidden` AS `hidden`,`sys_base_menus`.`component` AS `component`, `sys_base_menus`.`title`  AS `title`,`sys_base_menus`.`icon` AS `icon`,`sys_base_menus`.`sort` AS `sort`,`sys_authority_menus`.`sys_authority_authority_id` AS `authority_id`,`sys_authority_menus`.`sys_base_menu_id` AS `menu_id`,`sys_base_menus`.`keep_alive` AS `keep_alive`,`sys_base_menus`.`default_menu` AS `default_menu` from (`sys_authority_menus` join `sys_base_menus` on ((`sys_authority_menus`.`sys_base_menu_id` = `sys_base_menus`.`id`)))").Error
+	if err := db.Exec("CREATE ALGORITHM = UNDEFINED SQL SECURITY DEFINER VIEW `authority_menu` AS select `sys_base_menus`.`id` AS `id`,`sys_base_menus`.`created_at` AS `created_at`, `sys_base_menus`.`updated_at` AS `updated_at`, `sys_base_menus`.`deleted_at` AS `deleted_at`, `sys_base_menus`.`menu_level` AS `menu_level`,`sys_base_menus`.`parent_id` AS `parent_id`,`sys_base_menus`.`path` AS `path`,`sys_base_menus`.`name` AS `name`,`sys_base_menus`.`hidden` AS `hidden`,`sys_base_menus`.`component` AS `component`, `sys_base_menus`.`title`  AS `title`,`sys_base_menus`.`icon` AS `icon`,`sys_base_menus`.`sort` AS `sort`,`sys_authority_menus`.`sys_authority_authority_id` AS `authority_id`,`sys_authority_menus`.`sys_base_menu_id` AS `menu_id`,`sys_base_menus`.`keep_alive` AS `keep_alive`,`sys_base_menus`.`default_menu` AS `default_menu` from (`sys_authority_menus` join `sys_base_menus` on ((`sys_authority_menus`.`sys_base_menu_id` = `sys_base_menus`.`id`)))").Error; err != nil {
+		color.Danger.Println("authority_menu视图已存在!")
+	}
+	return nil
 }