compose mysql changed

.gitignore

@@ -1,5 +1,5 @@
 */**/*.yml
-*.yml
+conf.yml*
 *.out
 */**/main
 main

README-cn.md

@@ -2,6 +2,14 @@
   跨语言--语言无关，基于http协议
   支持xa、tcc、saga
 ## 快速开始
+  dtm依赖于mysql
+    使用已有的mysql：
+      参考conf.yml.sample将mysql信息填写到conf.yml
+    或者通过docker安装mysql
+      docker-compose up -f docker-compose.mysql.yml
+  启动并运行saga示例
+    go run app/main.go
+
   场景描述：
     假设您实现了一个转账功能，分为两个微服务：转入、转出
       转出：服务地址为 http://example.com/api/busi_saga/transOut?gid=xxx POST 参数为 {"uid": 2, "amount":30}

common/types_test.go

@@ -13,8 +13,8 @@ type testConfig struct {
 var config = testConfig{}
 
 var myinit int = func() int {
-	InitApp(GetProjectPath(), &config)
+	InitApp(GetProjectDir(), &config)
-	config.Mysql["database"] = "dtm"
+	config.Mysql["database"] = ""
 	return 0
 }()
 

common/utils.go

@@ -202,6 +202,10 @@ func InitApp(dir string, config interface{}) {
 		configLoaded[dir] = true
 		viper.SetConfigFile(dir + "/conf.yml")
 		err := viper.ReadInConfig()
+		if err != nil {
+			viper.SetConfigFile(dir + "/conf.sample.yml")
+			err = viper.ReadInConfig()
+		}
 		E2P(err)
 	}
 	err := viper.Unmarshal(config)

common/utils_test.go

@@ -96,6 +96,6 @@ func TestResty(t *testing.T) {
 }
 
 func TestCaller(t *testing.T) {
-	p := GetProjectPath()
+	p := GetProjectDir()
 	assert.Equal(t, true, strings.HasSuffix(filepath.Dir(p), "common"))
 }

compose.mysql.yml

@@ -0,0 +1,8 @@
+version: '3.3'
+services:
+  mysql:
+    image: 'mysql:5.7'
+    environment:
+      MYSQL_ROOT_PASSWORD: my-secret-pw
+    ports:
+      - '3306:3306'

conf.sample.yml

@@ -1,8 +1,7 @@
 Mysql:
-  host: 'mysql'
+  host: 'localhost'
   user: 'root'
   password: 'my-secret-pw'
-  database: 'dtm'
   port: '3306'
 
 PreparedExpire: 90 # 单位秒，处于prepared中的任务，过了这个时间，查询结果还是PENDING的话，则会被cancel

docker-compose.yml

@@ -1,15 +0,0 @@
-version: '3.3'
-services:
-  api:
-    build: .
-    ports:
-      - '80:4005'
-    volumes:
-      - .:/app/dtm
-    # command: ['sh', '-c', 'go build app/main.go && go test -v ./dtmsvr']
-  mysql:
-    image: 'mysql:5.7'
-    environment:
-      MYSQL_ROOT_PASSWORD: my-secret-pw
-    ports:
-      - '3306:3306'

dtmsvr/conf.yml.sample

@@ -1,8 +0,0 @@
-Mysql:
-  host: 'mysql'
-  user: 'root'
-  password: 'my-secret-pw'
-  database: 'dtm'
-  port: '3306'
-PreparedExpire: 90 # 单位秒，处于prepared中的任务，过了这个时间，查询结果还是PENDING的话，则会被cancel
-TransCronInterval: 20 # 单位秒 当事务等待这个时间之后，还没有变化，则进行一轮处理，包括prepared中的任务和commited的任务

dtmsvr/config.go

@@ -10,3 +10,5 @@ var config = &dtmsvrConfig{
 	PreparedExpire:  60,
 	JobCronInterval: 20,
 }
+
+var dbName = "dtm"

dtmsvr/dtmsvr_test.go

@@ -14,7 +14,7 @@ import (
 
 var myinit int = func() int {
 	common.InitApp(common.GetProjectDir(), &config)
-	config.Mysql["database"] = "dtm"
+	config.Mysql["database"] = dbName
 	return 0
 }()
 
@@ -26,12 +26,13 @@ func TestViper(t *testing.T) {
 func TestDtmSvr(t *testing.T) {
 	TransProcessedTestChan = make(chan string, 1)
 	PopulateMysql()
+	examples.PopulateMysql()
 	// 启动组件
 	go StartSvr()
 	go examples.SagaStartSvr()
 	go examples.XaStartSvr()
 	go examples.TccStartSvr()
-	time.Sleep(time.Duration(100 * 1000 * 1000))
+	time.Sleep(time.Duration(200 * 1000 * 1000))
 
 	// 清理数据
 	e2p(dbGet().Exec("truncate trans_global").Error)

dtmsvr/main.go

@@ -17,7 +17,7 @@ func Main() {
 func StartSvr() {
 	logrus.Printf("start dtmsvr")
 	common.InitApp(common.GetProjectDir(), &config)
-	config.Mysql["database"] = "dtm"
+	config.Mysql["database"] = dbName
 	app := common.GetGinApp()
 	AddRoute(app)
 	logrus.Printf("dtmsvr listen at: %d", dtmsvrPort)
@@ -26,6 +26,6 @@ func StartSvr() {
 
 func PopulateMysql() {
 	common.InitApp(common.GetProjectDir(), &config)
-	config.Mysql["database"] = "dtm"
+	config.Mysql["database"] = dbName
 	examples.RunSqlScript(config.Mysql, common.GetCurrentDir()+"/dtmsvr.sql")
 }

examples/config.go

@@ -5,3 +5,5 @@ type exampleConfig struct {
 }
 
 var Config = exampleConfig{}
+
+var dbName = "dtm_busi"

examples/data.go

@@ -31,6 +31,6 @@ func RunSqlScript(mysql map[string]string, script string) {
 
 func PopulateMysql() {
 	common.InitApp(common.GetProjectDir(), &Config)
-	Config.Mysql["database"] = "dtm_busi"
+	Config.Mysql["database"] = dbName
 	RunSqlScript(Config.Mysql, common.GetCurrentDir()+"/examples.sql")
 }

xa.go

@@ -103,7 +103,3 @@ func (xa *XaClient) XaGlobalTransaction(gid string, transFunc XaGlobalFunc) (rer
 	}
 	return nil
 }
-
-func getDb(conf map[string]string) *common.MyDb {
-	return common.DbGet(conf)
-}