Merge pull request ixre#20 from jsix/develop

commit
liangweidonggood · May 14, 2016 · ad22d17 · ad22d17
2 parents c4e2cdb + 9671e1b
commit ad22d17
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/app/front/shop/ols/payment_c.go b/src/app/front/shop/ols/payment_c.go
@@ -43,9 +43,9 @@ func (this *PaymentC) getAliPayment(ctx *echox.Context) payment.IPayment {
 	cnf := ctx.App.Config()
 	if guitl.IsMobileAgent(ctx.Request().UserAgent()) {
 		p = &payment.AliPayWap{
-			Partner: cnf.Get(variable.Alipay_Partner),
-			Key:     cnf.Get(variable.Alipay_Key),
-			Seller:  cnf.Get(variable.Alipay_Seller),
+			Partner: cnf.GetString(variable.Alipay_Partner),
+			Key:     cnf.GetString(variable.Alipay_Key),
+			Seller:  cnf.GetString(variable.Alipay_Seller),
 		}
 		//	p = &payment.AliPayWap{
 		//		Partner: "2088021187655650",
@@ -71,9 +71,9 @@ func (this *PaymentC) getAliPayment(ctx *echox.Context) payment.IPayment {
 		//	}
 	} else {
 		p = &payment.AliPay{
-			Partner: cnf.Get(variable.Alipay_Partner),
-			Key:     cnf.Get(variable.Alipay_Key),
-			Seller:  cnf.Get(variable.Alipay_Seller),
+			Partner: cnf.GetString(variable.Alipay_Partner),
+			Key:     cnf.GetString(variable.Alipay_Key),
+			Seller:  cnf.GetString(variable.Alipay_Seller),
 		}
 	}
 	return p

diff --git a/src/app/front/shop/ols/serve.go b/src/app/front/shop/ols/serve.go
@@ -14,7 +14,7 @@ import (
 	"go2o/src/core/domain/interface/enum"
 	"go2o/src/x/echox"
 	"gopkg.in/labstack/echo.v1"
-	//mw "gopkg.in/labstack/echo.v1/middleware"
+	mw "gopkg.in/labstack/echo.v1/middleware"
 	"net/http"
 	"strings"
 	"sync"
@@ -78,7 +78,7 @@ func registerRoutes(s *echox.Echo) {
 
 func getServe(path string) *echox.Echo {
 	s := echox.New()
-	//s.Use(mw.Recover())
+	s.Use(mw.Recover())
 	s.Use(echox.StopAttack)
 	s.Use(shopCheck)
 	registerRoutes(s)