fix error tips with english

assets/lang/en.json

@@ -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",

assets/lang/zh.json

@@ -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": "操作确认",

assets/static/js/index.js

@@ -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,15 +150,43 @@ $(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 (typeof item === "function") {
+                if (item != null) {
-                    item && item(result.trim);
+                    if (typeof item === "function") {
-                } else {
+                        item && item(result.trim);
-                    $(item).val(result.trim);
+                    } else {
+                        $(item).val(result.trim);
+                    }
                 }
             },
             ports: function (value, item) {
@@ -136,10 +194,12 @@ $(function () {
                 if (!result.valid) {
                     return lang['PortsInvalid'];
                 }
-                if (typeof item === "function") {
+                if (item != null) {
-                    item && item(result.trim);
+                    if (typeof item === "function") {
-                } else {
+                        item && item(result.trim);
-                    $(item).val(result.trim);
+                    } else {
+                        $(item).val(result.trim);
+                    }
                 }
             },
             domains: function (value, item) {
@@ -147,10 +207,12 @@ $(function () {
                 if (!result.valid) {
                     return lang['DomainsInvalid'];
                 }
-                if (typeof item === "function") {
+                if (item != null) {
-                    item && item(result.trim);
+                    if (typeof item === "function") {
-                } else {
+                        item && item(result.trim);
-                    $(item).val(result.trim);
+                    } else {
+                        $(item).val(result.trim);
+                    }
                 }
             },
             subdomains: function (value, item) {
@@ -158,10 +220,12 @@ $(function () {
                 if (!result.valid) {
                     return lang['SubdomainsInvalid'];
                 }
-                if (typeof item === "function") {
+                if (item != null) {
-                    item && item(result.trim);
+                    if (typeof item === "function") {
-                } else {
+                        item && item(result.trim);
-                    $(item).val(result.trim);
+                    } else {
+                        $(item).val(result.trim);
+                    }
                 }
             }
         };
@@ -217,8 +281,11 @@ $(function () {
             var after = $.extend(true, {}, obj.data);
             var verifyMsg = false;
             if (field === 'token') {
-                if (value.trim() === '') {
+                verifyMsg = verifyRules.token(value, function (trim) {
-                    layui.layer.msg(lang['TokenEmpty'])
+                    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)
         }
 

assets/templates/index.html

@@ -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"
+                <input type="text" name="user" lay-verify="user" placeholder="${ .PleaseInputUserAccount }"
-                       class="layui-input"
+                       autocomplete="off" class="layui-input"/>
-                       lay-verify="required">
             </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 }"
+                <input type="text" name="token" lay-verify="token" placeholder="${ .PleaseInputUserToken }"
-                       class="layui-input"
+                       autocomplete="off" class="layui-input"/>
-                       autocomplete="off">
             </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>

pkg/server/controller/controller.go

@@ -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")