From 8188bdf790629c0eeb5d9a4f8536f92b297268e8 Mon Sep 17 00:00:00 2001 From: yangyile Date: Mon, 10 Feb 2025 16:23:03 +0700 Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8D=95=E5=8D=87=E7=BA=A7=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 6 ++- .gitignore | 51 +++++++++-------------- README.md | 5 ++- go.mod | 38 +++++++++--------- go.sum | 76 +++++++++++++++++------------------ 5 files changed, 84 insertions(+), 92 deletions(-) mode change 100755 => 100644 .gitignore diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7af6886..b66f75d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,6 +42,7 @@ jobs: path-to-profile: /tmp/coverage/combined.txt flag-name: Go-${{ matrix.go }} parallel: true + if: ${{ github.event.repository.fork == false }} # 仅在非 fork 时上传覆盖率 check-coverage: name: Check coverage @@ -51,14 +52,15 @@ jobs: - uses: shogo82148/actions-goveralls@v1 with: parallel-finished: true + if: ${{ github.event.repository.fork == false }} # 仅在非 fork 时检查覆盖率 # 发布 Release release: name: Release a new version needs: [ lint, test ] runs-on: ubuntu-latest - # 仅在推送标签时执行 - if: ${{ success() && startsWith(github.ref, 'refs/tags/v') }} + # 仅在推送标签时执行 - && - 仅在非 fork 时执行发布 + if: ${{ github.event.repository.fork == false && success() && startsWith(github.ref, 'refs/tags/v') }} steps: # 1. 检出代码 - name: Checkout code diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 index 38b9fe4..6f72f89 --- a/.gitignore +++ b/.gitignore @@ -1,36 +1,25 @@ -*.a -*.so +# If you prefer the allow list template instead of the deny list, see community template: +# https://github.com/github/gitignore/blob/main/community/Golang/Go.AllowList.gitignore +# +# Binaries for programs and plugins *.exe -*.pyc -*.log +*.exe~ *.dll -*.out -*.key -_test +*.so +*.dylib + +# Test binary, built with `go test -c` *.test -*.cert -*.exe~ + +# Output of the go coverage tool, specifically when used with LiteIDE +*.out + +# Dependency directories (remove the comment below to include it) +# vendor/ + +# Go workspace file go.work -.Trash-* -.DS_Store go.work.sum -main.out.bin -*gitignore*secrets* -*gitignore*outputs* -ehthumbs.db -Thumbs.db -.gitkeep -.vscode/ -*.dylib -vendor/ -.idea/ -*.err -*.swp -_obj -tmp/ -bin/ -tags -*.DB -*.db -*.o -*~ + +# env file +.env diff --git a/README.md b/README.md index eb4d0bd..63c4c07 100644 --- a/README.md +++ b/README.md @@ -268,5 +268,6 @@ If you find this package helpful, give it a star on GitHub! Give me stars. Thank you!!! -## See stars -[![see stars](https://starchart.cc/yyle88/gormcnm.svg?variant=adaptive)](https://starchart.cc/yyle88/gormcnm) +## Starring + +[![starring](https://starchart.cc/yyle88/gormcnm.svg?variant=adaptive)](https://starchart.cc/yyle88/gormcnm) diff --git a/go.mod b/go.mod index 4e3d351..6663722 100644 --- a/go.mod +++ b/go.mod @@ -5,15 +5,15 @@ go 1.22.8 require ( github.com/pkg/errors v0.9.1 github.com/stretchr/testify v1.10.0 - github.com/yyle88/done v1.0.18 - github.com/yyle88/must v0.0.9 - github.com/yyle88/neatjson v0.0.10 - github.com/yyle88/rese v0.0.1 - github.com/yyle88/runpath v1.0.22 - github.com/yyle88/sure v0.0.33 - github.com/yyle88/syntaxgo v0.0.39 - github.com/yyle88/tern v0.0.3 - gorm.io/driver/sqlite v1.5.6 + github.com/yyle88/done v1.0.21 + github.com/yyle88/must v0.0.13 + github.com/yyle88/neatjson v0.0.11 + github.com/yyle88/rese v0.0.3 + github.com/yyle88/runpath v1.0.23 + github.com/yyle88/sure v0.0.36 + github.com/yyle88/syntaxgo v0.0.44 + github.com/yyle88/tern v0.0.5 + gorm.io/driver/sqlite v1.5.7 gorm.io/gorm v1.25.12 ) @@ -26,18 +26,18 @@ require ( github.com/mattn/go-sqlite3 v1.14.24 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/rogpeppe/go-internal v1.13.1 // indirect - github.com/yyle88/erero v1.0.14 // indirect - github.com/yyle88/formatgo v1.0.19 // indirect - github.com/yyle88/mutexmap v1.0.8 // indirect - github.com/yyle88/printgo v1.0.1 // indirect - github.com/yyle88/zaplog v0.0.16 // indirect + github.com/yyle88/erero v1.0.17 // indirect + github.com/yyle88/formatgo v1.0.22 // indirect + github.com/yyle88/mutexmap v1.0.10 // indirect + github.com/yyle88/printgo v1.0.2 // indirect + github.com/yyle88/zaplog v0.0.19 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d // indirect - golang.org/x/mod v0.22.0 // indirect - golang.org/x/sync v0.10.0 // indirect - golang.org/x/text v0.21.0 // indirect - golang.org/x/tools v0.28.0 // indirect + golang.org/x/exp v0.0.0-20250207012021-f9890c6ad9f3 // indirect + golang.org/x/mod v0.23.0 // indirect + golang.org/x/sync v0.11.0 // indirect + golang.org/x/text v0.22.0 // indirect + golang.org/x/tools v0.29.0 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index f1cda17..786642b 100644 --- a/go.sum +++ b/go.sum @@ -23,48 +23,48 @@ github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/yyle88/done v1.0.18 h1:O71T+76laNmuY1kYP8PHkp6uceoN6ABTng/8c9KpZts= -github.com/yyle88/done v1.0.18/go.mod h1:32UMgjuZP9LctfNNhBQqTyVbjggPOWpoXn8Mp0VrQbw= -github.com/yyle88/erero v1.0.14 h1:ozS3iPLIsnRPSs8AdfbA/3f3hGw5EFkJMkfA/dfI+do= -github.com/yyle88/erero v1.0.14/go.mod h1:NhP5EcPoVlShkMk1cVCFP3im5Zm+JRG35qIInMw7aeo= -github.com/yyle88/formatgo v1.0.19 h1:XgcSB8KsGLTnv7UOCVZDtrd3yJggFd2J82xG5qvmdFI= -github.com/yyle88/formatgo v1.0.19/go.mod h1:Q+JpNGVgskW2Xl+BdHXZ7r6y6TQlQOyN7/23Gu/wzoM= -github.com/yyle88/must v0.0.9 h1:LA03i1O4/6Syopma8xqJMiWfAWeehoySeUaRmdQEvKY= -github.com/yyle88/must v0.0.9/go.mod h1:5Ur4BKRx6GuW4gCZNx8Hf+iRS9lVmywSkCpxun/f+Do= -github.com/yyle88/mutexmap v1.0.8 h1:VntAdXID5wbk211LZEPVK96jQBxIcfVIbQuk9cv3P/8= -github.com/yyle88/mutexmap v1.0.8/go.mod h1:QUYDuARLPlGj414kHewQ5tt8jkDxQXoai8H3C4Gg+yc= -github.com/yyle88/neatjson v0.0.10 h1:JrBsSWnEu6vqObFT8bUJE83HDb7xYScuEiz/RZp15pM= -github.com/yyle88/neatjson v0.0.10/go.mod h1:4ENPBNVvTIB6iLv3mM02Jv/OEXANZNYDGXynSSt4kcc= -github.com/yyle88/printgo v1.0.1 h1:0lCpq28Tlf0jmYhSIlDQ7A3hAqVYswhBuURLR9xbmsw= -github.com/yyle88/printgo v1.0.1/go.mod h1:yCvpShGBkKdWX5RO+yum2gLbru9ebc04sVmuzhPKSMw= -github.com/yyle88/rese v0.0.1 h1:Eu2I+7BpbkX1n7SOu11AHVqecTuOVdg4becgt2ThGIo= -github.com/yyle88/rese v0.0.1/go.mod h1:GoPiHJPEWyeBL0DxOHT5hLnibFbav+jck/NZxLqNVI8= -github.com/yyle88/runpath v1.0.22 h1:gcyaNMNZq7yjL2Xlwvs0W7BOkzn4VJTJqA8ko7CKhKg= -github.com/yyle88/runpath v1.0.22/go.mod h1:JRGxn/0Ytg6CvGoE2VrO74oX8Lu4jbOPZDKxr8tzPEg= -github.com/yyle88/sure v0.0.33 h1:draMRRyZ3IWnXFyfKIWwH3ljWvA5Pq/X+z/fHyCbyFE= -github.com/yyle88/sure v0.0.33/go.mod h1:ep6XBfw1D5bBNsihnaWlenO8Qc8lF+vfqwDqvnZBM9Y= -github.com/yyle88/syntaxgo v0.0.39 h1:947UHHAqGsHAmS7nJ5Y/Br+yhJjTZtq1543XIizfevI= -github.com/yyle88/syntaxgo v0.0.39/go.mod h1:vR/bU2RVwvkfkQyMy30OWpdmn5jc3wrm8vcMbHQGCbc= -github.com/yyle88/tern v0.0.3 h1:Ut5p1wPAVcreEkmzDp+IiteA3K2vnTeAYE1PyBLNgjU= -github.com/yyle88/tern v0.0.3/go.mod h1:g9weyOMLtXYyt37EAshZPUTTHdH7WFauuxDi4oPr7/8= -github.com/yyle88/zaplog v0.0.16 h1:ZCxQhq3+nWeWMAXIzeA1EA4exRq5Pn8pXTpEw1GjyD4= -github.com/yyle88/zaplog v0.0.16/go.mod h1:0ct8Rh6uE5i9RG+xbH6d4/pyDBt9JmxBqHNCI+T4wiM= +github.com/yyle88/done v1.0.21 h1:KFmBJzHuPAfsOrQDz9YuwBZ9xSDH7QdkOPHJMQjZzZg= +github.com/yyle88/done v1.0.21/go.mod h1:+MY1SL3TY4SrA2/rtsqeky82DHlDcsm1q1zfIMhANu4= +github.com/yyle88/erero v1.0.17 h1:QTZh2TJA6XBXSIYDikhVn7nfG7CmEVqJ9db5n1idaGc= +github.com/yyle88/erero v1.0.17/go.mod h1:jm6rQ1TNxrgfE6VJh9Cub8RCM9dJMXVLNRBAbxJmiwY= +github.com/yyle88/formatgo v1.0.22 h1:ug5y3JigVwZ1kgTtyuNey7RRHrGlMIEJP4gkXJmgvtQ= +github.com/yyle88/formatgo v1.0.22/go.mod h1:XXql3lly9YIODohSpFKs/Yy8phxATS/NujXMoBxKs9I= +github.com/yyle88/must v0.0.13 h1:VfhoGtm6M+lTBtLS+zYoth8HDczjTXELnasRbchKD1k= +github.com/yyle88/must v0.0.13/go.mod h1:RI1P7b6Ao7EDYuBZgJYIuJcrwUxtxrTFA3UbU8xQZeg= +github.com/yyle88/mutexmap v1.0.10 h1:PIsx9KTdK6h1yH5NzBrPl21RrZ/XsE4IbgulMlhJzZE= +github.com/yyle88/mutexmap v1.0.10/go.mod h1:QUYDuARLPlGj414kHewQ5tt8jkDxQXoai8H3C4Gg+yc= +github.com/yyle88/neatjson v0.0.11 h1:sk/FDtWFHZgtiL1ywO1HkF1z4quPLGthoVemOap2bWk= +github.com/yyle88/neatjson v0.0.11/go.mod h1:jI2c/BBd6xQeK4yxCFHmDsxC8G1Yi0to/Sfp0Po7Auc= +github.com/yyle88/printgo v1.0.2 h1:SpRXNh1YGvcIDpi6fJHCD9r2znewaW/rVi2nqu65XOk= +github.com/yyle88/printgo v1.0.2/go.mod h1:M1rjoy58Q+wXBuzTNJJ0pGEwS+fV8lH7FID5qCVzHGY= +github.com/yyle88/rese v0.0.3 h1:zKlzEz9sr6MZxl5sZO4QprgD6WgDe00NOZKEOhe5D9o= +github.com/yyle88/rese v0.0.3/go.mod h1:Z/Ktyy1QNj+sksotAu8iOZZqCyuBjbY7UJU+2ou67z8= +github.com/yyle88/runpath v1.0.23 h1:VEdeaMXfvFY7CuF9Nceuxb6HSNDcmiSSGEf+zT7O900= +github.com/yyle88/runpath v1.0.23/go.mod h1:JRGxn/0Ytg6CvGoE2VrO74oX8Lu4jbOPZDKxr8tzPEg= +github.com/yyle88/sure v0.0.36 h1:Lzgkk7FMzPvdlNxuEDOJ4uUp9B0xfGtLCFs36r4do/c= +github.com/yyle88/sure v0.0.36/go.mod h1:krNSM3sRNIfT7eaD5KxhsmSg6g5b17YBfdGM/JMreUI= +github.com/yyle88/syntaxgo v0.0.44 h1:3MlktVp6jLjQdC75yunf93BBD1ChEBXJ57Q9SsU7QPs= +github.com/yyle88/syntaxgo v0.0.44/go.mod h1:P/wceuPWDCYMZCAGv8a/Zb+jUeAnGnvDlO5astXG9HY= +github.com/yyle88/tern v0.0.5 h1:a9HCJrP38VPowB3to54kOia1+Ab/ROoMJx0OXPUq3pY= +github.com/yyle88/tern v0.0.5/go.mod h1:g9weyOMLtXYyt37EAshZPUTTHdH7WFauuxDi4oPr7/8= +github.com/yyle88/zaplog v0.0.19 h1:O4g7EO+uks7DkXbBXAje0LRvrBbkPuMD4gphuXw9jAo= +github.com/yyle88/zaplog v0.0.19/go.mod h1:jN9/2IXYlpHOgoIyOTid1EPlUyGBWzFjr0dX9YKLkC0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= -golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d h1:0olWaB5pg3+oychR51GUVCEsGkeCU/2JxjBgIo4f3M0= -golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c= -golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= -golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= -golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= -golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= -golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8= -golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw= +golang.org/x/exp v0.0.0-20250207012021-f9890c6ad9f3 h1:qNgPs5exUA+G0C96DrPwNrvLSj7GT/9D+3WMWUcUg34= +golang.org/x/exp v0.0.0-20250207012021-f9890c6ad9f3/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU= +golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM= +golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= +golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w= +golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= +golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= +golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE= +golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= @@ -72,7 +72,7 @@ gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gorm.io/driver/sqlite v1.5.6 h1:fO/X46qn5NUEEOZtnjJRWRzZMe8nqJiQ9E+0hi+hKQE= -gorm.io/driver/sqlite v1.5.6/go.mod h1:U+J8craQU6Fzkcvu8oLeAQmi50TkwPEhHDEjQZXDah4= +gorm.io/driver/sqlite v1.5.7 h1:8NvsrhP0ifM7LX9G4zPB97NwovUakUxc+2V2uuf3Z1I= +gorm.io/driver/sqlite v1.5.7/go.mod h1:U+J8craQU6Fzkcvu8oLeAQmi50TkwPEhHDEjQZXDah4= gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8= gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=