feat:make

Makefile

@@ -1,6 +1,12 @@
 SHELL=cmd
-.PHONY: all
-all:  fmt tidy lint
+.PHONY: all clean check lint cover build_api_win build_rpc_win help
+
+all:clean check cover
+
+modInit:  go mod init userCenter
+
+modTidy: go mod tidy
+
 genRpc:
 	cd rpc &&  goctl rpc protoc userCenter.proto --go_out=. --go-grpc_out=. --zrpc_out=.
 	@echo "===========> genRpc finish"
@@ -9,17 +15,77 @@ genApi:
 	cd api/ && goctl api go -api userCenter.api -dir .
 	@echo "===========> genApi finish"
 
-fmt:
-	go fmt ./...
+#格式化动作
+check:
+	#格式化代码
+	go fmt ./
 	@echo "===========> fmt finish"
-tidy:
-	go mod tidy
-	@echo "===========> tidy finish"
+	#一般错误检查
+	go vet ./
+	@echo "===========> vet finish"
+	#会把指定代码包的所有Go语言源码文件中的旧版本代码修正为新版本的代码。这里所说的版本即Go语言的版本
+	go fix ./
+	@echo "===========> fix finish"
 
+#跑静态分析
 lint:
-	@echo "===========> Run golangci to lint source codes"
-	@golangci-lint run
+	golangcli-lint run --enable-all
+
+#定义变量
+API_LINUX_FILE=./api/userCenter_linux
+API_WIN_FILE=./api/userCenter.exe
+RPC_LINUX_FILE=./rpc/userCenter_linux
+RPC_WIN_FILE=./rpc/userCenter.exe
+
+#编译api--linux
+build_api_linux:
+	SET GOARCH=amd64
+	SET GOOS=linux
+	go build -ldflags="-s -w" -o ${API_LINUX_FILE} ./api/usercenter.go
+
+#编辑api--win
+build_api_win:
+	go build -ldflags="-s -w"  -o ${API_WIN_FILE} ./api/usercenter.go
+
+#编译rpc--linux
+build_rpc_linux:
+	SET GOOS=linux
+	SET GOARCH=amd64
+	go build -ldflags="-s -w" -o ${RPC_LINUX_FILE} ./rpc/usercenter.go
 
+#编辑rpc--win
+build_rpc_win:
+	go build -ldflags="-s -w"  -o ${RPC_WIN_FILE} ./rpc/usercenter.go
+
+#单元测试覆盖率
 cover:
 	@echo "===========> Run go test "
