fix bug

controllers/home.go

@@ -60,3 +60,12 @@ func (this *HomeController) ListBanner() {
 	br.Msg = "获取数据成功"
 	br.Data = list
 }
+
+//func init() {
+//	fmt.Println("start")
+//	list, err := services.HomeList(11602, 16)
+//	fmt.Println(err)
+//	result, err := json.Marshal(list)
+//	utils.FileLog.Info("%s", string(result))
+//	fmt.Println("end")
+//}

controllers/user.go

@@ -1,9 +1,10 @@
 package controllers
 
 import (
-	"fmt"
 	"hongze/hongze_api/models"
+	"hongze/hongze_api/services"
 	"hongze/hongze_api/utils"
+	"time"
 )
 
 //用户
@@ -61,13 +62,32 @@ func (this *UserCommonController) GetSmsCode() {
 	mobile := this.GetString("Mobile")
 	areaNum := this.GetString("AreaNum")
 	msgCode := utils.GetRandString(4)
+	var result bool
 	if areaNum == "86" || areaNum == "" || areaNum == "0" {
-
+		result = services.SendSmsCode(mobile, msgCode)
+	} else {
+		result = services.SendSmsCodeGj(mobile, msgCode, areaNum)
+	}
+	//发送成功
+	if result {
+		item := new(models.MsgCode)
+		item.OpenId = ""
+		item.Code = msgCode
+		item.Mobile = mobile
+		item.ExpiredIn = time.Now().Unix() + 15*60
+		item.Enabled = 1
+		err := models.AddMsgCode(item)
+		if err != nil {
+			br.Msg = "发送失败"
+			br.ErrMsg = "发送失败，Err:" + err.Error()
+			return
+		}
+		br.Msg = "发送成功"
+	} else {
+		br.Msg = "发送失败"
 	}
-	fmt.Println(mobile,msgCode)
 	br.Ret = 200
 	br.Success = true
-	br.Msg = "获取成功"
 }
 
 /*

models/db.go

@@ -39,5 +39,6 @@ func init() {
 		new(ReportViewRecord),
 		new(WxUser),
 		new(Session),
+		new(MsgCode),
 	)
 }

models/msg_code.go

@@ -0,0 +1,25 @@
+package models
+
+import (
+	"rdluck_tools/orm"
+	"time"
+)
+
+type MsgCode struct {
+	MsgCodeId     int `orm:"column(msg_code_id);pk"`
+	OpenId          string
+	Mobile          string
+	Code            string
+	ExpiredIn       int64
+	Enabled         int
+	CreatedTime     time.Time
+	LastUpdatedTime time.Time
+}
+
+//添加用户session信息
+func AddMsgCode(item *MsgCode) (err error) {
+	o := orm.NewOrm()
+	o.Using("rddp")
+	_, err = o.Insert(item)
+	return
+}

models/report.go

@@ -27,6 +27,8 @@ type Report struct {
 	VideoName          string    `description:"音频文件名称"`
 	VideoPlaySeconds   string    `description:"音频播放时长"`
 	ContentSub         string    `description:"内容前两个章节"`
+	IsShowNewLabel     int       `description:"是否显示新标签"`
+	IsCurrentDate      int       `description:"是否当前日期"`
 }
 
 type ReportList struct {
@@ -116,7 +118,7 @@ func GetReportVarietyListByUserIdExt(userId int, reportType string) (list []*Rep
 }
 
 type ReportDetailResp struct {
-	Report *Report  `description:"报告"`
-	Status int  `description:"状态：0：正常展示，1：报告不存在，2：无权限"`
-	Msg string `description:"提示信息"`
-}
+	Report *Report `description:"报告"`
+	Status int     `description:"状态：0：正常展示，1：报告不存在，2：无权限"`
+	Msg    string  `description:"提示信息"`
+}

services/home.go

@@ -22,8 +22,6 @@ func HomeList(userId, companyId int) (items []*models.HomeList, err error) {
 	}
 	permissionStr := strings.Join(permissionArr, "','")
 	permissionStr = "'" + permissionStr + "'"
-	fmt.Println("permissionStr")
-	fmt.Println(permissionStr)
 
 	maxPermissionCount, err := models.GetUserIsMaxPermission(companyId)
 	if err != nil {

services/sms.go

@@ -62,14 +62,39 @@ func sendSms(mobile, tplId, code string) (rs []byte, err error) {
 }
 
 
-func sendSmsGj(mobile, tplId, code,areaNum string) (rs []byte, err error) {
+func SendSmsCodeGj(mobile, vcode,areaNum string) bool {
+	flag := false
+	result, err := sendSmsGj(mobile, vcode,areaNum)
+	if err != nil {
+		fmt.Println("发送短信失败")
+		return false
+	}
+	fmt.Println("result", string(result))
+	var netReturn map[string]interface{}
+	err = json.Unmarshal(result, &netReturn)
+	if err != nil {
+		go utils.SendEmail("短信验证码发送失败", "err:"+err.Error()+" result"+string(result), utils.EmailSendToUsers)
+		flag = false
+	}
+	if netReturn["error_code"].(float64) == 0 {
+		fmt.Printf("接口返回result字段是:\r\n%v", netReturn["result"])
+		flag = true
+	} else {
+		go utils.SendEmail("短信验证码发送失败", " result"+string(result), utils.EmailSendToUsers)
+		flag = false
+	}
+	return flag
+}
+
+
+func sendSmsGj(mobile, code,areaNum string) (rs []byte, err error) {
 	var Url *url.URL
 	apiURL := "http://v.juhe.cn/smsInternational/send.php"
 	//初始化参数
 	param := url.Values{}
 	//配置请求参数,方法内部已处理urlencode问题,中文参数可以直接传参
 	param.Set("mobile", mobile)            //接受短信的用户手机号码
-	param.Set("tplId", tplId)             //您申请的短信模板ID，根据实际情况修改
+	param.Set("tplId", "10054")             //您申请的短信模板ID，根据实际情况修改
 	param.Set("tplValue", "#code#="+code) //您设置的模板变量，根据实际情况
 	param.Set("key", utils.JhGjAppKey)     //应用APPKEY(应用详细页查询)
 	param.Set("areaNum", areaNum)     //应用APPKEY(应用详细页查询)