feat(config): 添加环境变量配置支持
- 在 config.go 中增加对环境变量的读取逻辑 - 更新 Dockerfile,添加新的环境变量 - 移除 views/merchant.html 中的多余支付选项 - 在 supplier.go 中添加新的供应商 "七喜"
This commit is contained in:
@@ -23,6 +23,9 @@ FROM alpine:latest
|
|||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
ENV TZ=Asia/Shanghai
|
ENV TZ=Asia/Shanghai
|
||||||
ENV serverName=""
|
ENV serverName=""
|
||||||
|
ENV gatewayAddr=""
|
||||||
|
ENV portalAddr=""
|
||||||
|
|
||||||
# 定义参数
|
# 定义参数
|
||||||
ARG USE_PROXY
|
ARG USE_PROXY
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ var supplierCode2Name = map[string]string{
|
|||||||
"FAT_SIX": "胖小刘",
|
"FAT_SIX": "胖小刘",
|
||||||
"SELF_THIRD": "自有上游",
|
"SELF_THIRD": "自有上游",
|
||||||
"STAR_SILENCE": "星寂",
|
"STAR_SILENCE": "星寂",
|
||||||
|
"QIXI": "七喜",
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetSupplierMap() map[string]string {
|
func GetSupplierMap() map[string]string {
|
||||||
|
|||||||
@@ -1,6 +1,10 @@
|
|||||||
package config
|
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 {
|
type RedisConfig struct {
|
||||||
Host string `json:"host"`
|
Host string `json:"host"`
|
||||||
@@ -14,12 +18,23 @@ type Secret struct {
|
|||||||
IV string `json:"iv"`
|
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")
|
host, _ := web.AppConfig.String("gateway::host")
|
||||||
return host
|
return host
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetPortalHost() string {
|
func GetPortalHost() (url string) {
|
||||||
|
url = env.Get("portalAddr", url)
|
||||||
|
if url != "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
host, _ := web.AppConfig.String("portal::host")
|
host, _ := web.AppConfig.String("portal::host")
|
||||||
return host
|
return host
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -265,26 +265,6 @@
|
|||||||
<select hidden id="pay-type" style="top: 31px;" value="CARD_DH">
|
<select hidden id="pay-type" style="top: 31px;" value="CARD_DH">
|
||||||
<option value="none">请选择</option>
|
<option value="none">请选择</option>
|
||||||
<option value="CARD_DH">卡密兑换</option>
|
<option value="CARD_DH">卡密兑换</option>
|
||||||
<option value="WEIXIN_SCAN">微信扫码</option>
|
|
||||||
<option value="WEIXIN_H5">微信H5</option>
|
|
||||||
<option value="WEIXIN_SYT">微信收银台</option>
|
|
||||||
<option value="ALI_SCAN">支付宝扫码</option>
|
|
||||||
<option value="ALI_H5">支付宝H5</option>
|
|
||||||
<option value="ALI_SYT">支付宝收银台</option>
|
|
||||||
<option value="QQ_SCAN">QQ扫码</option>
|
|
||||||
<option value="QQ_H5">QQ-H5</option>
|
|
||||||
<option value="QQ_SYT">QQ收银台</option>
|
|
||||||
<option value="UNION_SCAN">银联扫码</option>
|
|
||||||
<option value="UNION_H5">银联H5</option>
|
|
||||||
<option value="UNION_PC_WAP">银联pc-web</option>
|
|
||||||
<option value="UNION_SYT">银联收银台</option>
|
|
||||||
<option value="UNION_FAST">银联快捷</option>
|
|
||||||
<option value="BAIDU_SCAN">百度钱包扫码</option>
|
|
||||||
<option value="BAIDU_H5">百度钱包H5</option>
|
|
||||||
<option value="BAIDU_SYT">百度钱包收银台</option>
|
|
||||||
<option value="JD_SCAN">京东扫码</option>
|
|
||||||
<option value="JD_H5">京东H5</option>
|
|
||||||
<option value="JD_SYT">京东收银台</option>
|
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user