Browse Source

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

qimiao 3 years ago
parent
commit
0df39ffaf0
100 changed files with 259 additions and 281 deletions
  1. 3 3
      server/Dockerfile
  2. 6 6
      server/api/v1/autocode/autocodeExample.go
  3. 2 2
      server/api/v1/autocode/enter.go
  4. 3 3
      server/api/v1/enter.go
  5. 1 1
      server/api/v1/example/enter.go
  6. 4 4
      server/api/v1/example/exa_breakpoint_continue.go
  7. 6 6
      server/api/v1/example/exa_customer.go
  8. 4 4
      server/api/v1/example/exa_excel.go
  9. 5 5
      server/api/v1/example/exa_file_upload_download.go
  10. 4 4
      server/api/v1/example/exa_simple_uploader.go
  11. 1 1
      server/api/v1/system/enter.go
  12. 7 7
      server/api/v1/system/sys_api.go
  13. 7 7
      server/api/v1/system/sys_authority.go
  14. 5 5
      server/api/v1/system/sys_auto_code.go
  15. 3 3
      server/api/v1/system/sys_captcha.go
  16. 5 5
      server/api/v1/system/sys_casbin.go
  17. 5 5
      server/api/v1/system/sys_dictionary.go
  18. 5 5
      server/api/v1/system/sys_dictionary_detail.go
  19. 3 3
      server/api/v1/system/sys_initdb.go
  20. 3 3
      server/api/v1/system/sys_jwt_blacklist.go
  21. 7 7
      server/api/v1/system/sys_menu.go
  22. 6 6
      server/api/v1/system/sys_operation_record.go
  23. 5 5
      server/api/v1/system/sys_system.go
  24. 8 8
      server/api/v1/system/sys_user.go
  25. 3 3
      server/config.docker.yaml
  26. 4 4
      server/config.yaml
  27. 4 4
      server/core/server.go
  28. 3 3
      server/core/viper.go
  29. 2 2
      server/core/zap.go
  30. 2 2
      server/global/global.go
  31. 2 25
      server/go.mod
  32. 7 7
      server/initialize/gorm.go
  33. 1 1
      server/initialize/internal/logger.go
  34. 1 1
      server/initialize/plugin.go
  35. 1 1
      server/initialize/redis.go
  36. 10 9
      server/initialize/router.go
  37. 3 3
      server/initialize/timer.go
  38. 1 1
      server/initialize/validator.go
  39. 3 3
      server/main.go
  40. 4 4
      server/middleware/casbin_rbac.go
  41. 5 5
      server/middleware/email.go
  42. 1 1
      server/middleware/error.go
  43. 5 5
      server/middleware/jwt.go
  44. 2 2
      server/middleware/need_init.go
  45. 4 4
      server/middleware/operation.go
  46. 1 1
      server/model/autocode/autocodeExample.go
  47. 2 2
      server/model/autocode/request/autocodeExample.go
  48. 1 1
      server/model/example/exa_breakpoint_continue.go
  49. 2 2
      server/model/example/exa_customer.go
  50. 1 1
      server/model/example/exa_excel.go
  51. 1 1
      server/model/example/exa_file_upload_download.go
  52. 1 1
      server/model/example/response/exa_breakpoint_continue.go
  53. 1 1
      server/model/example/response/exa_customer.go
  54. 1 1
      server/model/example/response/exa_file_upload_download.go
  55. 2 2
      server/model/system/request/sys_api.go
  56. 1 1
      server/model/system/request/sys_autocode.go
  57. 2 2
      server/model/system/request/sys_dictionary.go
  58. 2 2
      server/model/system/request/sys_dictionary_detail.go
  59. 2 2
      server/model/system/request/sys_menu.go
  60. 2 2
      server/model/system/request/sys_operation_record.go
  61. 1 1
      server/model/system/response/sys_api.go
  62. 1 1
      server/model/system/response/sys_authority.go
  63. 1 1
      server/model/system/response/sys_casbin.go
  64. 1 1
      server/model/system/response/sys_menu.go
  65. 1 1
      server/model/system/response/sys_system.go
  66. 1 1
      server/model/system/response/sys_user.go
  67. 1 1
      server/model/system/sys_api.go
  68. 1 1
      server/model/system/sys_autocode_history.go
  69. 1 1
      server/model/system/sys_base_menu.go
  70. 1 1
      server/model/system/sys_dictionary.go
  71. 1 1
      server/model/system/sys_dictionary_detail.go
  72. 1 1
      server/model/system/sys_jwt_blacklist.go
  73. 1 1
      server/model/system/sys_operation_record.go
  74. 1 1
      server/model/system/sys_system.go
  75. 1 1
      server/model/system/sys_user.go
  76. 3 3
      server/plugin/email/api/sys_email.go
  77. 1 1
      server/plugin/email/global/gloabl.go
  78. 2 2
      server/plugin/email/main.go
  79. 2 2
      server/plugin/email/router/sys_email.go
  80. 1 1
      server/plugin/email/service/sys_email.go
  81. 1 1
      server/plugin/email/utils/email.go
  82. 0 0
      server/resource/page/js/index.94d8e405.js
  83. 1 1
      server/resource/template/readme.txt.tpl
  84. 6 6
      server/resource/template/server/api.go.tpl
  85. 1 1
      server/resource/template/server/model.go.tpl
  86. 2 2
      server/resource/template/server/request.go.tpl
  87. 2 2
      server/resource/template/server/router.go.tpl
  88. 4 4
      server/resource/template/server/service.go.tpl
  89. 2 2
      server/router/autocode/autocodeExample.go
  90. 2 2
      server/router/autocode/enter.go
  91. 3 3
      server/router/enter.go
  92. 2 2
      server/router/example/exa_customer.go
  93. 1 1
      server/router/example/exa_excel.go
  94. 1 1
      server/router/example/exa_file_upload_and_download.go
  95. 1 1
      server/router/example/exa_simple_uploader.go
  96. 2 2
      server/router/system/sys_api.go
  97. 2 2
      server/router/system/sys_authority.go
  98. 1 1
      server/router/system/sys_auto_code.go
  99. 1 1
      server/router/system/sys_base.go
  100. 2 2
      server/router/system/sys_casbin.go

