diff --git a/conf/app.conf b/conf/app.conf index 6dba4e9..4c9323e 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -24,6 +24,9 @@ db = 10 [gateway] host = http://localhost:12309/ +[portal] +host = http://localhost:12400/ + [testExtraLink] ; 测试连接 host = http://localhost:12305 diff --git a/config/config.go b/config/config.go index 9568378..c7dcea4 100644 --- a/config/config.go +++ b/config/config.go @@ -19,6 +19,11 @@ func GetGatewayHost() string { return host } +func GetPortalHost() string { + host, _ := web.AppConfig.String("portal::host") + return host +} + func GetRedisConfig() (*RedisConfig, error) { // 获取redis配置 redisConfig := &RedisConfig{} diff --git a/controllers/pageController.go b/controllers/pageController.go index dd45c60..3fe9ddd 100644 --- a/controllers/pageController.go +++ b/controllers/pageController.go @@ -3,6 +3,7 @@ package controllers import ( "boss/config" + "boss/service" "boss/utils" "encoding/base64" "strconv" @@ -18,11 +19,11 @@ type PageController struct { func (c *PageController) Index() { c.TplName = "index.html" testExtraLink, err := web.AppConfig.String("testExtraLink::host") - if err != nil { testExtraLink = "http://127.0.0.1:12305" } - + roadList := service.QueryRoad() + c.Data["roadList"] = roadList c.Data["extraAddr"] = testExtraLink } @@ -82,6 +83,7 @@ func (c *PageAuthController) MerchantV2Page() { token = base64.URLEncoding.EncodeToString(tokenB) } c.Data["token"] = token + c.Data["portalHost"] = config.GetPortalHost() c.TplName = "merchant_v2.html" } @@ -99,6 +101,7 @@ func (c *PageAuthController) RechargeAppleAccountPage() { token = base64.URLEncoding.EncodeToString(tokenB) } c.Data["token"] = token + c.Data["portalHost"] = config.GetPortalHost() c.TplName = "apple-card/account.html" } @@ -116,6 +119,7 @@ func (c *PageAuthController) OrderSummary() { token = base64.URLEncoding.EncodeToString(tokenB) } c.Data["token"] = token + c.Data["portalHost"] = config.GetPortalHost() c.TplName = "order_summary.html" } @@ -135,6 +139,7 @@ func (c *PageAuthController) RechargeAppleOrderPage() { token = base64.URLEncoding.EncodeToString(tokenB) } c.Data["token"] = token + c.Data["portalHost"] = config.GetPortalHost() c.TplName = "apple-card/recharge-order.html" } diff --git a/service/queryService.go b/service/queryService.go index 3cd534e..d5d2dfa 100644 --- a/service/queryService.go +++ b/service/queryService.go @@ -5,6 +5,7 @@ import ( "boss/datas" "boss/models/order" "boss/models/payfor" + "boss/models/road" "boss/models/user" "boss/utils/mfa" "fmt" @@ -279,14 +280,16 @@ func QueryTodaySummary(params map[string]string) order.Summary { func ValidTotp(accountUid, totpCode string) bool { userInfo := user.GetUserInfoByUserID(accountUid) - if userInfo.Id == 0 { return false } - if userInfo.OtpSecret == "" { return true } - return mfa.ValidCode(totpCode, userInfo.OtpSecret) } + +func QueryRoad() []road.RoadInfo { + roadInfoList := road.GetAllRoad(map[string]string{}) + return roadInfoList +} diff --git a/views/apple-card/account.html b/views/apple-card/account.html index 0ac21ac..cf74024 100644 --- a/views/apple-card/account.html +++ b/views/apple-card/account.html @@ -13,7 +13,7 @@ diff --git a/views/apple-card/recharge-order.html b/views/apple-card/recharge-order.html index 33b965f..a1a1bff 100644 --- a/views/apple-card/recharge-order.html +++ b/views/apple-card/recharge-order.html @@ -13,7 +13,7 @@ diff --git a/views/index.html b/views/index.html index 445bd05..5e1b8df 100644 --- a/views/index.html +++ b/views/index.html @@ -344,20 +344,23 @@ 资金流水 - + {{range.roadList}}
- 订单管理 + 订单管理({{RoadName}})
- 实时订单 - 订单收益 - 订单汇总 + 实时订单 + 订单收益 + 订单汇总
- + {{end}}
diff --git a/views/merchant_v2.html b/views/merchant_v2.html index 990fcf6..8fa9604 100644 --- a/views/merchant_v2.html +++ b/views/merchant_v2.html @@ -13,7 +13,7 @@ diff --git a/views/order_summary.html b/views/order_summary.html index 3a903ca..e6ae09f 100644 --- a/views/order_summary.html +++ b/views/order_summary.html @@ -12,7 +12,7 @@