fix bug

controllers/user.go

@@ -1,7 +1,9 @@
 package controllers
 
 import (
+	"fmt"
 	"hongze/hongze_api/models"
+	"hongze/hongze_api/utils"
 )
 
 //用户
@@ -56,7 +58,13 @@ func (this *UserCommonController) GetSmsCode() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
+	mobile := this.GetString("Mobile")
+	areaNum := this.GetString("AreaNum")
+	msgCode := utils.GetRandString(4)
+	if areaNum == "86" || areaNum == "" || areaNum == "0" {
 
+	}
+	fmt.Println(mobile,msgCode)
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

models/home.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+	"fmt"
 	"hongze/hongze_api/utils"
 	"rdluck_tools/orm"
 )
@@ -23,9 +24,11 @@ func ListHome(userId, maxPermission, userPermission int, permissionStr string) (
 	sql := `SELECT id,classify_name FROM classify WHERE parent_id=0 ORDER BY create_time ASC `
 	_, err = o.Raw(sql).QueryRows(&items)
 	if err != nil {
+		fmt.Println("Get classify Err:" + err.Error())
 		return
 	}
 	lenItem := len(items)
+	fmt.Println("lenItem:", lenItem)
 	for i := 0; i < lenItem; i++ {
 		item := items[i]
 		subItems := make([]*HomeClassifyItem, 0)
@@ -44,6 +47,7 @@ func ListHome(userId, maxPermission, userPermission int, permissionStr string) (
 		subSql += ` ORDER BY create_time ASC `
 		_, err = o.Raw(subSql, item.ClassifyId).QueryRows(&subItems)
 		if err != nil {
+			fmt.Println("Sub Err:" + err.Error())
 			return
 		}
 		lenSub := len(subItems)
@@ -58,8 +62,12 @@ func ListHome(userId, maxPermission, userPermission int, permissionStr string) (
                 ORDER BY b.publish_time DESC LIMIT 1  `
 			report := new(Report)
 			err = o.Raw(reportSql, userId, subItem.ClassifyId).QueryRow(&report)
-			if err != nil && err.Error() != utils.ErrNoRow() {
-				return
+			if err != nil {
+				if err.Error() != utils.ErrNoRow() {
+					return
+				} else {
+					err = nil
+				}
 			}
 			subItems[k].Child = report
 		}
@@ -67,4 +75,3 @@ func ListHome(userId, maxPermission, userPermission int, permissionStr string) (
 	}
 	return
 }
-

models/wx_user.go

@@ -78,7 +78,7 @@ type PermissionSearchKeyWord struct {
 }
 
 func GetPermissionSearchKeyWord(userId int) (items []*PermissionSearchKeyWord, err error) {
-	sql := "SELECT a.key_word FROM chart_permission_search_key_word_mapping AS a INNER JOIN company_report_permission AS crp ON a.chart_permission_id=crp.chart_permission_id INNER JOIN wx_user AS wu ON wu.company_id=crp.company_id WHERE wu.user_id=? AND `from`='rddp' GROUP BY a.key_word"
+	sql := "SELECT a.key_word FROM chart_permission_search_key_word_mapping AS a INNER JOIN company_report_permission AS crp ON a.chart_permission_id=crp.chart_permission_id INNER JOIN wx_user AS wu ON wu.company_id=crp.company_id WHERE wu.user_id=? AND `from`='rddp' GROUP BY a.key_word "
 	o := orm.NewOrm()
 	_, err = o.Raw(sql, userId).QueryRows(&items)
 	return

services/home.go

@@ -6,9 +6,14 @@ import (
 	"strings"
 )
 
-func HomeList(userId, companyId int) (items []*models.HomeList,err error) {
+func HomeList(userId, companyId int) (items []*models.HomeList, err error) {
+	defer func() {
+		fmt.Println("line 11")
+		fmt.Println("err:",err)
+	}()
 	permissionKey, err := models.GetPermissionSearchKeyWord(userId)
 	if err != nil {
+		fmt.Println("GetPermissionSearchKeyWord Err:"+err.Error())
 		return
 	}
 	var permissionArr []string
@@ -19,14 +24,20 @@ func HomeList(userId, companyId int) (items []*models.HomeList,err error) {
 	permissionStr = "'" + permissionStr + "'"
 	fmt.Println("permissionStr")
 	fmt.Println(permissionStr)
+
 	maxPermissionCount, err := models.GetUserIsMaxPermission(companyId)
 	if err != nil {
+		fmt.Println("GetUserIsMaxPermission Err:" + err.Error())
 		return
 	}
 	permissionStatus, err := CheckUserPermission(userId)
 	if err != nil {
+		fmt.Println("CheckUserPermission Err:" + err.Error())
 		return
 	}
 	items, err = models.ListHome(userId, maxPermissionCount, permissionStatus, permissionStr)
+	if err != nil {
+		fmt.Println("ListHome Err:" + err.Error())
+	}
 	return
 }

services/sms.go

@@ -9,48 +9,41 @@ import (
 	"net/http"
 )
 
-func SendSmsCode(mobile,ip string,codeType int,vcode string)bool  {
-	flag:=false
-	tplId:=""
-	switch codeType {
-	case utils.REGISTER_CODE:
-		tplId="206722"
-	case utils.LOGIN_CODE:
-		tplId="65692"
-	}
-	result,err:=sendSms(mobile,tplId,vcode)
-	if err!=nil {
+func SendSmsCode(mobile, vcode string) bool {
+	flag := false
+	tplId := "65692"
+	result, err := sendSms(mobile, tplId, vcode)
+	if err != nil {
 		fmt.Println("发送短信失败")
-		return  false
+		return false
 	}
-	fmt.Println("result",string(result))
+	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
+	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
+	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
+	return flag
 }
 
-
-func sendSms(mobile,tplId,code string)(rs []byte, err error)  {
+func sendSms(mobile, tplId, code string) (rs []byte, err error) {
 	var Url *url.URL
 	apiURL := "http://v.juhe.cn/sms/send"
 	//初始化参数
 	param := url.Values{}
 	//配置请求参数,方法内部已处理urlencode问题,中文参数可以直接传参
-	param.Set("mobile", mobile) //接受短信的用户手机号码
-	param.Set("tpl_id", tplId) //您申请的短信模板ID，根据实际情况修改
+	param.Set("mobile", mobile)            //接受短信的用户手机号码
+	param.Set("tpl_id", tplId)             //您申请的短信模板ID，根据实际情况修改
 	param.Set("tpl_value", "#code#="+code) //您设置的模板变量，根据实际情况
-	param.Set("key", utils.JhGnAppKey)  //应用APPKEY(应用详细页查询)
+	param.Set("key", utils.JhGnAppKey)     //应用APPKEY(应用详细页查询)
 
 	Url, err = url.Parse(apiURL)
 	if err != nil {
@@ -66,4 +59,33 @@ func sendSms(mobile,tplId,code string)(rs []byte, err error)  {
 	}
 	defer resp.Body.Close()
 	return ioutil.ReadAll(resp.Body)
-}
+}
+
+
+func sendSmsGj(mobile, tplId, 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("tplValue", "#code#="+code) //您设置的模板变量，根据实际情况
+	param.Set("key", utils.JhGjAppKey)     //应用APPKEY(应用详细页查询)
+	param.Set("areaNum", areaNum)     //应用APPKEY(应用详细页查询)
+
+	Url, err = url.Parse(apiURL)
+	if err != nil {
+		fmt.Printf("解析url错误:\r\n%v", err)
+		return nil, err
+	}
+	//如果参数中有中文参数,这个方法会进行URLEncode
+	Url.RawQuery = param.Encode()
+	resp, err := http.Get(Url.String())
+	if err != nil {
+		fmt.Println("err:", err)
+		return nil, err
+	}
+	defer resp.Body.Close()
+	return ioutil.ReadAll(resp.Body)
+}

utils/constants.go

@@ -19,7 +19,7 @@ const (
 )
 
 const (
-	APPNAME          = "弘则-日度点评-管理后台"
+	APPNAME          = "弘则-日度点评"
 	EmailSendToUsers = "glji@hzinsights.com"
 )
 
@@ -39,6 +39,7 @@ const (
 var (
 	JhGnTplId  = "65692"                            //聚合国内模板编码
 	JhGjTplId  = "10054"                            //聚合国内模板编码
+
 	JhGnAppKey = "4c8504c49dd335e99cfd7b6a3a9e2415" //聚合国内AppKey
 	JhGjAppKey = "3326ad2c1047a4cd92ace153e6044ca3"
 )