diff --git a/pom.xml b/pom.xml index 3de2c82a..b6bfd51b 100644 --- a/pom.xml +++ b/pom.xml @@ -11,8 +11,8 @@ UTF-8 3.21.0.1 - 2.0.10.RELEASE - 0.2.4 + 2.0.14.RELEASE + 0.2.5 0.1.3 0.11.0 1.0 diff --git a/src/main/java/com/tale/exception/TipException.java b/src/main/java/com/tale/exception/TipException.java deleted file mode 100644 index bc166d39..00000000 --- a/src/main/java/com/tale/exception/TipException.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.tale.exception; - -/** - * @author biezhi - * @date 2018/6/5 - */ -public class TipException extends RuntimeException { - - public TipException() { - } - - public TipException(String message) { - super(message); - } - -} diff --git a/src/main/java/com/tale/validators/CommonValidator.java b/src/main/java/com/tale/validators/CommonValidator.java index 524d5018..414c52e9 100644 --- a/src/main/java/com/tale/validators/CommonValidator.java +++ b/src/main/java/com/tale/validators/CommonValidator.java @@ -74,12 +74,12 @@ public static void valid(Contents param) { public static void valid(LoginParam param) { Validators.notEmpty().test(param.getUsername()).throwIfInvalid("用户名"); - Validators.notEmpty().test(param.getPassword()).throwIfInvalid("密码"); + Validators.notEmpty().test(param.getPassword()).throwIfInvalid("登录密码"); Validators.moreThan(4).test(param.getUsername()).throwIfInvalid("用户名"); Validators.lessThan(20).test(param.getUsername()).throwIfInvalid("用户名"); - Validators.moreThan(6).test(param.getPassword()).throwIfInvalid("用户名"); - Validators.lessThan(14).test(param.getPassword()).throwIfInvalid("用户名"); + Validators.moreThan(6).test(param.getPassword()).throwIfInvalid("登录密码"); + Validators.lessThan(14).test(param.getPassword()).throwIfInvalid("登录密码"); } public static void valid(InstallParam param) { diff --git a/src/main/resources/templates/admin/footer.html b/src/main/resources/templates/admin/footer.html index 8174d1a6..28f42ba6 100644 --- a/src/main/resources/templates/admin/footer.html +++ b/src/main/resources/templates/admin/footer.html @@ -3,6 +3,8 @@ + + @@ -16,4 +18,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/templates/admin/setting.html b/src/main/resources/templates/admin/setting.html index d8d920b8..ff1d1252 100644 --- a/src/main/resources/templates/admin/setting.html +++ b/src/main/resources/templates/admin/setting.html @@ -214,6 +214,7 @@

高级选项设置

}); }, saveAdvanced: function () { + var $vm = this; var param = $('#advanced-form').serialize(); tale.post({ url: '/admin/api/advanced/save', @@ -250,4 +251,4 @@

高级选项设置

- \ No newline at end of file +