diff --git a/.drone.yml b/.drone.yml index dec0ece..246db32 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,6 +17,8 @@ steps: environment: DOCKER_LOGIN: from_secret: docker_login + DOCKER_TOKEN: + from_secret: docker_token DOCKER_PASSWORD: from_secret: docker_password commands: @@ -26,10 +28,18 @@ steps: - docker push docker.kkknametrans.buzz/kami/boss_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER} - docker push docker.kkknametrans.buzz/kami/boss_${DRONE_BRANCH}:latest - docker logout docker.kkknametrans.buzz + - docker login git.kkknametrans.buzz -u $DOCKER_LOGIN -p $DOCKER_TOKEN + - docker tag docker.kkknametrans.buzz/kami/boss_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER} git.kkknametrans.buzz/danial/kami_boss_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER} + - docker tag docker.kkknametrans.buzz/kami/boss_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER} git.kkknametrans.buzz/danial/kami_boss_${DRONE_BRANCH}:latest + - docker push git.kkknametrans.buzz/danial/kami_boss_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER} + - docker push git.kkknametrans.buzz/danial/kami_boss_${DRONE_BRANCH}:latest + - docker logout git.kkknametrans.buzz - name: deploy to docker compose environment: DOCKER_LOGIN: from_secret: docker_login + DOCKER_TOKEN: + from_secret: docker_token DOCKER_PASSWORD: from_secret: docker_password commands: diff --git a/deploy/Dockerfile b/deploy/Dockerfile index 9dea408..1cdf8b7 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -23,6 +23,9 @@ FROM alpine:latest WORKDIR /app ENV TZ=Asia/Shanghai ENV serverName="" +ENV gatewayAddr="" +ENV portalAddr="" + # 定义参数 ARG USE_PROXY diff --git a/internal/common/supplier.go b/internal/common/supplier.go index 1515a08..2bcf0cf 100644 --- a/internal/common/supplier.go +++ b/internal/common/supplier.go @@ -12,6 +12,7 @@ var supplierCode2Name = map[string]string{ "FAT_SIX": "胖小刘", "SELF_THIRD": "自有上游", "STAR_SILENCE": "星寂", + "QIXI": "七喜", } func GetSupplierMap() map[string]string { diff --git a/internal/config/config.go b/internal/config/config.go index c7dcea4..6cb1f84 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -1,6 +1,10 @@ package config -import "github.com/beego/beego/v2/server/web" +import ( + "github.com/beego/beego/v2/core/config/env" + "github.com/beego/beego/v2/server/web" + "strings" +) type RedisConfig struct { Host string `json:"host"` @@ -14,12 +18,23 @@ type Secret struct { IV string `json:"iv"` } -func GetGatewayHost() string { +func GetGatewayHost() (url string) { + url = env.Get("gatewayAddr", url) + if url != "" { + if !strings.HasSuffix(url, "/") { + url += "/" + } + return + } host, _ := web.AppConfig.String("gateway::host") return host } -func GetPortalHost() string { +func GetPortalHost() (url string) { + url = env.Get("portalAddr", url) + if url != "" { + return + } host, _ := web.AppConfig.String("portal::host") return host } diff --git a/internal/controllers/getController.go b/internal/controllers/getController.go index aa9d9b7..c9ab17b 100644 --- a/internal/controllers/getController.go +++ b/internal/controllers/getController.go @@ -780,7 +780,7 @@ func (c *GetController) GetOrder() { c.GenerateJSON(orderDataJSON) } -// 获取订单统计数据 +// GetOrderSummary 获取订单统计数据 func (c *GetController) GetOrderSummary() { startTime := strings.TrimSpace(c.GetString("startTime")) endTime := strings.TrimSpace(c.GetString("endTime")) @@ -816,7 +816,6 @@ func (c *GetController) GetOrderSummary() { l := order.GetOrderLenByMap(params) c.GetCutPage(l) orderDataJSON := new(datas.OrderDataSummaryJSON) - // orderDataJSON.OrderList = order.GetOrderByMap(params, c.DisplayCount, c.Offset) orderDataJSON.OrderProfitSummary = order.ProfitSummary{ TotalProfit: service.QueryTotalSummary(params), TodayProfit: service.QueryTodaySummary(params), diff --git a/internal/models/order/order_profit_info.go b/internal/models/order/order_profit_info.go index 26f4012..f6cccc4 100644 --- a/internal/models/order/order_profit_info.go +++ b/internal/models/order/order_profit_info.go @@ -59,9 +59,7 @@ func GetOrderProfitListByBankOrderIdList(bankOrderIdList []string) []OrderProfit return orderProfitList } bankOrderIdList = slice.Unique(bankOrderIdList) - //按照100个为一组分组 - //bankOrderIdList2 := slice.Chunk(bankOrderIdList, 100) - slice.ForEachConcurrent(slice.Chunk(bankOrderIdList, 100), func(index int, item []string) { + slice.ForEach(slice.Chunk(bankOrderIdList, 100), func(index int, item []string) { tmpOrderProfitList := make([]OrderProfitInfo, 0) _, err := o.QueryTable(ORDER_PROFIT_INFO).Filter("bank_order_id__in", item).All(&tmpOrderProfitList) if err != nil { @@ -69,7 +67,7 @@ func GetOrderProfitListByBankOrderIdList(bankOrderIdList []string) []OrderProfit return } orderProfitList = append(orderProfitList, tmpOrderProfitList...) - }, 10) + }) return orderProfitList } diff --git a/views/merchant.html b/views/merchant.html index dee0670..45913b1 100644 --- a/views/merchant.html +++ b/views/merchant.html @@ -265,26 +265,6 @@