From 3ac64d65b6b01c8bd971ae7bb6b2ea53678ce81f Mon Sep 17 00:00:00 2001
From: ssongliu <73214554+ssongliu@users.noreply.github.com>
Date: Fri, 5 May 2023 11:40:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E9=94=99=E8=AF=AF=E8=BF=94=E5=9B=9E=20(#873)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/app/service/auth.go | 4 ++--
 backend/constant/errs.go    | 1 +
 backend/i18n/lang/en.yaml   | 1 +
 backend/i18n/lang/zh.yaml   | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/backend/app/service/auth.go b/backend/app/service/auth.go
index 4976d41b4..6c1512938 100644
--- a/backend/app/service/auth.go
+++ b/backend/app/service/auth.go
@@ -1,11 +1,11 @@
 package service
 
 import (
-	"fmt"
 	"strconv"
 	"time"
 
 	"github.com/1Panel-dev/1Panel/backend/app/dto"
+	"github.com/1Panel-dev/1Panel/backend/buserr"
 	"github.com/1Panel-dev/1Panel/backend/constant"
 	"github.com/1Panel-dev/1Panel/backend/global"
 	"github.com/1Panel-dev/1Panel/backend/utils/encrypt"
@@ -191,5 +191,5 @@ func (u *AuthService) InitUser(c *gin.Context, req dto.InitUser) error {
 		return nil
 	}
 
-	return fmt.Errorf("can't init user because user %s is in system", user.Value)
+	return buserr.New(constant.ErrInitUser)
 }
diff --git a/backend/constant/errs.go b/backend/constant/errs.go
index a7f6aee10..142cc78a5 100644
--- a/backend/constant/errs.go
+++ b/backend/constant/errs.go
@@ -46,6 +46,7 @@ var (
 	ErrTypeNotSafety       = "ErrNotSafety"
 	ErrNameIsExist         = "ErrNameIsExist"
 	ErrDemoEnvironment     = "ErrDemoEnvironment"
+	ErrInitUser            = "ErrInitUser"
 )
 
 // app
diff --git a/backend/i18n/lang/en.yaml b/backend/i18n/lang/en.yaml
index 175fee311..145756022 100644
--- a/backend/i18n/lang/en.yaml
+++ b/backend/i18n/lang/en.yaml
@@ -17,6 +17,7 @@ ErrRepoNotValid: "Remote repository verification failed！"
 ErrNameIsExist: "Name is already exist"
 ErrDemoEnvironment: "Demo server, prohibit this operation!"
 ErrCmdTimeout: "Command execution timed out！"
+ErrInitUser: "The user initialization has been completed by the system. Please do not repeat the operation!"
 
 #app
 ErrPortInUsed: "{{ .detail }} port already in use"
diff --git a/backend/i18n/lang/zh.yaml b/backend/i18n/lang/zh.yaml
index d4982b536..9c8956f87 100644
--- a/backend/i18n/lang/zh.yaml
+++ b/backend/i18n/lang/zh.yaml
@@ -17,6 +17,7 @@ ErrRepoNotValid: "远程仓库校验失败！"
 ErrNameIsExist: "名称已存在"
 ErrDemoEnvironment: "演示服务器，禁止此操作!"
 ErrCmdTimeout: "命令执行超时！"
+ErrInitUser: "系统已完成用户初始化，请勿重复操作!"
 
 #app
 ErrPortInUsed: "{{ .detail }} 端口已被占用！"