Skip to content

Commit 0df39ff

Browse files
author
qimiao
committed
Merge remote-tracking branch 'origin/gva_gormv2_dev' into gva_gormv2_dev
2 parents 8931c46 + ee535d8 commit 0df39ff

File tree

153 files changed

+384
-405
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+384
-405
lines changed

‎server/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
FROM golang:alpine
22

3-
WORKDIR /go/src/github.com/flipped-aurora/gin-vue-admin
3+
WORKDIR /go/src/github.com/flipped-aurora/gin-vue-admin/server
44
COPY . .
55

66
RUN go generate && go env && go build -o server .
77

88
FROM alpine:latest
99
LABEL MAINTAINER="SliverHorn@sliver_horn@qq.com"
1010

11-
WORKDIR /go/src/github.com/flipped-aurora/gin-vue-admin
11+
WORKDIR /go/src/github.com/flipped-aurora/gin-vue-admin/server
1212

13-
COPY --from=0 /go/src/github.com/flipped-aurora/gin-vue-admin ./
13+
COPY --from=0 /go/src/github.com/flipped-aurora/gin-vue-admin/server ./
1414

1515
EXPOSE 8888
1616

‎server/api/v1/autocode/autocodeExample.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package autocode
22

33
import (
4-
"github.com/flipped-aurora/gin-vue-admin/global"
5-
"github.com/flipped-aurora/gin-vue-admin/model/autocode"
6-
autocodeReq "github.com/flipped-aurora/gin-vue-admin/model/autocode/request"
7-
"github.com/flipped-aurora/gin-vue-admin/model/common/response"
8-
"github.com/flipped-aurora/gin-vue-admin/service"
9-
"github.com/flipped-aurora/gin-vue-admin/utils"
4+
"github.com/flipped-aurora/gin-vue-admin/server/global"
5+
"github.com/flipped-aurora/gin-vue-admin/server/model/autocode"
6+
autocodeReq "github.com/flipped-aurora/gin-vue-admin/server/model/autocode/request"
7+
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
8+
"github.com/flipped-aurora/gin-vue-admin/server/service"
9+
"github.com/flipped-aurora/gin-vue-admin/server/utils"
1010
"github.com/gin-gonic/gin"
1111
"go.uber.org/zap"
1212
)

‎server/api/v1/autocode/enter.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package autocode
22

33
type ApiGroup struct {
4-
// Code generated by github.com/flipped-aurora/gin-vue-admin Begin; DO NOT EDIT.
4+
// Code generated by github.com/flipped-aurora/gin-vue-admin/server Begin; DO NOT EDIT.
55
AutoCodeExampleApi
6-
// Code generated by github.com/flipped-aurora/gin-vue-admin End; DO NOT EDIT.
6+
// Code generated by github.com/flipped-aurora/gin-vue-admin/server End; DO NOT EDIT.
77
}

‎server/api/v1/enter.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package v1
22

33
import (
4-
"github.com/flipped-aurora/gin-vue-admin/api/v1/autocode"
5-
"github.com/flipped-aurora/gin-vue-admin/api/v1/example"
6-
"github.com/flipped-aurora/gin-vue-admin/api/v1/system"
4+
"github.com/flipped-aurora/gin-vue-admin/server/api/v1/autocode"
5+
"github.com/flipped-aurora/gin-vue-admin/server/api/v1/example"
6+
"github.com/flipped-aurora/gin-vue-admin/server/api/v1/system"
77
)
88

