Ver Fonte

wip:超前项目修改

duxin há 2 anos atrás
pai
commit
b807804a37
1 ficheiros alterados com 11 adições e 10 exclusões
  1. 11 10
      src/customerService/advancedProjectService.go

+ 11 - 10
src/customerService/advancedProjectService.go

@@ -5,9 +5,9 @@ import (
 	"errors"
 	"fmt"
 	"log"
+	"net/url"
 	"order"
 	qutil "qfw/util"
-	"regexp"
 	"strings"
 	"time"
 	"util"
@@ -17,22 +17,23 @@ import (
 func GetTitleService(noticeAddress string) (string, string) {
 	//分割字符串
 	//noticeAddress = "https://jybx-webtest.jydev.jianyu360.com/article/content/ABCY1xJdCkFODwsAmtyZ3IwCjMZSTJgR2R1Kw4nKTogVX5wHFJUCWs%3D.html"
-	//firstArr := strings.Split(noticeAddress, "/")
-	//if len(firstArr) == 0 {
-	//	return "", ""
-	//}
-	reg := regexp.MustCompile("ABC(.*?)*.html")
-	infoIdStrHtml := reg.FindString(noticeAddress)
-	if infoIdStrHtml == "" || len(infoIdStrHtml) == 0 {
+	urlAddress, err := url.QueryUnescape(noticeAddress) //登录后的url转译
+	if err != nil {
+		log.Printf("公告地址url转译失败;err:%s", err.Error())
+		return "", ""
+	}
+	ids := strings.Split(urlAddress, ".html") //区分html前后数据
+	firstArr := strings.Split(ids[0], "/")
+	if len(firstArr) == 0 {
 		return "", ""
 	}
-	in := strings.Index(infoIdStrHtml, ".html")
-	infoIdStr := infoIdStrHtml[:in]
+	infoIdStr := firstArr[len(firstArr)-1] // 获取id
 	//secondArr := strings.Split(firstArr[len(firstArr)-1], ".")
 	//if len(secondArr) == 0 {
 	//	return "", ""
 	//}
 	//infoIdStr := secondArr[0]
+	infoIdStr, _ = url.QueryUnescape(infoIdStr)
 	infoId := qutil.DecodeArticleId2ByCheck(infoIdStr)[0]
 	if infoId == "" {
 		return "", ""