-	cd service/ &&  go test -v -covermode=set -coverprofile=test_cover.out && go tool cover -html=test_cover.out -o coverage.html
+	cd service/ &&  go test -v -covermode=set -coverprofile=test_cover.out && go tool cover -html=test_cover.out -o coverage.html
+
+#清理
+clean:
+	go clean
+	rm -rf ./rpc/*.exe
+	rm -rf ./api/*.exe
+
+#显示帮助
+help:
+	@echo "make all 执行"
+	@echo "make modInit 初始化go.mod文件"
+	@echo "make modTidy 更新go.mod"
+	@echo "make genRpc 初始rpc"
+	@echo "make genApi 初始化api"
+	@echo "make check fmt、vet、fix代码静态检查"
+	@echo "make lint lint代码静态走查"
+	@echo "make build_api_mac 编译api->Mac可执行文件"
+	@echo "make build_api_linux 编译api->Linux可执行文件"
+	@echo "make build_api_win 编译api->windows可执行文件"
+	@echo "make build_rpc_mac 编译rpc->Mac可执行文件"
+	@echo "make build_rpc_linux 编译rpc->Linux可执行文件"
+	@echo "make build_rpc_win 编译rpc->windows可执行文件"
+	@echo "make cover 单元测试用例覆盖率"
+	@echo "make clean 清理"
+
+
+
+

api/internal/handler/checkenthandler.go

@@ -3,10 +3,10 @@ package handler
 import (
 	"net/http"
 
+	"github.com/zeromicro/go-zero/rest/httpx"
 	"userCenter/api/internal/logic"
 	"userCenter/api/internal/svc"
 	"userCenter/api/internal/types"
-	"github.com/zeromicro/go-zero/rest/httpx"
 )
 
 func CheckEntHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {

api/internal/handler/entauthhandler.go

@@ -3,10 +3,10 @@ package handler
 import (
 	"net/http"
 
+	"github.com/zeromicro/go-zero/rest/httpx"
 	"userCenter/api/internal/logic"
 	"userCenter/api/internal/svc"
 	"userCenter/api/internal/types"
-	"github.com/zeromicro/go-zero/rest/httpx"
 )
 
 func EntAuthHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {

api/internal/handler/entinfohandler.go

@@ -3,10 +3,10 @@ package handler
 import (
 	"net/http"
 
+	"github.com/zeromicro/go-zero/rest/httpx"
 	"userCenter/api/internal/logic"
 	"userCenter/api/internal/svc"
 	"userCenter/api/internal/types"
-	"github.com/zeromicro/go-zero/rest/httpx"
 )
 
 func EntInfoHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {

api/internal/handler/entlisthandler.go

@@ -3,10 +3,10 @@ package handler
 import (
 	"net/http"
 
+	"github.com/zeromicro/go-zero/rest/httpx"
 	"userCenter/api/internal/logic"
 	"userCenter/api/internal/svc"
 	"userCenter/api/internal/types"
-	"github.com/zeromicro/go-zero/rest/httpx"
 )
 
 func EntListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {

api/internal/handler/examinehandler.go

@@ -3,10 +3,10 @@ package handler
 import (
 	"net/http"
 
+	"github.com/zeromicro/go-zero/rest/httpx"
 	"userCenter/api/internal/logic"
 	"userCenter/api/internal/svc"
 	"userCenter/api/internal/types"
-	"github.com/zeromicro/go-zero/rest/httpx"
 )
 
 func ExamineHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {

api/internal/handler/updateenthandler.go

@@ -3,10 +3,10 @@ package handler
 import (
 	"net/http"
 
+	"github.com/zeromicro/go-zero/rest/httpx"
 	"userCenter/api/internal/logic"
 	"userCenter/api/internal/svc"
 	"userCenter/api/internal/types"
-	"github.com/zeromicro/go-zero/rest/httpx"
 )
 
 func UpdateEntHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {

api/internal/logic/useraddlogic.go

@@ -3,11 +3,11 @@ package logic
 import (
 	"context"
 
+	"github.com/zeromicro/go-zero/core/logx"
 	"userCenter/api/internal/svc"
 	"userCenter/api/internal/types"
 	"userCenter/entity"
 	. "userCenter/rpc/usercenter"
-	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type UserAddLogic struct {

api/internal/logic/userdellogic.go

@@ -3,11 +3,11 @@ package logic
 import (
 	"context"
 
+	"github.com/zeromicro/go-zero/core/logx"
 	"userCenter/api/internal/svc"
 	"userCenter/api/internal/types"
 	"userCenter/entity"
 	. "userCenter/rpc/usercenter"
-	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type UserDelLogic struct {

api/internal/logic/userupdatelogic.go

@@ -3,11 +3,11 @@ package logic
 import (
 	"context"
 
+	"github.com/zeromicro/go-zero/core/logx"
 	"userCenter/api/internal/svc"
 	"userCenter/api/internal/types"
 	"userCenter/entity"
 	. "userCenter/rpc/usercenter"
-	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type UserUpdateLogic struct {

api/usercenter.go

@@ -8,15 +8,15 @@ import (
 	"syscall"
 
 	"bp.jydev.jianyu360.cn/BaseService/gateway/core/node"
+	"github.com/zeromicro/go-zero/core/conf"
+	"github.com/zeromicro/go-zero/core/logx"
+	"github.com/zeromicro/go-zero/rest"
+	"github.com/zeromicro/go-zero/zrpc"
 	"userCenter/api/internal/config"
 	"userCenter/api/internal/handler"
 	"userCenter/api/internal/svc"
 	"userCenter/entity"
 	"userCenter/rpc/usercenter"
-	"github.com/zeromicro/go-zero/core/conf"
-	"github.com/zeromicro/go-zero/core/logx"
-	"github.com/zeromicro/go-zero/rest"
-	"github.com/zeromicro/go-zero/zrpc"
 )
 
 var configFile = flag.String("f", "etc/usercenter-api.yaml", "the config file")

rpc/internal/logic/useraddlogic.go

@@ -3,10 +3,10 @@ package logic
 import (
 	"context"
 
+	"github.com/zeromicro/go-zero/core/logx"
 	"userCenter/rpc/internal/svc"
 	"userCenter/rpc/pb"
 	"userCenter/service"
-	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type UserAddLogic struct {

rpc/internal/logic/userdellogic.go

@@ -3,10 +3,10 @@ package logic
 import (
 	"context"
 
+	"github.com/zeromicro/go-zero/core/logx"
 	"userCenter/rpc/internal/svc"
 	"userCenter/rpc/pb"
 	"userCenter/service"
-	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type UserDelLogic struct {

service/test_cover.out

@@ -1,157 +1 @@
 mode: set
-userCenter/service/user.go:11.45,26.16 3 1
-userCenter/service/user.go:31.2,35.3 1 1
-userCenter/service/user.go:26.16,28.3 1 1
-userCenter/service/user.go:28.8,30.3 1 0
-userCenter/service/user.go:38.47,41.8 3 1
-userCenter/service/user.go:46.2,50.3 1 1
-userCenter/service/user.go:41.8,43.3 1 1
-userCenter/service/user.go:43.8,45.3 1 0
-userCenter/service/user.go:53.44,56.8 3 1
-userCenter/service/user.go:61.2,65.3 1 1
-userCenter/service/user.go:56.8,58.3 1 0
-userCenter/service/user.go:58.8,60.3 1 1
-userCenter/service/user.go:68.40,70.60 2 1
-userCenter/service/user.go:134.2,134.10 1 1
-userCenter/service/user.go:137.2,137.11 1 1
-userCenter/service/user.go:70.60,72.23 2 1
-userCenter/service/user.go:77.3,77.26 1 1
-userCenter/service/user.go:82.3,82.25 1 1
-userCenter/service/user.go:87.3,87.25 1 1
-userCenter/service/user.go:92.3,92.26 1 1
-userCenter/service/user.go:97.3,97.26 1 1
-userCenter/service/user.go:102.3,102.25 1 1
-userCenter/service/user.go:107.3,107.25 1 1
-userCenter/service/user.go:112.3,112.25 1 1
-userCenter/service/user.go:117.3,132.29 3 1
-userCenter/service/user.go:72.23,74.4 1 1
-userCenter/service/user.go:74.9,76.4 1 0
-userCenter/service/user.go:77.26,79.4 1 1
-userCenter/service/user.go:79.9,81.4 1 0
-userCenter/service/user.go:82.25,84.4 1 0
-userCenter/service/user.go:84.9,86.4 1 1
-userCenter/service/user.go:87.25,89.4 1 1
-userCenter/service/user.go:89.9,91.4 1 0
-userCenter/service/user.go:92.26,94.4 1 0
-userCenter/service/user.go:94.9,96.4 1 1
-userCenter/service/user.go:97.26,99.4 1 0
-userCenter/service/user.go:99.9,101.4 1 1
-userCenter/service/user.go:102.25,104.4 1 0
-userCenter/service/user.go:104.9,106.4 1 1
-userCenter/service/user.go:107.25,109.4 1 0
-userCenter/service/user.go:109.9,111.4 1 1
-userCenter/service/user.go:112.25,114.4 1 0
-userCenter/service/user.go:114.9,116.4 1 1
-userCenter/service/user.go:134.10,136.3 1 1
-userCenter/service/user.go:140.37,143.43 3 1
-userCenter/service/user.go:167.2,167.11 1 1
-userCenter/service/user.go:143.43,144.61 1 0
-userCenter/service/user.go:163.3,163.11 1 0
-userCenter/service/user.go:144.61,162.4 4 0
-userCenter/service/user.go:163.11,165.4 1 0
-userCenter/service/workDesktop.go:21.108,23.23 2 1
-userCenter/service/workDesktop.go:125.2,125.8 1 1
-userCenter/service/workDesktop.go:24.23,26.23 1 1
-userCenter/service/workDesktop.go:41.22,45.52 3 1
-userCenter/service/workDesktop.go:97.18,98.77 1 1
-userCenter/service/workDesktop.go:26.23,28.17 2 1
-userCenter/service/workDesktop.go:28.17,29.217 1 1
-userCenter/service/workDesktop.go:29.217,32.6 2 0
-userCenter/service/workDesktop.go:34.9,36.45 1 1
-userCenter/service/workDesktop.go:36.45,39.5 2 0
-userCenter/service/workDesktop.go:45.52,47.44 2 1
-userCenter/service/workDesktop.go:47.44,52.75 2 1
-userCenter/service/workDesktop.go:56.5,57.46 2 1
-userCenter/service/workDesktop.go:52.75,55.6 2 1
-userCenter/service/workDesktop.go:57.46,66.35 3 1
-userCenter/service/workDesktop.go:92.6,92.23 1 1
-userCenter/service/workDesktop.go:66.35,76.26 3 1
-userCenter/service/workDesktop.go:84.7,84.87 1 1
-userCenter/service/workDesktop.go:90.7,90.40 1 1
-userCenter/service/workDesktop.go:77.17,78.46 1 1
-userCenter/service/workDesktop.go:79.18,80.47 1 1
-userCenter/service/workDesktop.go:81.15,82.46 1 1
-userCenter/service/workDesktop.go:84.87,86.70 2 1
-userCenter/service/workDesktop.go:86.70,88.9 1 1
-userCenter/service/workDesktop.go:98.77,101.4 2 1
-userCenter/service/workDesktop.go:101.9,103.47 2 1
-userCenter/service/workDesktop.go:103.47,105.57 2 1
-userCenter/service/workDesktop.go:105.57,106.151 1 1
-userCenter/service/workDesktop.go:106.151,109.7 2 0
-userCenter/service/workDesktop.go:111.10,118.12 1 0
-userCenter/service/workDesktop.go:118.12,121.6 2 0
-userCenter/service/workDesktop.go:129.81,130.21 1 1
-userCenter/service/workDesktop.go:133.2,135.45 3 1
-userCenter/service/workDesktop.go:141.2,141.8 1 1
-userCenter/service/workDesktop.go:130.21,132.3 1 1
-userCenter/service/workDesktop.go:135.45,137.46 2 1
-userCenter/service/workDesktop.go:137.46,139.4 1 1
-userCenter/service/workDesktop.go:145.81,151.39 5 1
-userCenter/service/workDesktop.go:157.2,158.44 2 1
-userCenter/service/workDesktop.go:161.2,168.30 2 1
-userCenter/service/workDesktop.go:198.2,204.37 6 1
-userCenter/service/workDesktop.go:214.2,215.22 2 1
-userCenter/service/workDesktop.go:151.39,152.51 1 1
-userCenter/service/workDesktop.go:152.51,154.4 1 1
-userCenter/service/workDesktop.go:158.44,160.3 1 0
-userCenter/service/workDesktop.go:168.30,180.22 2 1
-userCenter/service/workDesktop.go:188.3,188.82 1 1
-userCenter/service/workDesktop.go:194.3,194.18 1 1
-userCenter/service/workDesktop.go:181.13,182.41 1 1
-userCenter/service/workDesktop.go:183.14,184.42 1 1
-userCenter/service/workDesktop.go:185.11,186.41 1 1
-userCenter/service/workDesktop.go:188.82,190.66 2 1
-userCenter/service/workDesktop.go:190.66,192.5 1 1
-userCenter/service/workDesktop.go:194.18,196.4 1 1
-userCenter/service/workDesktop.go:204.37,205.59 1 1
-userCenter/service/workDesktop.go:205.59,207.87 2 1
-userCenter/service/workDesktop.go:207.87,209.5 1 0
-userCenter/service/workDesktop.go:210.9,212.4 1 0
-userCenter/service/entService.go:35.94,36.66 1 0
-userCenter/service/entService.go:39.2,60.29 4 0
-userCenter/service/entService.go:106.2,107.29 2 0
-userCenter/service/entService.go:137.2,137.33 1 0
-userCenter/service/entService.go:140.2,140.50 1 0
-userCenter/service/entService.go:36.66,38.3 1 0
-userCenter/service/entService.go:60.29,63.24 2 0
-userCenter/service/entService.go:80.3,80.24 1 0
-userCenter/service/entService.go:63.24,69.25 5 0
-userCenter/service/entService.go:72.4,72.24 1 0
-userCenter/service/entService.go:69.25,71.5 1 0
-userCenter/service/entService.go:72.24,78.5 1 0
-userCenter/service/entService.go:80.24,83.31 3 0
-userCenter/service/entService.go:92.4,95.23 2 0
-userCenter/service/entService.go:99.4,100.24 2 0
-userCenter/service/entService.go:83.31,86.29 2 0
-userCenter/service/entService.go:89.5,89.8 1 0
-userCenter/service/entService.go:86.29,88.6 1 0
-userCenter/service/entService.go:95.23,97.5 1 0
-userCenter/service/entService.go:100.24,102.5 1 0
-userCenter/service/entService.go:107.29,108.24 1 0
-userCenter/service/entService.go:108.24,115.32 5 0
-userCenter/service/entService.go:120.4,120.25 1 0
-userCenter/service/entService.go:123.4,123.24 1 0
-userCenter/service/entService.go:130.4,132.24 2 0
-userCenter/service/entService.go:115.32,116.39 1 0
-userCenter/service/entService.go:116.39,118.6 1 0
-userCenter/service/entService.go:120.25,122.5 1 0
-userCenter/service/entService.go:123.24,125.24 2 0
-userCenter/service/entService.go:125.24,127.6 1 0
-userCenter/service/entService.go:132.24,134.5 1 0
-userCenter/service/entService.go:137.33,139.3 1 0
-userCenter/service/entService.go:144.86,145.45 1 0
-userCenter/service/entService.go:148.2,157.23 2 0
-userCenter/service/entService.go:161.2,161.31 1 0
-userCenter/service/entService.go:145.45,147.3 1 0
-userCenter/service/entService.go:157.23,159.3 1 0
-userCenter/service/entService.go:165.99,185.23 6 0
-userCenter/service/entService.go:197.2,201.3 1 0
-userCenter/service/entService.go:185.23,196.3 1 0
-userCenter/service/entService.go:205.115,221.23 6 0
-userCenter/service/entService.go:234.2,238.3 1 0
-userCenter/service/entService.go:221.23,233.3 1 0
-userCenter/service/entService.go:241.94,248.2 3 0
-userCenter/service/entService.go:251.101,277.2 4 0
-userCenter/service/entService.go:279.89,288.2 3 0
-userCenter/service/entService.go:290.112,314.2 4 0
-userCenter/service/entService.go:316.98,323.2 2 0