From 6afe84821090ec42ca14880749f2cbc07442ce2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=92=8B=E5=90=89=E5=85=86?= <303176530@qq.com> Date: Mon, 23 Aug 2021 23:13:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=AE=9A=E4=B8=BA=E8=87=B3server=E4=B8=BA=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E5=8C=96=E6=8F=90=E4=BE=9B=E4=BE=BF=E5=88=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/Dockerfile | 6 +++--- server/api/v1/autocode/autocodeExample.go | 12 ++++++------ server/api/v1/autocode/enter.go | 4 ++-- server/api/v1/enter.go | 6 +++--- server/api/v1/example/enter.go | 2 +- server/api/v1/example/exa_breakpoint_continue.go | 8 ++++---- server/api/v1/example/exa_customer.go | 12 ++++++------ server/api/v1/example/exa_excel.go | 8 ++++---- .../api/v1/example/exa_file_upload_download.go | 10 +++++----- server/api/v1/example/exa_simple_uploader.go | 8 ++++---- server/api/v1/system/enter.go | 2 +- server/api/v1/system/sys_api.go | 14 +++++++------- server/api/v1/system/sys_authority.go | 14 +++++++------- server/api/v1/system/sys_auto_code.go | 10 +++++----- server/api/v1/system/sys_captcha.go | 6 +++--- server/api/v1/system/sys_casbin.go | 10 +++++----- server/api/v1/system/sys_dictionary.go | 10 +++++----- server/api/v1/system/sys_dictionary_detail.go | 10 +++++----- server/api/v1/system/sys_initdb.go | 6 +++--- server/api/v1/system/sys_jwt_blacklist.go | 6 +++--- server/api/v1/system/sys_menu.go | 14 +++++++------- server/api/v1/system/sys_operation_record.go | 12 ++++++------ server/api/v1/system/sys_system.go | 10 +++++----- server/api/v1/system/sys_user.go | 16 ++++++++-------- server/config.docker.yaml | 6 +++--- server/config.yaml | 8 ++++---- server/core/server.go | 8 ++++---- server/core/viper.go | 6 +++--- server/core/zap.go | 4 ++-- server/global/global.go | 4 ++-- server/go.mod | 2 +- server/initialize/gorm.go | 14 +++++++------- server/initialize/internal/logger.go | 2 +- server/initialize/plugin.go | 2 +- server/initialize/redis.go | 2 +- server/initialize/router.go | 16 ++++++++-------- server/initialize/timer.go | 6 +++--- server/initialize/validator.go | 2 +- server/main.go | 6 +++--- server/middleware/casbin_rbac.go | 8 ++++---- server/middleware/email.go | 10 +++++----- server/middleware/error.go | 2 +- server/middleware/jwt.go | 10 +++++----- server/middleware/need_init.go | 4 ++-- server/middleware/operation.go | 8 ++++---- server/model/autocode/autocodeExample.go | 2 +- server/model/autocode/request/autocodeExample.go | 4 ++-- server/model/example/exa_breakpoint_continue.go | 2 +- server/model/example/exa_customer.go | 4 ++-- server/model/example/exa_excel.go | 2 +- server/model/example/exa_file_upload_download.go | 2 +- .../example/response/exa_breakpoint_continue.go | 2 +- server/model/example/response/exa_customer.go | 2 +- .../example/response/exa_file_upload_download.go | 2 +- server/model/system/request/sys_api.go | 4 ++-- server/model/system/request/sys_autocode.go | 2 +- server/model/system/request/sys_dictionary.go | 4 ++-- .../system/request/sys_dictionary_detail.go | 4 ++-- server/model/system/request/sys_menu.go | 4 ++-- .../model/system/request/sys_operation_record.go | 4 ++-- server/model/system/response/sys_api.go | 2 +- server/model/system/response/sys_authority.go | 2 +- server/model/system/response/sys_casbin.go | 2 +- server/model/system/response/sys_menu.go | 2 +- server/model/system/response/sys_system.go | 2 +- server/model/system/response/sys_user.go | 2 +- server/model/system/sys_api.go | 2 +- server/model/system/sys_autocode_history.go | 2 +- server/model/system/sys_base_menu.go | 2 +- server/model/system/sys_dictionary.go | 2 +- server/model/system/sys_dictionary_detail.go | 2 +- server/model/system/sys_jwt_blacklist.go | 2 +- server/model/system/sys_operation_record.go | 2 +- server/model/system/sys_system.go | 2 +- server/model/system/sys_user.go | 2 +- server/plugin/email/api/sys_email.go | 6 +++--- server/plugin/email/global/gloabl.go | 2 +- server/plugin/email/main.go | 4 ++-- server/plugin/email/router/sys_email.go | 4 ++-- server/plugin/email/service/sys_email.go | 2 +- server/plugin/email/utils/email.go | 2 +- server/resource/page/js/index.94d8e405.js | 2 +- server/resource/template/readme.txt.tpl | 2 +- server/resource/template/server/api.go.tpl | 12 ++++++------ server/resource/template/server/model.go.tpl | 2 +- server/resource/template/server/request.go.tpl | 4 ++-- server/resource/template/server/router.go.tpl | 4 ++-- server/resource/template/server/service.go.tpl | 8 ++++---- server/router/autocode/autocodeExample.go | 4 ++-- server/router/autocode/enter.go | 4 ++-- server/router/enter.go | 6 +++--- server/router/example/exa_customer.go | 4 ++-- server/router/example/exa_excel.go | 2 +- .../example/exa_file_upload_and_download.go | 2 +- server/router/example/exa_simple_uploader.go | 2 +- server/router/system/sys_api.go | 4 ++-- server/router/system/sys_authority.go | 4 ++-- server/router/system/sys_auto_code.go | 2 +- server/router/system/sys_base.go | 2 +- server/router/system/sys_casbin.go | 4 ++-- server/router/system/sys_dictionary.go | 4 ++-- server/router/system/sys_dictionary_detail.go | 4 ++-- server/router/system/sys_initdb.go | 2 +- server/router/system/sys_jwt.go | 4 ++-- server/router/system/sys_menu.go | 4 ++-- server/router/system/sys_operation_record.go | 2 +- server/router/system/sys_system.go | 4 ++-- server/router/system/sys_user.go | 4 ++-- server/service/autocode/autocodeExample.go | 6 +++--- server/service/autocode/enter.go | 4 ++-- server/service/enter.go | 6 +++--- .../service/example/exa_breakpoint_continue.go | 4 ++-- server/service/example/exa_customer.go | 10 +++++----- server/service/example/exa_excel_parse.go | 4 ++-- .../service/example/exa_file_upload_download.go | 8 ++++---- server/service/example/exa_simple_uploader.go | 4 ++-- server/service/system/jwt_black_list.go | 4 ++-- server/service/system/sys_api.go | 6 +++--- server/service/system/sys_authority.go | 8 ++++---- server/service/system/sys_auto_code.go | 8 ++++---- server/service/system/sys_autocode_history.go | 8 ++++---- server/service/system/sys_base_menu.go | 4 ++-- server/service/system/sys_casbin.go | 6 +++--- server/service/system/sys_dictionary.go | 6 +++--- server/service/system/sys_dictionary_detail.go | 6 +++--- server/service/system/sys_initdb.go | 14 +++++++------- server/service/system/sys_menu.go | 6 +++--- server/service/system/sys_operation_record.go | 8 ++++---- server/service/system/sys_system.go | 8 ++++---- server/service/system/sys_user.go | 8 ++++---- server/source/admin.go | 4 ++-- server/source/api.go | 4 ++-- server/source/authorities_menus.go | 2 +- server/source/authority.go | 4 ++-- server/source/authority_menu.go | 4 ++-- server/source/casbin.go | 2 +- server/source/data_authorities.go | 2 +- server/source/dictionary.go | 4 ++-- server/source/dictionary_details.go | 4 ++-- server/source/file.go | 4 ++-- server/source/menu.go | 6 +++--- server/source/user_authority.go.go | 4 ++-- server/utils/captcha/redis.go | 2 +- server/utils/clamis.go | 4 ++-- server/utils/directory.go | 2 +- server/utils/injectionCode.go | 4 ++-- server/utils/rotatelogs_unix.go | 3 ++- server/utils/rotatelogs_windows.go | 2 +- server/utils/upload/aliyun_oss.go | 2 +- server/utils/upload/local.go | 4 ++-- server/utils/upload/qiniu.go | 2 +- server/utils/upload/tencent_cos.go | 2 +- server/utils/upload/upload.go | 2 +- 153 files changed, 381 insertions(+), 380 deletions(-) diff --git a/server/Dockerfile b/server/Dockerfile index d032120de..3481e8eb7 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -1,6 +1,6 @@ FROM golang:alpine -WORKDIR /go/src/github.com/flipped-aurora/gin-vue-admin +WORKDIR /go/src/github.com/flipped-aurora/gin-vue-admin/server COPY . . RUN go generate && go env && go build -o server . @@ -8,9 +8,9 @@ RUN go generate && go env && go build -o server . FROM alpine:latest LABEL MAINTAINER="SliverHorn@sliver_horn@qq.com" -WORKDIR /go/src/github.com/flipped-aurora/gin-vue-admin +WORKDIR /go/src/github.com/flipped-aurora/gin-vue-admin/server -COPY --from=0 /go/src/github.com/flipped-aurora/gin-vue-admin ./ +COPY --from=0 /go/src/github.com/flipped-aurora/gin-vue-admin/server ./ EXPOSE 8888 diff --git a/server/api/v1/autocode/autocodeExample.go b/server/api/v1/autocode/autocodeExample.go index 4c5a8a3ea..ff83240c2 100644 --- a/server/api/v1/autocode/autocodeExample.go +++ b/server/api/v1/autocode/autocodeExample.go @@ -1,12 +1,12 @@ package autocode import ( - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/model/autocode" - autocodeReq "github.com/flipped-aurora/gin-vue-admin/model/autocode/request" - "github.com/flipped-aurora/gin-vue-admin/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/service" - "github.com/flipped-aurora/gin-vue-admin/utils" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/model/autocode" + autocodeReq "github.com/flipped-aurora/gin-vue-admin/server/model/autocode/request" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" + "github.com/flipped-aurora/gin-vue-admin/server/service" + "github.com/flipped-aurora/gin-vue-admin/server/utils" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/server/api/v1/autocode/enter.go b/server/api/v1/autocode/enter.go index 65d3e2da3..ea9dd214d 100644 --- a/server/api/v1/autocode/enter.go +++ b/server/api/v1/autocode/enter.go @@ -1,7 +1,7 @@ package autocode type ApiGroup struct { - // Code generated by github.com/flipped-aurora/gin-vue-admin Begin; DO NOT EDIT. + // Code generated by github.com/flipped-aurora/gin-vue-admin/server Begin; DO NOT EDIT. AutoCodeExampleApi - // Code generated by github.com/flipped-aurora/gin-vue-admin End; DO NOT EDIT. + // Code generated by github.com/flipped-aurora/gin-vue-admin/server End; DO NOT EDIT. } diff --git a/server/api/v1/enter.go b/server/api/v1/enter.go index a016e4505..4f92934ec 100644 --- a/server/api/v1/enter.go +++ b/server/api/v1/enter.go @@ -1,9 +1,9 @@ package v1 import ( - "github.com/flipped-aurora/gin-vue-admin/api/v1/autocode" - "github.com/flipped-aurora/gin-vue-admin/api/v1/example" - "github.com/flipped-aurora/gin-vue-admin/api/v1/system" + "github.com/flipped-aurora/gin-vue-admin/server/api/v1/autocode" + "github.com/flipped-aurora/gin-vue-admin/server/api/v1/example" + "github.com/flipped-aurora/gin-vue-admin/server/api/v1/system" ) type ApiGroup struct { diff --git a/server/api/v1/example/enter.go b/server/api/v1/example/enter.go index b126944d4..599510ea7 100644 --- a/server/api/v1/example/enter.go +++ b/server/api/v1/example/enter.go @@ -1,6 +1,6 @@ package example -import "github.com/flipped-aurora/gin-vue-admin/service" +import "github.com/flipped-aurora/gin-vue-admin/server/service" type ApiGroup struct { CustomerApi diff --git a/server/api/v1/example/exa_breakpoint_continue.go b/server/api/v1/example/exa_breakpoint_continue.go index ceef242f8..9afbf2792 100644 --- a/server/api/v1/example/exa_breakpoint_continue.go +++ b/server/api/v1/example/exa_breakpoint_continue.go @@ -4,10 +4,10 @@ import ( "io/ioutil" "strconv" - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/model/common/response" - exampleRes "github.com/flipped-aurora/gin-vue-admin/model/example/response" - "github.com/flipped-aurora/gin-vue-admin/utils" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" + exampleRes "github.com/flipped-aurora/gin-vue-admin/server/model/example/response" + "github.com/flipped-aurora/gin-vue-admin/server/utils" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/server/api/v1/example/exa_customer.go b/server/api/v1/example/exa_customer.go index 686b1f0da..3939ebfb5 100644 --- a/server/api/v1/example/exa_customer.go +++ b/server/api/v1/example/exa_customer.go @@ -1,12 +1,12 @@ package example import ( - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/model/example" - exampleRes "github.com/flipped-aurora/gin-vue-admin/model/example/response" - "github.com/flipped-aurora/gin-vue-admin/utils" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" + "github.com/flipped-aurora/gin-vue-admin/server/model/example" + exampleRes "github.com/flipped-aurora/gin-vue-admin/server/model/example/response" + "github.com/flipped-aurora/gin-vue-admin/server/utils" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/server/api/v1/example/exa_excel.go b/server/api/v1/example/exa_excel.go index b926ade49..12dc2b9eb 100644 --- a/server/api/v1/example/exa_excel.go +++ b/server/api/v1/example/exa_excel.go @@ -1,10 +1,10 @@ package example import ( - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/model/example" - "github.com/flipped-aurora/gin-vue-admin/utils" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" + "github.com/flipped-aurora/gin-vue-admin/server/model/example" + "github.com/flipped-aurora/gin-vue-admin/server/utils" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/server/api/v1/example/exa_file_upload_download.go b/server/api/v1/example/exa_file_upload_download.go index 47e29607e..5fdf6dc58 100644 --- a/server/api/v1/example/exa_file_upload_download.go +++ b/server/api/v1/example/exa_file_upload_download.go @@ -1,11 +1,11 @@ package example import ( - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/model/example" - exampleRes "github.com/flipped-aurora/gin-vue-admin/model/example/response" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" + "github.com/flipped-aurora/gin-vue-admin/server/model/example" + exampleRes "github.com/flipped-aurora/gin-vue-admin/server/model/example/response" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/server/api/v1/example/exa_simple_uploader.go b/server/api/v1/example/exa_simple_uploader.go index d035da73c..90e0bf51b 100644 --- a/server/api/v1/example/exa_simple_uploader.go +++ b/server/api/v1/example/exa_simple_uploader.go @@ -1,10 +1,10 @@ package example import ( - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/model/example" - "github.com/flipped-aurora/gin-vue-admin/utils" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" + "github.com/flipped-aurora/gin-vue-admin/server/model/example" + "github.com/flipped-aurora/gin-vue-admin/server/utils" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/server/api/v1/system/enter.go b/server/api/v1/system/enter.go index 2c618c70f..995522c3c 100644 --- a/server/api/v1/system/enter.go +++ b/server/api/v1/system/enter.go @@ -1,6 +1,6 @@ package system -import "github.com/flipped-aurora/gin-vue-admin/service" +import "github.com/flipped-aurora/gin-vue-admin/server/service" type ApiGroup struct { SystemApiApi diff --git a/server/api/v1/system/sys_api.go b/server/api/v1/system/sys_api.go index 5ccb19c08..ba7fb8a37 100644 --- a/server/api/v1/system/sys_api.go +++ b/server/api/v1/system/sys_api.go @@ -1,13 +1,13 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/model/system" - systemReq "github.com/flipped-aurora/gin-vue-admin/model/system/request" - systemRes "github.com/flipped-aurora/gin-vue-admin/model/system/response" - "github.com/flipped-aurora/gin-vue-admin/utils" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" + "github.com/flipped-aurora/gin-vue-admin/server/model/system" + systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response" + "github.com/flipped-aurora/gin-vue-admin/server/utils" "github.com/gin-gonic/gin" "go.uber.org/zap" diff --git a/server/api/v1/system/sys_authority.go b/server/api/v1/system/sys_authority.go index 29b1c81f7..5cb6d96a4 100644 --- a/server/api/v1/system/sys_authority.go +++ b/server/api/v1/system/sys_authority.go @@ -1,13 +1,13 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/model/system" - systemReq "github.com/flipped-aurora/gin-vue-admin/model/system/request" - systemRes "github.com/flipped-aurora/gin-vue-admin/model/system/response" - "github.com/flipped-aurora/gin-vue-admin/utils" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" + "github.com/flipped-aurora/gin-vue-admin/server/model/system" + systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response" + "github.com/flipped-aurora/gin-vue-admin/server/utils" "github.com/gin-gonic/gin" "go.uber.org/zap" diff --git a/server/api/v1/system/sys_auto_code.go b/server/api/v1/system/sys_auto_code.go index 229bfc4e0..315dcb7ba 100644 --- a/server/api/v1/system/sys_auto_code.go +++ b/server/api/v1/system/sys_auto_code.go @@ -6,11 +6,11 @@ import ( "net/url" "os" - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/model/system" - systemReq "github.com/flipped-aurora/gin-vue-admin/model/system/request" - "github.com/flipped-aurora/gin-vue-admin/utils" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" + "github.com/flipped-aurora/gin-vue-admin/server/model/system" + systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "github.com/flipped-aurora/gin-vue-admin/server/utils" "github.com/gin-gonic/gin" "go.uber.org/zap" diff --git a/server/api/v1/system/sys_captcha.go b/server/api/v1/system/sys_captcha.go index 29450f366..f07587d56 100644 --- a/server/api/v1/system/sys_captcha.go +++ b/server/api/v1/system/sys_captcha.go @@ -1,9 +1,9 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/model/common/response" - systemRes "github.com/flipped-aurora/gin-vue-admin/model/system/response" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" + systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response" "github.com/gin-gonic/gin" "github.com/mojocn/base64Captcha" "go.uber.org/zap" diff --git a/server/api/v1/system/sys_casbin.go b/server/api/v1/system/sys_casbin.go index 19cc0dc24..ce2f1bcb1 100644 --- a/server/api/v1/system/sys_casbin.go +++ b/server/api/v1/system/sys_casbin.go @@ -1,11 +1,11 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/model/system/request" - systemRes "github.com/flipped-aurora/gin-vue-admin/model/system/response" - "github.com/flipped-aurora/gin-vue-admin/utils" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" + "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response" + "github.com/flipped-aurora/gin-vue-admin/server/utils" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/server/api/v1/system/sys_dictionary.go b/server/api/v1/system/sys_dictionary.go index 42da16f01..4b7b39446 100644 --- a/server/api/v1/system/sys_dictionary.go +++ b/server/api/v1/system/sys_dictionary.go @@ -1,11 +1,11 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/model/system" - "github.com/flipped-aurora/gin-vue-admin/model/system/request" - "github.com/flipped-aurora/gin-vue-admin/utils" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" + "github.com/flipped-aurora/gin-vue-admin/server/model/system" + "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "github.com/flipped-aurora/gin-vue-admin/server/utils" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/server/api/v1/system/sys_dictionary_detail.go b/server/api/v1/system/sys_dictionary_detail.go index 590fef8b0..498446242 100644 --- a/server/api/v1/system/sys_dictionary_detail.go +++ b/server/api/v1/system/sys_dictionary_detail.go @@ -1,11 +1,11 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/model/system" - "github.com/flipped-aurora/gin-vue-admin/model/system/request" - "github.com/flipped-aurora/gin-vue-admin/utils" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" + "github.com/flipped-aurora/gin-vue-admin/server/model/system" + "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "github.com/flipped-aurora/gin-vue-admin/server/utils" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/server/api/v1/system/sys_initdb.go b/server/api/v1/system/sys_initdb.go index d53d12d34..0d062a99f 100644 --- a/server/api/v1/system/sys_initdb.go +++ b/server/api/v1/system/sys_initdb.go @@ -1,9 +1,9 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/model/system/request" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" + "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" "go.uber.org/zap" "github.com/gin-gonic/gin" diff --git a/server/api/v1/system/sys_jwt_blacklist.go b/server/api/v1/system/sys_jwt_blacklist.go index 55dc2a0b6..a3ecb2dc7 100644 --- a/server/api/v1/system/sys_jwt_blacklist.go +++ b/server/api/v1/system/sys_jwt_blacklist.go @@ -1,9 +1,9 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/model/system" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" + "github.com/flipped-aurora/gin-vue-admin/server/model/system" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/server/api/v1/system/sys_menu.go b/server/api/v1/system/sys_menu.go index 8333f26a4..d01393669 100644 --- a/server/api/v1/system/sys_menu.go +++ b/server/api/v1/system/sys_menu.go @@ -1,13 +1,13 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/model/system" - systemReq "github.com/flipped-aurora/gin-vue-admin/model/system/request" - systemRes "github.com/flipped-aurora/gin-vue-admin/model/system/response" - "github.com/flipped-aurora/gin-vue-admin/utils" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" + "github.com/flipped-aurora/gin-vue-admin/server/model/system" + systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response" + "github.com/flipped-aurora/gin-vue-admin/server/utils" "github.com/gin-gonic/gin" "go.uber.org/zap" diff --git a/server/api/v1/system/sys_operation_record.go b/server/api/v1/system/sys_operation_record.go index ba18e024d..8bf165a65 100644 --- a/server/api/v1/system/sys_operation_record.go +++ b/server/api/v1/system/sys_operation_record.go @@ -1,12 +1,12 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/model/system" - systemReq "github.com/flipped-aurora/gin-vue-admin/model/system/request" - "github.com/flipped-aurora/gin-vue-admin/utils" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" + "github.com/flipped-aurora/gin-vue-admin/server/model/system" + systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "github.com/flipped-aurora/gin-vue-admin/server/utils" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/server/api/v1/system/sys_system.go b/server/api/v1/system/sys_system.go index 4d255807c..c344bac53 100644 --- a/server/api/v1/system/sys_system.go +++ b/server/api/v1/system/sys_system.go @@ -1,11 +1,11 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/model/system" - systemRes "github.com/flipped-aurora/gin-vue-admin/model/system/response" - "github.com/flipped-aurora/gin-vue-admin/utils" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" + "github.com/flipped-aurora/gin-vue-admin/server/model/system" + systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response" + "github.com/flipped-aurora/gin-vue-admin/server/utils" "github.com/gin-gonic/gin" "go.uber.org/zap" diff --git a/server/api/v1/system/sys_user.go b/server/api/v1/system/sys_user.go index cf1921742..1652523f8 100644 --- a/server/api/v1/system/sys_user.go +++ b/server/api/v1/system/sys_user.go @@ -4,14 +4,14 @@ import ( "strconv" "time" - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/middleware" - "github.com/flipped-aurora/gin-vue-admin/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/model/system" - systemReq "github.com/flipped-aurora/gin-vue-admin/model/system/request" - systemRes "github.com/flipped-aurora/gin-vue-admin/model/system/response" - "github.com/flipped-aurora/gin-vue-admin/utils" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/middleware" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" + "github.com/flipped-aurora/gin-vue-admin/server/model/system" + systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response" + "github.com/flipped-aurora/gin-vue-admin/server/utils" "github.com/dgrijalva/jwt-go" "github.com/gin-gonic/gin" diff --git a/server/config.docker.yaml b/server/config.docker.yaml index ef91eb060..886c1b451 100644 --- a/server/config.docker.yaml +++ b/server/config.docker.yaml @@ -1,4 +1,4 @@ -# github.com/flipped-aurora/gin-vue-admin Global Configuration +# github.com/flipped-aurora/gin-vue-admin/server Global Configuration # jwt configuration jwt: @@ -10,7 +10,7 @@ jwt: zap: level: 'info' format: 'console' - prefix: '[github.com/flipped-aurora/gin-vue-admin]' + prefix: '[github.com/flipped-aurora/gin-vue-admin/server]' director: 'log' link-name: 'latest_log' show-line: true @@ -111,7 +111,7 @@ tencent-cos: secret-id: 'xxxxxxxx' secret-key: 'xxxxxxxx' base-url: 'https://gin.vue.admin' - path-prefix: 'github.com/flipped-aurora/gin-vue-admin' + path-prefix: 'github.com/flipped-aurora/gin-vue-admin/server' # excel configuration excel: diff --git a/server/config.yaml b/server/config.yaml index e0181e971..66a4cf9e1 100644 --- a/server/config.yaml +++ b/server/config.yaml @@ -1,4 +1,4 @@ -# github.com/flipped-aurora/gin-vue-admin Global Configuration +# github.com/flipped-aurora/gin-vue-admin/server Global Configuration # jwt configuration jwt: @@ -10,7 +10,7 @@ jwt: zap: level: 'info' format: 'console' - prefix: '[github.com/flipped-aurora/gin-vue-admin]' + prefix: '[github.com/flipped-aurora/gin-vue-admin/server]' director: 'log' link-name: 'latest_log' show-line: true @@ -53,7 +53,7 @@ captcha: img-height: 80 # mysql connect configuration -# 未初始化之前请勿手动修改数据库信息！！！如果一定要手动初始化请看（https://www.github.com/flipped-aurora/gin-vue-admin.com/docs/first） +# 未初始化之前请勿手动修改数据库信息！！！如果一定要手动初始化请看（https://www.github.com/flipped-aurora/gin-vue-admin/server.com/docs/first） mysql: path: '' config: '' @@ -113,7 +113,7 @@ tencent-cos: secret-id: 'xxxxxxxx' secret-key: 'xxxxxxxx' base-url: 'https://gin.vue.admin' - path-prefix: 'github.com/flipped-aurora/gin-vue-admin' + path-prefix: 'github.com/flipped-aurora/gin-vue-admin/server' # excel configuration excel: diff --git a/server/core/server.go b/server/core/server.go index eb40ce0c7..e14fc0b8d 100644 --- a/server/core/server.go +++ b/server/core/server.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/initialize" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/initialize" "go.uber.org/zap" ) @@ -30,12 +30,12 @@ func RunWindowsServer() { global.GVA_LOG.Info("server run success on ", zap.String("address", address)) fmt.Printf(` - 欢迎使用 github.com/flipped-aurora/gin-vue-admin + 欢迎使用 github.com/flipped-aurora/gin-vue-admin/server 当前版本:V2.4.4 加群方式:微信号：shouzi_1994 QQ群：622360840 默认自动化文档地址:http://127.0.0.1%s/swagger/index.html 默认前端文件运行地址:http://127.0.0.1:8080 - 如果项目让您获得了收益，希望您能请团队喝杯可乐:https://www.github.com/flipped-aurora/gin-vue-admin.com/docs/coffee + 如果项目让您获得了收益，希望您能请团队喝杯可乐:https://www.github.com/flipped-aurora/gin-vue-admin/server.com/docs/coffee `, address) global.GVA_LOG.Error(s.ListenAndServe().Error()) } diff --git a/server/core/viper.go b/server/core/viper.go index 8d45d63db..b7c33a3ef 100644 --- a/server/core/viper.go +++ b/server/core/viper.go @@ -6,9 +6,9 @@ import ( "os" "path/filepath" - "github.com/flipped-aurora/gin-vue-admin/global" - _ "github.com/flipped-aurora/gin-vue-admin/packfile" - "github.com/flipped-aurora/gin-vue-admin/utils" + "github.com/flipped-aurora/gin-vue-admin/server/global" + _ "github.com/flipped-aurora/gin-vue-admin/server/packfile" + "github.com/flipped-aurora/gin-vue-admin/server/utils" "github.com/fsnotify/fsnotify" "github.com/spf13/viper" diff --git a/server/core/zap.go b/server/core/zap.go index a778f1a41..a0f40fe76 100644 --- a/server/core/zap.go +++ b/server/core/zap.go @@ -5,8 +5,8 @@ import ( "os" "time" - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/utils" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/utils" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) diff --git a/server/global/global.go b/server/global/global.go index 9429d031d..58d7efd99 100644 --- a/server/global/global.go +++ b/server/global/global.go @@ -1,13 +1,13 @@ package global import ( - "github.com/flipped-aurora/gin-vue-admin/utils/timer" + "github.com/flipped-aurora/gin-vue-admin/server/utils/timer" "golang.org/x/sync/singleflight" "go.uber.org/zap" - "github.com/flipped-aurora/gin-vue-admin/config" + "github.com/flipped-aurora/gin-vue-admin/server/config" "github.com/go-redis/redis/v8" "github.com/spf13/viper" diff --git a/server/go.mod b/server/go.mod index 3f50ac9a3..055161d9b 100644 --- a/server/go.mod +++ b/server/go.mod @@ -1,4 +1,4 @@ -module github.com/flipped-aurora/gin-vue-admin +module github.com/flipped-aurora/gin-vue-admin/server go 1.16 diff --git a/server/initialize/gorm.go b/server/initialize/gorm.go index 124189372..243f856b6 100644 --- a/server/initialize/gorm.go +++ b/server/initialize/gorm.go @@ -3,11 +3,11 @@ package initialize import ( "os" - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/initialize/internal" - "github.com/flipped-aurora/gin-vue-admin/model/autocode" - "github.com/flipped-aurora/gin-vue-admin/model/example" - "github.com/flipped-aurora/gin-vue-admin/model/system" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/initialize/internal" + "github.com/flipped-aurora/gin-vue-admin/server/model/autocode" + "github.com/flipped-aurora/gin-vue-admin/server/model/example" + "github.com/flipped-aurora/gin-vue-admin/server/model/system" "go.uber.org/zap" "gorm.io/driver/mysql" @@ -52,9 +52,9 @@ func MysqlTables(db *gorm.DB) { example.ExaCustomer{}, system.SysOperationRecord{}, system.SysAutoCodeHistory{}, - // Code generated by github.com/flipped-aurora/gin-vue-admin Begin; DO NOT EDIT. + // Code generated by github.com/flipped-aurora/gin-vue-admin/server Begin; DO NOT EDIT. autocode.AutoCodeExample{}, - // Code generated by github.com/flipped-aurora/gin-vue-admin End; DO NOT EDIT. + // Code generated by github.com/flipped-aurora/gin-vue-admin/server End; DO NOT EDIT. ) if err != nil { global.GVA_LOG.Error("register table failed", zap.Any("err", err)) diff --git a/server/initialize/internal/logger.go b/server/initialize/internal/logger.go index ffebb42c5..25b7b8ca2 100644 --- a/server/initialize/internal/logger.go +++ b/server/initialize/internal/logger.go @@ -8,7 +8,7 @@ import ( "os" "time" - "github.com/flipped-aurora/gin-vue-admin/global" + "github.com/flipped-aurora/gin-vue-admin/server/global" "gorm.io/gorm/logger" "gorm.io/gorm/utils" ) diff --git a/server/initialize/plugin.go b/server/initialize/plugin.go index 55c142369..29019bb47 100644 --- a/server/initialize/plugin.go +++ b/server/initialize/plugin.go @@ -1,7 +1,7 @@ package initialize import ( - "github.com/flipped-aurora/gin-vue-admin/utils/plugin" + "github.com/flipped-aurora/gin-vue-admin/server/utils/plugin" "github.com/gin-gonic/gin" ) diff --git a/server/initialize/redis.go b/server/initialize/redis.go index 6242ced86..afc2868ee 100644 --- a/server/initialize/redis.go +++ b/server/initialize/redis.go @@ -3,7 +3,7 @@ package initialize import ( "context" - "github.com/flipped-aurora/gin-vue-admin/global" + "github.com/flipped-aurora/gin-vue-admin/server/global" "github.com/go-redis/redis/v8" "go.uber.org/zap" diff --git a/server/initialize/router.go b/server/initialize/router.go index d60acce1b..e4a259a8e 100644 --- a/server/initialize/router.go +++ b/server/initialize/router.go @@ -1,14 +1,14 @@ package initialize import ( - "github.com/flipped-aurora/gin-vue-admin/plugin/email" - "github.com/flipped-aurora/gin-vue-admin/plugin/example_plugin" + "github.com/flipped-aurora/gin-vue-admin/server/plugin/email" + "github.com/flipped-aurora/gin-vue-admin/server/plugin/example_plugin" "net/http" - _ "github.com/flipped-aurora/gin-vue-admin/docs" - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/middleware" - "github.com/flipped-aurora/gin-vue-admin/router" + _ "github.com/flipped-aurora/gin-vue-admin/server/docs" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/middleware" + "github.com/flipped-aurora/gin-vue-admin/server/router" "github.com/gin-gonic/gin" "github.com/swaggo/gin-swagger" "github.com/swaggo/gin-swagger/swaggerFiles" @@ -56,9 +56,9 @@ func Routers() *gin.Engine { exampleRouter.InitSimpleUploaderRouter(PrivateGroup) // 断点续传（插件版） exampleRouter.InitCustomerRouter(PrivateGroup) // 客户路由 - // Code generated by github.com/flipped-aurora/gin-vue-admin Begin; DO NOT EDIT. + // Code generated by github.com/flipped-aurora/gin-vue-admin/server Begin; DO NOT EDIT. autocodeRouter.InitSysAutoCodeExampleRouter(PrivateGroup) - // Code generated by github.com/flipped-aurora/gin-vue-admin End; DO NOT EDIT. + // Code generated by github.com/flipped-aurora/gin-vue-admin/server End; DO NOT EDIT. } // 添加开放权限的插件 示例 diff --git a/server/initialize/timer.go b/server/initialize/timer.go index bf82e445b..f65180b25 100644 --- a/server/initialize/timer.go +++ b/server/initialize/timer.go @@ -3,9 +3,9 @@ package initialize import ( "fmt" - "github.com/flipped-aurora/gin-vue-admin/config" - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/utils" + "github.com/flipped-aurora/gin-vue-admin/server/config" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/utils" ) func Timer() { diff --git a/server/initialize/validator.go b/server/initialize/validator.go index 8a05bb088..79aea6693 100644 --- a/server/initialize/validator.go +++ b/server/initialize/validator.go @@ -1,6 +1,6 @@ package initialize -import "github.com/flipped-aurora/gin-vue-admin/utils" +import "github.com/flipped-aurora/gin-vue-admin/server/utils" func init() { _ = utils.RegisterRule("PageVerify", diff --git a/server/main.go b/server/main.go index 079d20ff1..c82e084bf 100644 --- a/server/main.go +++ b/server/main.go @@ -1,9 +1,9 @@ package main import ( - "github.com/flipped-aurora/gin-vue-admin/core" - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/initialize" + "github.com/flipped-aurora/gin-vue-admin/server/core" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/initialize" ) //go:generate go env -w GO111MODULE=on diff --git a/server/middleware/casbin_rbac.go b/server/middleware/casbin_rbac.go index 6a6664a04..05bba88c8 100644 --- a/server/middleware/casbin_rbac.go +++ b/server/middleware/casbin_rbac.go @@ -1,10 +1,10 @@ package middleware import ( - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/model/system/request" - "github.com/flipped-aurora/gin-vue-admin/service" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" + "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "github.com/flipped-aurora/gin-vue-admin/server/service" "github.com/gin-gonic/gin" ) diff --git a/server/middleware/email.go b/server/middleware/email.go index df2468c44..9ba328b91 100644 --- a/server/middleware/email.go +++ b/server/middleware/email.go @@ -1,15 +1,15 @@ package middleware import ( - "github.com/flipped-aurora/gin-vue-admin/plugin/email/utils" + "github.com/flipped-aurora/gin-vue-admin/server/plugin/email/utils" "io/ioutil" "strconv" "time" - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/model/system" - "github.com/flipped-aurora/gin-vue-admin/model/system/request" - "github.com/flipped-aurora/gin-vue-admin/service" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/model/system" + "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "github.com/flipped-aurora/gin-vue-admin/server/service" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/server/middleware/error.go b/server/middleware/error.go index 6ad41aff1..f68b7a562 100644 --- a/server/middleware/error.go +++ b/server/middleware/error.go @@ -8,7 +8,7 @@ import ( "runtime/debug" "strings" - "github.com/flipped-aurora/gin-vue-admin/global" + "github.com/flipped-aurora/gin-vue-admin/server/global" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/server/middleware/jwt.go b/server/middleware/jwt.go index 53d5f6de6..3eb701ad3 100644 --- a/server/middleware/jwt.go +++ b/server/middleware/jwt.go @@ -5,11 +5,11 @@ import ( "strconv" "time" - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/model/system" - "github.com/flipped-aurora/gin-vue-admin/model/system/request" - "github.com/flipped-aurora/gin-vue-admin/service" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" + "github.com/flipped-aurora/gin-vue-admin/server/model/system" + "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "github.com/flipped-aurora/gin-vue-admin/server/service" "github.com/dgrijalva/jwt-go" "github.com/gin-gonic/gin" diff --git a/server/middleware/need_init.go b/server/middleware/need_init.go index 4f0f3f627..2a68720ec 100644 --- a/server/middleware/need_init.go +++ b/server/middleware/need_init.go @@ -1,8 +1,8 @@ package middleware import ( - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/model/common/response" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" "github.com/gin-gonic/gin" ) diff --git a/server/middleware/operation.go b/server/middleware/operation.go index cb829bd27..d6efd0881 100644 --- a/server/middleware/operation.go +++ b/server/middleware/operation.go @@ -7,10 +7,10 @@ import ( "strconv" "time" - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/model/system" - "github.com/flipped-aurora/gin-vue-admin/model/system/request" - "github.com/flipped-aurora/gin-vue-admin/service" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/model/system" + "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "github.com/flipped-aurora/gin-vue-admin/server/service" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/server/model/autocode/autocodeExample.go b/server/model/autocode/autocodeExample.go index bacd3e2d0..425e504b7 100644 --- a/server/model/autocode/autocodeExample.go +++ b/server/model/autocode/autocodeExample.go @@ -2,7 +2,7 @@ package autocode import ( - "github.com/flipped-aurora/gin-vue-admin/global" + "github.com/flipped-aurora/gin-vue-admin/server/global" ) // 如果含有time.Time 请自行import time包 diff --git a/server/model/autocode/request/autocodeExample.go b/server/model/autocode/request/autocodeExample.go index 093ab5677..d048a988a 100644 --- a/server/model/autocode/request/autocodeExample.go +++ b/server/model/autocode/request/autocodeExample.go @@ -2,8 +2,8 @@ package request import ( - "github.com/flipped-aurora/gin-vue-admin/model/autocode" - "github.com/flipped-aurora/gin-vue-admin/model/common/request" + "github.com/flipped-aurora/gin-vue-admin/server/model/autocode" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" ) // 如果含有time.Time 请自行import time包 diff --git a/server/model/example/exa_breakpoint_continue.go b/server/model/example/exa_breakpoint_continue.go index 07f78985e..3c2924bdb 100644 --- a/server/model/example/exa_breakpoint_continue.go +++ b/server/model/example/exa_breakpoint_continue.go @@ -1,7 +1,7 @@ package example import ( - "github.com/flipped-aurora/gin-vue-admin/global" + "github.com/flipped-aurora/gin-vue-admin/server/global" ) // file struct, 文件结构体 diff --git a/server/model/example/exa_customer.go b/server/model/example/exa_customer.go index 92ac28eba..a4929efa1 100644 --- a/server/model/example/exa_customer.go +++ b/server/model/example/exa_customer.go @@ -1,8 +1,8 @@ package example import ( - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/model/system" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/model/system" ) type ExaCustomer struct { diff --git a/server/model/example/exa_excel.go b/server/model/example/exa_excel.go index 52f36808f..fa96569dc 100644 --- a/server/model/example/exa_excel.go +++ b/server/model/example/exa_excel.go @@ -1,6 +1,6 @@ package example -import "github.com/flipped-aurora/gin-vue-admin/model/system" +import "github.com/flipped-aurora/gin-vue-admin/server/model/system" type ExcelInfo struct { FileName string `json:"fileName"` // 文件名 diff --git a/server/model/example/exa_file_upload_download.go b/server/model/example/exa_file_upload_download.go index 633dfda1f..6f74bb4bc 100644 --- a/server/model/example/exa_file_upload_download.go +++ b/server/model/example/exa_file_upload_download.go @@ -1,7 +1,7 @@ package example import ( - "github.com/flipped-aurora/gin-vue-admin/global" + "github.com/flipped-aurora/gin-vue-admin/server/global" ) type ExaFileUploadAndDownload struct { diff --git a/server/model/example/response/exa_breakpoint_continue.go b/server/model/example/response/exa_breakpoint_continue.go index d2ddaad83..54aa3516b 100644 --- a/server/model/example/response/exa_breakpoint_continue.go +++ b/server/model/example/response/exa_breakpoint_continue.go @@ -1,6 +1,6 @@ package response -import "github.com/flipped-aurora/gin-vue-admin/model/example" +import "github.com/flipped-aurora/gin-vue-admin/server/model/example" type FilePathResponse struct { FilePath string `json:"filePath"` diff --git a/server/model/example/response/exa_customer.go b/server/model/example/response/exa_customer.go index 120b9553e..7fd26f9d6 100644 --- a/server/model/example/response/exa_customer.go +++ b/server/model/example/response/exa_customer.go @@ -1,6 +1,6 @@ package response -import "github.com/flipped-aurora/gin-vue-admin/model/example" +import "github.com/flipped-aurora/gin-vue-admin/server/model/example" type ExaCustomerResponse struct { Customer example.ExaCustomer `json:"customer"` diff --git a/server/model/example/response/exa_file_upload_download.go b/server/model/example/response/exa_file_upload_download.go index 3bfbdfa4d..c1b7931a0 100644 --- a/server/model/example/response/exa_file_upload_download.go +++ b/server/model/example/response/exa_file_upload_download.go @@ -1,6 +1,6 @@ package response -import "github.com/flipped-aurora/gin-vue-admin/model/example" +import "github.com/flipped-aurora/gin-vue-admin/server/model/example" type ExaFileResponse struct { File example.ExaFileUploadAndDownload `json:"file"` diff --git a/server/model/system/request/sys_api.go b/server/model/system/request/sys_api.go index 60cf4ce38..0be8ee72d 100644 --- a/server/model/system/request/sys_api.go +++ b/server/model/system/request/sys_api.go @@ -1,8 +1,8 @@ package request import ( - "github.com/flipped-aurora/gin-vue-admin/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/model/system" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" + "github.com/flipped-aurora/gin-vue-admin/server/model/system" ) // api分页条件查询及排序结构体 diff --git a/server/model/system/request/sys_autocode.go b/server/model/system/request/sys_autocode.go index 42798ad07..7216d91f1 100644 --- a/server/model/system/request/sys_autocode.go +++ b/server/model/system/request/sys_autocode.go @@ -1,6 +1,6 @@ package request -import "github.com/flipped-aurora/gin-vue-admin/model/common/request" +import "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" type SysAutoHistory struct { request.PageInfo diff --git a/server/model/system/request/sys_dictionary.go b/server/model/system/request/sys_dictionary.go index a119e51d2..170ed60db 100644 --- a/server/model/system/request/sys_dictionary.go +++ b/server/model/system/request/sys_dictionary.go @@ -1,8 +1,8 @@ package request import ( - "github.com/flipped-aurora/gin-vue-admin/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/model/system" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" + "github.com/flipped-aurora/gin-vue-admin/server/model/system" ) type SysDictionarySearch struct { diff --git a/server/model/system/request/sys_dictionary_detail.go b/server/model/system/request/sys_dictionary_detail.go index 8039be6aa..2f97da280 100644 --- a/server/model/system/request/sys_dictionary_detail.go +++ b/server/model/system/request/sys_dictionary_detail.go @@ -1,8 +1,8 @@ package request import ( - "github.com/flipped-aurora/gin-vue-admin/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/model/system" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" + "github.com/flipped-aurora/gin-vue-admin/server/model/system" ) type SysDictionaryDetailSearch struct { diff --git a/server/model/system/request/sys_menu.go b/server/model/system/request/sys_menu.go index 554b12293..2e785c2c4 100644 --- a/server/model/system/request/sys_menu.go +++ b/server/model/system/request/sys_menu.go @@ -1,8 +1,8 @@ package request import ( - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/model/system" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/model/system" ) // Add menu authority info structure diff --git a/server/model/system/request/sys_operation_record.go b/server/model/system/request/sys_operation_record.go index f167930c1..e58dd59c3 100644 --- a/server/model/system/request/sys_operation_record.go +++ b/server/model/system/request/sys_operation_record.go @@ -1,8 +1,8 @@ package request import ( - "github.com/flipped-aurora/gin-vue-admin/model/common/request" - "github.com/flipped-aurora/gin-vue-admin/model/system" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" + "github.com/flipped-aurora/gin-vue-admin/server/model/system" ) type SysOperationRecordSearch struct { diff --git a/server/model/system/response/sys_api.go b/server/model/system/response/sys_api.go index b4a49371f..09dc72f8b 100644 --- a/server/model/system/response/sys_api.go +++ b/server/model/system/response/sys_api.go @@ -1,6 +1,6 @@ package response -import "github.com/flipped-aurora/gin-vue-admin/model/system" +import "github.com/flipped-aurora/gin-vue-admin/server/model/system" type SysAPIResponse struct { Api system.SysApi `json:"api"` diff --git a/server/model/system/response/sys_authority.go b/server/model/system/response/sys_authority.go index 513f70d23..7eaaacaf9 100644 --- a/server/model/system/response/sys_authority.go +++ b/server/model/system/response/sys_authority.go @@ -1,6 +1,6 @@ package response -import "github.com/flipped-aurora/gin-vue-admin/model/system" +import "github.com/flipped-aurora/gin-vue-admin/server/model/system" type SysAuthorityResponse struct { Authority system.SysAuthority `json:"authority"` diff --git a/server/model/system/response/sys_casbin.go b/server/model/system/response/sys_casbin.go index 20ff15fd8..267bb42c9 100644 --- a/server/model/system/response/sys_casbin.go +++ b/server/model/system/response/sys_casbin.go @@ -1,7 +1,7 @@ package response import ( - "github.com/flipped-aurora/gin-vue-admin/model/system/request" + "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" ) type PolicyPathResponse struct { diff --git a/server/model/system/response/sys_menu.go b/server/model/system/response/sys_menu.go index e5b614ed8..d8f80f314 100644 --- a/server/model/system/response/sys_menu.go +++ b/server/model/system/response/sys_menu.go @@ -1,6 +1,6 @@ package response -import "github.com/flipped-aurora/gin-vue-admin/model/system" +import "github.com/flipped-aurora/gin-vue-admin/server/model/system" type SysMenusResponse struct { Menus []system.SysMenu `json:"menus"` diff --git a/server/model/system/response/sys_system.go b/server/model/system/response/sys_system.go index c308d77aa..f19e965bf 100644 --- a/server/model/system/response/sys_system.go +++ b/server/model/system/response/sys_system.go @@ -1,6 +1,6 @@ package response -import "github.com/flipped-aurora/gin-vue-admin/config" +import "github.com/flipped-aurora/gin-vue-admin/server/config" type SysConfigResponse struct { Config config.Server `json:"config"` diff --git a/server/model/system/response/sys_user.go b/server/model/system/response/sys_user.go index 8f67ae742..d6f1074b7 100644 --- a/server/model/system/response/sys_user.go +++ b/server/model/system/response/sys_user.go @@ -1,7 +1,7 @@ package response import ( - "github.com/flipped-aurora/gin-vue-admin/model/system" + "github.com/flipped-aurora/gin-vue-admin/server/model/system" ) type SysUserResponse struct { diff --git a/server/model/system/sys_api.go b/server/model/system/sys_api.go index 4ac81486d..731efc483 100644 --- a/server/model/system/sys_api.go +++ b/server/model/system/sys_api.go @@ -1,7 +1,7 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/global" + "github.com/flipped-aurora/gin-vue-admin/server/global" ) type SysApi struct { diff --git a/server/model/system/sys_autocode_history.go b/server/model/system/sys_autocode_history.go index 1ea217b13..2250cb304 100644 --- a/server/model/system/sys_autocode_history.go +++ b/server/model/system/sys_autocode_history.go @@ -1,6 +1,6 @@ package system -import "github.com/flipped-aurora/gin-vue-admin/global" +import "github.com/flipped-aurora/gin-vue-admin/server/global" // 自动迁移代码记录,用于回滚,重放使用 diff --git a/server/model/system/sys_base_menu.go b/server/model/system/sys_base_menu.go index 5830c1e86..9a655c4d7 100644 --- a/server/model/system/sys_base_menu.go +++ b/server/model/system/sys_base_menu.go @@ -1,7 +1,7 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/global" + "github.com/flipped-aurora/gin-vue-admin/server/global" ) type SysBaseMenu struct { diff --git a/server/model/system/sys_dictionary.go b/server/model/system/sys_dictionary.go index afe6a1ac0..b5af59ac9 100644 --- a/server/model/system/sys_dictionary.go +++ b/server/model/system/sys_dictionary.go @@ -2,7 +2,7 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/global" + "github.com/flipped-aurora/gin-vue-admin/server/global" ) // 如果含有time.Time 请自行import time包 diff --git a/server/model/system/sys_dictionary_detail.go b/server/model/system/sys_dictionary_detail.go index af70f52af..f44308005 100644 --- a/server/model/system/sys_dictionary_detail.go +++ b/server/model/system/sys_dictionary_detail.go @@ -2,7 +2,7 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/global" + "github.com/flipped-aurora/gin-vue-admin/server/global" ) // 如果含有time.Time 请自行import time包 diff --git a/server/model/system/sys_jwt_blacklist.go b/server/model/system/sys_jwt_blacklist.go index 3fddc4435..4f9fa396d 100644 --- a/server/model/system/sys_jwt_blacklist.go +++ b/server/model/system/sys_jwt_blacklist.go @@ -1,7 +1,7 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/global" + "github.com/flipped-aurora/gin-vue-admin/server/global" ) type JwtBlacklist struct { diff --git a/server/model/system/sys_operation_record.go b/server/model/system/sys_operation_record.go index ae9675946..43bf7569a 100644 --- a/server/model/system/sys_operation_record.go +++ b/server/model/system/sys_operation_record.go @@ -4,7 +4,7 @@ package system import ( "time" - "github.com/flipped-aurora/gin-vue-admin/global" + "github.com/flipped-aurora/gin-vue-admin/server/global" ) // 如果含有time.Time 请自行import time包 diff --git a/server/model/system/sys_system.go b/server/model/system/sys_system.go index 198b3560f..ad983110b 100644 --- a/server/model/system/sys_system.go +++ b/server/model/system/sys_system.go @@ -1,7 +1,7 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/config" + "github.com/flipped-aurora/gin-vue-admin/server/config" ) // 配置文件结构体 diff --git a/server/model/system/sys_user.go b/server/model/system/sys_user.go index ba5baff84..9b10b5595 100644 --- a/server/model/system/sys_user.go +++ b/server/model/system/sys_user.go @@ -1,7 +1,7 @@ package system import ( - "github.com/flipped-aurora/gin-vue-admin/global" + "github.com/flipped-aurora/gin-vue-admin/server/global" "github.com/satori/go.uuid" ) diff --git a/server/plugin/email/api/sys_email.go b/server/plugin/email/api/sys_email.go index 337eea57d..f21cd59a7 100644 --- a/server/plugin/email/api/sys_email.go +++ b/server/plugin/email/api/sys_email.go @@ -1,9 +1,9 @@ package api import ( - "github.com/flipped-aurora/gin-vue-admin/global" - "github.com/flipped-aurora/gin-vue-admin/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/plugin/email/service" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" + "github.com/flipped-aurora/gin-vue-admin/server/plugin/email/service" "github.com/gin-gonic/gin" "go.uber.org/zap" ) diff --git a/server/plugin/email/global/gloabl.go b/server/plugin/email/global/gloabl.go index f099a2e36..13082d0db 100644 --- a/server/plugin/email/global/gloabl.go +++ b/server/plugin/email/global/gloabl.go @@ -1,5 +1,5 @@ package global -import "github.com/flipped-aurora/gin-vue-admin/plugin/email/config" +import "github.com/flipped-aurora/gin-vue-admin/server/plugin/email/config" var GlobalConfig = new(config.Email) diff --git a/server/plugin/email/main.go b/server/plugin/email/main.go index b15ce24ab..c36b3efcf 100644 --- a/server/plugin/email/main.go +++ b/server/plugin/email/main.go @@ -1,8 +1,8 @@ package email import ( - "github.com/flipped-aurora/gin-vue-admin/plugin/email/global" - "github.com/flipped-aurora/gin-vue-admin/plugin/email/router" + "github.com/flipped-aurora/gin-vue-admin/server/plugin/email/global" + "github.com/flipped-aurora/gin-vue-admin/server/plugin/email/router" "github.com/gin-gonic/gin" ) diff --git a/server/plugin/email/router/sys_email.go b/server/plugin/email/router/sys_email.go index e3d7abd77..339f68e8b 100644 --- a/server/plugin/email/router/sys_email.go +++ b/server/plugin/email/router/sys_email.go @@ -1,8 +1,8 @@ package router import ( - "github.com/flipped-aurora/gin-vue-admin/middleware" - "github.com/flipped-aurora/gin-vue-admin/plugin/email/api" + "github.com/flipped-aurora/gin-vue-admin/server/middleware" + "github.com/flipped-aurora/gin-vue-admin/server/plugin/email/api" "github.com/gin-gonic/gin" ) diff --git a/server/plugin/email/service/sys_email.go b/server/plugin/email/service/sys_email.go index 30bcee29c..b031b3791 100644 --- a/server/plugin/email/service/sys_email.go +++ b/server/plugin/email/service/sys_email.go @@ -1,7 +1,7 @@ package service import ( - "github.com/flipped-aurora/gin-vue-admin/plugin/email/utils" + "github.com/flipped-aurora/gin-vue-admin/server/plugin/email/utils" ) type EmailService struct { diff --git a/server/plugin/email/utils/email.go b/server/plugin/email/utils/email.go index a4c7ec9fb..986b90fb8 100644 --- a/server/plugin/email/utils/email.go +++ b/server/plugin/email/utils/email.go @@ -6,7 +6,7 @@ import ( "net/smtp" "strings" - "github.com/flipped-aurora/gin-vue-admin/plugin/email/global" + "github.com/flipped-aurora/gin-vue-admin/server/plugin/email/global" "github.com/jordan-wright/email" ) diff --git a/server/resource/page/js/index.94d8e405.js b/server/resource/page/js/index.94d8e405.js index fd278be2a..f8ae690f3 100644 --- a/server/resource/page/js/index.94d8e405.js +++ b/server/resource/page/js/index.94d8e405.js @@ -1 +1 @@ -(function(e){function t(t){for(var o,n,c=t[0],r=t[1],s=t[2],d=0,u=[];d'});l.a.add(c);t["default"]=c},"0498":function(e,t,a){},"064a":function(e,t,a){"use strict";a.r(t);var o=a("09f1"),n=a.n(o),i=a("d6af"),l=a.n(i),c=new n.a({id:"icon-select",use:"icon-select-usage",viewBox:"0 0 1024 1024",content:''});l.a.add(c);t["default"]=c},"0f88":function(e,t,a){"use strict";a.r(t),t["default"]={"list-type":function(e,t,a){var o=[],n=t.__config__;return"picture-card"===t["list-type"]?o.push(e("i",{class:"el-icon-plus"})):o.push(e("el-button",{attrs:{size:"small",type:"primary",icon:"el-icon-upload"}},[n.buttonText])),n.showTip&&o.push(e("div",{slot:"tip",class:"el-upload__tip"},["只能上传不超过 ",n.fileSize,n.sizeUnit," 的",t.accept,"文件"])),o}}},"128d":function(e,t,a){"use strict";a.r(t);var o=a("09f1"),n=a.n(o),i=a("d6af"),l=a.n(i),c=new n.a({id:"icon-textarea",use:"icon-textarea-usage",viewBox:"0 0 1024 1024",content:''});l.a.add(c);t["default"]=c},"167d":function(e,t,a){"use strict";a.r(t),t["default"]={prepend:function(e,t,a){return e("template",{slot:"prepend"},[t.__slot__[a]])},append:function(e,t,a){return e("template",{slot:"append"},[t.__slot__[a]])}}},"1fce":function(e,t,a){"use strict";a.r(t);var o=a("09f1"),n=a.n(o),i=a("d6af"),l=a.n(i),c=new n.a({id:"icon-number",use:"icon-number-usage",viewBox:"0 0 1024 1024",content:''});l.a.add(c);t["default"]=c},"235f":function(e,t,a){"use strict";a.r(t);var o=a("09f1"),n=a.n(o),i=a("d6af"),l=a.n(i),c=new n.a({id:"icon-date",use:"icon-date-usage",viewBox:"0 0 1024 1024",content:''});l.a.add(c);t["default"]=c},2384:function(e,t,a){"use strict";a.r(t);var o=a("09f1"),n=a.n(o),i=a("d6af"),l=a.n(i),c=new n.a({id:"icon-switch",use:"icon-switch-usage",viewBox:"0 0 1024 1024",content:''});l.a.add(c);t["default"]=c},"2a3d":function(e,t,a){"use strict";a.r(t);var o=a("09f1"),n=a.n(o),i=a("d6af"),l=a.n(i),c=new n.a({id:"icon-password",use:"icon-password-usage",viewBox:"0 0 1024 1024",content:''});l.a.add(c);t["default"]=c},"2cfa":function(e,t,a){"use strict";a.r(t);a("9719");t["default"]={options:function(e,t,a){var o=[];return t.__slot__.options.forEach((function(a){"button"===t.__config__.optionType?o.push(e("el-radio-button",{attrs:{label:a.value}},[a.label])):o.push(e("el-radio",{attrs:{label:a.value,border:t.border}},[a.label]))})),o}}},"2dba":function(e,t,a){"use strict";a("b62d")},"31c6":function(e,t,a){"use strict";var o,n=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("textarea",{staticStyle:{visibility:"hidden"},attrs:{id:e.tinymceId}})},i=[],l=(a("6390"),a("186d"),a("1f5d"),a("c88b")),c=a("5f72"),r=a.n(c),s=a("4771");function d(e){var t=s["a"].tinymceUrl;if(o)e(o);else{var a=r.a.Loading.service({fullscreen:!0,lock:!0,text:"富文本资源加载中...",spinner:"el-icon-loading",background:"rgba(255, 255, 255, 0.5)"});Object(l["a"])(t,(function(){a.close(),o=tinymce,e(o)}))}}var u=["advlist anchor autolink autosave code codesample directionality emoticons fullscreen hr image imagetools insertdatetime link lists media nonbreaking noneditable pagebreak paste preview print save searchreplace spellchecker tabfocus table template textpattern visualblocks visualchars wordcount"],_=["code searchreplace bold italic underline strikethrough alignleft aligncenter alignright outdent indent blockquote removeformat subscript superscript codesample hr bullist numlist link image charmap preview anchor pagebreak insertdatetime media table emoticons forecolor backcolor fullscreen"],p=a("f22b"),f=1,m={props:{id:{type:String,default:function(){return 1e4===f&&(f=1),"tinymce".concat(+new Date).concat(f++)}},value:{default:""}},data:function(){return{tinymceId:this.id}},mounted:function(){var e=this;d((function(t){a("afc4");var o={selector:"#".concat(e.tinymceId),language:"zh_CN",menubar:"file edit insert view format table",plugins:u,toolbar:_,height:300,branding:!1,object_resizing:!1,end_container_on_empty_block:!0,powerpaste_word_import:"clean",code_dialog_height:450,code_dialog_width:1e3,advlist_bullet_styles:"square",advlist_number_styles:"default",default_link_target:"_blank",link_title:!1,nonbreaking_force_tab:!0};o=Object.assign(o,e.$attrs),o.init_instance_callback=function(t){e.value&&t.setContent(e.value),e.vModel(t)},t.init(o)}))},destroyed:function(){this.destroyTinymce()},methods:{vModel:function(e){var t=this,a=Object(p["debounce"])(250,e.setContent);this.$watch("value",(function(t,o){e&&t!==o&&t!==e.getContent()&&("string"!==typeof t&&(t=t.toString()),a.call(e,t))})),e.on("change keyup undo redo",(function(){t.$emit("input",e.getContent())}))},destroyTinymce:function(){if(window.tinymce){var e=window.tinymce.get(this.tinymceId);e&&e.destroy()}}}},v=m,h=a("5d22"),b=Object(h["a"])(v,n,i,!1,null,null,null);t["a"]=b.exports},"3add":function(e,t,a){"use strict";a.r(t);var o=a("09f1"),n=a.n(o),i=a("d6af"),l=a.n(i),c=new n.a({id:"icon-time",use:"icon-time-usage",viewBox:"0 0 1024 1024",content:''});l.a.add(c);t["default"]=c},"3d38":function(e,t,a){"use strict";a("0498")},4758:function(e,t,a){"use strict";var o=a("6abc"),n=a("58c8"),i=a("bbc6"),l=(a("186d"),a("9208"),a("9719"),a("cd57"),a("aa0d"),a("12b5"),a("58af"),a("1f5d"),a("3c75"),a("6390"),a("ed08")),c={},r=a("9977"),s=r.keys()||[];function d(e,t){var a=this;e.props.value=t,e.on.input=function(e){a.$emit("input",e)}}function u(e,t,a){var o=c[t.__config__.tag];o&&Object.keys(o).forEach((function(n){var i=o[n];t.__slot__&&t.__slot__[n]&&a.push(i(e,t,n))}))}function _(e){var t=this;["on","nativeOn"].forEach((function(a){var o=Object.keys(e[a]||{});o.forEach((function(o){var n=e[a][o];"string"===typeof n&&(e[a][o]=function(e){return t.$emit(n,e)})}))}))}function p(e,t){var a=this;Object.keys(e).forEach((function(l){var c=e[l];"__vModel__"===l?d.call(a,t,e.__config__.defaultValue):void 0!==t[l]?null===t[l]||t[l]instanceof RegExp||["boolean","string","number","function"].includes(Object(i["a"])(t[l]))?t[l]=c:Array.isArray(t[l])?t[l]=[].concat(Object(n["a"])(t[l]),Object(n["a"])(c)):t[l]=Object(o["a"])(Object(o["a"])({},t[l]),c):t.attrs[l]=c})),f(t)}function f(e){delete e.attrs.__config__,delete e.attrs.__slot__,delete e.attrs.__methods__}function m(){return{class:{},attrs:{},props:{},domProps:{},nativeOn:{},on:{},style:{},directives:[],scopedSlots:{},slot:null,key:null,ref:null,refInFor:!0}}s.forEach((function(e){var t=e.replace(/^\.\/(.*)\.\w+$/,"$1"),a=r(e).default;c[t]=a})),t["a"]={props:{conf:{type:Object,required:!0}},render:function(e){var t=m(),a=Object(l["b"])(this.conf),o=this.$slots.default||[];return u.call(this,e,a,o),_.call(this,a),p.call(this,a,t),e(this.conf.__config__.tag,t,o)}}},4771:function(e,t,a){"use strict";a("6390");var o="https://lib.baomitu.com/",n="/form-generator/";function i(e,t,a){return"".concat(o).concat(e,"/").concat(t,"/").concat(a)}t["a"]={beautifierUrl:i("js-beautify","1.13.5","beautifier.min.js"),monacoEditorUrl:"".concat(n,"libs/monaco-editor/vs"),tinymceUrl:i("tinymce","5.7.0","tinymce.min.js")}},"47f1":function(e,t,a){"use strict";a.r(t);var o=a("09f1"),n=a.n(o),i=a("d6af"),l=a.n(i),c=new n.a({id:"icon-table",use:"icon-table-usage",viewBox:"0 0 1024 1024",content:''});l.a.add(c);t["default"]=c},"4ed4":function(e,t,a){"use strict";a.r(t);var o=a("09f1"),n=a.n(o),i=a("d6af"),l=a.n(i),c=new n.a({id:"icon-button",use:"icon-button-usage",viewBox:"0 0 1024 1024",content:''});l.a.add(c);t["default"]=c},"51ff":function(e,t,a){var o={"./button.svg":"4ed4","./cascader.svg":"a393","./checkbox.svg":"8963","./color.svg":"03ab","./component.svg":"56d6","./date-range.svg":"e6df","./date.svg":"235f","./input.svg":"81d6","./number.svg":"1fce","./password.svg":"2a3d","./radio.svg":"d8dc","./rate.svg":"6786","./rich-text.svg":"c630","./row.svg":"c95d","./select.svg":"064a","./slider.svg":"eb1c","./switch.svg":"2384","./table.svg":"47f1","./textarea.svg":"128d","./time-range.svg":"861c","./time.svg":"3add","./upload.svg":"9d82"};function n(e){var t=i(e);return a(t)}function i(e){if(!a.o(o,e)){var t=new Error("Cannot find module '"+e+"'");throw t.code="MODULE_NOT_FOUND",t}return o[e]}n.keys=function(){return Object.keys(o)},n.resolve=i,e.exports=n,n.id="51ff"},"56d6":function(e,t,a){"use strict";a.r(t);var o=a("09f1"),n=a.n(o),i=a("d6af"),l=a.n(i),c=new n.a({id:"icon-component",use:"icon-component-usage",viewBox:"0 0 1024 1024",content:''});l.a.add(c);t["default"]=c},"5d2b":function(e,t,a){},"5f72":function(e,t){e.exports=ELEMENT},6389:function(e,t){e.exports=VueRouter},"648e":function(e,t,a){},"64d8":function(e,t,a){},6786:function(e,t,a){"use strict";a.r(t);var o=a("09f1"),n=a.n(o),i=a("d6af"),l=a.n(i),c=new n.a({id:"icon-rate",use:"icon-rate-usage",viewBox:"0 0 1069 1024",content:''});l.a.add(c);t["default"]=c},6828:function(e,t,a){"use strict";a("64d8")},"7f29":function(e,t,a){"use strict";a.r(t);a("9719");t["default"]={options:function(e,t,a){var o=[];return t.__slot__.options.forEach((function(t){o.push(e("el-option",{attrs:{label:t.label,value:t.value,disabled:t.disabled}}))})),o}}},"80e9":function(e,t,a){"use strict";a("a31c")},"81d6":function(e,t,a){"use strict";a.r(t);var o=a("09f1"),n=a.n(o),i=a("d6af"),l=a.n(i),c=new n.a({id:"icon-input",use:"icon-input-usage",viewBox:"0 0 1024 1024",content:''});l.a.add(c);t["default"]=c},"861c":function(e,t,a){"use strict";a.r(t);var o=a("09f1"),n=a.n(o),i=a("d6af"),l=a.n(i),c=new n.a({id:"icon-time-range",use:"icon-time-range-usage",viewBox:"0 0 1024 1024",content:''});l.a.add(c);t["default"]=c},8963:function(e,t,a){"use strict";a.r(t);var o=a("09f1"),n=a.n(o),i=a("d6af"),l=a.n(i),c=new n.a({id:"icon-checkbox",use:"icon-checkbox-usage",viewBox:"0 0 1024 1024",content:''});l.a.add(c);t["default"]=c},"8a8a":function(e,t,a){"use strict";a.r(t);a("c9ba"),a("e6f5"),a("5bda"),a("85ea");var o,n,i=a("8bbf"),l=a.n(i),c=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",[a("router-view")],1)},r=[],s={mounted:function(){var e=document.querySelector("#pre-loader");e.style.display="none",document.body.ondrop=function(e){e.preventDefault(),e.stopPropagation()}}},d=s,u=a("5d22"),_=Object(u["a"])(d,c,r,!1,null,null,null),p=_.exports,f=(a("186d"),a("c447"),a("9208"),a("6389")),m=a.n(f),v=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"container"},[a("div",{staticClass:"left-board"},[e._m(0),a("el-scrollbar",{staticClass:"left-scrollbar"},[a("div",{staticClass:"components-list"},e._l(e.leftComponents,(function(t,o){return a("div",{key:o},[a("div",{staticClass:"components-title"},[a("svg-icon",{attrs:{"icon-class":"component"}}),e._v(" "+e._s(t.title)+" ")],1),a("draggable",{staticClass:"components-draggable",attrs:{list:t.list,group:{name:"componentsGroup",pull:"clone",put:!1},clone:e.cloneComponent,draggable:".components-item",sort:!1},on:{end:e.onEnd}},e._l(t.list,(function(t,o){return a("div",{key:o,staticClass:"components-item",on:{click:function(a){return e.addComponent(t)}}},[a("div",{staticClass:"components-body"},[a("svg-icon",{attrs:{"icon-class":t.__config__.tagIcon}}),e._v(" "+e._s(t.__config__.label)+" ")],1)])})),0)],1)})),0)])],1),a("div",{staticClass:"center-board"},[a("div",{staticClass:"action-bar"},[a("el-button",{attrs:{icon:"el-icon-video-play",type:"text"},on:{click:e.run}},[e._v(" 运行 ")]),a("el-button",{attrs:{icon:"el-icon-view",type:"text"},on:{click:e.showJson}},[e._v(" 查看json ")]),a("el-button",{attrs:{icon:"el-icon-download",type:"text"},on:{click:e.download}},[e._v(" 导出vue文件 ")]),a("el-button",{staticClass:"copy-btn-main",attrs:{icon:"el-icon-document-copy",type:"text"},on:{click:e.copy}},[e._v(" 复制代码 ")]),a("el-button",{staticClass:"delete-btn",attrs:{icon:"el-icon-delete",type:"text"},on:{click:e.empty}},[e._v(" 清空 ")])],1),a("el-scrollbar",{staticClass:"center-scrollbar"},[a("el-row",{staticClass:"center-board-row",attrs:{gutter:e.formConf.gutter}},[a("el-form",{attrs:{size:e.formConf.size,"label-position":e.formConf.labelPosition,disabled:e.formConf.disabled,"label-width":e.formConf.labelWidth+"px"}},[a("draggable",{staticClass:"drawing-board",attrs:{list:e.drawingList,animation:340,group:"componentsGroup"}},e._l(e.drawingList,(function(t,o){return a("draggable-item",{key:t.renderKey,attrs:{"drawing-list":e.drawingList,"current-item":t,index:o,"active-id":e.activeId,"form-conf":e.formConf},on:{activeItem:e.activeFormItem,copyItem:e.drawingItemCopy,deleteItem:e.drawingItemDelete}})})),1),a("div",{directives:[{name:"show",rawName:"v-show",value:!e.drawingList.length,expression:"!drawingList.length"}],staticClass:"empty-info"},[e._v(" 从左侧拖入或点选组件进行表单设计 ")])],1)],1)],1)],1),a("right-panel",{attrs:{"active-data":e.activeData,"form-conf":e.formConf,"show-field":!!e.drawingList.length},on:{"tag-change":e.tagChange,"fetch-data":e.fetchData}}),a("form-drawer",{attrs:{visible:e.drawerVisible,"form-data":e.formData,size:"100%","generate-conf":e.generateConf},on:{"update:visible":function(t){e.drawerVisible=t}}}),a("json-drawer",{attrs:{size:"60%",visible:e.jsonDrawerVisible,"json-str":JSON.stringify(e.formData)},on:{"update:visible":function(t){e.jsonDrawerVisible=t},refresh:e.refreshJson}}),a("code-type-dialog",{attrs:{visible:e.dialogVisible,title:"选择生成类型","show-file-name":e.showFileName},on:{"update:visible":function(t){e.dialogVisible=t},confirm:e.generate}}),a("input",{attrs:{id:"copyNode",type:"hidden"}})],1)},h=[function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"logo-wrapper",staticStyle:{"z-index":"9999"}},[a("div",{staticClass:"logo"},[e._v(" github.com/flipped-aurora/gin-vue-admin 表单生成器 依赖"),a("a",{staticClass:"github",attrs:{href:"https://github.com/JakHuang/form-generator",target:"_blank"}},[e._v("【Form Generator】")])])])}],b=a("bbc6"),g=a("6abc"),w=(a("cd57"),a("aa0d"),a("de23"),a("2236"),a("0f45"),a("f0b3"),a("1264"),a("6390"),a("a92d"),a("15ee"),a("9719"),a("12b5"),a("3335")),y=a.n(w),D=a("f22b"),x=a("31bf"),k=a("7094"),C=a.n(k),O=a("4758"),M=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",[a("el-drawer",e._g(e._b({on:{opened:e.onOpen,close:e.onClose}},"el-drawer",e.$attrs,!1),e.$listeners),[a("div",{staticStyle:{height:"100%"}},[a("el-row",{staticStyle:{height:"100%",overflow:"auto"}},[a("el-col",{staticClass:"left-editor",attrs:{md:24,lg:12}},[a("div",{staticClass:"setting",attrs:{title:"资源引用"},on:{click:e.showResource}},[a("el-badge",{staticClass:"item",attrs:{"is-dot":!!e.resources.length}},[a("i",{staticClass:"el-icon-setting"})])],1),a("el-tabs",{staticClass:"editor-tabs",attrs:{type:"card"},model:{value:e.activeTab,callback:function(t){e.activeTab=t},expression:"activeTab"}},[a("el-tab-pane",{attrs:{name:"html"}},[a("span",{attrs:{slot:"label"},slot:"label"},["html"===e.activeTab?a("i",{staticClass:"el-icon-edit"}):a("i",{staticClass:"el-icon-document"}),e._v(" template ")])]),a("el-tab-pane",{attrs:{name:"js"}},[a("span",{attrs:{slot:"label"},slot:"label"},["js"===e.activeTab?a("i",{staticClass:"el-icon-edit"}):a("i",{staticClass:"el-icon-document"}),e._v(" script ")])]),a("el-tab-pane",{attrs:{name:"css"}},[a("span",{attrs:{slot:"label"},slot:"label"},["css"===e.activeTab?a("i",{staticClass:"el-icon-edit"}):a("i",{staticClass:"el-icon-document"}),e._v(" css ")])])],1),a("div",{directives:[{name:"show",rawName:"v-show",value:"html"===e.activeTab,expression:"activeTab==='html'"}],staticClass:"tab-editor",attrs:{id:"editorHtml"}}),a("div",{directives:[{name:"show",rawName:"v-show",value:"js"===e.activeTab,expression:"activeTab==='js'"}],staticClass:"tab-editor",attrs:{id:"editorJs"}}),a("div",{directives:[{name:"show",rawName:"v-show",value:"css"===e.activeTab,expression:"activeTab==='css'"}],staticClass:"tab-editor",attrs:{id:"editorCss"}})],1),a("el-col",{staticClass:"right-preview",attrs:{md:24,lg:12}},[a("div",{staticClass:"action-bar",style:{"text-align":"left"}},[a("span",{staticClass:"bar-btn",on:{click:e.runCode}},[a("i",{staticClass:"el-icon-refresh"}),e._v(" 刷新 ")]),a("span",{staticClass:"bar-btn",on:{click:e.exportFile}},[a("i",{staticClass:"el-icon-download"}),e._v(" 导出vue文件 ")]),a("span",{ref:"copyBtn",staticClass:"bar-btn copy-btn"},[a("i",{staticClass:"el-icon-document-copy"}),e._v(" 复制代码 ")]),a("span",{staticClass:"bar-btn delete-btn",on:{click:function(t){return e.$emit("update:visible",!1)}}},[a("i",{staticClass:"el-icon-circle-close"}),e._v(" 关闭 ")])]),a("iframe",{directives:[{name:"show",rawName:"v-show",value:e.isIframeLoaded,expression:"isIframeLoaded"}],ref:"previewPage",staticClass:"result-wrapper",attrs:{frameborder:"0",src:"preview.html"},on:{load:e.iframeLoad}}),a("div",{directives:[{name:"show",rawName:"v-show",value:!e.isIframeLoaded,expression:"!isIframeLoaded"},{name:"loading",rawName:"v-loading",value:!0,expression:"true"}],staticClass:"result-wrapper"})])],1)],1)]),a("resource-dialog",{attrs:{visible:e.resourceVisible,"origin-resource":e.resources},on:{"update:visible":function(t){e.resourceVisible=t},save:e.setResource}})],1)},j=[],I=(a("bd99"),a("75c8")),E=(a("4882"),a("beaa"));function L(e){return'\n '.concat(e,'\n
\n 取消\n 确定\n
\n ')}function T(e){return"")}function z(e){return"