diff --git a/server/core/server.go b/server/core/server.go index 69e73eebf..1a84f7515 100644 --- a/server/core/server.go +++ b/server/core/server.go @@ -37,7 +37,7 @@ func RunWindowsServer() { fmt.Printf(` %s gin-vue-admin - %s:v2.5.7 + %s: v2.5.7 加群方式:微信号：shouzi_1994 QQ群：622360840 插件市场:https://plugin.gin-vue-admin.com GVA讨论社区:https://support.qq.com/products/371961 diff --git a/server/go.mod b/server/go.mod index 814bd25bd..03ee224e3 100644 --- a/server/go.mod +++ b/server/go.mod @@ -20,6 +20,7 @@ require ( github.com/jordan-wright/email v0.0.0-20200824153738-3f5bafa1cd84 github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible github.com/mojocn/base64Captcha v1.3.5 + github.com/nicksnyder/go-i18n/v2 v2.2.0 github.com/otiai10/copy v1.7.0 github.com/pkg/errors v0.9.1 github.com/qiniu/api.v7/v7 v7.4.1 @@ -44,7 +45,6 @@ require ( gorm.io/driver/sqlserver v1.5.1 gorm.io/gorm v1.25.2 nhooyr.io/websocket v1.8.7 - github.com/nicksnyder/go-i18n/v2 v2.2.0 ) require ( diff --git a/server/utils/ast/ast_gorm_test.go b/server/utils/ast/ast_gorm_test.go index 0c83802c9..023d8512a 100644 --- a/server/utils/ast/ast_gorm_test.go +++ b/server/utils/ast/ast_gorm_test.go @@ -1,15 +1,16 @@ package ast import ( + "testing" + "github.com/flipped-aurora/gin-vue-admin/server/global" "github.com/flipped-aurora/gin-vue-admin/server/model/example" - "testing" ) const A = 123 func TestAddRegisterTablesAst(t *testing.T) { - AddRegisterTablesAst("D:\\gin-vue-admin\\server\\utils\\ast_test.go", "Register", "test", "testDB", "testModel") + AddRegisterTablesAst("D:\\gin-vue-admin\\server\\utils\\ast_test.go", "Register", "test", "testDB", "testModel", "") } func Register() { diff --git a/web/src/locales/en.json b/web/src/locales/en.json index bc383e9a1..e2aa8945a 100644 --- a/web/src/locales/en.json +++ b/web/src/locales/en.json @@ -181,6 +181,7 @@ "enterDBAddress": "Please enter the database address", "enterDBHost": "Please enter database host", "enterDBName": "Please enter database name", + "enterSQLitePath" : "Please enter sqlite database file path", "enterDBPassword": "Please enter the database password (empty if none)", "enterDBPort": "Please enter database port", "enterDBUser": "", @@ -189,7 +190,9 @@ "language": "Language", "note": "Initialization notice", "note1": "1.You should be familiar with Vue And GoLang.", - "note2": "2.Please confirm that you have read the official documentation.", + "note2-1": "2.Please confirm that you have read ", + "note2-2": " the official documentation.", + "note2-3": "Initialization video", "note3": "3.Please confirm that you understand the subsequent configuration process.", "note4": "4.If you use a mysql database, please confirm that the database engine is ", "note5": "Note: The development team does not provide free services for the content written in the document.", @@ -212,6 +215,7 @@ "errPassword": "Please enter the correct password", "errUserName": "Please enter the correct username", "errVerificationCode": "Incorrect verification code", + "verificationCode" : "Verification code", "init": "Go to initialization", "language": "Languages", "login": "Login" @@ -361,10 +365,12 @@ "sysDictionaryDetail" : { "displayValue" : "Display value", "dictValue" : "Dictionary value", + "extendedValue" : "Extended value", "enabledStatus" : "Enabled status", "addDictEntry" : "Add dictionary entry", "enterDisplayValue" : "Please enter a display value", "enterDictValue" : "Please enter a dictionary value", + "enterExtendedValue" : "Please enter extended value", "addDictionaryItem" : "Add Dictionary Item", "editDictionaryItem" : "Edit Dictionary Item" } diff --git a/web/src/locales/zh.json b/web/src/locales/zh.json index 8bdeb71cd..ee54ba8cf 100644 --- a/web/src/locales/zh.json +++ b/web/src/locales/zh.json @@ -181,6 +181,7 @@ "enterDBAddress": "请输入数据库链接", "enterDBHost": "", "enterDBName": "请输入数据库名称", + "enterSQLitePath" : "请输入sqlite数据库文件存放路径", "enterDBPassword": "请输入数据库密码（没有则为空）", "enterDBPort": "请输入数据库端口", "enterDBUser": "请输入数据库用户名", @@ -189,7 +190,9 @@ "language": "语", "note": "初始化须知", "note1": "1.您需有用一定的VUE和GOLANG基础", - "note2": "2.请您确认是否已经阅读过官方文档", + "note2-1": "2.请您确认是否已经阅读过", + "note2-2": "官方文档", + "note2-3": "初始化视频", "note3": "3.请您确认是否了解后续的配置流程", "note4": "4.如果您使用mysql数据库，请确认数据库引擎为", "note5": "注：开发组不为文档中书写过的内容提供无偿服务", @@ -212,6 +215,7 @@ "errPassword": "请输入正确的密码", "errUserName": "请输入正确的用户名", "errVerificationCode": "验证码格式不正确", + "verificationCode" : "位验证码", "init": "前往初始化", "language": "Languages", "login": "登 录" @@ -361,10 +365,12 @@ "sysDictionaryDetail" : { "displayValue" : "展示值", "dictValue" : "字典值", + "extendedValue" : "扩展值", "enabledStatus" : "启用状态", "addDictEntry" : "新增字典项", "enterDisplayValue" : "请输入展示值", "enterDictValue" : "请输入字典值", + "enterExtendedValue" : "请输入扩展值", "addDictionaryItem" : "添加字典项", "editDictionaryItem" : "修改字典项" } diff --git a/web/src/view/init/index.vue b/web/src/view/init/index.vue index 330ba0de3..6b3684c4f 100644 --- a/web/src/view/init/index.vue +++ b/web/src/view/init/index.vue @@ -28,14 +28,14 @@ size="large" @click="goDoc" > - {{ t('init.readDocs') }} + {{ t('init.readDocs') }} - {{ t('init.confirm') }} + {{ t('init.confirm') }}

@@ -53,24 +53,35 @@ > - - English - 中文 - العربية + + English + 中文 + العربية @@ -156,7 +167,7 @@ class="img" > diff --git a/web/src/view/login/index.vue b/web/src/view/login/index.vue index ebfd1be03..bceffd0b4 100644 --- a/web/src/view/login/index.vue +++ b/web/src/view/login/index.vue @@ -24,15 +24,39 @@

- + - + @@ -109,7 +133,7 @@
- + enterDenterSQLitePathBName