+ 3 - 3
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@[email protected]"
 
-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
 

+ 6 - 6
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"
 )

+ 2 - 2
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.
 }

+ 3 - 3
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 {

+ 1 - 1
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

+ 4 - 4
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"
 )

+ 6 - 6
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"
 )

+ 4 - 4
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"
 )

+ 5 - 5
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"
 )

+ 4 - 4
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"
 )

+ 1 - 1
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

+ 7 - 7
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"

+ 7 - 7
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"

+ 5 - 5
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"

+ 3 - 3
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"

+ 5 - 5
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"
 )

+ 5 - 5
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"
 )

+ 5 - 5
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"
 )

+ 3 - 3
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"

+ 3 - 3
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"
 )

+ 7 - 7
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"

+ 6 - 6
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"
 )

+ 5 - 5
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"

+ 8 - 8
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"

+ 3 - 3
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:

+ 4 - 4
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:

+ 4 - 4
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())
 }

+ 3 - 3
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"

+ 2 - 2
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"
 )

+ 2 - 2
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"

+ 2 - 25
server/go.mod

@@ -1,58 +1,35 @@
-module github.com/flipped-aurora/gin-vue-admin
+module github.com/flipped-aurora/gin-vue-admin/server
 
 go 1.16
 
 require (
-	github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
 	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
 	github.com/aliyun/aliyun-oss-go-sdk v2.1.6+incompatible
-	github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect
 	github.com/casbin/casbin/v2 v2.11.0
 	github.com/casbin/gorm-adapter/v3 v3.0.2
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
-	github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 // indirect
+	github.com/flipped-aurora/gva-plug-email v0.0.0-20210823152517-a061eeea2d16
 	github.com/fsnotify/fsnotify v1.4.9
 	github.com/fvbock/endless v0.0.0-20170109170031-447134032cb6
 	github.com/gin-gonic/gin v1.6.3
-	github.com/go-ole/go-ole v1.2.4 // indirect
-	github.com/go-openapi/jsonreference v0.19.6 // indirect
-	github.com/go-openapi/spec v0.20.3 // indirect
-	github.com/go-openapi/swag v0.19.15 // indirect
-	github.com/go-playground/validator/v10 v10.3.0 // indirect
 	github.com/go-redis/redis/v8 v8.11.0
 	github.com/go-sql-driver/mysql v1.5.0
 	github.com/gookit/color v1.3.1
-	github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 // indirect
 	github.com/jordan-wright/email v0.0.0-20200824153738-3f5bafa1cd84
-	github.com/json-iterator/go v1.1.10 // indirect
 	github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible
-	github.com/lestrrat-go/strftime v1.0.3 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mitchellh/mapstructure v1.2.2 // indirect
 	github.com/mojocn/base64Captcha v1.3.1
-	github.com/pelletier/go-toml v1.6.0 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
 	github.com/qiniu/api.v7/v7 v7.4.1
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/satori/go.uuid v1.2.0
 	github.com/shirou/gopsutil v3.21.1+incompatible
-	github.com/spf13/afero v1.2.2 // indirect
-	github.com/spf13/cast v1.3.1 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/spf13/viper v1.7.0
 	github.com/swaggo/gin-swagger v1.3.0
 	github.com/swaggo/swag v1.7.0
-	github.com/tebeka/strftime v0.1.3 // indirect
 	github.com/tencentyun/cos-go-sdk-v5 v0.7.19
 	github.com/unrolled/secure v1.0.7
 	github.com/xuri/excelize/v2 v2.4.1
 	go.uber.org/zap v1.10.0
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
-	golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
-	golang.org/x/tools v0.1.5 // indirect
-	google.golang.org/protobuf v1.24.0 // indirect
-	gopkg.in/ini.v1 v1.55.0 // indirect
 	gorm.io/driver/mysql v1.0.1
 	gorm.io/gorm v1.20.7
 )

