浏览代码

mysql驱动修改

jiaojiao7 3 年之前
父节点
当前提交
33684bcec2
共有 4 个文件被更改,包括 71 次插入11 次删除
  1. 15 0
      rpc/config.json
  2. 42 0
      rpc/db/config.go
  3. 3 2
      rpc/etc/message.yaml
  4. 11 9
      rpc/message.go

+ 15 - 0
rpc/config.json

@@ -0,0 +1,15 @@
+{
+  "mysql": {
+    "dbName": "messageCentertest",
+    "address": "am-2ze6crwd6bb0283jn167320o.ads.aliyuncs.com",
+    "userName": "jianyu",
+    "passWord": "topnet@123",
+    "maxOpenConns": 5,
+    "maxIdleConns": 5
+  },
+  "etcd": {
+    "address": "127.0.0.1:2379",
+    "jyUserCenterKey": "usercenter.rpc",
+    "jyResourceCenterKey": "resourcescenter.rpc"
+  }
+}

+ 42 - 0
rpc/db/config.go

@@ -0,0 +1,42 @@
+package db
+
+import (
+	qutil "app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/mysql"
+	"log"
+)
+
+var Config *config
+
+type config struct {
+	Mysql mysqlConf
+	Etcd  map[string]interface{}
+}
+
+type mysqlConf struct {
+	DbName       string
+	Address      string
+	UserName     string
+	PassWord     string
+	MaxOpenConns int
+	MaxIdleConns int
+}
+
+var MainMysql *mysql.Mysql
+
+func init() {
+	//程序配置文件
+	qutil.ReadConfig(&Config)
+
+	log.Println("开始初始化数据库。。。。。")
+	//初始化mysql
+	MainMysql = &mysql.Mysql{
+		Address:      Config.Mysql.Address,
+		UserName:     Config.Mysql.UserName,
+		PassWord:     Config.Mysql.PassWord,
+		DBName:       Config.Mysql.DbName,
+		MaxOpenConns: Config.Mysql.MaxOpenConns,
+		MaxIdleConns: Config.Mysql.MaxIdleConns,
+	}
+	MainMysql.Init()
+}

+ 3 - 2
rpc/etc/message.yaml

@@ -2,12 +2,13 @@ Name: message.rpc
 ListenOn: 127.0.0.1:8081
 Etcd:
   Hosts:
-  - 127.0.0.1:2379
+  - 192.168.3.240:2379
+  - 192.168.3.240:2379
   Key: message.rpc
   Timeout: 6000
 DataSource: jianyu:topnet@123@tcp(am-2ze6crwd6bb0283jn167320o.ads.aliyuncs.com:3306)/messageCentertest?charset=utf8mb4&parseTime=true&loc=Local
 FileSystemConf:
   Etcd:
     Hosts:
-      - 127.0.0.1:2379
+      - 192.168.3.240:2379
     Key: message.rpc

+ 11 - 9
rpc/message.go

@@ -4,23 +4,24 @@
 package main
 
 import (
-	"app.yhyue.com/moapp/MessageCenter/entity"
 	"app.yhyue.com/moapp/MessageCenter/rpc/internal/config"
 	"app.yhyue.com/moapp/MessageCenter/rpc/internal/server"
 	"app.yhyue.com/moapp/MessageCenter/rpc/internal/svc"
 	"app.yhyue.com/moapp/MessageCenter/rpc/message"
 	"flag"
 	"fmt"
-	_ "github.com/go-sql-driver/mysql"
-	"github.com/go-xorm/xorm"
+	clientv3 "go.etcd.io/etcd/client/v3"
 	"log"
+	"time"
 
+	_ "app.yhyue.com/moapp/MessageCenter/rpc/db"
 	"github.com/tal-tech/go-zero/core/conf"
 	"github.com/tal-tech/go-zero/zrpc"
 	"google.golang.org/grpc"
 )
 
 var configFile = flag.String("f", "etc/message.yaml", "the config file")
+var EtcdCli *clientv3.Client
 
 func main() {
 	flag.Parse()
@@ -43,13 +44,14 @@ func main() {
 func init() {
 	conf.MustLoad(*configFile, &config.ConfigJson)
 	var err error
-	log.Println(config.ConfigJson.DataSource)
-	entity.Engine, err = xorm.NewEngine("mysql", config.ConfigJson.DataSource)
-	log.Println(err)
-	entity.Engine.ShowSQL(true)
+	EtcdCli, err = clientv3.New(clientv3.Config{
+		Endpoints:   config.ConfigJson.Etcd.Hosts,
+		DialTimeout: 5 * time.Second,
+	})
 	if err != nil {
-		log.Fatal("数据库连接失败:", err)
+		log.Printf("connect to etcd failed, err:%v\n", err)
+		return
 	}
-	fmt.Println(config.ConfigJson.DataSource + "链接成功")
+	log.Println("connect to etcd success")
 
 }