linmadan / mmm-worth · 提交

转到一个项目

作者 陈志颖
提交 10684f339c1efa975551b7117bda014ef47d9968 1 个父辈 08f2e4e3

fix:删除无用的pg配置

内嵌 并排对比
正在显示 8 个修改的文件 包含 146 行增加 和 4 行删除
1 -github.com/360EntSecGroup-Skylar/excelize v1.4.1 h1:l55mJb6rkkaUzOpSsgEeKYtS6/0gHwBYyfo5Jcjv/Ks=  
2 github.com/360EntSecGroup-Skylar/excelize/v2 v2.3.1 h1:j56fC19WoD3z+u+ZHxm2XwRGyS1XmdSMk7058BLhdsM= 1 github.com/360EntSecGroup-Skylar/excelize/v2 v2.3.1 h1:j56fC19WoD3z+u+ZHxm2XwRGyS1XmdSMk7058BLhdsM=
3 github.com/360EntSecGroup-Skylar/excelize/v2 v2.3.1/go.mod h1:gXEhMjm1VadSGjAzyDlBxmdYglP8eJpYWxpwJnmXRWw= 2 github.com/360EntSecGroup-Skylar/excelize/v2 v2.3.1/go.mod h1:gXEhMjm1VadSGjAzyDlBxmdYglP8eJpYWxpwJnmXRWw=
4 github.com/DataDog/zstd v1.3.6-0.20190409195224-796139022798/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= 3 github.com/DataDog/zstd v1.3.6-0.20190409195224-796139022798/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
@@ -166,6 +165,7 @@ golang.org/x/crypto v0.0.0-20191029031824-8986dd9e96cf/go.mod h1:LzIPMQfyMNhhGPh @@ -166,6 +165,7 @@ golang.org/x/crypto v0.0.0-20191029031824-8986dd9e96cf/go.mod h1:LzIPMQfyMNhhGPh
166 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= 165 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
167 golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a h1:vclmkQCjlDX5OydZ9wv8rBCcS0QyQY66Mpf/7BZbInM= 166 golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a h1:vclmkQCjlDX5OydZ9wv8rBCcS0QyQY66Mpf/7BZbInM=
168 golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= 167 golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
  168 +golang.org/x/image v0.0.0-20200922025426-e59bae62ef32 h1:E+SEVulmY8U4+i6vSB88YSc2OKAFfvbHPU/uDTdQu7M=
169 golang.org/x/image v0.0.0-20200922025426-e59bae62ef32/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= 169 golang.org/x/image v0.0.0-20200922025426-e59bae62ef32/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
170 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= 170 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
171 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= 171 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
1 package command 1 package command
  2 +
  3 +import (
  4 + "fmt"
  5 + "github.com/astaxie/beego/validation"
  6 + "time"
  7 +)
  8 +
  9 +type CreateListIntervalCommand struct {
  10 + CompanyId int64 `json:"companyId" valid:"Required"` // 公司id
  11 + ListIntervalStartTime time.Time `json:"listIntervalStartTime"` // 排行榜开始时间
  12 + ListIntervalEndTime time.Time `json:"listIntervalEndTime"` // 排行榜结束时间
  13 +}
  14 +
  15 +func (createListIntervalCommand *CreateListIntervalCommand) ValidateCommand() error {
  16 + valid := validation.Validation{}
  17 + b, err := valid.Valid(createListIntervalCommand)
  18 + if err != nil {
  19 + return err
  20 + }
  21 + if !b {
  22 + for _, validErr := range valid.Errors {
  23 + return fmt.Errorf("%s %s", validErr.Key, validErr.Message)
  24 + }
  25 + }
  26 + return nil
  27 +}
1 package command 1 package command
  2 +
  3 +import (
  4 + "fmt"
  5 + "github.com/astaxie/beego/validation"
  6 +)
  7 +
  8 +type RemoveListIntervalCommand struct {
  9 + ListIntervalId int `json:"listIntervalId" valid:"Required"` // 排行榜Id
  10 +}
  11 +
  12 +func (removeListIntervalCommand *RemoveListIntervalCommand) ValidateCommand() error {
  13 + valid := validation.Validation{}
  14 + b, err := valid.Valid(removeListIntervalCommand)
  15 + if err != nil {
  16 + return err
  17 + }
  18 + if !b {
  19 + for _, validErr := range valid.Errors {
  20 + return fmt.Errorf("%s %s", validErr.Key, validErr.Message)
  21 + }
  22 + }
  23 + return nil
  24 +}