+ 7 - 7
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))

+ 1 - 1
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"
 )

+ 1 - 1
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"
 )
 

+ 1 - 1
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"

+ 10 - 9
server/initialize/router.go

@@ -1,14 +1,15 @@
 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/gva-plug-email"   // 在线仓库模式
+	"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,15 +57,15 @@ 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.
 	}
 
 	//  添加开放权限的插件 示例
 	PluginInit(PublicGroup, example_plugin.ExamplePlugin)
 
-	//  添加跟角色挂钩权限的插件 示例
+	//  添加跟角色挂钩权限的插件 示例 本地示例模式于在线仓库模式注意上方的import 可以自行切换 效果相同
 	PluginInit(PrivateGroup, email.CreateEmailPlug(
 		global.GVA_CONFIG.Email.To,
 		global.GVA_CONFIG.Email.From,

+ 3 - 3
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() {

+ 1 - 1
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",

+ 3 - 3
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

+ 4 - 4
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"
 )
 

+ 5 - 5
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"
 )

+ 1 - 1
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"
 )

+ 5 - 5
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"

+ 2 - 2
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"
 )
 

+ 4 - 4
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"
 )

+ 1 - 1
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包

+ 2 - 2
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包

+ 1 - 1
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, 文件结构体

+ 2 - 2
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 {

+ 1 - 1
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"` // 文件名

+ 1 - 1
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 {

+ 1 - 1
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"`

+ 1 - 1
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"`

+ 1 - 1
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"`

+ 2 - 2
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分页条件查询及排序结构体

+ 1 - 1
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

+ 2 - 2
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 {

+ 2 - 2
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 {

+ 2 - 2
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

+ 2 - 2
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 {

+ 1 - 1
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"`

+ 1 - 1
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"`

+ 1 - 1
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 {

+ 1 - 1
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"`

+ 1 - 1
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"`

+ 1 - 1
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 {

+ 1 - 1
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 {

+ 1 - 1
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"
 
 // 自动迁移代码记录,用于回滚,重放使用
 

+ 1 - 1
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 {

+ 1 - 1
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包

+ 1 - 1
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包

+ 1 - 1
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 {

+ 1 - 1
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包

+ 1 - 1
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"
 )
 
 // 配置文件结构体

+ 1 - 1
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"
 )
 

+ 3 - 3
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"
 )

+ 1 - 1
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)

+ 2 - 2
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"
 )
 

+ 2 - 2
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"
 )
 

+ 1 - 1
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 {

+ 1 - 1
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"
 )

File diff suppressed because it is too large
+ 0 - 0
server/resource/page/js/index.94d8e405.js


+ 1 - 1
server/resource/template/readme.txt.tpl

@@ -2,7 +2,7 @@
 
 后端代码解压后同理,放到自己想要的 mvc对应路径 并且到 initRouter中注册自动生成的路由 到registerTable中注册自动生成的model
 
-项目github:"https://github.com/piexlmax/github.com/flipped-aurora/gin-vue-admin"
+项目github:"https://github.com/piexlmax/github.com/flipped-aurora/gin-vue-admin/server"
 
 希望大家给个star多多鼓励
 

+ 6 - 6
server/resource/template/server/api.go.tpl

@@ -1,12 +1,12 @@
 package autocode
 
 import (
-	"github.com/flipped-aurora/gin-vue-admin/global"
-    "github.com/flipped-aurora/gin-vue-admin/model/autocode"
-    "github.com/flipped-aurora/gin-vue-admin/model/common/request"
-    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/server/global"
+    "github.com/flipped-aurora/gin-vue-admin/server/model/autocode"
+    "github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
+    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/gin-gonic/gin"
     "go.uber.org/zap"
 )

+ 1 - 1
server/resource/template/server/model.go.tpl

@@ -2,7 +2,7 @@
 package autocode
 
 import (
-	"github.com/flipped-aurora/gin-vue-admin/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
 )
 
 // {{.StructName}} 结构体

+ 2 - 2
server/resource/template/server/request.go.tpl

@@ -1,8 +1,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"
 )
 
 type {{.StructName}}Search struct{

+ 2 - 2
server/resource/template/server/router.go.tpl

@@ -1,8 +1,8 @@
 package autocode
 
 import (
-	"github.com/flipped-aurora/gin-vue-admin/api/v1"
-	"github.com/flipped-aurora/gin-vue-admin/middleware"
+	"github.com/flipped-aurora/gin-vue-admin/server/api/v1"
+	"github.com/flipped-aurora/gin-vue-admin/server/middleware"
 	"github.com/gin-gonic/gin"
 )
 

+ 4 - 4
server/resource/template/server/service.go.tpl

@@ -1,10 +1,10 @@
 package autocode
 
 import (
-	"github.com/flipped-aurora/gin-vue-admin/global"
-	"github.com/flipped-aurora/gin-vue-admin/model/autocode"
-	"github.com/flipped-aurora/gin-vue-admin/model/common/request"
-    autoCodeReq "github.com/flipped-aurora/gin-vue-admin/model/autocode/request"
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/autocode"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
+    autoCodeReq "github.com/flipped-aurora/gin-vue-admin/server/model/autocode/request"
 )
 
 type {{.StructName}}Service struct {

+ 2 - 2
server/router/autocode/autocodeExample.go

@@ -1,8 +1,8 @@
 package autocode
 
 import (
-	v1 "github.com/flipped-aurora/gin-vue-admin/api/v1"
-	"github.com/flipped-aurora/gin-vue-admin/middleware"
+	v1 "github.com/flipped-aurora/gin-vue-admin/server/api/v1"
+	"github.com/flipped-aurora/gin-vue-admin/server/middleware"
 	"github.com/gin-gonic/gin"
 )
 

+ 2 - 2
server/router/autocode/enter.go

@@ -1,7 +1,7 @@
 package autocode
 
 type RouterGroup 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.
 	AutoCodeExampleRouter
-	// 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.
 }

+ 3 - 3
server/router/enter.go

@@ -1,9 +1,9 @@
 package router
 
 import (
-	"github.com/flipped-aurora/gin-vue-admin/router/autocode"
-	"github.com/flipped-aurora/gin-vue-admin/router/example"
-	"github.com/flipped-aurora/gin-vue-admin/router/system"
+	"github.com/flipped-aurora/gin-vue-admin/server/router/autocode"
+	"github.com/flipped-aurora/gin-vue-admin/server/router/example"
+	"github.com/flipped-aurora/gin-vue-admin/server/router/system"
 )
 
 type RouterGroup struct {

+ 2 - 2
server/router/example/exa_customer.go

@@ -1,8 +1,8 @@
 package example
 
 import (
-	v1 "github.com/flipped-aurora/gin-vue-admin/api/v1"
-	"github.com/flipped-aurora/gin-vue-admin/middleware"
+	v1 "github.com/flipped-aurora/gin-vue-admin/server/api/v1"
+	"github.com/flipped-aurora/gin-vue-admin/server/middleware"
 	"github.com/gin-gonic/gin"
 )
 

+ 1 - 1
server/router/example/exa_excel.go

@@ -1,7 +1,7 @@
 package example
 
 import (
-	v1 "github.com/flipped-aurora/gin-vue-admin/api/v1"
+	v1 "github.com/flipped-aurora/gin-vue-admin/server/api/v1"
 	"github.com/gin-gonic/gin"
 )
 

+ 1 - 1
server/router/example/exa_file_upload_and_download.go

@@ -1,7 +1,7 @@
 package example
 
 import (
-	v1 "github.com/flipped-aurora/gin-vue-admin/api/v1"
+	v1 "github.com/flipped-aurora/gin-vue-admin/server/api/v1"
 	"github.com/gin-gonic/gin"
 )
 

+ 1 - 1
server/router/example/exa_simple_uploader.go

@@ -1,7 +1,7 @@
 package example
 
 import (
-	v1 "github.com/flipped-aurora/gin-vue-admin/api/v1"
+	v1 "github.com/flipped-aurora/gin-vue-admin/server/api/v1"
 	"github.com/gin-gonic/gin"
 )
 

+ 2 - 2
server/router/system/sys_api.go

@@ -1,8 +1,8 @@
 package system
 
 import (
-	v1 "github.com/flipped-aurora/gin-vue-admin/api/v1"
-	"github.com/flipped-aurora/gin-vue-admin/middleware"
+	v1 "github.com/flipped-aurora/gin-vue-admin/server/api/v1"
+	"github.com/flipped-aurora/gin-vue-admin/server/middleware"
 	"github.com/gin-gonic/gin"
 )
 

+ 2 - 2
server/router/system/sys_authority.go

@@ -1,8 +1,8 @@
 package system
 
 import (
-	v1 "github.com/flipped-aurora/gin-vue-admin/api/v1"
-	"github.com/flipped-aurora/gin-vue-admin/middleware"
+	v1 "github.com/flipped-aurora/gin-vue-admin/server/api/v1"
+	"github.com/flipped-aurora/gin-vue-admin/server/middleware"
 	"github.com/gin-gonic/gin"
 )
 

+ 1 - 1
server/router/system/sys_auto_code.go

@@ -1,7 +1,7 @@
 package system
 
 import (
-	v1 "github.com/flipped-aurora/gin-vue-admin/api/v1"
+	v1 "github.com/flipped-aurora/gin-vue-admin/server/api/v1"
 	"github.com/gin-gonic/gin"
 )
 

+ 1 - 1
server/router/system/sys_base.go

@@ -1,7 +1,7 @@
 package system
 
 import (
-	v1 "github.com/flipped-aurora/gin-vue-admin/api/v1"
+	v1 "github.com/flipped-aurora/gin-vue-admin/server/api/v1"
 	"github.com/gin-gonic/gin"
 )
 

+ 2 - 2
server/router/system/sys_casbin.go

@@ -1,8 +1,8 @@
 package system
 
 import (
-	v1 "github.com/flipped-aurora/gin-vue-admin/api/v1"
-	"github.com/flipped-aurora/gin-vue-admin/middleware"
+	v1 "github.com/flipped-aurora/gin-vue-admin/server/api/v1"
+	"github.com/flipped-aurora/gin-vue-admin/server/middleware"
 	"github.com/gin-gonic/gin"
 )
 

Some files were not shown because too many files changed in this diff