Browse Source

feat:免费用户正文手机号替换

xuemingyang 3 years ago
parent
commit
115e5b5b46
2 changed files with 3 additions and 3 deletions
  1. 2 2
      src/jfw/front/shorturl.go
  2. 1 1
      src/jfw/modules/app/src/app/front/shorturl.go

+ 2 - 2
src/jfw/front/shorturl.go

@@ -310,7 +310,7 @@ func (s *Short) Article(stype, id string) error {
 					re1 := regexp.MustCompile("1[345789]{1}\\d{9}")
 					detail1 := re1.ReplaceAllString(detail, `<span id="phone-freeView" class="freeView">点击查看</span>`)
 					//座机
-					re2 := regexp.MustCompile("(0[0-9]{2,3}(\\-)?)?([2-9][0-9]{6,7})+((\\-)?[0-9]{1,4})?")
+					re2 := regexp.MustCompile("((0\\d{2,3})-)(\\d{7,8})(-(\\d{3,}))?")
 					detail2 := re2.ReplaceAllString(detail1, `<span id="tel-freeView" 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})(\\]?)")
@@ -452,7 +452,7 @@ func (s *Short) Article(stype, id string) error {
 						re1 := regexp.MustCompile("1[345789]{1}\\d{9}")
 						detail1 := re1.ReplaceAllString(detail, `<span id="phone-freeView" class="freeView">点击查看</span>`)
 						//座机
-						re2 := regexp.MustCompile("(0[0-9]{2,3}(\\-)?)?([2-9][0-9]{6,7})+((\\-)?[0-9]{1,4})?")
+						re2 := regexp.MustCompile("((0\\d{2,3})-)(\\d{7,8})(-(\\d{3,}))?")
 						detail2 := re2.ReplaceAllString(detail1, `<span id="tel-freeView" 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})(\\]?)")

+ 1 - 1
src/jfw/modules/app/src/app/front/shorturl.go

@@ -187,7 +187,7 @@ func (s *Short) Article(stype, id string) error {
 				re1 := regexp.MustCompile("1[345789]{1}\\d{9}")
 				detail1 := re1.ReplaceAllString(detail, `<span id="phone-freeView" class="freeView">点击查看</span>`)
 				//座机
-				re2 := regexp.MustCompile("(0[0-9]{2,3}(\\-)?)?([2-9][0-9]{6,7})+((\\-)?[0-9]{1,4})?")
+				re2 := regexp.MustCompile("((0\\d{2,3})-)(\\d{7,8})(-(\\d{3,}))?")
 				detail2 := re2.ReplaceAllString(detail1, `<span id="tel-freeView" 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})(\\]?)")