99
type ApiGroup struct {

‎server/api/v1/example/enter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package example
22

3-
import "github.com/flipped-aurora/gin-vue-admin/service"
3+
import "github.com/flipped-aurora/gin-vue-admin/server/service"
44

55
type ApiGroup struct {
66
CustomerApi

‎server/api/v1/example/exa_breakpoint_continue.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import (
44
"io/ioutil"
55
"strconv"
66

7-
"github.com/flipped-aurora/gin-vue-admin/global"
8-
"github.com/flipped-aurora/gin-vue-admin/model/common/response"
9-
exampleRes "github.com/flipped-aurora/gin-vue-admin/model/example/response"
10-
"github.com/flipped-aurora/gin-vue-admin/utils"
7+
"github.com/flipped-aurora/gin-vue-admin/server/global"
8+
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
9+
exampleRes "github.com/flipped-aurora/gin-vue-admin/server/model/example/response"
10+
"github.com/flipped-aurora/gin-vue-admin/server/utils"
1111
"github.com/gin-gonic/gin"
1212
"go.uber.org/zap"
1313
)

‎server/api/v1/example/exa_customer.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package example
22

33
import (
4-
"github.com/flipped-aurora/gin-vue-admin/global"
5-
"github.com/flipped-aurora/gin-vue-admin/model/common/request"
6-
"github.com/flipped-aurora/gin-vue-admin/model/common/response"
7-
"github.com/flipped-aurora/gin-vue-admin/model/example"
8-
exampleRes "github.com/flipped-aurora/gin-vue-admin/model/example/response"
9-
"github.com/flipped-aurora/gin-vue-admin/utils"
4+
"github.com/flipped-aurora/gin-vue-admin/server/global"
5+
"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
6+
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
7+
"github.com/flipped-aurora/gin-vue-admin/server/model/example"
8+
exampleRes "github.com/flipped-aurora/gin-vue-admin/server/model/example/response"
9+
"github.com/flipped-aurora/gin-vue-admin/server/utils"
1010
"github.com/gin-gonic/gin"
1111
"go.uber.org/zap"
1212
)

‎server/api/v1/example/exa_excel.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package example
22

33
import (
4-
"github.com/flipped-aurora/gin-vue-admin/global"
5-
"github.com/flipped-aurora/gin-vue-admin/model/common/response"
6-
"github.com/flipped-aurora/gin-vue-admin/model/example"
7-
"github.com/flipped-aurora/gin-vue-admin/utils"
4+
"github.com/flipped-aurora/gin-vue-admin/server/global"
5+
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
6+
"github.com/flipped-aurora/gin-vue-admin/server/model/example"
7+
"github.com/flipped-aurora/gin-vue-admin/server/utils"
88
"github.com/gin-gonic/gin"
99
"go.uber.org/zap"
1010
)

‎server/api/v1/example/exa_file_upload_download.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package example
22

33
import (
4-
"github.com/flipped-aurora/gin-vue-admin/global"
5-
"github.com/flipped-aurora/gin-vue-admin/model/common/request"
6-
"github.com/flipped-aurora/gin-vue-admin/model/common/response"
7-
"github.com/flipped-aurora/gin-vue-admin/model/example"
8-
exampleRes "github.com/flipped-aurora/gin-vue-admin/model/example/response"
4+
"github.com/flipped-aurora/gin-vue-admin/server/global"
5+
"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
6+
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
7+
"github.com/flipped-aurora/gin-vue-admin/server/model/example"
8+
exampleRes "github.com/flipped-aurora/gin-vue-admin/server/model/example/response"
99
"github.com/gin-gonic/gin"
1010
"go.uber.org/zap"
1111
)

‎server/api/v1/example/exa_simple_uploader.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package example
22

33
import (
4-
"github.com/flipped-aurora/gin-vue-admin/global"
5-
"github.com/flipped-aurora/gin-vue-admin/model/common/response"
6-
"github.com/flipped-aurora/gin-vue-admin/model/example"
7-
"github.com/flipped-aurora/gin-vue-admin/utils"
4+
"github.com/flipped-aurora/gin-vue-admin/server/global"
5+
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
6+
"github.com/flipped-aurora/gin-vue-admin/server/model/example"
7+
"github.com/flipped-aurora/gin-vue-admin/server/utils"
88
"github.com/gin-gonic/gin"
99
"go.uber.org/zap"
1010
)

‎server/api/v1/system/enter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package system
22

3-
import "github.com/flipped-aurora/gin-vue-admin/service"
3+
import "github.com/flipped-aurora/gin-vue-admin/server/service"
44

55
type ApiGroup struct {
66
SystemApiApi

‎server/api/v1/system/sys_api.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package system
22

33
import (
4-
"github.com/flipped-aurora/gin-vue-admin/global"
5-
"github.com/flipped-aurora/gin-vue-admin/model/common/request"
6-
"github.com/flipped-aurora/gin-vue-admin/model/common/response"
7-
"github.com/flipped-aurora/gin-vue-admin/model/system"
8-
systemReq "github.com/flipped-aurora/gin-vue-admin/model/system/request"
9-
systemRes "github.com/flipped-aurora/gin-vue-admin/model/system/response"
10-
"github.com/flipped-aurora/gin-vue-admin/utils"
4+
"github.com/flipped-aurora/gin-vue-admin/server/global"
5+
"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
6+
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
7+
"github.com/flipped-aurora/gin-vue-admin/server/model/system"
8+
systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
9+
systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response"
10+
"github.com/flipped-aurora/gin-vue-admin/server/utils"
1111

1212
"github.com/gin-gonic/gin"
1313
"go.uber.org/zap"

‎server/api/v1/system/sys_authority.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package system
22

33
import (
4-
"github.com/flipped-aurora/gin-vue-admin/global"
5-
"github.com/flipped-aurora/gin-vue-admin/model/common/request"
6-
"github.com/flipped-aurora/gin-vue-admin/model/common/response"
7-
"github.com/flipped-aurora/gin-vue-admin/model/system"
8-
systemReq "github.com/flipped-aurora/gin-vue-admin/model/system/request"
9-
systemRes "github.com/flipped-aurora/gin-vue-admin/model/system/response"
10-
"github.com/flipped-aurora/gin-vue-admin/utils"
4+
"github.com/flipped-aurora/gin-vue-admin/server/global"
5+
"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
6+
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
7+
"github.com/flipped-aurora/gin-vue-admin/server/model/system"
8+
systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
9+
systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response"
10+
"github.com/flipped-aurora/gin-vue-admin/server/utils"
1111

1212
"github.com/gin-gonic/gin"
1313
"go.uber.org/zap"

‎server/api/v1/system/sys_auto_code.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import (
66
"net/url"
77
"os"
88

9-
"github.com/flipped-aurora/gin-vue-admin/global"
10-
"github.com/flipped-aurora/gin-vue-admin/model/common/response"
11-
"github.com/flipped-aurora/gin-vue-admin/model/system"
12-
systemReq "github.com/flipped-aurora/gin-vue-admin/model/system/request"
13-
"github.com/flipped-aurora/gin-vue-admin/utils"
9+
"github.com/flipped-aurora/gin-vue-admin/server/global"
10+
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
11+
"github.com/flipped-aurora/gin-vue-admin/server/model/system"
12+
systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
13+
"github.com/flipped-aurora/gin-vue-admin/server/utils"
1414

1515
"github.com/gin-gonic/gin"
1616
"go.uber.org/zap"

‎server/api/v1/system/sys_captcha.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package system
22

33
import (
4-
"github.com/flipped-aurora/gin-vue-admin/global"
5-
"github.com/flipped-aurora/gin-vue-admin/model/common/response"
6-
systemRes "github.com/flipped-aurora/gin-vue-admin/model/system/response"
4+
"github.com/flipped-aurora/gin-vue-admin/server/global"
5+
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
6+
systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response"
77
"github.com/gin-gonic/gin"
88
"github.com/mojocn/base64Captcha"
99
"go.uber.org/zap"

‎server/api/v1/system/sys_casbin.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package system
22

33
import (
4-
"github.com/flipped-aurora/gin-vue-admin/global"
5-
"github.com/flipped-aurora/gin-vue-admin/model/common/response"
6-
"github.com/flipped-aurora/gin-vue-admin/model/system/request"
7-
systemRes "github.com/flipped-aurora/gin-vue-admin/model/system/response"
8-
"github.com/flipped-aurora/gin-vue-admin/utils"
4+
"github.com/flipped-aurora/gin-vue-admin/server/global"
5+
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
6+
"github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
7+
systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response"
8+
"github.com/flipped-aurora/gin-vue-admin/server/utils"
99
"github.com/gin-gonic/gin"
1010
"go.uber.org/zap"
1111
)

‎server/api/v1/system/sys_dictionary.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package system
22

33
import (
4-
"github.com/flipped-aurora/gin-vue-admin/global"
5-
"github.com/flipped-aurora/gin-vue-admin/model/common/response"
6-
"github.com/flipped-aurora/gin-vue-admin/model/system"
7-
"github.com/flipped-aurora/gin-vue-admin/model/system/request"
8-
"github.com/flipped-aurora/gin-vue-admin/utils"
4+
"github.com/flipped-aurora/gin-vue-admin/server/global"
5+
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
6+
"github.com/flipped-aurora/gin-vue-admin/server/model/system"
7+
"github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
8+
"github.com/flipped-aurora/gin-vue-admin/server/utils"
99
"github.com/gin-gonic/gin"
1010
"go.uber.org/zap"
1111
)

‎server/api/v1/system/sys_dictionary_detail.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package system
22

33
import (
4-
"github.com/flipped-aurora/gin-vue-admin/global"
5-
"github.com/flipped-aurora/gin-vue-admin/model/common/response"
6-
"github.com/flipped-aurora/gin-vue-admin/model/system"
7-
"github.com/flipped-aurora/gin-vue-admin/model/system/request"
8-
"github.com/flipped-aurora/gin-vue-admin/utils"
4+
"github.com/flipped-aurora/gin-vue-admin/server/global"
5+
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
6+
"github.com/flipped-aurora/gin-vue-admin/server/model/system"
7+
"github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
8+
"github.com/flipped-aurora/gin-vue-admin/server/utils"
99
"github.com/gin-gonic/gin"
1010
"go.uber.org/zap"
1111
)

‎server/api/v1/system/sys_initdb.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package system
22

33
import (
4-
"github.com/flipped-aurora/gin-vue-admin/global"
5-
"github.com/flipped-aurora/gin-vue-admin/model/common/response"
6-
"github.com/flipped-aurora/gin-vue-admin/model/system/request"
4+
"github.com/flipped-aurora/gin-vue-admin/server/global"
5+
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
6+
"github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
77
"go.uber.org/zap"
88

99
"github.com/gin-gonic/gin"

‎server/api/v1/system/sys_jwt_blacklist.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package system
22

33
import (
4-
"github.com/flipped-aurora/gin-vue-admin/global"
5-
"github.com/flipped-aurora/gin-vue-admin/model/common/response"
6-
"github.com/flipped-aurora/gin-vue-admin/model/system"
4+
"github.com/flipped-aurora/gin-vue-admin/server/global"
5+
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
6+
"github.com/flipped-aurora/gin-vue-admin/server/model/system"
77
"github.com/gin-gonic/gin"
88
"go.uber.org/zap"
99
)

‎server/api/v1/system/sys_menu.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package system
22

33
import (
4-
"github.com/flipped-aurora/gin-vue-admin/global"
5-
"github.com/flipped-aurora/gin-vue-admin/model/common/request"
6-
"github.com/flipped-aurora/gin-vue-admin/model/common/response"
7-
"github.com/flipped-aurora/gin-vue-admin/model/system"
8-
systemReq "github.com/flipped-aurora/gin-vue-admin/model/system/request"
9-
systemRes "github.com/flipped-aurora/gin-vue-admin/model/system/response"
10-
"github.com/flipped-aurora/gin-vue-admin/utils"
4+
"github.com/flipped-aurora/gin-vue-admin/server/global"
5+
"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
6+
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
7+
"github.com/flipped-aurora/gin-vue-admin/server/model/system"
8+
systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
9+
systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response"
10+
"github.com/flipped-aurora/gin-vue-admin/server/utils"
1111

1212
"github.com/gin-gonic/gin"
1313
"go.uber.org/zap"

‎server/api/v1/system/sys_operation_record.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package system
22

33
import (
4-
"github.com/flipped-aurora/gin-vue-admin/global"
5-
"github.com/flipped-aurora/gin-vue-admin/model/common/request"
6-
"github.com/flipped-aurora/gin-vue-admin/model/common/response"
7-
"github.com/flipped-aurora/gin-vue-admin/model/system"
8-
systemReq "github.com/flipped-aurora/gin-vue-admin/model/system/request"
9-
"github.com/flipped-aurora/gin-vue-admin/utils"
4+
"github.com/flipped-aurora/gin-vue-admin/server/global"
5+
"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
6+
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
7+
"github.com/flipped-aurora/gin-vue-admin/server/model/system"
8+
systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
9+
"github.com/flipped-aurora/gin-vue-admin/server/utils"
1010
"github.com/gin-gonic/gin"
1111
"go.uber.org/zap"
1212
)

‎server/api/v1/system/sys_system.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package system
22

33
import (
4-
"github.com/flipped-aurora/gin-vue-admin/global"
5-
"github.com/flipped-aurora/gin-vue-admin/model/common/response"
6-
"github.com/flipped-aurora/gin-vue-admin/model/system"
7-
systemRes "github.com/flipped-aurora/gin-vue-admin/model/system/response"
8-
"github.com/flipped-aurora/gin-vue-admin/utils"
4+
"github.com/flipped-aurora/gin-vue-admin/server/global"
5+
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
6+
"github.com/flipped-aurora/gin-vue-admin/server/model/system"
7+
systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response"
8+
"github.com/flipped-aurora/gin-vue-admin/server/utils"
99

1010
"github.com/gin-gonic/gin"
1111
"go.uber.org/zap"

‎server/api/v1/system/sys_user.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import (
44
"strconv"
55
"time"
66

7-
"github.com/flipped-aurora/gin-vue-admin/global"
8-
"github.com/flipped-aurora/gin-vue-admin/middleware"
9-
"github.com/flipped-aurora/gin-vue-admin/model/common/request"
10-
"github.com/flipped-aurora/gin-vue-admin/model/common/response"
11-
"github.com/flipped-aurora/gin-vue-admin/model/system"
12-
systemReq "github.com/flipped-aurora/gin-vue-admin/model/system/request"
13-
systemRes "github.com/flipped-aurora/gin-vue-admin/model/system/response"
14-
"github.com/flipped-aurora/gin-vue-admin/utils"
7+
"github.com/flipped-aurora/gin-vue-admin/server/global"
8+
"github.com/flipped-aurora/gin-vue-admin/server/middleware"
9+
"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
10+
"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
11+
"github.com/flipped-aurora/gin-vue-admin/server/model/system"
12+
systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
13+
systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response"
14+
"github.com/flipped-aurora/gin-vue-admin/server/utils"
1515

1616
"github.com/dgrijalva/jwt-go"
1717
"github.com/gin-gonic/gin"

0 commit comments

Comments
 (0)