Skip to content

Commit d2da81e

Browse files
SliverHornSliverHorn
authored
Merge pull request flipped-aurora#393 from SliverHorn/gva_gormv2_dev
修复v2.4.0的docker-compose的启动异常问题， swagger错误修复
2 parents 717cb67 + a539757 commit d2da81e

File tree

7 files changed

+2842
-190
lines changed

7 files changed

+2842
-190
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ captcha:
6161
6262
# mysql connect configuration
6363
mysql:
64-
path: '177.7.0.13:3306'
65-
config: 'charset=utf8mb4&parseTime=True&loc=Local'
66-
db-name: 'qmPlus'
67-
username: 'root'
68-
password: 'Aa@6447985'
64+
path: ''
65+
config: ''
66+
db-name: ''
67+
username: ''
68+
password: ''
6969
max-idle-conns: 10
7070
max-open-conns: 100
7171
log-mode: false

‎docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: "3.8"
1+
version: "3"
22

33
networks:
44
network:

‎dockerfile_server

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,17 @@ RUN sh ./server-handle.sh
1212
RUN rm -f server-handle.sh
1313
RUN cat ./config.yaml
1414

15-
RUN go build -o gva cmd/main.go
1615
RUN go env && go build -o server .
1716

18-
1917
FROM alpine:latest
2018
LABEL MAINTAINER="SliverHorn@sliver_horn@qq.com"
2119

2220
WORKDIR /go/src/gin-vue-admin
2321

24-
COPY --from=0 /go/src/gin-vue-admin/gva ./
2522
COPY --from=0 /go/src/gin-vue-admin/server ./
2623
COPY --from=0 /go/src/gin-vue-admin/config.yaml ./
2724
COPY --from=0 /go/src/gin-vue-admin/resource ./resource
2825

2926
EXPOSE 8888
3027

31-
ENTRYPOINT ./gva initdb && ./server
28+
ENTRYPOINT ./server

‎server/api/v1/exa_excel.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func LoadExcel(c *gin.Context) {
8282
// @Security ApiKeyAuth
8383
// @accept multipart/form-data
8484
// @Produce application/json
85-
// @Param fileName query fileName true "模板名称"
85+
// @Param fileName query string true "模板名称"
8686
// @Success 200
8787
// @Router /excel/downloadTemplate [get]
8888
func DownloadTemplate(c *gin.Context) {

0 commit comments

Comments
 (0)