|
@@ -39,18 +39,17 @@ func (jy *JyData) FindInfo() {
|
|
|
if strings.Contains(identity, "page_workDesktop/work-bench") {
|
|
|
identity = rpreUrl.ReplaceAllString(identity, "")
|
|
|
}
|
|
|
- if strings.Contains(identity, "content") {
|
|
|
- identity = rpre.ReplaceAllString(identity, "")
|
|
|
- identity = rsuf.ReplaceAllString(identity, "")
|
|
|
- id = qu.CommonDecodeArticle("content", identity)[0]
|
|
|
- } else if strings.Contains(identity, "bdprivate") {
|
|
|
- identity = rpre1.ReplaceAllString(identity, "")
|
|
|
- identity = rsuf.ReplaceAllString(identity, "")
|
|
|
- id = qu.CommonDecodeArticle("bdprivate", identity)[0]
|
|
|
- } else if strings.Contains(identity, "mailprivate") {
|
|
|
- identity = rpre2.ReplaceAllString(identity, "")
|
|
|
- identity = rsuf.ReplaceAllString(identity, "")
|
|
|
- id = qu.CommonDecodeArticle("mailprivate", identity)[0]
|
|
|
+ matchArr := regpre.FindAllStringSubmatch(identity, -1)
|
|
|
+ if len(matchArr) == 1 && len(matchArr[0]) == 3 {
|
|
|
+ qu.Debug("findInfo --- type/decode id ---", matchArr[0][1], matchArr[0][2])
|
|
|
+ id = qu.CommonDecodeArticle(matchArr[0][1], matchArr[0][2])[0]
|
|
|
+ //if strings.Contains(identity, "content") {
|
|
|
+ // id = qu.CommonDecodeArticle("content", identity)[0]
|
|
|
+ //} else if strings.Contains(identity, "bdprivate") {
|
|
|
+ // id = qu.CommonDecodeArticle("bdprivate", identity)[0]
|
|
|
+ //} else if strings.Contains(identity, "mailprivate") {
|
|
|
+ // id = qu.CommonDecodeArticle("mailprivate", identity)[0]
|
|
|
+ //}
|
|
|
}
|
|
|
}
|
|
|
qu.Debug("findInfo --- url/id ---", id)
|