Jelajahi Sumber

config: add env work_dir

Yi 1 tahun lalu
induk
melakukan
fc08c669b1
7 mengubah file dengan 29 tambahan dan 10 penghapusan
  1. 6 4
      .drone.yml
  2. 1 0
      README.md
  3. 2 1
      config/load_config.go
  4. 1 0
      go.mod
  5. 1 0
      go.sum
  6. 2 5
      module/backend/interface.go
  7. 16 0
      module/backend/mock/kptservice.go

+ 6 - 4
.drone.yml

@@ -6,6 +6,12 @@ clone:
   depth: 1
   disable: true
 
+environment:
+  GOOS: linux
+  GOARCH: amd64
+  APP_ENVIRONMENT: test
+  GO_WORK_DIR: /drone/src/kpt-tmr-group/
+
 steps:
   - name: clone
     image: alpine/git
@@ -15,10 +21,6 @@ steps:
     image: golang:1.17
     commands:
       - cd /drone/src/kpt-tmr-group
-      - go env -w GO111MODULE=on
-      - go env -w GOPROXY=https://goproxy.cn,direct
-      - go env -w CGO_ENABLED=0
-      - go mod tidy -compat=1.17
       - go test `go list ./... | grep -v -E "mock|store|test|fake|cmd|bin|backend|google|logger|proto"` -coverprofile .cover.txt
       - go tool cover -func .cover.txt
       - rm .cover.txt

+ 1 - 0
README.md

@@ -16,6 +16,7 @@ kpt-tmr-group - 科湃腾TMR集团版
 需要设置的环境变量:
 
 - export APP_ENVIRONMENT=test
+- export GO_WORK_DIR=D:\project\golangNew\kpt-tmr-group
 
 
 然后你可以尝试编译:

+ 2 - 1
config/load_config.go

@@ -2,13 +2,14 @@ package config
 
 import (
 	"fmt"
+	"os"
 
 	"github.com/mitchellh/mapstructure"
 	"github.com/spf13/viper"
 )
 
 func Initialize(path string, cfgStruct interface{}) error {
-	dir := fmt.Sprintf("./config/%s", path)
+	dir := fmt.Sprintf("%s/config/%s", os.Getenv("GO_WORK_DIR"), path)
 	// dir = fmt.Sprintf("D:\\project\\golangNew\\kpt-tmr-group\\config\\%s", path)
 	viper.SetConfigType("yaml")
 	viper.SetConfigFile(dir)

+ 1 - 0
go.mod

@@ -31,6 +31,7 @@ require (
 	github.com/xuri/excelize/v2 v2.7.1
 	go.uber.org/dig v1.15.0
 	go.uber.org/zap v1.21.0
+	golang.org/x/sync v0.1.0
 	google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef
 	google.golang.org/grpc v1.52.0
 	google.golang.org/protobuf v1.30.0

+ 1 - 0
go.sum

@@ -469,6 +469,7 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

+ 2 - 5
module/backend/interface.go

@@ -24,11 +24,8 @@ type Hub struct {
 type StoreEntry struct {
 	dig.In
 
-	Cfg *config.AppConfig
-	DB  *kptstore.DB
-	// SSO *sso.Cache
-	// AsynqClient asynqsvc.Client
-	// Cache *redis.Client
+	Cfg      *config.AppConfig
+	DB       *kptstore.DB
 	WxClient *wechat.ClientService
 }
 

+ 16 - 0
module/backend/mock/kptservice.go

@@ -8,6 +8,7 @@ import (
 	bytes "bytes"
 	context "context"
 	io "io"
+	model "kpt-tmr-group/model"
 	operationPb "kpt-tmr-group/proto/go/backend/operation"
 	reflect "reflect"
 
@@ -719,6 +720,21 @@ func (mr *MockKptServiceMockRecorder) ResetPasswordSystemUser(arg0, arg1 interfa
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ResetPasswordSystemUser", reflect.TypeOf((*MockKptService)(nil).ResetPasswordSystemUser), arg0, arg1)
 }
 
+// SearchAnalysisAccuracy mocks base method.
+func (m *MockKptService) SearchAnalysisAccuracy(arg0 context.Context, arg1 *operationPb.SearchAnalysisAccuracyRequest) (*model.SearchAnalysisAccuracyResponse, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "SearchAnalysisAccuracy", arg0, arg1)
+	ret0, _ := ret[0].(*model.SearchAnalysisAccuracyResponse)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// SearchAnalysisAccuracy indicates an expected call of SearchAnalysisAccuracy.
+func (mr *MockKptServiceMockRecorder) SearchAnalysisAccuracy(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SearchAnalysisAccuracy", reflect.TypeOf((*MockKptService)(nil).SearchAnalysisAccuracy), arg0, arg1)
+}
+
 // SearchCattleCategoryList mocks base method.
 func (m *MockKptService) SearchCattleCategoryList(arg0 context.Context, arg1 *operationPb.SearchCattleCategoryRequest) (*operationPb.SearchCattleCategoryResponse, error) {
 	m.ctrl.T.Helper()