Merge pull request #126 from suyuan32/dev

fix: wrong variable name in i18n
suyuan32 · Jun 5, 2023 · 07e26eb · 07e26eb
2 parents 901a41d + ed7d01a
commit 07e26eb
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/api/internal/i18n/locale/en.json b/api/internal/i18n/locale/en.json
@@ -80,7 +80,7 @@
 		"createProvider": "Create a provider information",
 		"updateProvider": "Update the provider information",
 		"deleteProvider": "Delete provider information",
-		"geProviderList": "Get provider list",
+		"getProviderList": "Get provider list",
 		"oauthLogin": "Third-party log in",
 		"createToken": "Create a token",
 		"updateToken": "Update the token",

diff --git a/api/internal/i18n/locale/zh.json b/api/internal/i18n/locale/zh.json
@@ -81,7 +81,7 @@
 		"createProvider": "创建登录提供商",
 		"updateProvider": "更新登录提供商",
 		"deleteProvider": "删除登录提供商",
-		"geProviderList": "获取提供商列表",
+		"getProviderList": "获取提供商列表",
 		"oauthLogin": "第三方登录",
 		"createToken": "创建Token",
 		"updateToken": "更新Token",

diff --git a/rpc/internal/logic/base/init_database_api_data.go b/rpc/internal/logic/base/init_database_api_data.go
@@ -397,7 +397,7 @@ func (l *InitDatabaseLogic) insertApiData() error {
 
 	apis = append(apis, l.svcCtx.DB.API.Create().
 		SetPath("/oauth_provider/list").
-		SetDescription("apiDesc.geProviderList").
+		SetDescription("apiDesc.getProviderList").
 		SetAPIGroup("oauth").
 		SetMethod("POST"),
 	)

diff --git a/rpc/internal/logic/base/init_database_logic.go b/rpc/internal/logic/base/init_database_logic.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 
 	"entgo.io/ent/dialect/sql/schema"
+	"github.com/suyuan32/simple-admin-common/enum/common"
 	"github.com/suyuan32/simple-admin-common/msg/logmsg"
 	"github.com/suyuan32/simple-admin-common/utils/encrypt"
 	"github.com/zeromicro/go-zero/core/errorx"
@@ -314,7 +315,7 @@ func (l *InitDatabaseLogic) insertDepartmentData() error {
 		SetPhone("18888888888").
 		SetRemark("Super Administrator").
 		SetSort(1).
-		SetParentID(0),
+		SetParentID(common.DefaultParentId),
 	)
 
 	err := l.svcCtx.DB.Department.CreateBulk(departments...).Exec(l.ctx)