Răsfoiți Sursa

fix:正则座机号匹配修改

duxin 3 ani în urmă
părinte
comite
8e62ea0257

+ 8 - 5
src/jfw/front/shorturl.go

@@ -313,13 +313,14 @@ func (s *Short) Article(stype, id string) error {
 					if code != "" {
 						detail1 = strings.ReplaceAll(detail1, code, "*********")
 					}
-
 					//座机
-					re2 := regexp.MustCompile("((\\d{3,4})-)(\\d{3,8})(-(\\d{3,}))?")
+					re2 := regexp.MustCompile("((0\\d{2,3})-)(\\d{7,8})(-(\\d{3,}))?")
 					detail2 := re2.ReplaceAllString(detail1, `<span class="freeView">点击查看</span>`)
+					re4 := regexp.MustCompile("((400)-)(\\d{3,4}-)(\\d{3,})")
+					detail4 := re4.ReplaceAllString(detail2, `<span class="freeView">点击查看</span>`)
 					//邮箱
 					re3 := regexp.MustCompile("([a-zA-Z0-9_\\-\\.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([a-zA-Z0-9\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\\]?)")
-					detail3 := re3.ReplaceAllString(detail2, `<span class="freeView">点击查看</span>`)
+					detail3 := re3.ReplaceAllString(detail4, `<span class="freeView">点击查看</span>`)
 					obj["detail"] = strings.ReplaceAll(strings.ReplaceAll(detail3, `<span class="freeView">点击查看</span><span class="freeView">点击查看</span>`, `<span class="freeView">点击查看</span>`), "*********", code)
 				}
 			}
@@ -462,11 +463,13 @@ func (s *Short) Article(stype, id string) error {
 							detail1 = strings.ReplaceAll(detail1, code, "*********")
 						}
 						//座机
-						re2 := regexp.MustCompile("((\\d{3,4})-)(\\d{3,8})(-(\\d{3,}))?")
+						re2 := regexp.MustCompile("((0\\d{2,3})-)(\\d{7,8})(-(\\d{3,}))?")
 						detail2 := re2.ReplaceAllString(detail1, `<span class="freeView">点击查看</span>`)
+						re4 := regexp.MustCompile("((400)-)(\\d{3,4}-)(\\d{3,})")
+						detail4 := re4.ReplaceAllString(detail2, `<span class="freeView">点击查看</span>`)
 						//邮箱
 						re3 := regexp.MustCompile("([a-zA-Z0-9_\\-\\.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([a-zA-Z0-9\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\\]?)")
-						detail3 := re3.ReplaceAllString(detail2, `<span class="freeView">点击查看</span>`)
+						detail3 := re3.ReplaceAllString(detail4, `<span class="freeView">点击查看</span>`)
 						obj["detail"] = strings.ReplaceAll(strings.ReplaceAll(detail3, `<span class="freeView">点击查看</span><span class="freeView">点击查看</span>`, `<span class="freeView">点击查看</span>`), "*********", code)
 					}
 				}

+ 4 - 2
src/jfw/modules/app/src/app/front/shorturl.go

@@ -191,11 +191,13 @@ func (s *Short) Article(stype, id string) error {
 					detail1 = strings.ReplaceAll(detail1, code, "*********")
 				}
 				//座机
-				re2 := regexp.MustCompile("((\\d{3,4})-)(\\d{3,8})(-(\\d{3,}))?")
+				re2 := regexp.MustCompile("((0\\d{2,3})-)(\\d{7,8})(-(\\d{3,}))?")
 				detail2 := re2.ReplaceAllString(detail1, `<span class="freeView">点击查看</span>`)
+				re4 := regexp.MustCompile("((400)-)(\\d{3,4}-)(\\d{3,})")
+				detail4 := re4.ReplaceAllString(detail2, `<span class="freeView">点击查看</span>`)
 				//邮箱
 				re3 := regexp.MustCompile("([a-zA-Z0-9_\\-\\.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([a-zA-Z0-9\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\\]?)")
-				detail3 := re3.ReplaceAllString(detail2, `<span class="freeView">点击查看</span>`)
+				detail3 := re3.ReplaceAllString(detail4, `<span class="freeView">点击查看</span>`)
 				obj["detail"] = strings.ReplaceAll(strings.ReplaceAll(detail3, `<span class="freeView">点击查看</span><span class="freeView">点击查看</span>`, `<span class="freeView">点击查看</span>`), "*********", code)
 			}
 		}