Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/services into dev

controllers/auth.go

@@ -81,15 +81,17 @@ func (c *BaseController) authWechat(serv *service.SysServ) {
 	}
 
 	// DEV MODE
-	wxDetail = map[string]interface{}{
-		"openid":     " OPENID",
-		" nickname":  "NICKNAME",
-		"sex":        "1",
-		"province":   "PROVINCE",
-		"city":       "CITY",
-		"country":    "COUNTRY",
-		"headimgurl": "http://thirdwx.qlogo.cn/mmopen/g3MonUZtNHkdmzicIlibx6iaFqAc56vxLSUfpb6n5WKSYVY0ChQKkiaJSgQ1dZuTOgvLLrhJbERQQ4eMsv84eavHiaiceqxibJxCfHe/46",
-		"unionid":    "o6_bmasdasdsad6_2sgVt7hMZOPfL",
+	if c.RunMode == "dev" {
+		wxDetail = map[string]interface{}{
+			"openid":     " OPENID",
+			"nickname":   "NICKNAME",
+			"sex":        "1",
+			"province":   "PROVINCE",
+			"city":       "CITY",
+			"country":    "COUNTRY",
+			"headimgurl": "http://thirdwx.qlogo.cn/mmopen/g3MonUZtNHkdmzicIlibx6iaFqAc56vxLSUfpb6n5WKSYVY0ChQKkiaJSgQ1dZuTOgvLLrhJbERQQ4eMsv84eavHiaiceqxibJxCfHe/46",
+			"unionid":    "o6_bmasdasdsad6_2sgVt7hMZOPfL",
+		}
 	}
 
 	if custID == "" && wxDetail == nil {
@@ -109,6 +111,10 @@ func (c *BaseController) authWechat(serv *service.SysServ) {
 		)
 	}
 
+	if userMap != nil {
+		c.Context.Set("userMap", *userMap)
+	}
+
 	if !c.needAuth() {
 		return
 	}

controllers/base.go

@@ -14,6 +14,7 @@ type BaseController struct {
 	beego.Controller
 	Context  *utils.Context
 	Configer map[string]config.Configer
+	RunMode  string
 }
 
 //Prepare 继承beego的

controllers/config.go

@@ -3,6 +3,7 @@ package controllers
 import (
 	"spaceofcheng/services/utils"
 
+	"github.com/astaxie/beego"
 	"github.com/astaxie/beego/config"
 )
 
@@ -14,6 +15,8 @@ const (
 )
 
 func (c *BaseController) initConfig() {
+	c.RunMode = beego.AppConfig.String("runmode")
+
 	if c.Configer == nil {
 		c.Configer = make(map[string]config.Configer)
 	}

controllers/customer/customer.go

@@ -116,8 +116,10 @@ func (c *CustomerController) SignUp() {
 		c.ResponseError(errors.New("请填写完整注册信息"))
 	}
 
-	if err := utils.ValidCaptcha(phone, captcha); err != nil {
-		c.ResponseError(err)
+	if c.RunMode != "dev" {
+		if err := utils.ValidCaptcha(phone, captcha); err != nil {
+			c.ResponseError(err)
+		}
 	}
 
 	userMapping := c.Context.Get("userMap").(model.TaUserMapping)

controllers/message.go

@@ -13,6 +13,10 @@ func (c *BaseController) SendCaptcha() {
 		c.ResponseError(errors.New("请确定手机号码"))
 	}
 
+	if c.RunMode == "dev" {
+		c.ResponseJSON("ok")
+	}
+
 	if err := utils.SendCaptcha(phone); err != nil {
 		utils.LogError(err)
 		c.ResponseError(errors.New("验证码发送失败, 请重试"))
@@ -34,6 +38,10 @@ func (c *BaseController) ValidCaptcha() {
 		c.ResponseError(errors.New("验证码不能为空"))
 	}
 
+	if c.RunMode == "dev" {
+		c.ResponseJSON("ok")
+	}
+
 	if err := utils.ValidCaptcha(phone, captcha); err != nil {
 		c.ResponseError(err)
 	}

log/common.2018-08-23.log

@@ -0,0 +1,27 @@
+2018/08/20 15:27:18 [E] 获取客户列表失败: sql: converting Exec argument $1 type: unsupported type []interface {}, a slice of interface
+2018/08/20 15:36:51 [E] 获取客户列表失败: sql: converting Exec argument $1 type: unsupported type []interface {}, a slice of interface
+2018/08/20 15:37:19 [E] 获取客户列表失败: sql: converting Exec argument $1 type: unsupported type []interface {}, a slice of interface
+2018/08/20 15:44:30 [E] 获取客户列表失败: Error 1248: Every derived table must have its own alias
+2018/08/20 15:46:35 [E] 获取客户列表失败: Error 1248: Every derived table must have its own alias
+2018/08/20 15:49:09 [E] 获取客户列表失败: Error 1060: Duplicate column name 'user_id'
+2018/08/20 15:57:45 [E] 获取客户列表失败: sql: statement expects 2 inputs; got 1
+2018/08/20 19:25:08 [E] 短信发送失败: 400 
+2018/08/20 19:27:58 [E] 短信发送失败: 400 
+2018/08/20 19:28:52 [E] 短信发送失败: 400 
+2018/08/21 13:38:17 [E] 用户没有设置默认案场
+2018/08/21 13:38:17 [E] 您没有该案场的权限！
+2018/08/21 13:39:04 [E] 用户没有设置默认案场
+2018/08/21 13:39:04 [E] 您没有该案场的权限！
+2018/08/21 13:39:09 [E] 用户没有设置默认案场
+2018/08/21 13:39:09 [E] 您没有该案场的权限！
+2018/08/21 13:39:24 [E] 用户没有设置默认案场
+2018/08/21 13:39:24 [E] 您没有该案场的权限！
+2018/08/21 13:41:04 [E] 用户没有设置默认案场
+2018/08/21 13:41:04 [E] 您没有该案场的权限！
+2018/08/21 14:26:22 [E] 用户登录失败: dial tcp 192.168.0.62:3306: connectex: A connection attempt failed because the connected party did not properly respond after a period of time, or established connection failed because connected host has failed to respond.
+2018/08/21 14:27:06 [E] 用户登录失败: dial tcp 192.168.0.62:3306: connectex: A connection attempt failed because the connected party did not properly respond after a period of time, or established connection failed because connected host has failed to respond.
+2018/08/23 19:57:03 [E] 获取人员映射账户失败: Params type error
+2018/08/23 19:58:00 [E] 获取人员映射账户失败: Params type error
+2018/08/23 19:58:39 [E] 获取人员映射账户失败: Params type error
+2018/08/23 20:03:16 [E] 获取人员映射账户失败: Params type error
+2018/08/23 20:05:14 [E] 获取人员映射账户失败: Params type error

log/common.log

@@ -1,27 +1,7 @@
-2018/08/20 15:27:18 [E] 获取客户列表失败: sql: converting Exec argument $1 type: unsupported type []interface {}, a slice of interface
-2018/08/20 15:36:51 [E] 获取客户列表失败: sql: converting Exec argument $1 type: unsupported type []interface {}, a slice of interface
-2018/08/20 15:37:19 [E] 获取客户列表失败: sql: converting Exec argument $1 type: unsupported type []interface {}, a slice of interface
-2018/08/20 15:44:30 [E] 获取客户列表失败: Error 1248: Every derived table must have its own alias
-2018/08/20 15:46:35 [E] 获取客户列表失败: Error 1248: Every derived table must have its own alias
-2018/08/20 15:49:09 [E] 获取客户列表失败: Error 1060: Duplicate column name 'user_id'
-2018/08/20 15:57:45 [E] 获取客户列表失败: sql: statement expects 2 inputs; got 1
-2018/08/20 19:25:08 [E] 短信发送失败: 400 
-2018/08/20 19:27:58 [E] 短信发送失败: 400 
-2018/08/20 19:28:52 [E] 短信发送失败: 400 
-2018/08/21 13:38:17 [E] 用户没有设置默认案场
-2018/08/21 13:38:17 [E] 您没有该案场的权限！
-2018/08/21 13:39:04 [E] 用户没有设置默认案场
-2018/08/21 13:39:04 [E] 您没有该案场的权限！
-2018/08/21 13:39:09 [E] 用户没有设置默认案场
-2018/08/21 13:39:09 [E] 您没有该案场的权限！
-2018/08/21 13:39:24 [E] 用户没有设置默认案场
-2018/08/21 13:39:24 [E] 您没有该案场的权限！
-2018/08/21 13:41:04 [E] 用户没有设置默认案场
-2018/08/21 13:41:04 [E] 您没有该案场的权限！
-2018/08/21 14:26:22 [E] 用户登录失败: dial tcp 192.168.0.62:3306: connectex: A connection attempt failed because the connected party did not properly respond after a period of time, or established connection failed because connected host has failed to respond.
-2018/08/21 14:27:06 [E] 用户登录失败: dial tcp 192.168.0.62:3306: connectex: A connection attempt failed because the connected party did not properly respond after a period of time, or established connection failed because connected host has failed to respond.
-2018/08/23 19:57:03 [E] 获取人员映射账户失败: Params type error
-2018/08/23 19:58:00 [E] 获取人员映射账户失败: Params type error
-2018/08/23 19:58:39 [E] 获取人员映射账户失败: Params type error
-2018/08/23 20:03:16 [E] 获取人员映射账户失败: Params type error
-2018/08/23 20:05:14 [E] 获取人员映射账户失败: Params type error
+2018/08/24 09:40:16 [E] 验证码 - 17714208769 : 648633
+2018/08/24 10:53:37 [E] 获取人员映射账户失败: Error 1205: Lock wait timeout exceeded; try restarting transaction
+2018/08/24 10:54:58 [E] 获取人员映射账户失败: Error 1205: Lock wait timeout exceeded; try restarting transaction
+2018/08/24 10:55:03 [E] 获取人员映射账户失败: Error 1205: Lock wait timeout exceeded; try restarting transaction
+2018/08/24 10:55:42 [E] 获取人员映射账户失败: Error 1205: Lock wait timeout exceeded; try restarting transaction
+2018/08/24 10:55:46 [E] 获取人员映射账户失败: Error 1205: Lock wait timeout exceeded; try restarting transaction
+2018/08/24 11:30:58 [E] 更新用户映射信息失败:Params type error

models/customer/customer.go

@@ -137,7 +137,7 @@ func (m *CustomerDAO) UpdateUserMapping(userMap *model.TaUserMapping, cols []str
 		return errors.New("用户映射信息不存在")
 	}
 
-	_, err := m.db.Where("mapping_id=?", userMap.MappingId).Cols(cols...).Update(&userMap)
+	_, err := m.db.Where("mapping_id=?", userMap.MappingId).Cols(cols...).Update(userMap)
 	return err
 }
 

models/goods/orders.go

@@ -95,7 +95,7 @@ func (m *GoodsDAO) SaveOrdersCoupon(coupons []model.TaGoodsOrdersCoupon, order *
 	if _, err := m.db.
 		Where("orders_id=?", order.OrdersId).
 		Cols([]string{"coupon_amount", "actual_amount"}...).
-		Update(&order); err != nil {
+		Update(order); err != nil {
 		return err
 	}
 

models/system/user.go

@@ -375,6 +375,6 @@ func (m *UserDAO) UpdateUserMapping(userMap *model.TaUserMapping, cols []string)
 		return errors.New("用户映射信息不存在")
 	}
 
-	_, err := m.db.Where("mapping_id=?", userMap.MappingId).Cols(cols...).Update(&userMap)
+	_, err := m.db.Where("mapping_id=?", userMap.MappingId).Cols(cols...).Update(userMap)
 	return err
 }

service/customer/customer.go

@@ -9,8 +9,6 @@ import (
 	"spaceofcheng/services/service/events"
 	"spaceofcheng/services/utils"
 	"strconv"
-
-	"github.com/astaxie/beego"
 )
 
 // CustomerServ 系统处理
@@ -38,7 +36,7 @@ func (s *CustomerServ) GetCustWithWXList(phone string, page ...int) ([]customer.
 func (s *CustomerServ) GetCustWithWXByID(custID string) (*customer.CustWithWX, error) {
 	cust, err := s.dao.GetCustWithWXByID(custID)
 	if err != nil {
-		beego.Error(err)
+		utils.LogError(err.Error())
 		return nil, err
 	}
 
@@ -53,7 +51,7 @@ func (s *CustomerServ) GetCustWithWXByID(custID string) (*customer.CustWithWX, e
 func (s *CustomerServ) GetCustUserByID(userID string) (*UserProfile, error) {
 	user, err := s.dao.GetUserByID(userID)
 	if err != nil {
-		beego.Error(err)
+		utils.LogError(err.Error())
 		return nil, err
 	}
 
@@ -79,7 +77,7 @@ func (s *CustomerServ) GetCustUserByID(userID string) (*UserProfile, error) {
 func (s *CustomerServ) BindWechatUser(userMap *model.TaUserMapping, phone string) (*model.TaCustomer, error) {
 	user, err := s.dao.GetUserByPhone(phone)
 	if err != nil {
-		beego.Error(err)
+		utils.LogError(err.Error())
 		return nil, err
 	}
 
@@ -89,7 +87,7 @@ func (s *CustomerServ) BindWechatUser(userMap *model.TaUserMapping, phone string
 
 	cust, err := s.dao.GetCustomerByPhone(phone)
 	if err != nil {
-		beego.Error(err)
+		utils.LogError(err.Error())
 		return nil, err
 	}
 
@@ -102,7 +100,7 @@ func (s *CustomerServ) BindWechatUser(userMap *model.TaUserMapping, phone string
 		wxInfo := wxInfoRaw.(map[string]interface{})
 		newCust, err := s.SaveNewCustomer(wxInfo, "", "", user.UserId)
 		if err != nil {
-			beego.Error(err)
+			utils.LogError(err.Error())
 			return nil, err
 		}
 		cust = newCust
@@ -133,7 +131,7 @@ func (s *CustomerServ) BindWechatUser(userMap *model.TaUserMapping, phone string
 func (s *CustomerServ) BindWechatCust(userMap *model.TaUserMapping, phone, caseID, userID string) (*model.TaCustomer, error) {
 	cust, err := s.dao.GetCustomerByPhone(phone)
 	if err != nil {
-		beego.Error(err)
+		utils.LogError(err.Error())
 		return nil, err
 	}
 
@@ -147,7 +145,7 @@ func (s *CustomerServ) BindWechatCust(userMap *model.TaUserMapping, phone, caseI
 		wxInfo := wxInfoRaw.(map[string]interface{})
 		newCust, err := s.SaveNewCustomer(wxInfo, caseID, userID, "")
 		if err != nil {
-			beego.Error(err)
+			utils.LogError(err.Error())
 			return nil, err
 		}
 
@@ -202,7 +200,7 @@ func (s *CustomerServ) SaveNewCustomer(wxInfo map[string]interface{}, caseID, ar
 	if caseID != "" {
 		cs, err := s.casedao.GetCaseByID(caseID)
 		if err != nil {
-			beego.Error(err)
+			utils.LogError(err.Error())
 			return nil, err
 		}
 
@@ -218,7 +216,7 @@ func (s *CustomerServ) SaveNewCustomer(wxInfo map[string]interface{}, caseID, ar
 	if arID != "" {
 		ar, err := s.dao.GetUserByID(arID)
 		if err != nil {
-			beego.Error(err)
+			utils.LogError(err.Error())
 			return nil, err
 		}
 
@@ -235,7 +233,7 @@ func (s *CustomerServ) SaveNewCustomer(wxInfo map[string]interface{}, caseID, ar
 	if userID != "" {
 		user, err := s.dao.GetUserByID(userID)
 		if err != nil {
-			beego.Error(err)
+			utils.LogError(err.Error())
 			return nil, err
 		}
 

test.http

@@ -0,0 +1,19 @@
+@domain = localhost:8080
+@guestAPI = api/guest
+@phone = 17714208769
+
+@contentForm = application/x-www-form-urlencoded
+@contentJSON = application/json
+# 验证码
+
+GET http://{{domain}}/{{guestAPI}}/captcha?phone={{phone}}
+
+
+###
+POST http://dev.ycjcjy.com/api-v2/api/guest/wxsignup
+content-type: {{contentForm}}
+
+phone={{phone}}
+&captcha=648633
+&case=1
+&sales=0

utils/captcha.go

@@ -73,6 +73,8 @@ func (c *CaptchaEngine) SendCaptcha(phone string) {
 
 	c.capList[phone] = theCap
 
+	LogError("验证码 - " + phone + " : " + theCap.Captcha)
+
 	SendSMS("captcha", theCap.Phone, theCap.Captcha)
 }