修改Jenkins file

.vscode/settings.json

@@ -7,7 +7,7 @@
   "go.useLanguageServer": true,
   "[go]": {
     "editor.codeActionsOnSave": {
-      "source.organizeImports": true
+      "source.organizeImports": "explicit"
     }
   },
   "go.autocompleteUnimportedPackages": true,

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}"

go.mod

@@ -1,42 +1,15 @@
 module github.com/jinmukeji/plat-pkg/v2
 
-go 1.16
+go 1.12
 
 replace (
 	// FIXME: 由于 etcd 与 gRPC 的兼容问题，暂时使用定制的 etcd 版本
-	//  https://github.com/etcd-io/etcd/issues/11721
-	//  https://github.com/etcd-io/etcd/issues/11154
-	//  https://github.com/etcd-io/etcd/pull/11823
+	// https://github.com/etcd-io/etcd/issues/11721
 	github.com/coreos/etcd => github.com/skyjia/etcd v3.3.22-grpc1.27-origmodule+incompatible
-
-	// cli包缺失移植到金姆健康
 	github.com/micro/cli/v2 => github.com/jinmukeji/jm-micro/v2 v2.0.0
 
-	// FIXME: etcd 与 grpc 1.30+ 版本不兼容，此处降级到 v0.15.2
-	github.com/smallstep/cli => github.com/smallstep/cli v0.15.2
-	// FIXME: etcd 与 grpc 1.30+ 版本不兼容，此处降级到 1.29
-	google.golang.org/grpc => google.golang.org/grpc v1.29.1
+	github.com/micro/go-micro/v2 => github.com/micro/go-micro/v2 v2.8.0
+	github.com/micro/micro/v2 => github.com/micro/micro/v2 v2.8.0
+	google.golang.org/grpc => google.golang.org/grpc v1.26.0
 )
 
-require (
-	github.com/coreos/etcd v3.3.27+incompatible
-	github.com/dgrijalva/jwt-go v3.2.0+incompatible
-	github.com/gin-gonic/gin v1.8.1
-	github.com/go-micro/plugins/v2/logger/logrus v0.0.0-20220711144004-e3081cf21c80
-	github.com/go-micro/plugins/v2/micro/cors v0.0.0-20220711144004-e3081cf21c80
-	github.com/go-micro/plugins/v2/micro/metadata v0.0.0-20220711144004-e3081cf21c80
-	github.com/go-micro/plugins/v2/wrapper/service v0.0.0-20220711144004-e3081cf21c80
-	github.com/go-sql-driver/mysql v1.6.0
-	github.com/gobwas/glob v0.2.3
-	github.com/jinmukeji/go-pkg/v2 v2.6.0
-	github.com/jinzhu/gorm v1.9.16
-	github.com/micro/cli/v2 v2.1.2
-	github.com/micro/go-micro/v2 v2.9.1
-	github.com/micro/micro/v2 v2.9.3
-	github.com/rs/xid v1.4.0
-	github.com/sirupsen/logrus v1.8.1
-	github.com/smallstep/cli v0.15.0
-	github.com/stretchr/testify v1.8.0
-	google.golang.org/grpc v1.44.0
-	gopkg.in/yaml.v2 v2.4.0
-)

jenkins_ci/ci_build.sh

@@ -1,3 +1,4 @@
-CUR=`dirname $0`
+#!/bin/bash
+CUR=$(dirname $0)
 cd ${CUR}/..
 make build

jenkins_ci/ci_format.sh

@@ -1,5 +1,6 @@
+#!/bin/bash
 # 代码格式化
-CUR=`dirname $0`
+CUR=$(dirname $0)
 cd ${CUR}/..
 set -e
 make format

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."[email protected]:".insteadOf "https://github.com/"
+go mod tidy
+go install golang.org/x/tools/cmd/goimports@latest
+go install github.com/goreleaser/goreleaser/v2@latest

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

jenkins_ci/ci_start_services.sh

@@ -1,26 +1,27 @@
+#!/bin/bash
 # 启动服务
 pip3 install awscli --upgrade --user
 export PATH=/root/.local/bin/:$PATH
 aws --version
 #docker login
-$( aws ecr get-login --no-include-email)
+$(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`
+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
+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配置信息注入
@@ -30,9 +31,9 @@ tar -zxvf etcddump_0.1.3_Linux_x86_64.tar.gz
 #     etcddump dump \
 # 	--address=127.0.0.1:2379 \
 # 	--prefix="/micro/config/jm" \
-# 	--output=test.out  
+# 	--output=test.out
 # #这个命令将配置dump到test.out文件
 #通过restore导入配置信息
 ./etcddump restore \
-	--address=${DOCKER_HOST_IP}:2379 \
-	--file=test.out
+    --address=${DOCKER_HOST_IP}:2379 \
+    --file=test.out

jenkins_ci/ci_stop_services.sh

@@ -1,5 +1,6 @@
+#!/bin/bash
 #关闭服务
-CUR=`dirname $0`
+CUR=$(dirname $0)
 cd ${CUR}/..
 docker stop etcd || echo "etcd stop"
 docker network rm default_network || echo "default_network stop"

jenkins_ci/ci_unittest.sh

@@ -1,4 +1,5 @@
+#!/bin/bash
 #单元测试
-CUR=`dirname $0`
+CUR=$(dirname $0)
 cd ${CUR}/..
 ETCD_ADDR=${DOCKER_HOST_IP}:2379 make test