From d38299b90dc85978414955bae9bbd9dff18826a1 Mon Sep 17 00:00:00 2001 From: mountain Date: Wed, 24 May 2023 15:31:01 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AA=A8=EB=93=88=20=EC=B6=A9=EB=8F=8C=20?= =?UTF-8?q?=ED=95=B4=EA=B2=B0=20=EB=B0=8F=20=EC=BD=94=EB=93=9C=20=EC=A0=95?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 - core/api.go | 51 ++++++++++++++++++++++++++++++++++-- core/maingate.go | 24 +++++++++++------ core/platformapple.go | 2 +- core/platformfirebaseauth.go | 2 +- core/platformgamepot.go | 2 +- core/platformgoogle.go | 2 +- core/platformmicrosoft.go | 2 +- core/platformtwitter.go | 2 +- core/service.go | 32 +++++++++++++++++----- core/watch.go | 5 ++-- go.mod | 20 +++++++------- go.sum | 34 +++++++++++++----------- main.go | 4 +-- 14 files changed, 128 insertions(+), 55 deletions(-) diff --git a/.gitignore b/.gitignore index 6f277c4..7da7304 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ .vscode/ -__debug_bin.exe *.log *.exe diff --git a/core/api.go b/core/api.go index aa8115a..326ae6e 100644 --- a/core/api.go +++ b/core/api.go @@ -13,8 +13,8 @@ import ( "time" "unsafe" - "repositories.action2quare.com/ayo/go-ayo/common" - "repositories.action2quare.com/ayo/go-ayo/logger" + common "repositories.action2quare.com/ayo/gocommon" + "repositories.action2quare.com/ayo/gocommon/logger" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson/primitive" @@ -114,6 +114,32 @@ func (caller apiCaller) isValidUser(service any, category string) (valid bool, a return svcdesc.isValidAPIUser(category, email), false } +func (caller apiCaller) uploadAPI(w http.ResponseWriter, r *http.Request) error { + // file, header, err := r.FormFile("file") + // if err != nil { + // logger.Error(err) + // w.WriteHeader(http.StatusBadRequest) + // return + // } + // defer file.Close() + + // contents, err := io.ReadAll(file) + // if err != nil { + // logger.Error(err) + // w.WriteHeader(http.StatusInternalServerError) + // return + // } + + // ext := path.Ext(header.Filename) + // if ext == ".zip" { + + // } + + // // deploys 폴더는 파일시스템 서비스이므로 다운로드 가능 + // filename := path.Join("deploys", name, version, name+ext) + return nil +} + func (caller apiCaller) whitelistAPI(w http.ResponseWriter, r *http.Request) error { mg := caller.mg queryvals := r.URL.Query() @@ -189,6 +215,25 @@ func (caller apiCaller) whitelistAPI(w http.ResponseWriter, r *http.Request) err return nil } +// func (caller apiCaller) divisionAPI(w http.ResponseWriter, r *http.Request, svcid string, divid string) error { +// if r.Method == "PUT" { +// // svcid, divid에 statemeta 설정 +// file, header, err := r.FormFile("file") +// if err != nil { +// logger.Error(err) +// w.WriteHeader(http.StatusBadRequest) +// return +// } +// defer file.Close() + +// if header. +// stateFile, header, err := r.FormFile("file") +// if err != nil { +// return err +// } +// } +// } + func (caller apiCaller) serviceAPI(w http.ResponseWriter, r *http.Request) error { mg := caller.mg queryvals := r.URL.Query() @@ -464,6 +509,8 @@ func (mg *Maingate) api(w http.ResponseWriter, r *http.Request) { err = caller.configAPI(w, r) } else if strings.HasSuffix(r.URL.Path, "/account") { err = caller.accountAPI(w, r) + } else if strings.HasSuffix(r.URL.Path, "/upload") { + err = caller.uploadAPI(w, r) } if err != nil { diff --git a/core/maingate.go b/core/maingate.go index b783827..a885101 100644 --- a/core/maingate.go +++ b/core/maingate.go @@ -21,8 +21,8 @@ import ( "time" "unsafe" - "repositories.action2quare.com/ayo/go-ayo/common" - "repositories.action2quare.com/ayo/go-ayo/logger" + common "repositories.action2quare.com/ayo/gocommon" + "repositories.action2quare.com/ayo/gocommon/logger" "github.com/golang-jwt/jwt" "go.mongodb.org/mongo-driver/bson" @@ -545,9 +545,17 @@ func (mg *Maingate) RegisterHandlers(ctx context.Context, serveMux *http.ServeMu w.Write(configraw) }) + if err := os.MkdirAll("static", os.ModePerm); err != nil { + // 일반 엔드유저한테 오픈할 static 페이지 + return err + } + fsx := http.FileServer(http.Dir("./console")) serveMux.Handle(common.MakeHttpHandlerPattern(prefix, "console", "/"), http.StripPrefix("/console/", fsx)) + ssx := http.FileServer(http.Dir("./static")) + serveMux.Handle(common.MakeHttpHandlerPattern(prefix, "static", "/"), http.StripPrefix("/static/", ssx)) + serveMux.HandleFunc(common.MakeHttpHandlerPattern(prefix, "request_login_url", AuthPlatformGoogle), mg.platform_google_get_login_url) serveMux.HandleFunc(common.MakeHttpHandlerPattern(prefix, "authorize", AuthPlatformGoogle), mg.platform_google_authorize) serveMux.HandleFunc(common.MakeHttpHandlerPattern(prefix, "authorize_result", AuthPlatformGoogle), mg.platform_google_authorize_result) @@ -767,7 +775,7 @@ func (mg *Maingate) updateUserinfo(info usertokeninfo) (bool, string, string) { } -func (mg *Maingate) getProviderInfo(platform string, uid string) (error, string, string) { +func (mg *Maingate) getProviderInfo(platform string, uid string) (string, string, error) { provider := "" providerid := "" @@ -778,15 +786,15 @@ func (mg *Maingate) getProviderInfo(platform string, uid string) (error, string, }) if err != nil { - return err, "", "" + return "", "", err } if found == nil { - return errors.New("firebase info not found: " + uid), "", "" + return "", "", errors.New("firebase info not found: " + uid) } provider = found["firebaseprovider"].(string) providerid = found["firebaseproviderId"].(string) if provider == "" || providerid == "" { - return errors.New("getProviderInfo - firebase info not found: " + provider + " / " + providerid), "", "" + return "", "", errors.New("getProviderInfo - firebase info not found: " + provider + " / " + providerid) } default: provider = platform @@ -794,10 +802,10 @@ func (mg *Maingate) getProviderInfo(platform string, uid string) (error, string, } if provider == "" || providerid == "" { - return errors.New("getProviderInfo - provider info not found: " + provider + " / " + providerid), "", "" + return "", "", errors.New("getProviderInfo - provider info not found: " + provider + " / " + providerid) } - return nil, provider, providerid + return provider, providerid, nil } diff --git a/core/platformapple.go b/core/platformapple.go index 8eadc5d..f34ed91 100644 --- a/core/platformapple.go +++ b/core/platformapple.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "repositories.action2quare.com/ayo/go-ayo/logger" + "repositories.action2quare.com/ayo/gocommon/logger" "github.com/golang-jwt/jwt" "go.mongodb.org/mongo-driver/bson" diff --git a/core/platformfirebaseauth.go b/core/platformfirebaseauth.go index 7883aa1..5741818 100644 --- a/core/platformfirebaseauth.go +++ b/core/platformfirebaseauth.go @@ -8,7 +8,7 @@ import ( "net/url" "time" - "repositories.action2quare.com/ayo/go-ayo/logger" + "repositories.action2quare.com/ayo/gocommon/logger" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson/primitive" diff --git a/core/platformgamepot.go b/core/platformgamepot.go index f7b5b76..5881130 100644 --- a/core/platformgamepot.go +++ b/core/platformgamepot.go @@ -9,7 +9,7 @@ import ( "net/url" "time" - "repositories.action2quare.com/ayo/go-ayo/logger" + "repositories.action2quare.com/ayo/gocommon/logger" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson/primitive" diff --git a/core/platformgoogle.go b/core/platformgoogle.go index f2589b0..5c50b34 100644 --- a/core/platformgoogle.go +++ b/core/platformgoogle.go @@ -8,7 +8,7 @@ import ( "net/url" "time" - "repositories.action2quare.com/ayo/go-ayo/logger" + "repositories.action2quare.com/ayo/gocommon/logger" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson/primitive" diff --git a/core/platformmicrosoft.go b/core/platformmicrosoft.go index 9818149..6d5254b 100644 --- a/core/platformmicrosoft.go +++ b/core/platformmicrosoft.go @@ -8,7 +8,7 @@ import ( "net/url" "time" - "repositories.action2quare.com/ayo/go-ayo/logger" + "repositories.action2quare.com/ayo/gocommon/logger" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson/primitive" diff --git a/core/platformtwitter.go b/core/platformtwitter.go index 994f9f6..4accfc9 100644 --- a/core/platformtwitter.go +++ b/core/platformtwitter.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "repositories.action2quare.com/ayo/go-ayo/logger" + "repositories.action2quare.com/ayo/gocommon/logger" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson/primitive" diff --git a/core/service.go b/core/service.go index afe5e48..1ebd74b 100644 --- a/core/service.go +++ b/core/service.go @@ -12,9 +12,8 @@ import ( "time" "unsafe" - "repositories.action2quare.com/ayo/go-ayo/logger" - - "repositories.action2quare.com/ayo/go-ayo/common" + common "repositories.action2quare.com/ayo/gocommon" + "repositories.action2quare.com/ayo/gocommon/logger" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson/primitive" @@ -98,11 +97,30 @@ func (wl *whitelist) isMember(email string, platform string) bool { return false } +const ( + DivisionState_Closed = string("closed") + DivisionState_Maintenance = string("maintenance") + DivisionState_RestrictedOpen = string("restricted") + DivisionState_FullOpen = string("open") +) + +type maintenance struct { + Link string + StartTime primitive.Timestamp +} + +type division struct { + Url string `bson:"url"` + Priority int `bson:"priority"` + State string `bson:"state"` + Maintenance maintenance `bson:"maintenance"` +} + type serviceDescription struct { // sync.Mutex Id primitive.ObjectID `bson:"_id"` ServiceName string `bson:"service"` - Divisions map[string]any `bson:"divisions"` + Divisions map[string]division `bson:"divisions"` ServiceCode string `bson:"code"` UseWhitelist bool `bson:"use_whitelist"` Closed bool `bson:"closed"` @@ -118,7 +136,7 @@ type serviceDescription struct { getUserBrowserInfo func(r *http.Request) (string, error) getUserTokenWithCheck func(platform string, userid string, brinfo string) (usertokeninfo, error) updateUserinfo func(info usertokeninfo) (bool, string, string) - getProviderInfo func(platform string, uid string) (error, string, string) + getProviderInfo func(platform string, uid string) (string, string, error) apiUsers unsafe.Pointer divisionsSerialized unsafe.Pointer @@ -305,7 +323,7 @@ func (sh *serviceDescription) link(w http.ResponseWriter, r *http.Request) { return } - err, newType, newId = sh.getProviderInfo(newType, newId) + newType, newId, err = sh.getProviderInfo(newType, newId) if err != nil { logger.Error("getProviderInfo failed :", err) w.WriteHeader(http.StatusBadRequest) @@ -416,7 +434,7 @@ func (sh *serviceDescription) authorize(w http.ResponseWriter, r *http.Request) logger.Println("auth success :", authtype, uid, email, session) - err, newType, newId := sh.getProviderInfo(authtype, uid) + newType, newId, err := sh.getProviderInfo(authtype, uid) if err != nil { logger.Error("getProviderInfo failed :", err) w.WriteHeader(http.StatusBadRequest) diff --git a/core/watch.go b/core/watch.go index e52c195..4e8516f 100644 --- a/core/watch.go +++ b/core/watch.go @@ -6,9 +6,8 @@ import ( "sync/atomic" "time" - "repositories.action2quare.com/ayo/go-ayo/logger" - - "repositories.action2quare.com/ayo/go-ayo/common" + common "repositories.action2quare.com/ayo/gocommon" + "repositories.action2quare.com/ayo/gocommon/logger" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson/primitive" diff --git a/go.mod b/go.mod index 357a869..a5d84e4 100644 --- a/go.mod +++ b/go.mod @@ -6,24 +6,24 @@ require ( firebase.google.com/go v3.13.0+incompatible github.com/golang-jwt/jwt v3.2.2+incompatible go.mongodb.org/mongo-driver v1.11.6 - google.golang.org/api v0.124.0 - repositories.action2quare.com/ayo/go-ayo v0.0.0-20230524030148-5cf64e74bbfa + google.golang.org/api v0.123.0 + repositories.action2quare.com/ayo/gocommon v0.0.0-20230524061015-e95efa06a6d4 ) require ( - cloud.google.com/go v0.110.0 // indirect + cloud.google.com/go v0.110.2 // indirect cloud.google.com/go/compute v1.19.0 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect - cloud.google.com/go/firestore v1.9.0 // indirect + cloud.google.com/go/firestore v1.10.0 // indirect cloud.google.com/go/iam v0.13.0 // indirect - cloud.google.com/go/longrunning v0.4.1 // indirect - cloud.google.com/go/storage v1.28.1 // indirect + cloud.google.com/go/longrunning v0.4.2 // indirect + cloud.google.com/go/storage v1.29.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/go-redis/redis/v8 v8.11.5 // indirect - github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/golang/snappy v0.0.1 // indirect + github.com/golang/snappy v0.0.4 // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/google/s2a-go v0.1.4 // indirect github.com/google/uuid v1.3.0 // indirect @@ -44,7 +44,7 @@ require ( golang.org/x/sync v0.2.0 // indirect golang.org/x/sys v0.8.0 // indirect golang.org/x/text v0.9.0 // indirect - golang.org/x/time v0.1.0 // indirect + golang.org/x/time v0.3.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect @@ -52,4 +52,4 @@ require ( google.golang.org/protobuf v1.30.0 // indirect ) -replace repositories.action2quare.com/ayo/maingate => ./ \ No newline at end of file +replace repositories.action2quare.com/ayo/maingate => ./ diff --git a/go.sum b/go.sum index 322908b..f8575b0 100644 --- a/go.sum +++ b/go.sum @@ -1,19 +1,19 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.110.0 h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys= -cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY= +cloud.google.com/go v0.110.2 h1:sdFPBr6xG9/wkBbfhmUz/JmZC7X6LavQgcrVINrKiVA= +cloud.google.com/go v0.110.2/go.mod h1:k04UEeEtb6ZBRTv3dZz4CeJC3jKGxyhl0sAiVVquxiw= cloud.google.com/go/compute v1.19.0 h1:+9zda3WGgW1ZSTlVppLCYFIr48Pa35q1uG2N1itbCEQ= cloud.google.com/go/compute v1.19.0/go.mod h1:rikpw2y+UMidAe9tISo04EHNOIf42RLYF/q8Bs93scU= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= -cloud.google.com/go/firestore v1.9.0 h1:IBlRyxgGySXu5VuW0RgGFlTtLukSnNkpDiEOMkQkmpA= -cloud.google.com/go/firestore v1.9.0/go.mod h1:HMkjKHNTtRyZNiMzu7YAsLr9K3X2udY2AMwDaMEQiiE= +cloud.google.com/go/firestore v1.10.0 h1:FG5C49ukKKqyljY+XNRZGae1HZaiVe7aoqi2BipnBuM= +cloud.google.com/go/firestore v1.10.0/go.mod h1:eAeoQCV8F35Mcy4k8ZrQbcSYZOayIwoiU7ZJ6xzH1+o= cloud.google.com/go/iam v0.13.0 h1:+CmB+K0J/33d0zSQ9SlFWUeCCEn5XJA0ZMZ3pHE9u8k= cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0= -cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM= -cloud.google.com/go/longrunning v0.4.1/go.mod h1:4iWDqhBZ70CvZ6BfETbvam3T8FMvLK+eFj0E6AaRQTo= -cloud.google.com/go/storage v1.28.1 h1:F5QDG5ChchaAVQhINh24U99OWHURqrW8OmQcGKXcbgI= -cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y= +cloud.google.com/go/longrunning v0.4.2 h1:WDKiiNXFTaQ6qz/G8FCOkuY9kJmOJGY67wPUC1M2RbE= +cloud.google.com/go/longrunning v0.4.2/go.mod h1:OHrnaYyLUV6oqwh0xiS7e5sLQhP1m0QU9R+WhGDMgIQ= +cloud.google.com/go/storage v1.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI= +cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4= firebase.google.com/go v3.13.0+incompatible h1:3TdYC3DDi6aHn20qoRkxwGqNgdjtblwVAyRLQwGn/+4= firebase.google.com/go v3.13.0+incompatible/go.mod h1:xlah6XbEyW6tbfSklcfe5FHJIwjt8toICdV5Wh9ptHs= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= @@ -47,8 +47,9 @@ github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -66,8 +67,9 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= +github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -196,8 +198,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/time v0.1.0 h1:xYY+Bajn2a7VBmTM5GikTmnK8ZuX8YgnQCqZpbBNtmA= -golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= +golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= @@ -210,8 +212,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= -google.golang.org/api v0.124.0 h1:dP6Ef1VgOGqQ8eiv4GiY8RhmeyqzovcXBYPDUYG8Syo= -google.golang.org/api v0.124.0/go.mod h1:xu2HQurE5gi/3t1aFCvhPD781p0a3p11sdunTJ2BlP4= +google.golang.org/api v0.123.0 h1:yHVU//vA+qkOhm4reEC9LtzHVUCN/IqqNRl1iQ9xE20= +google.golang.org/api v0.123.0/go.mod h1:gcitW0lvnyWjSp9nKxAbdHKIZ6vF4aajGueeslZOyms= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= @@ -256,5 +258,5 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -repositories.action2quare.com/ayo/go-ayo v0.0.0-20230524030148-5cf64e74bbfa h1:mlRZAjs1adM8UVad00SQ2tWvhCzZqbKcHmAyjc4NnjY= -repositories.action2quare.com/ayo/go-ayo v0.0.0-20230524030148-5cf64e74bbfa/go.mod h1:AKV0q5x39cg3+l7be0B2QaQhHGcBf+eLdlcWd1lgs70= +repositories.action2quare.com/ayo/gocommon v0.0.0-20230524061015-e95efa06a6d4 h1:DFrkLvbPWqwVDU4X0QGJs2lhPduJYJU+JM/r1L2RMwo= +repositories.action2quare.com/ayo/gocommon v0.0.0-20230524061015-e95efa06a6d4/go.mod h1:pw573a06qV7dP1lSyavbWmzyYAsmwtK6mdbFENbh3cs= diff --git a/main.go b/main.go index e1e3e82..de90c94 100644 --- a/main.go +++ b/main.go @@ -7,10 +7,10 @@ import ( "net/http" "time" + common "repositories.action2quare.com/ayo/gocommon" "repositories.action2quare.com/ayo/maingate/core" - "repositories.action2quare.com/ayo/go-ayo/common" - "repositories.action2quare.com/ayo/go-ayo/logger" + "repositories.action2quare.com/ayo/gocommon/logger" ) // linux : go build --ldflags="-X 'main.revision=$(git rev-parse --short HEAD)'"