李哲 hace 4 años
padre
commit
c3686b09db
Se han modificado 5 ficheros con 16 adiciones y 11 borrados
  1. 3 0
      entity/integral.go
  2. 6 1
      rpc/etc/integral.yaml
  3. 3 2
      rpc/integral.go
  4. 0 3
      rpc/internal/config/config.go
  5. 4 5
      service/integralService.go

+ 3 - 0
entity/integral.go

@@ -1,5 +1,8 @@
 package entity
 
+import "github.com/go-xorm/xorm"
+
+var Engine *xorm.Engine
 //积分余额
 type Balance struct {
 	Id          int64  `xorm:"pk autoincr id" form:"id" json:"id"`

+ 6 - 1
rpc/etc/integral.yaml

@@ -2,8 +2,13 @@ Name: integral.rpc
 ListenOn: 127.0.0.1:8080
 Etcd:
   Hosts:
-  - 127.0.0.1:2379
+    - 127.0.0.1:2379
   Key: integral.rpc
 DataSource: admin:123456@tcp(192.168.3.14:3306)/jyintegral?charset=utf8
 Cache:
   - Host: localhost:6379
+FileSystemConf:
+  Etcd:
+    Hosts:
+      - 127.0.0.1:2379
+    Key: integral.rpc

+ 3 - 2
rpc/integral.go

@@ -6,6 +6,7 @@ import (
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/go-xorm/xorm"
 	"log"
+	"points_service/entity"
 	"points_service/service"
 
 	"points_service/rpc/integral"
@@ -43,10 +44,10 @@ func init() {
 	var err error
 	conf.MustLoad(*configFile, &c)
 	fmt.Println(c.DataSource)
-	config.Engine, err = xorm.NewEngine("mysql", c.DataSource)
+	entity.Engine, err = xorm.NewEngine("mysql", c.DataSource)
 	if err != nil {
 		log.Fatal("数据库连接失败:", err)
 	}
-	log.Println("积分流水:",integralService.IntegralConsumeService(config.Engine))
+	log.Println("积分流水:",integralService.IntegralConsumeService())
 	fmt.Println(c.DataSource+"链接成功")
 }

+ 0 - 3
rpc/internal/config/config.go

@@ -1,7 +1,6 @@
 package config
 
 import (
-	"github.com/go-xorm/xorm"
 	"github.com/tal-tech/go-zero/core/stores/cache"
 	"github.com/tal-tech/go-zero/zrpc"
 )
@@ -12,5 +11,3 @@ type Config struct {
 	DataSource     string          // 手动代码
 	Cache          cache.CacheConf // 手动代码
 }
-
-var Engine *xorm.Engine

+ 4 - 5
service/integralService.go

@@ -1,17 +1,15 @@
 package service
 
 import (
-	"github.com/go-xorm/xorm"
 	"log"
 	"points_service/entity"
 	"time"
 )
 type IntegralService struct{}
-
 //消耗积分流水
-func(service *IntegralService) IntegralConsumeService(orm *xorm.Engine) bool {
+func(service *IntegralService) IntegralConsumeService() bool {
 	flow := entity.Flow{}
-	flow.UserId = "111"
+	flow.UserId = "222"
 	flow.PointType = 1
 	flow.BusinessTypeId = 1
 	flow.BusinessType = "1"
@@ -19,7 +17,8 @@ func(service *IntegralService) IntegralConsumeService(orm *xorm.Engine) bool {
 	flow.CreateTime = time.Now().Format("2006-01-02 15:04:05")
 	flow.EndDate = time.Now().Format("2006-01-02")
 	flow.AppId = 10000
-	af, err := orm.Table("integral_flow").Insert(&flow)
+
+	af, err := entity.Engine.Table("integral_flow").Insert(&flow)
 	if err != nil {
 		log.Print("消耗积分记录失败")
 		return true