Skip to content

Commit fc48816

Browse files
honwenhonwen
committed
bump deps
1 parent 9ba9942 commit fc48816

File tree

6 files changed

+48
-92
lines changed

6 files changed

+48
-92
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
- uses: actions/setup-go@v3
2020
with:
21-
go-version: '1.20.4'
21+
go-version: '1.20.6'
2222

2323
- name: Prepare environment
2424
run: |-

‎go.mod‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ go 1.20
55
require (
66
// locked before tracing/logging https://github.com/denverdino/aliyungo/commits/master/go.mod
77
github.com/denverdino/aliyungo v0.0.0-20220321085828-46dabbd9e212
8-
github.com/honwen/golibs v0.4.6
9-
github.com/honwen/ip2loc v0.2.9
10-
github.com/urfave/cli v1.22.13
11-
github.com/ysmood/got v0.34.1
8+
github.com/honwen/golibs v0.4.7
9+
github.com/honwen/ip2loc v0.3.0
10+
github.com/urfave/cli v1.22.14
11+
github.com/ysmood/got v0.34.2
1212
)
1313

1414
require (
15-
github.com/AdguardTeam/golibs v0.13.2 // indirect
15+
github.com/AdguardTeam/golibs v0.13.6 // indirect
1616
github.com/PuerkitoBio/goquery v1.8.1 // indirect
1717
github.com/Workiva/go-datastructures v1.1.0 // indirect
1818
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
@@ -25,7 +25,7 @@ require (
2525
github.com/golang/mock v1.6.0 // indirect
2626
github.com/google/pprof v0.0.0-20221219190121-3cb0bae90811 // indirect
2727
github.com/miekg/dns v1.1.54 // indirect
28-
github.com/mr-karan/doggo v0.5.5 // indirect
28+
github.com/mr-karan/doggo v0.5.6 // indirect
2929
github.com/onsi/ginkgo/v2 v2.6.1 // indirect
3030
github.com/quic-go/qtls-go1-18 v0.2.0 // indirect
3131
github.com/quic-go/qtls-go1-19 v0.2.0 // indirect
@@ -35,12 +35,12 @@ require (
3535
github.com/sirupsen/logrus v1.9.0 // indirect
3636
github.com/tidwall/pretty v1.2.1 // indirect
3737
github.com/ysmood/gop v0.0.2 // indirect
38-
golang.org/x/crypto v0.4.0 // indirect
39-
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
40-
golang.org/x/mod v0.8.0 // indirect
41-
golang.org/x/net v0.8.0 // indirect
42-
golang.org/x/sys v0.6.0 // indirect
43-
golang.org/x/text v0.8.0 // indirect
38+
golang.org/x/crypto v0.11.0 // indirect
39+
golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect
40+
golang.org/x/mod v0.11.0 // indirect
41+
golang.org/x/net v0.12.0 // indirect
42+
golang.org/x/sys v0.10.0 // indirect
43+
golang.org/x/text v0.11.0 // indirect
4444
golang.org/x/tools v0.6.0 // indirect
4545
)
4646

‎go.sum‎

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D
99
git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
1010
github.com/AdguardTeam/golibs v0.10.9/go.mod h1:W+5rznZa1cSNSFt+gPS7f4Wytnr9fOrd5ZYqwadPw14=
1111
github.com/AdguardTeam/golibs v0.11.3/go.mod h1:87bN2x4VsTritptE3XZg9l8T6gznWsIxHBcQ1DeRIXA=
12-
github.com/AdguardTeam/golibs v0.13.2 h1:BPASsyQKmb+b8VnvsNOHp7bKfcZl9Z+Z2UhPjOiupSc=
13-
github.com/AdguardTeam/golibs v0.13.2/go.mod h1:7ylQLv2Lqsc3UW3jHoITynYk6Y1tYtgEMkR09ppfsN8=
12+
github.com/AdguardTeam/golibs v0.13.6 h1:z/0Q25pRLdaQxtoxvfSaooz5mdv8wj0R8KREj54q8yQ=
13+
github.com/AdguardTeam/golibs v0.13.6/go.mod h1:hOtcb8dPfKcFjWTPA904hTA4dl1aWvzeebdJpE72IPk=
1414
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
15-
github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
15+
github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
1616
github.com/PuerkitoBio/goquery v1.8.1 h1:uQxhNlArOIdbrH1tr0UXwdVFgDcZDrZVdcpygAcwmWM=
1717
github.com/PuerkitoBio/goquery v1.8.1/go.mod h1:Q8ICL1kNUJ2sXGoAhPGUdYDJvgQgHzJsnnd3H7Ho5jQ=
1818
github.com/Workiva/go-datastructures v1.1.0 h1:hu20UpgZneBhQ3ZvwiOGlqJSKIosin2Rd5wAKUHEO/k=
@@ -197,10 +197,10 @@ github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKe
197197
github.com/hjson/hjson-go/v4 v4.0.0/go.mod h1:KaYt3bTw3zhBjYqnXkYywcYctk0A2nxeEFTse3rH13E=
198198
github.com/honwen/doggo v0.0.0-20230203023054-7db5c2144fa4 h1:C9mhXGXDHGvXtUWpxAqNaDTwRrerMHDncLG9gM7koKs=
199199
github.com/honwen/doggo v0.0.0-20230203023054-7db5c2144fa4/go.mod h1:nUO7lfZiqarb3xs+XOMZ4OkVgAJWRoMwAAndrqm/bPw=
200-
github.com/honwen/golibs v0.4.6 h1:O0lue7+V38yROcjeyYxWk8QADa9QzHWf9F8aZBSP0kM=
201-
github.com/honwen/golibs v0.4.6/go.mod h1:zdbfGVNIRsX9XYIhH83FFGPWoE7FdEpSbaNMehZsXqs=
202-
github.com/honwen/ip2loc v0.2.9 h1:L+RweytFvylWymTserkpmrUebeQp3Sw68fzh2JQ40gs=
203-
github.com/honwen/ip2loc v0.2.9/go.mod h1:6oFeAO+QelQwUAYLXQivNQlSqqHSdWGwRykdhgba0nc=
200+
github.com/honwen/golibs v0.4.7 h1:v1cDIs6z5Y5hh5GRg52zmDXZwj0vFTmOoxXZDTngJw0=
201+
github.com/honwen/golibs v0.4.7/go.mod h1:okdLYeRk64tnMGTXK4LDzulCexx4KOtIAyNMY5+MoA0=
202+
github.com/honwen/ip2loc v0.3.0 h1:FVoxjr7peyFw/aMd0vKIKWTzJACs9jzo7O6mQqNNAtw=
203+
github.com/honwen/ip2loc v0.3.0/go.mod h1:ri2DQ7QNtPBZk7DmJi60fOrX5De4N2OKNtbFbAU4sf4=
204204
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
205205
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
206206
github.com/ianlancetaylor/demangle v0.0.0-20220319035150-800ac71e25c2/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w=
@@ -391,21 +391,21 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
391391
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
392392
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
393393
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
394-
github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
395-
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
394+
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
395+
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
396396
github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
397397
github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
398398
github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
399399
github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg=
400400
github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31/go.mod h1:onvgF043R+lC5RZ8IT9rBXDaEDnpnw/Cl+HFiw+v/7Q=
401-
github.com/urfave/cli v1.22.13 h1:wsLILXG8qCJNse/qAgLNf23737Cx05GflHg/PJGe1Ok=
402-
github.com/urfave/cli v1.22.13/go.mod h1:VufqObjsMTF2BBwKawpx9R8eAneNEWhoO0yx8Vd+FkE=
401+
github.com/urfave/cli v1.22.14 h1:ebbhrRiGK2i4naQJr+1Xj92HXZCrK7MsyTS/ob3HnAk=
402+
github.com/urfave/cli v1.22.14/go.mod h1:X0eDS6pD6Exaclxm99NJ3FiCDRED7vIHpx2mDOHLvkA=
403403
github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU=
404404
github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM=
405405
github.com/ysmood/gop v0.0.2 h1:VuWweTmXK+zedLqYufJdh3PlxDNBOfFHjIZlPT2T5nw=
406406
github.com/ysmood/gop v0.0.2/go.mod h1:rr5z2z27oGEbyB787hpEcx4ab8cCiPnKxn0SUHt6xzk=
407-
github.com/ysmood/got v0.34.1 h1:IrV2uWLs45VXNvZqhJ6g2nIhY+pgIG1CUoOcqfXFl1s=
408-
github.com/ysmood/got v0.34.1/go.mod h1:yddyjq/PmAf08RMLSwDjPyCvHvYed+WjHnQxpH851LM=
407+
github.com/ysmood/got v0.34.2 h1:oN4DDWwpN5BdNPqYtOIW8a13CsAdzTOECTND7pQQ148=
408+
github.com/ysmood/got v0.34.2/go.mod h1:yddyjq/PmAf08RMLSwDjPyCvHvYed+WjHnQxpH851LM=
409409
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
410410
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
411411
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
@@ -431,14 +431,15 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
431431
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
432432
golang.org/x/crypto v0.0.0-20220826181053-bd7e27e6170d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
433433
golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
434-
golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8=
435434
golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
435+
golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA=
436+
golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
436437
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
437438
golang.org/x/exp v0.0.0-20221019170559-20944726eadf/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
438439
golang.org/x/exp v0.0.0-20221205204356-47842c84f3db/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
439440
golang.org/x/exp v0.0.0-20221230185412-738e83a70c30/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
440-
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=
441-
golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
441+
golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 h1:MGwJjxBy0HJshjDNfLsYO8xppfqWlA5ZT9OhtUUhTNw=
442+
golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
442443
golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
443444
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
444445
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -452,8 +453,9 @@ golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2
452453
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
453454
golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
454455
golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
455-
golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
456456
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
457+
golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU=
458+
golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
457459
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
458460
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
459461
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -491,8 +493,9 @@ golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
491493
golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
492494
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
493495
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
494-
golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
495-
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
496+
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
497+
golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50=
498+
golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
496499
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
497500
golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
498501
golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -569,15 +572,17 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
569572
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
570573
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
571574
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
572-
golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
573-
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
575+
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
576+
golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
577+
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
574578
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
575579
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
576580
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
577581
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
578582
golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
579583
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
580-
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
584+
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
585+
golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
581586
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
582587
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
583588
golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
@@ -589,8 +594,9 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
589594
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
590595
golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
591596
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
592-
golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
593-
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
597+
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
598+
golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
599+
golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
594600
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
595601
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
596602
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

‎main.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
dns "github.com/honwen/aliyun-ddns-cli/alidns"
1919
"github.com/honwen/golibs/cip"
2020
"github.com/honwen/golibs/domain"
21+
"github.com/honwen/ip2loc"
2122
"github.com/urfave/cli"
2223
)
2324

@@ -295,7 +296,7 @@ func main() {
295296
if err := accessKey.CheckAndUpdateRecord(rr, domain, c.String("ipaddr"), recordType, c.Int("ttl")); err != nil {
296297
log.Printf("%+v", err)
297298
} else {
298-
log.Println(c.String("domain"), c.String("ipaddr"), ip2locCN(c.String("ipaddr")))
299+
log.Println(c.String("domain"), c.String("ipaddr"), ip2loc.IP2locCHS(c.String("ipaddr")))
299300
}
300301
return nil
301302
},
@@ -356,7 +357,7 @@ func main() {
356357
if err := accessKey.CheckAndUpdateRecord(rr, domain, autoip, recordType, c.Int("ttl")); err != nil {
357358
log.Printf("# Err-CheckAndUpdateRecord: [%+v]", err)
358359
} else {
359-
log.Println(c.String("domain"), autoip, ip2locCN(autoip))
360+
log.Println(c.String("domain"), autoip, ip2loc.IP2locCHS(autoip))
360361
}
361362
}
362363
if redoDurtion < 10 {
@@ -381,7 +382,7 @@ func main() {
381382
}
382383
// fmt.Println(c.Command.Name, "task: ", c.Command.Usage)
383384
ip := myip()
384-
fmt.Println(ip, ip2locCN(ip))
385+
fmt.Println(ip, ip2loc.IP2locCHS(ip))
385386
return nil
386387
},
387388
},
@@ -402,7 +403,7 @@ func main() {
402403
}
403404
// fmt.Println(c.Command.Name, "task: ", c.Command.Usage)
404405
ip := reslove(c.String("domain"))
405-
fmt.Println(ip, ip2locCN(ip))
406+
fmt.Println(ip, ip2loc.IP2locCHS(ip))
406407
return nil
407408
},
408409
},

