yhl452493373/frps-panel
1
0
Fork 0
mirror of https://github.com/yhl452493373/frps-panel.git synced 2026-04-04 06:16:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix error tips with english

Browse Source
This commit is contained in:
杨黄林
2023-08-30 19:55:32 +08:00
parent 6ca0044dc3
commit 012a18ceb2
6 changed files with 122 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
assets/lang/en.json
View File

@@ -29,6 +29,7 @@
"Other error": "Other error",
"Param error": "Param error",
"User exist": "User exist",
"User cannot be empty": "User cannot be empty",
"Token cannot be empty": "Token cannot be empty",
"Please check at least one user": "Please Check at least one user",
"Operation confirm": "Operation confirm",

1
assets/lang/zh.json
View File

@@ -29,6 +29,7 @@
"Other error": "其他异常",
"Param error": "参数异常",
"User exist": "用户已经存在",
"User cannot be empty": "用户不能为空",
"Token cannot be empty": "Token 不能为空",
"Please check at least one user": "请选中需要操作的用户",
"Operation confirm": "操作确认",

79
assets/static/js/index.js
View File

@@ -6,6 +6,36 @@ $(function () {
Disable: 3
}
/**
* verify user value
* @param username
*/
function verifyUser(username) {
var valid = true;
if (username.trim() === '' || !/\w/.test(username)) {
valid = false;
}
return {
valid: valid,
trim: username
};
}
/**
* verify token value
* @param token
*/
function verifyToken(token) {
var valid = true;
if (token.trim() === '' || !/\w/.test(token)) {
valid = false;
}
return {
valid: valid,
trim: token
};
}
/**
* verify comment is valid
* @param comment
@@ -120,50 +150,84 @@ $(function () {
function langLoaded(lang) {
//set verify rules
var verifyRules = {
user: function (value, item) {
var result = verifyUser(value);
if (!result.valid) {
return lang['UserEmpty'];
}
if (item != null) {
if (typeof item === "function") {
item && item(result.trim);
} else {
$(item).val(result.trim);
}
}
},
token: function (value, item) {
var result = verifyToken(value);
if (!result.valid) {
return lang['TokenEmpty'];
}
if (item != null) {
if (typeof item === "function") {
item && item(result.trim);
} else {
$(item).val(result.trim);
}
}
},
comment: function (value, item) {
var result = verifyComment(value);
if (!result.valid) {
return lang['CommentInvalid'];
}
if (item != null) {
if (typeof item === "function") {
item && item(result.trim);
} else {
$(item).val(result.trim);
}
}
},
ports: function (value, item) {
var result = verifyPorts(value);
if (!result.valid) {
return lang['PortsInvalid'];
}
if (item != null) {
if (typeof item === "function") {
item && item(result.trim);
} else {
$(item).val(result.trim);
}
}
},
domains: function (value, item) {
var result = verifyDomains(value);
if (!result.valid) {
return lang['DomainsInvalid'];
}
if (item != null) {
if (typeof item === "function") {
item && item(result.trim);
} else {
$(item).val(result.trim);
}
}
},
subdomains: function (value, item) {
var result = verifySubdomains(value);
if (!result.valid) {
return lang['SubdomainsInvalid'];
}
if (item != null) {
if (typeof item === "function") {
item && item(result.trim);
} else {
$(item).val(result.trim);
}
}
}
};
layui.form.verify(verifyRules);
@@ -217,8 +281,11 @@ $(function () {
var after = $.extend(true, {}, obj.data);
var verifyMsg = false;
if (field === 'token') {
if (value.trim() === '') {
layui.layer.msg(lang['TokenEmpty'])
verifyMsg = verifyRules.token(value, function (trim) {
updateTableField(obj, field, trim)
});
if (verifyMsg) {
layui.layer.msg(verifyMsg);
return obj.reedit();
}
@@ -318,7 +385,7 @@ $(function () {
btn: [lang['Confirm'], lang['Cancel']],
btn1: function (index) {
if (layui.form.validate('#addUserForm')) {
add(layui.form.val('addUserForm'), index)
add(layui.form.val('addUserForm'), index);
}
},
btn2: function (index) {
@@ -540,6 +607,12 @@ $(function () {
reason = lang['ParamError'];
else if (result.code === 2)
reason = lang['UserExist'];
else if (result.code === 3)
reason = lang['ParamError'];
else if (result.code === 4)
reason = lang['UserEmpty'];
else if (result.code === 5)
reason = lang['TokenEmpty'];
layui.layer.msg(lang['OperateFailed'] + ',' + reason)
}

2
assets/static/layui/layui.js
View File

File diff suppressed because one or more lines are too long

16
assets/templates/index.html
View File

@@ -24,7 +24,7 @@
<div class="layui-input-prefix">
<i class="layui-icon layui-icon-username"></i>
</div>
<input type="text" name="user" value="" placeholder="${ .User }" class="layui-input" autocomplete="off"
<input type="text" name="user" placeholder="${ .User }" class="layui-input" autocomplete="off"
lay-affix="clear">
</div>
</div>
@@ -73,21 +73,19 @@
</div>
</script>
<script type="text/html" id="addTemplate">
<div class="layui-form" id="addUserForm" lay-filter="addUserForm">
<form class="layui-form" id="addUserForm" lay-filter="addUserForm">
<div class="layui-form-item">
<label class="layui-form-label">${ .User }</label>
<div class="layui-input-block">
<input type="text" name="user" placeholder="${ .PleaseInputUserAccount }" autocomplete="off"
class="layui-input"
lay-verify="required">
<input type="text" name="user" lay-verify="user" placeholder="${ .PleaseInputUserAccount }"
autocomplete="off" class="layui-input"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">${ .Token }</label>
<div class="layui-input-block">
<input type="text" name="token" lay-verify="required" placeholder="${ .PleaseInputUserToken }"
class="layui-input"
autocomplete="off">
<input type="text" name="token" lay-verify="token" placeholder="${ .PleaseInputUserToken }"
autocomplete="off" class="layui-input"/>
</div>
</div>
<div class="layui-form-item layui-form-text">
@@ -118,7 +116,7 @@
autocomplete="off" class="layui-textarea"></textarea>
</div>
</div>
</div>
</form>
</script>
</body>
</html>

20
pkg/server/controller/controller.go
View File

@@ -19,6 +19,8 @@ const (
ParamError = 1
UserExist = 2
SaveError = 3
UserEmpty = 4
TokenEmpty = 5
)
var TrimAllSpaceReg = regexp.MustCompile("[\\n\\t\\r\\s]")
@@ -210,6 +212,7 @@ func (c *HandleController) MakeLangFunc() func(context *gin.Context) {
"OperateError": ginI18n.MustGetMessage(context, "Operate error"),
"OperateFailed": ginI18n.MustGetMessage(context, "Operate failed"),
"UserExist": ginI18n.MustGetMessage(context, "User exist"),
"UserEmpty": ginI18n.MustGetMessage(context, "User cannot be empty"),
"TokenEmpty": ginI18n.MustGetMessage(context, "Token cannot be empty"),
"ShouldCheckUser": ginI18n.MustGetMessage(context, "Please check at least one user"),
"OperationConfirm": ginI18n.MustGetMessage(context, "Operation confirm"),
@@ -221,6 +224,7 @@ func (c *HandleController) MakeLangFunc() func(context *gin.Context) {
"DomainsInvalid": ginI18n.MustGetMessage(context, "Domains is invalid"),
"SubdomainsInvalid": ginI18n.MustGetMessage(context, "Subdomains is invalid"),
"CommentInvalid": ginI18n.MustGetMessage(context, "Comment is invalid"),
"ParamError": ginI18n.MustGetMessage(context, "Param error"),
})
}
}
@@ -313,6 +317,14 @@ func (c *HandleController) MakeAddTokenFunc() func(context *gin.Context) {
context.JSON(http.StatusOK, &response)
return
}
if strings.TrimSpace(info.User) == "" {
log.Printf("user add failed, user cannot be empty")
response.Success = false
response.Code = UserEmpty
response.Message = fmt.Sprintf("user add failed, user cannot be empty")
context.JSON(http.StatusOK, &response)
return
}
if _, exist := c.Tokens[info.User]; exist {
log.Printf("user add failed, user [%v] exist", info.User)
response.Success = false
@@ -321,6 +333,14 @@ func (c *HandleController) MakeAddTokenFunc() func(context *gin.Context) {
context.JSON(http.StatusOK, &response)
return
}
if strings.TrimSpace(info.Token) == "" {
log.Printf("user add failed, token cannot be empty")
response.Success = false
response.Code = TokenEmpty
response.Message = fmt.Sprintf("user add failed, token cannot be empty")
context.JSON(http.StatusOK, &response)
return
}
c.Tokens[info.User] = info
usersSection, _ := c.IniFile.GetSection("users")