bug fix

conf/db.conf

@@ -5,8 +5,8 @@ db_type      = mysql
 con_protocol = tcp
 
 ; 数据库地址，可以使用IP
-# db_addr      = 192.168.0.122
-db_addr      = rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com
+db_addr      = 192.168.0.122
+# db_addr      = rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com
 
 ; 端口
 db_port      = 3306
@@ -15,7 +15,8 @@ db_port      = 3306
 username     = spaceofcheng
 
 ; 密码
-password     = c;a|vK)Xv/=L@c[6Fx,v[ITD5;WpR}+Y
+password     = spaceofcheng
+# password     = c;a|vK)Xv/=L@c[6Fx,v[ITD5;WpR}+Y
 
 ; 数据库名或者schema
 database     = spaceofcheng

controllers/auth.go

@@ -3,6 +3,7 @@ package controllers
 import (
 	"net/http"
 	"spaceofcheng/services/service"
+	"spaceofcheng/services/utils"
 )
 
 // Authenticate 权限验证
@@ -15,6 +16,8 @@ import (
 func (c *BaseController) authenticate() {
 	c.serv = service.NewSysServ(c.Context)
 
+	utils.LogError(123)
+
 	// 鉴权 - 并初始化上下文
 	res := c.serv.AuthAndInitCtx(c.Ctx)
 

controllers/base.go

@@ -50,9 +50,16 @@ func (c *BaseController) ResponseError(err error, code ...int) {
 }
 
 // ResponseRaw 返回
-func (c *BaseController) ResponseRaw(msg []byte) {
-	c.destroyContext(true)
+func (c *BaseController) ResponseRaw(msg []byte, stop ...bool) {
 	c.Ctx.ResponseWriter.Write(msg)
+
+	if stop != nil && len(stop) > 0 {
+		if !stop[0] {
+			return
+		}
+	}
+
+	c.destroyContext(true)
 	c.StopRun()
 }
 

controllers/bodycheck/bodycheck.go

@@ -4,8 +4,11 @@ import (
 	"encoding/json"
 	"io/ioutil"
 	"spaceofcheng/services/controllers"
+	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/bodycheck"
 	"spaceofcheng/services/utils"
+
+	"github.com/astaxie/beego"
 )
 
 // BodyCheckController 商品
@@ -21,6 +24,29 @@ func (c *BodyCheckController) Constructor() {
 	c.serv = bodycheck.NewBodyCheckServ(c.Context)
 }
 
+// GetQrcodeURL 获取二维码信息
+func (c *BodyCheckController) GetQrcodeURL() {
+	EquipmentID := c.GetString("EquipmentId")
+	qrcodePrefix := beego.AppConfig.String("qrcodePrefix")
+	org := c.Context.Get("org").(model.SysOrg)
+
+	qrcode, err := utils.WxClientFor(org.OrgId).GetTempStrQRCode(qrcodePrefix + EquipmentID)
+	if err != nil {
+		utils.LogError("获取二维码失败: " + err.Error())
+		// c.ResponseError(err)
+		c.ResponseOtherEndPoint(map[string]interface{}{
+			"Status":  false,
+			"Message": "获取二维码失败: " + err.Error(),
+		})
+	}
+
+	c.ResponseOtherEndPoint(map[string]interface{}{
+		"Status":    true,
+		"Message":   "",
+		"QrcodeUrl": qrcode,
+	})
+}
+
 // GetCheckByUser 根据用户获取体检报告
 func (c *BodyCheckController) GetCheckByUser() {
 	info, err := c.serv.GetCheckByUser()

controllers/context.go

@@ -33,3 +33,7 @@ func (c *BaseController) destroyContext(ok ...bool) {
 
 	c.Context.Destroy()
 }
+
+func (c *BaseController) DestroyContext() {
+	c.destroyContext()
+}

controllers/wechat.go

@@ -7,6 +7,7 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/url"
+	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/customer"
 	"spaceofcheng/services/utils"
@@ -15,144 +16,164 @@ import (
 	"github.com/astaxie/beego"
 )
 
-// WechatInfo 微信接入
-func (c *BaseController) WechatInfo() {
-	// signature := c.GetString("signature")
-	// timestamp := c.GetString("timestamp")
-	// nonce := c.GetString("nonce")
-	echostr := c.GetString("echostr")
-	c.ResponseRaw([]byte(echostr))
+// UserController 用户
+type WechatController struct {
+	BaseController
+	custServ *customer.CustomerServ
 }
 
-// GetQrcodeURL 获取二维码信息
-func (c *BaseController) GetQrcodeURL() {
-	EquipmentID := c.GetString("EquipmentId")
-	qrcodePrefix := beego.AppConfig.String("qrcodePrefix")
-	org := c.Context.Get("org").(model.SysOrg)
+// Constructor 初始化 Controller
+// @Title Constructor
+// @Description 初始化 Controller, 系统自动调用
+func (c *WechatController) Constructor() {
+	c.custServ = customer.NewCustomerServ(c.Context)
 
-	qrcode, err := utils.WxClientFor(org.OrgId).GetTempStrQRCode(qrcodePrefix + EquipmentID)
+	org := c.Context.Get("org").(model.SysOrg)
+	cert, err := models.GetWeChatConfig(org.OrgId, models.WECHAT_WX)
 	if err != nil {
-		utils.LogError("获取二维码失败！")
-		c.ResponseError(err)
+		utils.LogError("获取微信相关配置失败: " + err.Error())
+	} else {
+		utils.WxClientSingleton(org.OrgId, cert)
+	}
+}
+
+// WechatInfo 微信接入
+func (c *WechatController) WechatInfo() {
+	method := c.Ctx.Input.Method()
+	if method == http.MethodGet {
+		echostr := c.GetString("echostr")
+		c.ResponseRaw([]byte(echostr))
+	} else {
+		c.WxReceive()
 	}
-	c.ResponseJSON(map[string]interface{}{
-		"QrcodeUrl": qrcode,
-	})
 }
 
 // WxReceive
-func (c *BaseController) WxReceive() {
+func (c *WechatController) WxReceive() {
 	org := c.Context.Get("org").(model.SysOrg)
 	wechat := utils.WxClientFor(org.OrgId)
-	r := c.Ctx.Request
-	defer r.Body.Close()
-	con, _ := ioutil.ReadAll(r.Body) //获取post的数据
-	val, err := wechat.TransformMessage(string(con))
+	val, err := wechat.TransformMessage(string(c.Ctx.Input.RequestBody))
 	if err != nil {
-		beego.Error(err.Error())
+		utils.LogError("读取微信服务发送内容失败: " + err.Error())
 		c.ResponseRaw([]byte(""))
 	}
 
+	// 如果是事件
 	if val["MsgType"] == "event" {
+
+		// 如果是扫描二维码
 		qrcodePrefix := beego.AppConfig.String("qrcodePrefix")
 		if (val["Event"] == "subscribe" && strings.Contains(val["EventKey"], "qrscene_"+qrcodePrefix)) || val["Event"] == "SCAN" {
-			EquipmentID := strings.Split(val["EventKey"], qrcodePrefix)[1]
-			messagetxt, err := c.scanDo(val, EquipmentID)
+			openID := val["FromUserName"]
+			messagetxt, err := wechat.ResponseMessageText(openID, beego.AppConfig.String("followText"))
 			if err != nil {
-				beego.Error(err.Error())
+				utils.LogError("转换反馈微信消息失败: " + err.Error())
 				c.ResponseRaw([]byte(""))
 			}
-			c.ResponseRaw(messagetxt)
+
+			// 校验用户 并调用 悦奇接口
+			// 使用 goroutine 主要是为了实现快速反馈微信
+			// 微信只有 5 秒等待时间
+			var done = make(chan bool)
+			go func() {
+				//
+				user, err := c.checkUser(val)
+				if err != nil {
+					done <- true
+					return
+				}
+
+				//
+				EquipmentID := strings.Split(val["EventKey"], qrcodePrefix)[1]
+				c.replyToYueQi(user, EquipmentID)
+				done <- true
+			}()
+
+			//
+			c.ResponseRaw(messagetxt, false)
+			<-done
+			c.DestroyContext()
+			c.StopRun()
 		}
 	}
 	c.ResponseRaw([]byte(""))
 }
 
-func (c *BaseController) scanDo(val map[string]string, EquipmentID string) ([]byte, error) {
+// 校验用户
+func (c *WechatController) checkUser(val map[string]string) (map[string]interface{}, error) {
 	org := c.Context.Get("org").(model.SysOrg)
 	wechat := utils.WxClientFor(org.OrgId)
+	openID := val["FromUserName"]
 
-	if val["FromUserName"] == "" {
-		return nil, errors.New("openid为空")
-	}
-
-	user, err := wechat.GetUserDetail(val["FromUserName"])
+	user, err := wechat.GetUserDetail(openID)
 	if err != nil {
-		return nil, err
+		utils.LogError("获取微信用户详情失败:" + err.Error())
+		return nil, errors.New("获取微信用户详情失败")
 	}
-
-	var customerserv = customer.NewCustomerServ(c.Context)
+	// 悦奇设备字段
+	user["wechataccount"] = openID
+	user["wechatofficial"] = wechat.GetAppID()
 
 	// 判断用户是否存在
-	getUser, err := customerserv.GetCustUserByOpenID(user["openid"].(string))
+	getUser, err := c.custServ.GetCustUserByOpenID(openID)
 	if err != nil {
-		return nil, err
+		utils.LogError("查询来源用户失败: ", err)
+		return user, nil
 	}
-	name := user["nickname"].(string)
-	name = UnicodeEmojiCode(name)
-	user["nickname"] = name
-	if getUser == nil || getUser.CustomerId != "" {
+
+	if getUser == nil || getUser.CustomerId == "" {
 		// 新增用户
-		_, err := customerserv.SaveNewCustomer(user, "", "", "", "")
+		_, err := c.custServ.SaveNewCustomer(user, "", "", "", "")
 		if err != nil {
 			utils.LogError("用户保存失败：", err)
-			return nil, err
+			return user, nil
 		}
 	}
 
-	type WechatInfo struct {
-		EquipmentId    string
-		WXID           int
-		WechatUserInfo map[string]interface{}
+	return user, nil
+}
+
+// 反馈消息给悦奇
+func (c *WechatController) replyToYueQi(user map[string]interface{}, EquipmentID string) error {
+	var data = map[string]interface{}{
+		"EquipmentId":    EquipmentID,
+		"WechatUserInfo": user,
+		"WXID":           1,
 	}
-	appid := wechat.GetAppID()
-	user["wechataccount"] = user["openid"].(string)
-	user["wechatofficial"] = appid
-	var userinfo = WechatInfo{}
-	userinfo.EquipmentId = EquipmentID
-	userinfo.WechatUserInfo = user
-	userinfo.WXID = 1
 
 	apiPrefix := beego.AppConfig.String("postwechatInfo")
 
-	b, err := json.Marshal(userinfo)
+	b, err := json.Marshal(data)
 	if err != nil {
-		return nil, err
+		return utils.LogError("转换待发送数据失败: " + err.Error())
 	}
 
 	body := bytes.NewBuffer([]byte(b))
-
 	res, err := http.Post(apiPrefix, "application/json;charset=utf-8", body)
 	if err != nil {
-		beego.Error(err)
-		return nil, err
+		return utils.LogError("调用悦奇接口失败: " + err.Error())
 	}
+
 	result, err := ioutil.ReadAll(res.Body)
-	res.Body.Close()
+	defer res.Body.Close()
 	if err != nil {
-		utils.LogError("发送消息失败：", err)
-		return nil, err
+		return utils.LogError("发送消息至悦奇失败：", err)
 	}
+
 	var postResult struct {
 		Status  bool
 		Message string
 	}
+
 	if err = json.Unmarshal(result, &postResult); err != nil {
-		utils.LogError("发送消息失败：", err)
-		return nil, err
+		return utils.LogError("发送消息至悦奇失败：", err)
 	}
 
 	if !postResult.Status {
-		beego.Error(postResult.Message)
-		return nil, errors.New(postResult.Message)
+		return utils.LogError("发送消息至悦奇失败：", postResult.Message)
 	}
 
-	messagetxt, err := wechat.ResponseMessageText(user["openid"].(string), beego.AppConfig.String("followText"))
-	if err != nil {
-		beego.Error(err)
-		return nil, err
-	}
-	return messagetxt, nil
+	return nil
 }
 
 // UnicodeEmojiCode 过滤表情
@@ -171,7 +192,7 @@ func UnicodeEmojiCode(s string) string {
 }
 
 // GetWxJsSDKSignature 获取 微信 jssdk 签名
-func (c *BaseController) GetWxJsSDKSignature() {
+func (c *WechatController) GetWxJsSDKSignature() {
 	org := c.Context.Get("org").(model.SysOrg)
 	url, _ := url.QueryUnescape(c.GetString("url"))
 
@@ -185,7 +206,7 @@ func (c *BaseController) GetWxJsSDKSignature() {
 }
 
 // MiniLogin 获取小程序 OPENID
-func (c *BaseController) MiniLogin() {
+func (c *WechatController) MiniLogin() {
 	org := c.Context.Get("org").(model.SysOrg)
 	code := c.GetString("code")
 
@@ -204,7 +225,7 @@ func (c *BaseController) MiniLogin() {
 }
 
 // DecodeMiniData 解密小程序信息
-func (c *BaseController) DecodeMiniData() {
+func (c *WechatController) DecodeMiniData() {
 	org := c.Context.Get("org").(model.SysOrg)
 
 	cli := utils.MiniClientFor(org.OrgId)

models/cases/area.go

@@ -34,8 +34,8 @@ type AreaInfo struct {
 // GetCaseAreaByCase 根据案场获取案场区域
 func (m *CaseDAO) GetCaseAreaByCase(caseid string) ([]AreaInfo, error) {
 	var areas []AreaInfo
-	sql := `select * from sys_case_area where status>` + strconv.Itoa(models.STATUS_DEL) + ` and case_id ='` + caseid + `'`
-	err := m.db.Sql(sql).Find(&areas)
+	sql := "select * from sys_case_area where status > ? and case_id = ? order by `order`"
+	err := m.db.Sql(sql, models.STATUS_DEL, caseid).Find(&areas)
 	return areas, err
 }
 

models/cases/table.go

@@ -45,7 +45,7 @@ func (m *CaseDAO) GetCaseTable(caseids string, page int, pageSize int) ([]CaseTa
 // GetCaseTableByAreaID 根据区域ID获取桌位信息
 func (m *CaseDAO) GetCaseTableByAreaID(areaid string) ([]model.SysCaseTable, error) {
 	var tables []model.SysCaseTable
-	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("area_id=?", areaid).Find(&tables)
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("area_id=?", areaid).Asc("order").Find(&tables)
 	return tables, err
 }
 

models/sys.go

@@ -127,14 +127,26 @@ func EditUserMapping(user *model.TaUserMapping) error {
 }
 
 // GetWeChatConfig 获取微信配置
-func GetWeChatConfig(org, cliType string) (*model.SysWechatConf, error) {
+func GetWeChatConfig(org, cliType string) (map[string]string, error) {
 	conf := new(model.SysWechatConf)
 
 	if _, err := DBEngine.Where("org_id=?", org).And("type=?", cliType).Get(conf); err != nil {
 		return nil, err
 	}
 
-	return conf, nil
+	if conf.ConfId == "" {
+		return nil, nil
+	}
+
+	cert := map[string]string{
+		"appid":  conf.Appid,
+		"secret": conf.Secret,
+		"token":  conf.Token,
+		"aeskey": conf.Aeskey,
+		"wxid":   conf.Wxid,
+	}
+
+	return cert, nil
 }
 
 // InsertToken 插入 token 生成记录

routers/guest.go

@@ -54,9 +54,9 @@ func getGuestRoutes() beego.LinkNamespace {
 
 		// 微信
 		// js sdk 签名
-		beego.NSRouter("/wechat/jssdk/signature", &controllers.BaseController{}, "get:GetWxJsSDKSignature"),
-		beego.NSRouter("/wechat/mini/login", &controllers.BaseController{}, "post:MiniLogin"),
-		beego.NSRouter("/wechat/mini/decodedata", &controllers.BaseController{}, "post:DecodeMiniData"),
+		beego.NSRouter("/wechat/jssdk/signature", &controllers.WechatController{}, "get:GetWxJsSDKSignature"),
+		beego.NSRouter("/wechat/mini/login", &controllers.WechatController{}, "post:MiniLogin"),
+		beego.NSRouter("/wechat/mini/decodedata", &controllers.WechatController{}, "post:DecodeMiniData"),
 
 		beego.NSRouter("/websocket/:grps/:id", &controllers.BaseController{}, "get:Ws"),
 
@@ -66,6 +66,7 @@ func getGuestRoutes() beego.LinkNamespace {
 
 		// 签到
 		beego.NSRouter("/case/checkin", &cases.SigninController{}, "post:AddSignin"),
-		beego.NSRouter("/wechat", &controllers.BaseController{}, "get,post:WechatInfo"),
+		beego.NSRouter("/wechat", &controllers.WechatController{}, "get,post:WechatInfo"),
+		// beego.NSRouter("/wechat", &controllers.WechatController{}, "post:WxReceive"),
 	)
 }

service/customer/customer.go

@@ -272,9 +272,9 @@ func (s *CustomerServ) BindWechatCust(userMap *model.TaUserMapping, phone, caseI
 
 // SaveNewCustomer 新增客户
 func (s *CustomerServ) SaveNewCustomer(wxInfo map[string]interface{}, caseID, arID, phone, userID string) (*model.TaCustomer, error) {
-	if caseID == "" && arID == "" && userID == "" {
-		return nil, errors.New("新增信息失败, 无法确认人员类型")
-	}
+	// if caseID == "" && arID == "" && userID == "" {
+	// 	return nil, errors.New("新增信息失败, 无法确认人员类型")
+	// }
 
 	// 微信相关字段
 	nickyName := wxInfo["nickname"].(string)

service/sys.go

@@ -490,44 +490,31 @@ func (s *SysServ) saveNewCustomer(wxUser *utils.WechatUser, userMap *model.TaUse
 
 // initWechatClient 初始化微信客户端
 func (s *SysServ) initWechatClient(orgID string) error {
-	conf, err := models.GetWeChatConfig(orgID, models.WECHAT_WX)
+	cert, err := models.GetWeChatConfig(orgID, models.WECHAT_WX)
 	if err != nil {
 		utils.LogError("获取微信配置失败: " + err.Error())
 		return errors.New("获取微信配置失败")
 	}
 
-	if conf == nil || conf.ConfId == "" {
+	if cert == nil {
 		return errors.New("未找到微信配置")
 	}
 
-	cert := map[string]string{
-		"appid":  conf.Appid,
-		"secret": conf.Secret,
-		"token":  conf.Token,
-		"aeskey": conf.Aeskey,
-		"wxid":   conf.Wxid,
-	}
-
 	utils.WxClientSingleton(orgID, cert)
 	return nil
 }
 
 func (s *SysServ) initMiniClient(orgID string) error {
-	conf, err := models.GetWeChatConfig(orgID, models.WECHAT_MINI)
+	cert, err := models.GetWeChatConfig(orgID, models.WECHAT_MINI)
 	if err != nil {
 		utils.LogError("获取小程序配置失败: " + err.Error())
 		return errors.New("获取小程序配置失败")
 	}
 
-	if conf == nil || conf.ConfId == "" {
+	if cert == nil {
 		return errors.New("未找到小程序配置")
 	}
 
-	cert := map[string]string{
-		"appid":  conf.Appid,
-		"secret": conf.Secret,
-	}
-
 	utils.MiniClientSingleton(orgID, cert)
 	return nil
 }

utils/log.go

@@ -2,6 +2,8 @@ package utils
 
 import (
 	"errors"
+	"fmt"
+	"runtime"
 
 	"github.com/astaxie/beego/config"
 	"github.com/astaxie/beego/logs"
@@ -54,20 +56,24 @@ func NewLog(tp ...string) *logs.BeeLogger {
 func LogError(v ...interface{}) error {
 	log := instances["common"]
 
+	preMsg := ""
+	_, file, line, ok := runtime.Caller(0)
+	if ok {
+		preMsg = fmt.Sprintf("file: %s    line=%d : ", file, line)
+	}
+
+	log.Error(preMsg, v...)
+
 	if len(v) > 0 {
 		firstV := v[0]
-		leftV := v[1:]
 
 		switch err := firstV.(type) {
 		case string:
-			log.Error(err, leftV...)
 			return errors.New(err)
 		case error:
-			log.Error(err.Error(), leftV...)
 			return err
 		default:
 			msg := "Unknown error type"
-			log.Error(msg, leftV...)
 			return errors.New(msg)
 		}
 	}
@@ -79,17 +85,13 @@ func LogError(v ...interface{}) error {
 func LogInfo(v ...interface{}) {
 	log := instances["common"]
 
-	if len(v) > 0 {
-		firstV := v[0]
-		leftV := v[1:]
-
-		switch msg := firstV.(type) {
-		case string:
-			log.Info(msg, leftV...)
-		default:
-			log.Info("Unknown message type", leftV...)
-		}
+	preMsg := ""
+	_, file, line, ok := runtime.Caller(0)
+	if ok {
+		preMsg = fmt.Sprintf("file: %s    line=%d : ", file, line)
 	}
+
+	log.Error(preMsg, v...)
 }
 
 // GetDefaultLogger 获取默认 logger