Support multiple configuration files.

8treenet · Dec 23, 2022 · 6e4d80e · 6e4d80e
1 parent e0144d3
commit 6e4d80e
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/example/base/server/conf/config.toml b/example/base/server/conf/config.toml
@@ -1,5 +1,5 @@
 [db]
-addr = "root:123123@tcp(127.0.0.1:3306)/xxxx?charset=utf8&parseTime=True&loc=Local"
+addr = "root:123123@tcp(127.0.0.1:3306)/xxxx?charset=utf8mb4&parseTime=True&loc=Local"
 max_open_conns = 16
 max_idle_conns = 8
 conn_max_life_time = 300

diff --git a/example/base/server/conf/config.yaml b/example/base/server/conf/config.yaml
@@ -1,5 +1,5 @@
 db:
-  addr: root:123123@tcp(127.0.0.1:3306)/xxxx?charset=utf8&parseTime=True&loc=Local
+  addr: root:123123@tcp(127.0.0.1:3306)/xxxx?charset=utf8mb4&parseTime=True&loc=Local
   max_open_conns: 16
   max_idle_conns: 8
   conn_max_life_time: 300

diff --git a/example/fshop/server/conf/config.toml b/example/fshop/server/conf/config.toml
@@ -1,5 +1,5 @@
 [db]
-addr = "root:root7944@tcp(127.0.0.1:3306)/fshop?charset=utf8&parseTime=True&loc=Local"
+addr = "root:root7944@tcp(127.0.0.1:3306)/fshop?charset=utf8mb4&parseTime=True&loc=Local"
 max_open_conns = 16
 max_idle_conns = 8
 conn_max_life_time = 300

diff --git a/example/fshop/server/conf/config.yaml b/example/fshop/server/conf/config.yaml
@@ -1,5 +1,5 @@
 db:
-  addr: root:root7944@tcp(127.0.0.1:3306)/fshop?charset=utf8&parseTime=True&loc=Local
+  addr: root:root7944@tcp(127.0.0.1:3306)/fshop?charset=utf8mb4&parseTime=True&loc=Local
   max_open_conns: 16
   max_idle_conns: 8
   conn_max_life_time: 300

diff --git a/example/http2/server/conf/config.toml b/example/http2/server/conf/config.toml
@@ -1,5 +1,5 @@
 [db]
-addr = "root:123123@tcp(127.0.0.1:3306)/xxxx?charset=utf8&parseTime=True&loc=Local"
+addr = "root:123123@tcp(127.0.0.1:3306)/xxxx?charset=utf8mb4&parseTime=True&loc=Local"
 max_open_conns = 16
 max_idle_conns = 8
 conn_max_life_time = 300

diff --git a/example/http2/server/conf/config.yaml b/example/http2/server/conf/config.yaml
@@ -1,5 +1,5 @@
 db:
-  addr: root:123123@tcp(127.0.0.1:3306)/xxxx?charset=utf8&parseTime=True&loc=Local
+  addr: root:123123@tcp(127.0.0.1:3306)/xxxx?charset=utf8mb4&parseTime=True&loc=Local
   max_open_conns: 16
   max_idle_conns: 8
   conn_max_life_time: 300

diff --git a/example/infra-example/server/conf/config.toml b/example/infra-example/server/conf/config.toml
@@ -1,5 +1,5 @@
 [db]
-addr = "root:root7944@tcp(127.0.0.1:3306)/freedom?charset=utf8&parseTime=True&loc=Local"
+addr = "root:root7944@tcp(127.0.0.1:3306)/freedom?charset=utf8mb4&parseTime=True&loc=Local"
 max_open_conns = 16
 max_idle_conns = 8
 conn_max_life_time = 300

diff --git a/example/infra-example/server/conf/config.yaml b/example/infra-example/server/conf/config.yaml
@@ -1,5 +1,5 @@
 db:
-  addr: root:root7944@tcp(127.0.0.1:3306)/freedom?charset=utf8&parseTime=True&loc=Local
+  addr: root:root7944@tcp(127.0.0.1:3306)/freedom?charset=utf8mb4&parseTime=True&loc=Local
   max_open_conns: 16
   max_idle_conns: 8
   conn_max_life_time: 300

diff --git a/freedom/cmd/version.go b/freedom/cmd/version.go
@@ -7,7 +7,7 @@ import (
 )
 
 const (
-	versionNum = "v1.9.0"
+	versionNum = "v1.9.1"
 )
 
 var (

diff --git a/freedom/template/project/server.go b/freedom/template/project/server.go
@@ -8,7 +8,7 @@ func init() {
 
 func tomlConf() string {
 	return `[db]
-addr = "root:123123@tcp(127.0.0.1:3306)/xxxx?charset=utf8&parseTime=True&loc=Local"
+addr = "root:123123@tcp(127.0.0.1:3306)/xxxx?charset=utf8mb4&parseTime=True&loc=Local"
 max_open_conns = 16
 max_idle_conns = 8
 conn_max_life_time = 300
@@ -51,7 +51,7 @@ shutdown_second = 3
 
 func yamlConf() string {
 	return `db:
-	addr: root:123123@tcp(127.0.0.1:3306)/xxxx?charset=utf8&parseTime=True&loc=Local
+	addr: root:123123@tcp(127.0.0.1:3306)/xxxx?charset=utf8mb4&parseTime=True&loc=Local
 	max_open_conns: 16
 	max_idle_conns: 8
 	conn_max_life_time: 300