liuyong_awesome před 4 roky
rodič
revize
0744650e66
6 změnil soubory, kde provedl 25 přidání a 34 odebrání
  1. 4 1
      config/config.go
  2. 6 0
      config/config.yaml.bak
  3. 2 2
      go.mod
  4. 0 4
      lib/db.go
  5. 13 0
      service/bids_svc.go
  6. 0 27
      service/bids_test.go

+ 4 - 1
config/config.go

@@ -10,7 +10,10 @@ import (
 var k = koanf.New(".")
 var sy sync.Once
 
-func Init() {
+//func init()  {
+//	Init()
+//}
+func init() {
 	sy.Do(func() {
 		err := k.Load(file.Provider("./config/config.yaml"), yaml.Parser())
 		if err != nil {

+ 6 - 0
config/config.yaml.bak

@@ -0,0 +1,6 @@
+#[dbConfig]
+db_host:
+db_port:
+db_username:
+db_password:
+db_database: bids

+ 2 - 2
go.mod

@@ -47,6 +47,6 @@ require (
 	golang.org/x/net v0.0.0-20210329181859-df645c7b52b1 // indirect
 	golang.org/x/sys v0.0.0-20210326220804-49726bf1d181 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gorm.io/driver/mysql v1.0.5 // indirect
-	gorm.io/gorm v1.21.6 // indirect
+	gorm.io/driver/mysql v1.0.5
+	gorm.io/gorm v1.21.6
 )

+ 0 - 4
lib/db.go

@@ -1,7 +1,6 @@
 package lib
 
 import (
-	"encoding/json"
 	"fmt"
 	"gitdxz.51daxuetong.cn/go_dev/bids_rpcx/config"
 	"gorm.io/driver/mysql"
@@ -16,7 +15,6 @@ var syncDb sync.Once
 func GetDb() *gorm.DB {
 	syncDb.Do(func() {
 		cc := config.GetConfig()
-		fmt.Println(cc.All())
 		dbHost := cc.String("db_host")
 		dbPort := cc.String("db_port")
 		dbName := cc.String("db_database")
@@ -34,8 +32,6 @@ func GetDb() *gorm.DB {
 		sqlDB.SetMaxIdleConns(1)
 		sqlDB.SetMaxOpenConns(5)
 		sqlDB.SetConnMaxLifetime(time.Hour)
-		data, _ := json.Marshal(sqlDB.Stats()) //获得当前的SQL配置情况
-		fmt.Println(data)
 		Db = db
 	})
 	return Db

+ 13 - 0
service/bids_svc.go

@@ -13,6 +13,10 @@ type ChanReply struct {
 	Data  []dao.SemChannel
 	Count int
 }
+type CateReply struct {
+	Data  []dao.SemCategory
+	Count int
+}
 
 var bids = Bids{}
 
@@ -25,3 +29,12 @@ func (b *BidsSvc) GetChanList(ctx context.Context, args *Args, reply *ChanReply)
 	reply.Count = len(data)
 	return err
 }
+func (b *BidsSvc) GetCateList(ctx context.Context, args *Args, reply *CateReply) error {
+	data, err := bids.GetSemCategory()
+	if err != nil {
+		return err
+	}
+	reply.Data = data
+	reply.Count = len(data)
+	return err
+}

+ 0 - 27
service/bids_test.go

@@ -1,28 +1 @@
 package service
-
-import (
-	"gitdxz.51daxuetong.cn/go_dev/bids_rpcx/config"
-	"gitdxz.51daxuetong.cn/go_dev/bids_rpcx/dao"
-	"testing"
-)
-
-func TestGetSemCategory(t *testing.T) {
-	config.Init()
-	tests := []struct {
-		name    string
-		want    []dao.SemCategory
-		wantErr bool
-	}{
-		{name: "first", want: []dao.SemCategory{}, wantErr: false},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := GetSemCategory()
-			if (err != nil) != tt.wantErr {
-				t.Errorf("GetSemCategory() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			t.Log(got)
-		})
-	}
-}