‎utils.go‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,9 @@ package main
22

33
import (
44
"errors"
5-
"fmt"
6-
"log"
75
"reflect"
8-
"strings"
96

107
"github.com/honwen/golibs/cip"
11-
"github.com/honwen/ip2loc"
128
)
139

1410
var funcs = map[string]interface{}{
@@ -25,24 +21,6 @@ func contains(slice []string, item string) bool {
2521
return ok
2622
}
2723

28-
func ip2locCN(ip string) (str string) {
29-
if strings.Count(ip, `.`) < 3 {
30-
return
31-
}
32-
if loc, err := ip2loc.IP2loc(ip); err != nil {
33-
log.Printf("%+v", err)
34-
} else {
35-
str = fmt.Sprintf("[%s %s %s %s]", loc.CountryName, loc.RegionName, loc.CityName, loc.IspDomain)
36-
for strings.Contains(str, " ]") {
37-
str = strings.ReplaceAll(str, " ]", "]")
38-
}
39-
for strings.Contains(str, " ") {
40-
str = strings.ReplaceAll(str, " ", " ")
41-
}
42-
}
43-
return
44-
}
45-
4624
func Call(m map[string]interface{}, name string, params ...interface{}) (result []reflect.Value, err error) {
4725
f := reflect.ValueOf(m[name])
4826
if len(params) != f.Type().NumIn() {

‎utils_test.go‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,35 +9,6 @@ import (
99
"github.com/ysmood/got"
1010
)
1111

12-
func TestIp2locCN_Loop(t *testing.T) {
13-
for i := 1; i < 99999; i++ {
14-
got.T(t).Eq(ip2locCN("202.96.128.86"), "[中国 广东 广州 电信]")
15-
}
16-
}
17-
18-
func TestIp2locCN(t *testing.T) {
19-
got.T(t).Eq(ip2locCN(""), "")
20-
got.T(t).Eq(ip2locCN("202.96.128.86"), "[中国 广东 广州 电信]")
21-
got.T(t).Eq(ip2locCN("202.96.209.133"), "[中国 上海 上海 电信]")
22-
got.T(t).Eq(ip2locCN("219.141.136.10"), "[中国 北京 北京 电信]")
23-
24-
got.T(t).Eq(ip2locCN("210.22.70.3"), "[中国 上海 上海 联通]")
25-
got.T(t).Eq(ip2locCN("123.123.123.123"), "[中国 北京 北京 联通]")
26-
27-
got.T(t).Eq(ip2locCN("223.87.238.22"), "[中国 四川 成都 移动]")
28-
29-
got.T(t).Eq(ip2locCN("101.6.6.6"), "[中国 北京 北京 教育网]")
30-
31-
got.T(t).Eq(ip2locCN("168.95.1.1"), "[中国 台湾 中华电信]")
32-
got.T(t).Eq(ip2locCN("202.67.240.222"), "[中国 香港]")
33-
34-
got.T(t).Eq(ip2locCN("203.189.136.148"), "[柬埔寨 柬埔寨]")
35-
got.T(t).Eq(ip2locCN("203.112.2.4"), "[日本 日本]")
36-
got.T(t).Eq(ip2locCN("80.80.80.80"), "[荷兰 荷兰]")
37-
got.T(t).Eq(ip2locCN("74.82.42.42"), "[美国 加利福尼亚州]")
38-
39-
}
40-
4112
func TestGetIPv4(t *testing.T) {
4213
funcs["myip"] = cip.MyIPv4
4314
ip4 := myip()

0 commit comments

Comments
 (0)