zwl 5 vuotta sitten
vanhempi
commit
122c0c0206
5 muutettua tiedostoa jossa 36 lisäystä ja 14 poistoa
  1. 9 9
      db/db.go
  2. 1 0
      go.mod
  3. 2 0
      go.sum
  4. 22 4
      goods/goods.go
  5. 2 1
      main.go

+ 9 - 9
db/db.go

@@ -8,23 +8,23 @@ import (
 
 var driverName = "oci8"
 var dataSourceName = "mtp2_test18/muchinfo@192.168.31.117:1521/orcl"
-var engine *xorm.Engine
+var Engine *xorm.Engine
 
 // NewDbDriver 创建数据库驱动
-func NewDbDriver() error {
+func InitDbEngine() error {
 	var err error
-	engine, err := xorm.NewOracle(driverName, dataSourceName)
+	Engine, err = xorm.NewOracle(driverName, dataSourceName)
 	if err != nil {
 		fmt.Println("create db engine failed:", err)
 		return err
 	}
 
-	tabs, err := engine.DBMetas()
-	if err != nil {
-		fmt.Println("create db engine failed:", err)
-		return err
-	}
+	Engine.SetMaxIdleConns(10)
+	Engine.SetMaxOpenConns(100)
 
-	fmt.Println(len(tabs))
 	return nil
 }
+
+func GetEngine() *xorm.Engine {
+	return Engine
+}

+ 1 - 0
go.mod

@@ -25,6 +25,7 @@ require (
 	github.com/lestrrat/go-envload v0.0.0-20180220120943-6ed08b54a570 // indirect
 	github.com/lestrrat/go-file-rotatelogs v0.0.0-20180223000712-d3151e2a480f
 	github.com/lestrrat/go-strftime v0.0.0-20180220042222-ba3bf9c1d042 // indirect
+	github.com/mattn/go-oci8 v0.0.8
 	github.com/onsi/ginkgo v1.12.0 // indirect
 	github.com/onsi/gomega v1.9.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect

+ 2 - 0
go.sum

@@ -86,6 +86,8 @@ github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4=
 github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/mattn/go-isatty v0.0.9 h1:d5US/mDsogSGW37IV293h//ZFaeajb69h+EHFsv2xGg=
 github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
+github.com/mattn/go-oci8 v0.0.8 h1:D0lVs4vwDEsZ1uPKsE6v26OS6FfHeAI43yf3l8h3X48=
+github.com/mattn/go-oci8 v0.0.8/go.mod h1:wjDx6Xm9q7dFtHJvIlrI99JytznLw5wQ4R+9mNXJwGI=
 github.com/mattn/go-sqlite3 v2.0.1+incompatible h1:xQ15muvnzGBHpIpdrNi1DA5x0+TcBZzsIDwmw9uTHzw=
 github.com/mattn/go-sqlite3 v2.0.1+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=

+ 22 - 4
goods/goods.go

@@ -2,6 +2,9 @@ package goods
 
 import (
 	"net/http"
+	"strconv"
+
+	"mtp2_if/db"
 
 	"github.com/gin-gonic/gin"
 )
@@ -28,11 +31,26 @@ func QueryGoods(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 	}
 
+	sql := "select goodscode, goodsname, marketid from goods where goodsid = ?"
+	engine := db.GetEngine()
+	results, err := engine.QueryString(sql, goods.GoodsID)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+	}
+
+	if len(results) == 0 {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "cont find"})
+	}
+
+	goodscode := results[0]["GOODSCODE"]
+	goodsname := results[0]["GOODSNAME"]
+	marketid, _ := strconv.Atoi(results[0]["MARKETID"])
+
 	ret := GoodsQueryRsp{
-		GoodsID:   1,
-		GoodsCode: "Ag100",
-		GoodsName: "银100",
-		MarketID:  10104,
+		GoodsID:   goods.GoodsID,
+		GoodsCode: goodscode,
+		GoodsName: goodsname,
+		MarketID:  marketid,
 	}
 	/*
 		c.JSON(http.StatusOK, gin.H{

+ 2 - 1
main.go

@@ -5,10 +5,11 @@ import (
 	"mtp2_if/goods"
 
 	"github.com/gin-gonic/gin"
+	_ "github.com/mattn/go-oci8"
 )
 
 func main() {
-	err := db.NewDbDriver()
+	err := db.InitDbEngine()
 	if err != nil {
 		println("err", err)
 	}