Browse Source

config: 修改测试环境的数据库配置

Yi 11 months ago
parent
commit
d28242c10e
3 changed files with 7 additions and 6 deletions
  1. 2 2
      config/app.develop.yaml
  2. 2 2
      config/app.test.yaml
  3. 3 2
      model/system_menu.go

+ 2 - 2
config/app.develop.yaml

@@ -8,8 +8,8 @@ jwt_expire_time: 172800
 store:
   show_sql: true
   driver_name: mysql
-  kpt_rw: "root:123456@tcp(127.0.0.1:3306)/kpt_pasture?charset=utf8mb4&parseTime=true&loc=Local&allowNativePasswords=true&timeout=300s&readTimeout=300s&writeTimeout=300s"
-  kpt_migr: "root:123456@tcp(127.0.0.1:3306)/kpt_pasture?charset=utf8mb4&parseTime=true&loc=Local&allowNativePasswords=true&timeout=300s&readTimeout=300s&writeTimeout=300s"
+  kpt_rw: "root:123456@tcp(47.92.95.119:3306)/kpt_pasture?charset=utf8mb4&parseTime=true&loc=Local&allowNativePasswords=true&timeout=300s&readTimeout=300s&writeTimeout=300s"
+  kpt_migr: "root:123456@tcp(47.92.95.119:3306)/kpt_pasture?charset=utf8mb4&parseTime=true&loc=Local&allowNativePasswords=true&timeout=300s&readTimeout=300s&writeTimeout=300s"
 
 redis_setting:
   sso_cache:

+ 2 - 2
config/app.test.yaml

@@ -8,8 +8,8 @@ jwt_expire_time: 172800
 store:
   show_sql: true
   driver_name: mysql
-  kpt_rw: "root:123456@tcp(127.0.0.1:3306)/kpt_pasture?charset=utf8mb4&parseTime=true&loc=Local&allowNativePasswords=true&timeout=300s&readTimeout=300s&writeTimeout=300s"
-  kpt_migr: "root:123456@tcp(127.0.0.1:3306)/kpt_pasture?charset=utf8mb4&parseTime=true&loc=Local&allowNativePasswords=true&timeout=300s&readTimeout=300s&writeTimeout=300s"
+  kpt_rw: "root:123456@tcp(47.92.95.119:3306)/kpt_pasture?charset=utf8mb4&parseTime=true&loc=Local&allowNativePasswords=true&timeout=300s&readTimeout=300s&writeTimeout=300s"
+  kpt_migr: "root:123456@tcp(47.92.95.119:3306)/kpt_pasture?charset=utf8mb4&parseTime=true&loc=Local&allowNativePasswords=true&timeout=300s&readTimeout=300s&writeTimeout=300s"
 
 redis_setting:
   sso_cache:

+ 3 - 2
model/system_menu.go

@@ -117,7 +117,7 @@ func (s SystemMenuSlice) ToTree() []*pasturePb.MenuTree {
 	sort.Slice(s, func(i, j int) bool {
 		return s[i].ParentId < s[j].ParentId
 	})
-	zaplog.Info("ToTree", zap.Any("s", s))
+
 	for i, v := range s {
 		res[i] = &pasturePb.MenuTree{
 			Id:       int32(v.Id),
@@ -131,7 +131,6 @@ func (s SystemMenuSlice) ToTree() []*pasturePb.MenuTree {
 			Children: make([]*pasturePb.MenuTree, 0),
 		}
 	}
-	zaplog.Info("ToTree", zap.Any("res", res))
 	// 构建树
 	return buildTree(res)
 }
@@ -148,6 +147,8 @@ func buildTree(menuTreeList []*pasturePb.MenuTree) []*pasturePb.MenuTree {
 			}
 		}
 	}
+
+	zaplog.Info("tree", zap.Any("tree", tree))
 	return tree
 }