diff --git a/Jenkinsfile b/Jenkinsfile index b31e989..51ea2e5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,7 +2,7 @@ pipeline{ agent any environment { - GOROOT="/var/jenkins_home/tools/org.jenkinsci.plugins.golang.GolangInstallation/Go1.13" + GOROOT="/var/jenkins_home/tools/org.jenkinsci.plugins.golang.GolangInstallation/go_1.22/go" GOPATH="/var/go" GOBIN="${env.GOPATH}/bin" PATH="${env.GOBIN}:${env.GOROOT}/bin:${env.PATH}" @@ -38,21 +38,12 @@ pipeline{ sh label: '', script: '$PROJECT/jenkins_ci/ci_build.sh' } } - stage('服务数据准备'){ - steps{ - sh label: '', script: '$PROJECT/jenkins_ci/ci_start_services.sh' - } - } - stage('单元测试'){ - steps{ - sh label: '', script: '$PROJECT/jenkins_ci/ci_unittest.sh' - } - } + } post { always { - sh label: '', script: '$PROJECT/jenkins_ci/ci_stop_services.sh' + sh label: '', script: '' } success { emailext ( diff --git a/go.mod b/go.mod index b11cdc2..ef4747b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module github.com/jinmukeji/plat-pkg/v4 -go 1.18 +go 1.21 + +toolchain go1.23.0 replace ( golang.org/x/crypto => golang.org/x/crypto v0.21.0 diff --git a/go.sum b/go.sum index dfcc4f4..e22e4bd 100644 --- a/go.sum +++ b/go.sum @@ -39,7 +39,9 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg= github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= github.com/evanphx/json-patch/v5 v5.5.0 h1:bAmFiUJ+o0o2B4OiTFeE3MqCOtyo+jjPP9iZ0VRxYUc= +github.com/evanphx/json-patch/v5 v5.5.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= @@ -55,6 +57,7 @@ github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0= github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= github.com/go-acme/lego/v4 v4.4.0 h1:uHhU5LpOYQOdp3aDU+XY2bajseu8fuExphTL1Ss6/Fc= +github.com/go-acme/lego/v4 v4.4.0/go.mod h1:l3+tFUFZb590dWcqhWZegynUthtaHJbG2fevUpoOOE0= github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4= github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E= github.com/go-git/go-billy/v5 v5.2.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= @@ -77,9 +80,11 @@ github.com/go-micro/plugins/v4/registry/etcd v1.2.0/go.mod h1:CQeTHkjN3xMtIQsyna github.com/go-micro/plugins/v4/server/grpc v1.2.0 h1:lXfM+/0oE/u1g0hVBYsvbP4lYOYXYOmwf5qH7ghi7Cc= github.com/go-micro/plugins/v4/server/grpc v1.2.0/go.mod h1:+Ah9Pf/vMSXxBM3fup/hc3N+zN2as3nIpcRaR4sBjnY= github.com/go-micro/plugins/v4/transport/grpc v1.1.0 h1:mXfDYfFQLnVDzjGY3o84oe4prfux9h8txsnA19dKsj8= +github.com/go-micro/plugins/v4/transport/grpc v1.1.0/go.mod h1:J5xMp70xXZzm8yafICrDrWaUDd8Gwy8vt0xif7NcOPg= github.com/go-micro/plugins/v4/wrapper/service v1.2.0 h1:oR94tOsxm7Gi2y5uQPgb1TGcK0/GVjHeJz5xH0tiTgU= github.com/go-micro/plugins/v4/wrapper/service v1.2.0/go.mod h1:dVQKnbuVwHhuvXxYQZqNuIV3ldpXIf+fTIJvk3VHrkg= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= +github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= @@ -91,8 +96,11 @@ github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU= +github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM= github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og= +github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/ws v1.0.4 h1:5eXU1CZhpQdq5kXbKb+sECH5Ia5KiO6CYzIzdlVx6Bs= +github.com/gobwas/ws v1.0.4/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -102,10 +110,12 @@ github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= +github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= @@ -131,6 +141,7 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -178,6 +189,7 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smallstep/assert v0.0.0-20200723003110-82e2b9b3b262 h1:unQFBIznI+VYD1/1fApl1A+9VcBk+9dcqGfnePY87LY= +github.com/smallstep/assert v0.0.0-20200723003110-82e2b9b3b262/go.mod h1:MyOHs9Po2fbM1LHej6sBUT8ozbxmMOFG+E+rx/GSGuc= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= @@ -280,6 +292,7 @@ golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA= +golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= 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.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= @@ -306,6 +319,7 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go. google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= google.golang.org/grpc/examples v0.0.0-20211102180624-670c133e568e h1:m7aQHHqd0q89mRwhwS9Bx2rjyl/hsFAeta+uGrHsQaU= +google.golang.org/grpc/examples v0.0.0-20211102180624-670c133e568e/go.mod h1:gID3PKrg7pWKntu9Ss6zTLJ0ttC0X9IHgREOCZwbCVU= google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/jenkins_ci/ci_build.sh b/jenkins_ci/ci_build.sh index 3cc549c..899e18c 100755 --- a/jenkins_ci/ci_build.sh +++ b/jenkins_ci/ci_build.sh @@ -1,3 +1,4 @@ -CUR=`dirname $0` +#!/bin/bash +CUR=$(dirname $0) cd ${CUR}/.. make build diff --git a/jenkins_ci/ci_format.sh b/jenkins_ci/ci_format.sh index a200535..5ac8dc2 100755 --- a/jenkins_ci/ci_format.sh +++ b/jenkins_ci/ci_format.sh @@ -1,5 +1,6 @@ +#!/bin/bash # 代码格式化 -CUR=`dirname $0` +CUR=$(dirname $0) cd ${CUR}/.. set -e make format diff --git a/jenkins_ci/ci_init.sh b/jenkins_ci/ci_init.sh index 863afca..87d6235 100755 --- a/jenkins_ci/ci_init.sh +++ b/jenkins_ci/ci_init.sh @@ -1,8 +1,13 @@ +#!/bin/bash # 初始化项目 go version # set -e -GO111MODULE=off go get -u github.com/golangci/golangci-lint/cmd/golangci-lint -CUR=`dirname $0` +CUR=$(dirname $0) cd ${CUR}/.. -# go mod download -make setup +curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | bash -s -- -b $GOPATH/bin v1.59.1 +golangci-lint --version + +git config --global --add url."git@github.com:".insteadOf "https://github.com/" +go mod tidy +go install golang.org/x/tools/cmd/goimports@latest +go install github.com/goreleaser/goreleaser/v2@latest diff --git a/jenkins_ci/ci_lint.sh b/jenkins_ci/ci_lint.sh index 5383a3d..580466a 100755 --- a/jenkins_ci/ci_lint.sh +++ b/jenkins_ci/ci_lint.sh @@ -1,4 +1,10 @@ +#!/bin/bash # 静态代码分析 -CUR=`dirname $0` +CUR=$(dirname $0) cd ${CUR}/.. +go get -u github.com/golang/protobuf/{proto,protoc-gen-go} +go get -u google.golang.org/grpc +go mod vendor +export GO111MODULE=on + make lint diff --git a/jenkins_ci/ci_start_services.sh b/jenkins_ci/ci_start_services.sh deleted file mode 100755 index 3fa1d06..0000000 --- a/jenkins_ci/ci_start_services.sh +++ /dev/null @@ -1,38 +0,0 @@ -# 启动服务 -pip3 install awscli --upgrade --user -export PATH=/root/.local/bin/:$PATH -aws --version -#docker login -$( aws ecr get-login --no-include-email) -#关闭已开启的服务 -docker stop etcd || echo "etcd stop" -docker network rm default_network || echo "default_network stop" -CUR=`dirname $0` -cd ${CUR}/ -docker network create default_network -# 启动etcd -docker run \ - -d \ - --rm \ - -p 2379:2379 \ - -p 2380:2380 \ - --name etcd \ - --network=default_network \ - --env ALLOW_NONE_AUTHENTICATION=yes \ - --env ETCD_ADVERTISE_CLIENT_URLS=http://etcd:2379 \ - bitnami/etcd:latest -cd ${CUR}/../jenkins_ci -sleep 2s -# 将etcd配置信息注入 -wget https://s3.cn-north-1.amazonaws.com.cn/res.jinmuhealth.com/download/tools/etcddump/etcddump_0.1.3_Linux_x86_64.tar.gz -tar -zxvf etcddump_0.1.3_Linux_x86_64.tar.gz -# 在本地Deployment-config-kv下local ,执行put-etcd-all.sh ,通过 -# etcddump dump \ -# --address=127.0.0.1:2379 \ -# --prefix="/micro/config/jm" \ -# --output=test.out -# #这个命令将配置dump到test.out文件 -#通过restore导入配置信息 -./etcddump restore \ - --address=${DOCKER_HOST_IP}:2379 \ - --file=test.out diff --git a/jenkins_ci/ci_stop_services.sh b/jenkins_ci/ci_stop_services.sh deleted file mode 100755 index f8d1ff3..0000000 --- a/jenkins_ci/ci_stop_services.sh +++ /dev/null @@ -1,5 +0,0 @@ -#关闭服务 -CUR=`dirname $0` -cd ${CUR}/.. -docker stop etcd || echo "etcd stop" -docker network rm default_network || echo "default_network stop" diff --git a/jenkins_ci/ci_unittest.sh b/jenkins_ci/ci_unittest.sh deleted file mode 100755 index e09f47d..0000000 --- a/jenkins_ci/ci_unittest.sh +++ /dev/null @@ -1,4 +0,0 @@ -#单元测试 -CUR=`dirname $0` -cd ${CUR}/.. -ETCD_ADDR=${DOCKER_HOST_IP}:2379 make test