1 package command 1 package command
  2 +
  3 +import (
  4 + "fmt"
  5 + "github.com/astaxie/beego/validation"
  6 + "time"
  7 +)
  8 +
  9 +type UpdateListIntervalCommand struct {
  10 + ListIntervalId int `json:"listIntervalId" valid:"Required"` // 排行榜id
  11 + ListIntervalStartTime time.Time `json:"listIntervalStartTime"` // 排行榜开始时间
  12 + ListIntervalEndTime time.Time `json:"listIntervalEndTime"` // 排行榜结束时间
  13 +}
  14 +
  15 +func (updateListIntervalCommand *UpdateListIntervalCommand) ValidateCommand() error {
  16 + valid := validation.Validation{}
  17 + b, err := valid.Valid(updateListIntervalCommand)
  18 + if err != nil {
  19 + return err
  20 + }
  21 + if !b {
  22 + for _, validErr := range valid.Errors {
  23 + return fmt.Errorf("%s %s", validErr.Key, validErr.Message)
  24 + }
  25 + }
  26 + return nil
  27 +}
1 package query 1 package query
  2 +
  3 +import (
  4 + "fmt"
  5 + "github.com/astaxie/beego/validation"
  6 +)
  7 +
  8 +type GetListIntervalQuery struct {
  9 + ListIntervalId int `json:"listIntervalId"` // 排行榜id
  10 +}
  11 +
  12 +func (getListIntervalQuery *GetListIntervalQuery) ValidateCommand() error {
  13 + valid := validation.Validation{}
  14 + b, err := valid.Valid(getListIntervalQuery)
  15 + if err != nil {
  16 + return err
  17 + }
  18 + if !b {
  19 + for _, validErr := range valid.Errors {
  20 + return fmt.Errorf("%s %s", validErr.Key, validErr.Message)
  21 + }
  22 + }
  23 + return nil
  24 +}
1 package query 1 package query
  2 +
  3 +import (
  4 + "fmt"
  5 + "github.com/astaxie/beego/validation"
  6 +)
  7 +
  8 +type ListListIntervalQuery struct {
  9 + CompanyId int `json:"companyId"` // 公司id
  10 + }
  11 +
  12 +func (listListIntervalQuery *ListListIntervalQuery) ValidateQuery() error {
  13 + valid := validation.Validation{}
  14 + b, err := valid.Valid(listListIntervalQuery)
  15 + if err != nil {
  16 + return err
  17 + }
  18 + if !b {
  19 + for _, validErr := range valid.Errors {
  20 + return fmt.Errorf("%s %s", validErr.Key, validErr.Message)
  21 + }
  22 + }
  23 + return nil
  24 +}
1 package service 1 package service
  2 +
  3 +type ListIntervalService struct {
  4 +
  5 +}
  6 +
  7 +// TODO 创建排行榜时间
  8 +
  9 +
  10 +// TODO 返回排行榜时间列表
  11 +
  12 +
  13 +// TODO 返回排行榜时间
  14 +
  15 +
  16 +// TODO 更新排行榜时间
  17 +
  18 +
  19 +// TODO 移除排行榜时间
  20 +
  21 +
  22 +func NewListIntervalService(options map[string] interface{}) *ListIntervalService {
  23 + newListIntervalService := &ListIntervalService{}
  24 + return newListIntervalService
  25 +}
@@ -4,9 +4,6 @@ import "os" @@ -4,9 +4,6 @@ import "os"
4 4
5 var POSTGRESQL_DB_NAME = "mmm-worth" 5 var POSTGRESQL_DB_NAME = "mmm-worth"
6 var POSTGRESQL_USER = "postgres" 6 var POSTGRESQL_USER = "postgres"
7 -//var POSTGRESQL_PASSWORD = "abc123456"  
8 -//var POSTGRESQL_HOST = "127.0.0.1"  
9 -//var POSTGRESQL_PORT = "32432"  
10 var POSTGRESQL_PASSWORD = "1993618jack" 7 var POSTGRESQL_PASSWORD = "1993618jack"
11 var POSTGRESQL_HOST = "127.0.0.1" 8 var POSTGRESQL_HOST = "127.0.0.1"
12 var POSTGRESQL_PORT = "5432" 9 var POSTGRESQL_PORT = "5432"