From 05032fbe3a9166f47ae272a4b813b467a4cb950c Mon Sep 17 00:00:00 2001 From: danial Date: Sun, 2 Mar 2025 21:24:58 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat(config):=20=E6=B7=BB=E5=8A=A0=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E5=8F=98=E9=87=8F=E9=85=8D=E7=BD=AE=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 config.go 中增加对环境变量的读取逻辑 - 更新 Dockerfile，添加新的环境变量 - 移除 views/merchant.html 中的多余支付选项 - 在 supplier.go 中添加新的供应商 "七喜" --- deploy/Dockerfile | 3 +++ internal/common/supplier.go | 1 + internal/config/config.go | 21 ++++++++++++++++++--- views/merchant.html | 20 -------------------- 4 files changed, 22 insertions(+), 23 deletions(-) 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/views/merchant.html b/views/merchant.html index dee0670..45913b1 100644 --- a/views/merchant.html +++ b/views/merchant.html @@ -265,26 +265,6 @@ From 217ba0694913958298dff89d63760a0600b8bfad Mon Sep 17 00:00:00 2001 From: danial Date: Sun, 2 Mar 2025 21:34:47 +0800 Subject: [PATCH 2/5] =?UTF-8?q?ci(.drone.yml):=E5=A2=9E=E5=8A=A0=20Docker?= =?UTF-8?q?=20=E9=95=9C=E5=83=8F=E6=8E=A8=E9=80=81=E5=88=B0=20git.kkknamet?= =?UTF-8?q?rans.buzz?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 .drone.yml 文件中添加了新的 Docker 登录和推送步骤 - 使用 DOCKER_TOKEN 进行 git.kkknametrans.buzz 的 Docker 登录 - 将本地镜像打标签并推送到 git.kkknametrans.buzz 的仓库 - 更新了环境变量，增加了 DOCKER_TOKEN --- .drone.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.drone.yml b/.drone.yml index 911126d..5d5fe18 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,17 @@ 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}: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: From 7677be063468d9eb1b6b3784b6bda9a1e3af8a0b Mon Sep 17 00:00:00 2001 From: danial Date: Sun, 2 Mar 2025 21:37:09 +0800 Subject: [PATCH 3/5] =?UTF-8?q?ci(.drone.yml):=20=E4=BF=AE=E5=A4=8D=20Dock?= =?UTF-8?q?er=20=E9=95=9C=E5=83=8F=E6=8E=A8=E9=80=81=E8=87=B3=20GitLab=20?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E7=89=88=E6=9C=AC=E6=A0=87=E7=AD=BE=E9=97=AE?= =?UTF-8?q?=E9=A2=98-=20=E6=B7=BB=E5=8A=A0=E4=BA=86=E7=BC=BA=E5=A4=B1?= =?UTF-8?q?=E7=9A=84=20docker=20tag=E5=91=BD=E4=BB=A4=EF=BC=8C=E7=94=A8?= =?UTF-8?q?=E4=BA=8E=E5=88=9B=E5=BB=BA=E5=B8=A6=E6=9E=84=E5=BB=BA=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E7=9A=84=E6=A0=87=E7=AD=BE=20-=20=E7=8E=B0=E5=9C=A8?= =?UTF-8?q?=E5=B0=86=E5=90=8C=E6=97=B6=E6=8E=A8=E9=80=81=E5=B8=A6=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E7=BC=96=E5=8F=B7=E5=92=8C=20latest=20=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E7=9A=84=E9=95=9C=E5=83=8F=E5=88=B0=20GitLab?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 5d5fe18..ff20512 100644 --- a/.drone.yml +++ b/.drone.yml @@ -29,6 +29,7 @@ steps: - 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 From 2572430e216f0198c8511b74a4c2144fc5587a29 Mon Sep 17 00:00:00 2001 From: danial Date: Sun, 2 Mar 2025 21:38:22 +0800 Subject: [PATCH 4/5] =?UTF-8?q?ci(.drone.yml):=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=A4=9A=E4=BD=99=E7=9A=84=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除了 .drone.yml 文件中的一个多余空格 - 优化了 Docker镜像 tagging 步骤的格式 --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index ff20512..7ddfb0c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -29,7 +29,7 @@ steps: - 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}:${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 From 86326c321f6eb75d566895402826a3f748a05273 Mon Sep 17 00:00:00 2001 From: danial Date: Mon, 3 Mar 2025 23:03:29 +0800 Subject: [PATCH 5/5] =?UTF-8?q?refactor(internal):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=A9=E6=B6=A6=E4=BF=A1=E6=81=AF=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除了 getController.go 中的中文注释，统一为英文注释 - 删除了 getController.go 中未使用的代码注释 - 在 order_profit_info.go 中，将并行处理改为串行处理，以简化逻辑 - 移除了 order_profit_info.go 中的冗余注释 --- internal/controllers/getController.go | 3 +-- internal/models/order/order_profit_info.go | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) 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 }