feat:p583 app 提交配置、publicapply 未关注详情页调整请求方式

src/jfw/modules/app/p583.http

@@ -1,4 +1,4 @@
-GET http://127.0.0.1:89/jyapp/mini/RkxD
+GET http://127.0.0.1:89/jyapp/m/RV4=
 Content-Type: application/json
 
 {}

src/jfw/modules/app/src/app/filter/loginfilter.go

@@ -37,7 +37,7 @@ var urls = []*regexp.Regexp{
 	regexp.MustCompile("^/jyapp/initialize/whiteList"),
 	regexp.MustCompile("^/jyapp/transit/.*"),
 	regexp.MustCompile("^/jyapp/new/.*"),
-	regexp.MustCompile("^/jyapp/mini/.*"),
+	regexp.MustCompile("^/jyapp/m/.*"),
 }
 
 type loginFilter struct {

src/jfw/modules/app/src/app/front/activity.go

@@ -9,13 +9,13 @@ import (
 	"fmt"
 	"jy/src/jfw/modules/app/src/app/config"
 	"jy/src/jfw/modules/app/src/app/jyutil"
-	"strings"
+	"net/url"
 	"time"
 )
 
 type Activity struct {
 	*xweb.Action
-	mini           xweb.Mapper `xweb:"/jyapp/mini/(.*)"`      // /min/001#3 p583短地址
+	mini           xweb.Mapper `xweb:"/jyapp/m/(.*)"`         // /min/0013 p583短地址
 	checkSubscribe xweb.Mapper `xweb:"/jyapp/checkSubscribe"` // 是否关注 p583短地址
 }
 
@@ -35,13 +35,12 @@ func (s *Activity) Mini(args string) {
 		s.ServeJson(api.NewResult(nil, errors.New("参数异常")))
 		return
 	}
-	sidStrSplit := strings.Split(sidStr, "#")
-	if len(sidStrSplit) != 2 {
+	if len(sidStr) < 2 {
 		s.ServeJson(api.NewResult(nil, errors.New("参数异常")))
 	}
-	step := common.IntAll(sidStrSplit[1])
-	id := common.IntAll(sidStrSplit[0])
-	encryId := encrypt.SE.EncodeString(sidStrSplit[0])
+	step := common.IntAll(sidStr[len(sidStr)-1:])
+	id := common.IntAll(sidStr[:len(sidStr)-1])
+	encryId := encrypt.SE.EncodeString(sidStr[:len(sidStr)-1])
 	if step > len(config.Active.ActivateInfo.To) || id == 0 || common.IntAll(id) == 0 {
 		s.ServeJson(api.NewResult(nil, errors.New("参数异常")))
 		return
@@ -59,10 +58,10 @@ func (s *Activity) Mini(args string) {
 		s.T["env_version"] = config.Active.ActivateInfo.EnvVersion
 		if jyutil.IsSubscribe(userId) {
 			s.T["path"] = config.Active.ActivateInfo.To[stepIndex].Path.Sub
-			s.T["query"] = fmt.Sprintf(config.Active.ActivateInfo.To[stepIndex].Query.Sub, encryId)
+			s.T["query"] = url.QueryEscape(fmt.Sprintf(config.Active.ActivateInfo.To[stepIndex].Query.Sub, encryId))
 		} else {
 			s.T["path"] = config.Active.ActivateInfo.To[stepIndex].Path.Unsub
-			s.T["query"] = fmt.Sprintf(config.Active.ActivateInfo.To[stepIndex].Query.Unsub, encryId)
+			s.T["query"] = url.QueryEscape(fmt.Sprintf(config.Active.ActivateInfo.To[stepIndex].Query.Unsub, encryId))
 		}
 		s.Render(config.Active.ActivateInfo.To[stepIndex].Url, &s.T)
 		return

src/jfw/modules/publicapply/src/detail/service/service.go

@@ -4,6 +4,7 @@ import (
 	. "app.yhyue.com/moapp/jybase/api"
 	"app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/encrypt"
+	"encoding/json"
 	"jy/src/jfw/modules/publicapply/src/detail/dao"
 	"jy/src/jfw/modules/publicapply/src/detail/entity"
 	"jy/src/jfw/modules/publicapply/src/detail/util"
@@ -144,7 +145,18 @@ func (d *Detail) MinBaseInfo() {
 		}
 		//接收参数
 		// 查询 标讯id
-		auId := d.GetString("id")
+		if string(d.Body()) == "" {
+			return Result{Data: nil, Error_msg: Error_msg_1003}
+		}
+		param := struct {
+			Id string
+		}{}
+		//接收参数
+		err := json.Unmarshal(d.Body(), &param)
+		if err != nil || param.Id == "" {
+			return Result{Data: nil, Error_msg: Error_msg_1003}
+		}
+		auId := param.Id
 		id := encrypt.SE.DecodeString(auId)
 		if id == "" {
 			return Result{Data: nil, Error_msg: Error_msg_1003}

src/jfw/modules/publicapply/src/test/detail_test.http

@@ -63,6 +63,8 @@ client.assert(response.body.error_code===0, "response.body.error_code!==0");
 ### p583未关注详情页接口信息
 
 POST {{addr}}/publicapply/detail/minBaseInfo
-Content-Type: application/x-www-form-urlencoded
+Content-Type: application/json
 
-id=RQ==
+{
+  "id":"RQ=="
+}