From 97ac588c472a9e310932e1f423330049002827fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=BC=9F=E4=B9=90?= Date: Thu, 2 Mar 2023 15:11:24 +0800 Subject: [PATCH] pkg --- go.mod | 2 -- go.sum | 8 ------ pkg/xstring/stringx.go | 56 ------------------------------------------ 3 files changed, 66 deletions(-) diff --git a/go.mod b/go.mod index 83c03c7..2a12190 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,6 @@ go 1.20 require ( git.diulo.com/mogfee/go-common v0.0.0-20230301071202-cc79129d6a24 - github.com/PuerkitoBio/goquery v1.8.1 github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/envoyproxy/protoc-gen-validate v0.9.1 github.com/gin-gonic/gin v1.9.0 @@ -22,7 +21,6 @@ require ( ) require ( - github.com/andybalholm/cascadia v1.3.1 // indirect github.com/bytedance/sonic v1.8.3 // indirect github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect github.com/gin-contrib/sse v0.1.0 // indirect diff --git a/go.sum b/go.sum index da97298..2e298a6 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,5 @@ git.diulo.com/mogfee/go-common v0.0.0-20230301071202-cc79129d6a24 h1:fL1oF18chI61PjnQCBy4549A5j6isNKN3gyOnNP7bLM= git.diulo.com/mogfee/go-common v0.0.0-20230301071202-cc79129d6a24/go.mod h1:Q3SH0klnjQIvM57Fi95URevaFXIhsb7DZa+ZcNEU88M= -github.com/PuerkitoBio/goquery v1.8.1 h1:uQxhNlArOIdbrH1tr0UXwdVFgDcZDrZVdcpygAcwmWM= -github.com/PuerkitoBio/goquery v1.8.1/go.mod h1:Q8ICL1kNUJ2sXGoAhPGUdYDJvgQgHzJsnnd3H7Ho5jQ= -github.com/andybalholm/cascadia v1.3.1 h1:nhxRkql1kdYCc8Snf7D5/D3spOX+dBgjA6u8x004T2c= -github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA= github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= github.com/bytedance/sonic v1.8.3 h1:pf6fGl5eqWYKkx1RcD4qpuX+BIUaduv/wTm5ekWJ80M= github.com/bytedance/sonic v1.8.3/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U= @@ -105,7 +101,6 @@ golang.org/x/image v0.5.0/go.mod h1:FVC7BI/5Ym8R25iw5OLsgshdUBbT1h5jZTpA+mvAdZ4= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= @@ -113,7 +108,6 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -124,10 +118,8 @@ golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= diff --git a/pkg/xstring/stringx.go b/pkg/xstring/stringx.go index be5b176..1769eee 100644 --- a/pkg/xstring/stringx.go +++ b/pkg/xstring/stringx.go @@ -5,7 +5,6 @@ import ( "encoding/base64" "encoding/json" "fmt" - "github.com/PuerkitoBio/goquery" "github.com/pkg/errors" "reflect" "regexp" @@ -585,61 +584,6 @@ func Base64Decode(s string) (string, error) { return string(b), nil } -func HtmlToText(body string) ([]string, error) { - body = strings.ReplaceAll(body, " ", " ") - ss := "<(.|\\n)*?>" - body = regexp.MustCompile(ss).ReplaceAllString(body, " ") - doc, err := goquery.NewDocumentFromReader(strings.NewReader(body)) - if err != nil { - return nil, errors.Wrap(err, "") - } - defer doc.Clone() - v := doc.Text() - var hzRegexp = regexp.MustCompile("^[a-zA-Z0-9\u4e00-\u9fa5]$") - var zwReg = regexp.MustCompile("^[\u4e00-\u9fa5]$") - strn := "" - ars := []string{} - for _, c := range v { - filter := false - if hzRegexp.MatchString(string(c)) { - if zwReg.MatchString(string(c)) { - strn += string(c) - filter = true - } else { - strn += string(c) - } - } else { - filter = true - } - fmt.Println(strn) - if filter && strn != "" { - ars = append(ars, strn) - strn = "" - } - } - if strn != "" { - ars = append(ars, strn) - } - return ars, nil -} -func ContentText(body string) string { - doc, err := goquery.NewDocumentFromReader(strings.NewReader(body)) - if err != nil { - return err.Error() - } - defer doc.Clone() - return doc.Text() -} -func GetPicture(pic string) string { - if pic == "" { - return "/sites/default/files/imagecache/ic50x50/avatar_selection/o2QQW.jpg.png" - } - if !strings.HasPrefix(pic, "/") { - return "/" + pic - } - return pic -} - func Ucfirst(str string) string { for i, v := range str { return string(unicode.ToUpper(v)) + str[i+1:]