Merge branch 'master' into develop

go/gopath/src/fohow.com/apps/controllers/balance_controller/balance_controller.go

@@ -203,6 +203,8 @@ func (self *BalanceController) TakeCash() {
 		self.ReturnError(403, []string{"notBindbank", "请完善您的银行卡信息"}, "", nil)
 	}*/
 
+	self.ReturnError(403, []string{"systemupgrade", "系统升级中"}, "", nil)
+
 	wxUser := self.GetCurrentWxUser(false)
 	todayOrderList := balance_model.GetTakeCashOrderListByWxUIdAndTime(wxUser.Id, time.Now(), false)
 

go/gopath/src/fohow.com/apps/controllers/railsadmin_controller/cache_controller.go

@@ -1,7 +1,9 @@
 package railsadmin_controller
 
 import (
+	"fmt"
 	"fohow.com/apps"
+	"fohow.com/apps/models/user_model"
 	"fohow.com/cache"
 	"github.com/astaxie/beego"
 	"github.com/astaxie/beego/context"
@@ -44,6 +46,14 @@ func (self *RailsadminController) CleanCache() {
 		beego.BeeLogger.Warn("railsadmin after save clean product cache: %d", id)
 		k := cache.GetKey(cache.GetProductByPId, id)
 		cache.Cache.Delete(k)
+	case t == "user":
+		beego.BeeLogger.Warn("railsadmin after save clean user cache: %d", id)
+		wxUser := user_model.GetWxUserById(id, false)
+		userKey := fmt.Sprintf("user.GetByUid[%d]", wxUser.UserId)
+		wxUserKey := cache.GetKey(cache.GetWxUserById, wxUser.Id)
+		beego.BeeLogger.Warn("CleanCache--wxuserkey(%s)", wxUserKey)
+		cache.Cache.Delete(userKey)
+		cache.Cache.Delete(wxUserKey)
 	}
 	self.ServeJSON()
 }

go/gopath/src/fohow.com/apps/controllers/user_controller/user_controller.go

@@ -195,10 +195,11 @@ func (self *UserController) UpdateWxUserInfo() {
 
 // 获取当前用户信息
 func (self *UserController) Get() {
-	useCache, err := self.GetBool("cache", true)
-	if err != nil {
-		useCache = false
-	}
+	//useCache, err := self.GetBool("cache", false)
+	//if err != nil {
+	//
+	//}
+	useCache := false
 	user := self.GetCurrentUser(useCache)
 	wxUser := self.GetCurrentWxUser(useCache)
 	if user != nil {

go/gopath/src/fohow.com/apps/helpers/sms_helper.go

@@ -14,7 +14,7 @@ func DispathSendSms(tels []string, expressNo string) {
 	if tels == nil || len(tels) == 0 {
 		return
 	}
-	kefuTel := "13322915052"
+	kefuTel := "13322912052"
 	mobile := strings.Join(tels, ",")
 	params := fmt.Sprintf(`{"tel":"%s","expressNo":"%s"}`, kefuTel, expressNo)
 	/*	ok, resp := alidayu.SendSMS(mobile, sign, template, params)*/