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

service/message/cmscase.go

@@ -101,6 +101,12 @@ func (s *MessageServ) GetCmsCasesByID(cmscaseid string) (*message.CmsCase, error
 				return nil, errors.New("获取项目信息失败")
 			}
 			courses[inx].CourseImgs = imgs
+			caseinfo, err := s.casedao.GetCaseByID(course.CaseId)
+			if err != nil {
+				utils.LogError("获取项目信息案场失败: " + err.Error())
+				return nil, errors.New("获取项目信息失败")
+			}
+			courses[inx].CaseInfo = caseinfo
 		}
 
 		info.Courses = courses

service/message/message.go

@@ -2,6 +2,7 @@ package message
 
 import (
 	"errors"
+	"spaceofcheng/services/models/cases"
 	"spaceofcheng/services/models/course"
 	"spaceofcheng/services/models/message"
 	"spaceofcheng/services/models/model"
@@ -14,6 +15,7 @@ type MessageServ struct {
 	ctx       *utils.Context
 	dao       *message.MessageDAO
 	coursedao *course.CourseDAO
+	casedao   *cases.CaseDAO
 }
 
 // NewMessageServ 初始化
@@ -22,6 +24,7 @@ func NewMessageServ(ctx *utils.Context) *MessageServ {
 		ctx:       ctx,
 		dao:       message.NewMessageDAO(ctx),
 		coursedao: course.NewCourseDAO(ctx),
+		casedao:   cases.NewCaseDAO(ctx),
 	}
 }
 

service/sys.go

@@ -278,6 +278,11 @@ func (s *SysServ) authWechat(gctx *context.Context) map[string]interface{} {
 		}
 	}
 
+	// 防止JSON解析失败
+	if userMapping.AccountInfo == "" {
+		userMapping.AccountInfo = "{}"
+	}
+
 	// 更新映射信息, 没有的话则插入
 	err = models.EditUserMapping(userMapping)
 	if err != nil {