Skip to content

A
apaas-meshproxy
Commit be22277f authored by 李科's avatar 李科
Browse files
Options

Merge branch 'dev'

parents 5033abd5 2bf9cf12
Pipeline #77865 passed with stage
    Show whitespace changes
    Inline Side-by-side
    Showing with 6 additions and 6 deletions
    .beagle.yml
    View file @ be22277f
    ...@@ -50,7 +50,7 @@ steps: ...@@ -50,7 +50,7 @@ steps:
    base: registry.cn-qingdao.aliyuncs.com/wod/alpine-glibc:3.12 base: registry.cn-qingdao.aliyuncs.com/wod/alpine-glibc:3.12
    dockerfile: .beagle/dockerfile dockerfile: .beagle/dockerfile
    repo: gzgajzapi/apaas-meshproxy repo: gzgajzapi/apaas-meshproxy
    Version: "v3.0.7" Version: "v3.0.8"
    channel: alpha channel: alpha
    args: "TARGETOS=linux,TARGETARCH=amd64" args: "TARGETOS=linux,TARGETARCH=amd64"
    registry: hub.wodcloud.com registry: hub.wodcloud.com
    ...@@ -87,8 +87,8 @@ steps: ...@@ -87,8 +87,8 @@ steps:
    REGISTRY_PASSWORD: REGISTRY_PASSWORD:
    from_secret: REGISTRY_PASSWORD from_secret: REGISTRY_PASSWORD
    settings: settings:
    source: hub.wodcloud.com/gzgajzapi/apaas-meshproxy:v3.0.7-alpha source: hub.wodcloud.com/gzgajzapi/apaas-meshproxy:v3.0.8-alpha
    target: hub.wodcloud.com/gzgajzapi/apaas-meshproxy:v3.0.7 target: hub.wodcloud.com/gzgajzapi/apaas-meshproxy:v3.0.8
    registry: hub.wodcloud.com registry: hub.wodcloud.com
    --- ---
    ......
    src/handler/proxyhandler.go
    View file @ be22277f
    ...@@ -80,14 +80,14 @@ func Proxy(c *gin.Context) { ...@@ -80,14 +80,14 @@ func Proxy(c *gin.Context) {
    requestStartTime := FormatDateToCarbon(proxyData.RequestStartTime) requestStartTime := FormatDateToCarbon(proxyData.RequestStartTime)
    requestEndTime := FormatDateToCarbon(proxyData.RequestEndTime) requestEndTime := FormatDateToCarbon(proxyData.RequestEndTime)
    now := carbon.Now(carbon.Shanghai) today := carbon.Parse(carbon.Now().ToDateString(), carbon.Shanghai)
    if requestStartTime.Gt(now) { if requestStartTime.Gt(today) {
    res := model.WebRes{} res := model.WebRes{}
    res.ErrMsg = `申请使用期限未开始` res.ErrMsg = `申请使用期限未开始`
    c.JSON(200, res) c.JSON(200, res)
    return return
    } }
    if requestEndTime.Lt(now) { if requestEndTime.Lt(today) {
    res := model.WebRes{} res := model.WebRes{}
    res.ErrMsg = `申请使用期限已过期` res.ErrMsg = `申请使用期限已过期`
    c.JSON(200, res) c.JSON(200, res)
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment