caipin 4 年之前
父節點
當前提交
eefbcc7b8a
共有 3 個文件被更改,包括 3 次插入16 次删除
  1. 1 0
      .gitignore
  2. 0 15
      deployment/Dockerfile
  3. 2 1
      web/viewmodels/project.go

+ 1 - 0
.gitignore

@@ -6,3 +6,4 @@
 /web/docs/swagger.json
 /web/docs/swagger.yaml
 /web/main.go
+/deployment/Dockerfile

+ 0 - 15
deployment/Dockerfile

@@ -1,15 +0,0 @@
-#不需要goalng环境
-# from golang:1.15.6-buster
-
-# MAINTAINER cp cpthought@vip.qq.com 
-
-FROM centos:7
-
-#  ADD /bin/construction_management /
-ADD /bin/ /
-RUN chmod 777 /construction_management
-ENV PARAMS=""
-
-EXPOSE 6060
-
-ENTRYPOINT ["sh","-c","/construction_management $PARAMS"]

+ 2 - 1
web/viewmodels/project.go

@@ -43,6 +43,7 @@ type ProjectInfo struct {
 type ProjectPage struct {
 	Page             int    `form:"page" json:"page"`
 	Size             int    `form:"size" json:"size"`
+	PageSize         int    `form:"pageSize" json:"pageSize"`
 	InsideCategoryId string `form:"insideCategoryId" json:"insideCategoryId"`
 	Search           string `form:"search" json:"search"`
 }
@@ -51,7 +52,7 @@ func (l ProjectPage) ValidatePage() error {
 	return validation.ValidateStruct(&l,
 		// 字符的4倍
 		validation.Field(&l.Page, validation.Required.Error("当前页不能为空")),
-		validation.Field(&l.Size, validation.Required.Error("每页数量不能为空")),
+		// validation.Field(&l.Size, validation.Required.Error("每页数量不能为空")),
 	)
 }