Merge branch 'feature/v4.7.16' of http://192.168.3.207:8080/qmx/jy into feature/v4.7.16

src/jfw/front/front.go

@@ -844,26 +844,35 @@ func (m *Front) Sess(ostr string) error {
 			ok, _, _ = FindUserAndCreateSess(openid, m.Session(), "wx", false)
 		}
 		if ok {
-			actionurl := util.ObjToString(urlMap[str[3]])
-			if actionurl != "" {
+			actionurl := ""
+			if str[3] == "" {
 				if len(strs) > 1 {
-					if strings.Contains(actionurl, "followent/newInfo") {
-						actionurl = fmt.Sprintf(actionurl, (strs[1] + "___" + strs[2]))
-					} else {
-						//支持多个参数%s..
-						actionurl = fmt.Sprintf(actionurl, func(tmps []string) []interface{} {
-							res := make([]interface{}, strings.Count(actionurl, "%s"))
-							for k := range res {
-								if k < len(tmps) {
-									res[k] = tmps[k]
-								} else {
-									res[k] = ""
+					actionurl, _ = url.QueryUnescape(strs[1])
+				}
+			} else {
+				actionurl = util.ObjToString(urlMap[str[3]])
+				if actionurl != "" {
+					if len(strs) > 1 {
+						if strings.Contains(actionurl, "followent/newInfo") {
+							actionurl = fmt.Sprintf(actionurl, (strs[1] + "___" + strs[2]))
+						} else {
+							//支持多个参数%s..
+							actionurl = fmt.Sprintf(actionurl, func(tmps []string) []interface{} {
+								res := make([]interface{}, strings.Count(actionurl, "%s"))
+								for k := range res {
+									if k < len(tmps) {
+										res[k] = tmps[k]
+									} else {
+										res[k] = ""
+									}
 								}
-							}
-							return res
-						}(strs[1:])...)
+								return res
+							}(strs[1:])...)
+						}
 					}
 				}
+			}
+			if actionurl != "" {
 				//绑定手机号 跳转
 				if flag, _ := config.Sysconfig["phoneFilterFlag"].(bool); flag { //开关是否开启
 					//action走的nginx配置，需要单独在sess中判断
@@ -888,11 +897,7 @@ func (m *Front) Sess(ostr string) error {
 				}
 				m.Redirect(actionurl)
 			} else {
-				if !ok {
-					log.Println("数据库连接超时！", openid)
-				} else {
-					log.Println("解析结果：", str, "，actionurl为空")
-				}
+				log.Println("解析结果：", str, "，actionurl为空")
 				m.Render("_error.html")
 			}
 		} else {

src/jfw/modules/bigmember/src/service/follow/project.go

@@ -120,7 +120,7 @@ func (this *FollowProject) FollowList() {
 		}
 		pNum, _ := this.GetInteger("pageNum")   //当前页码
 		pSize, _ := this.GetInteger("pageSize") //每页数据量
-		pList, _, _, err := projectManager.GetFollowList(pNum, projectManager.MaxNum, entUserId)
+		pList, _, count, err := projectManager.GetFollowList(pNum, projectManager.MaxNum, entUserId)
 		//是否有下一页？？
 		if err != nil {
 			return nil, err
@@ -148,7 +148,7 @@ func (this *FollowProject) FollowList() {
 		}
 
 		return map[string]interface{}{
-			"total":     len(list),
+			"total":     count,
 			"hasNext":   qutil.If((pNum+1)*pSize >= len(list), false, true),
 			"List":      sList,
 			"followMax": projectManager.MaxNum,