From 13a77fca5fa814e78dacf082cf73e35a6b1576f9 Mon Sep 17 00:00:00 2001 From: syuchen Date: Sun, 25 Nov 2018 01:06:09 +0800 Subject: [PATCH 1/8] bugfixed $vm is not defined MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit "系统设置"页面saveAdvanced(保存设置)方法bug --- src/main/resources/templates/admin/setting.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 + From b80e5a94b548ea4aa709899401dd3a59430de055 Mon Sep 17 00:00:00 2001 From: biezhi Date: Tue, 27 Nov 2018 16:39:29 +0800 Subject: [PATCH 2/8] :arrow_up: upgrade blade --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3de2c82a..4625b2fb 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ UTF-8 3.21.0.1 - 2.0.10.RELEASE + 2.0.12.BETA 0.2.4 0.1.3 0.11.0 From f4116917eaec513356bdd3cc7e77a612d3122d6d Mon Sep 17 00:00:00 2001 From: biezhi Date: Tue, 27 Nov 2018 16:39:40 +0800 Subject: [PATCH 3/8] :fire: remove TipException --- .../java/com/tale/exception/TipException.java | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 src/main/java/com/tale/exception/TipException.java 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); - } - -} From 9193bbe7c88f6b9817ca2c25f30d62b344c75a5f Mon Sep 17 00:00:00 2001 From: biezhi Date: Tue, 27 Nov 2018 16:40:06 +0800 Subject: [PATCH 4/8] :bug: fixed common validator tip --- src/main/java/com/tale/validators/CommonValidator.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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) { From 9bfff744a777dfccb426f214c57d390e2ca422af Mon Sep 17 00:00:00 2001 From: syuchen Date: Wed, 28 Nov 2018 17:16:25 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=BA=E5=A4=B1?= =?UTF-8?q?=E7=9A=84=E5=85=B3=E9=97=AD=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit
①
②
③
④
...
④
③
②
① --- src/main/resources/templates/admin/footer.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 + From 2b8f8db2690c83fd87472ffb7d3419829ef68ebb Mon Sep 17 00:00:00 2001 From: biezhi Date: Tue, 18 Dec 2018 19:15:40 +0800 Subject: [PATCH 6/8] :arrow_up: upgrade dependency --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 4625b2fb..6db7e98a 100644 --- a/pom.xml +++ b/pom.xml @@ -10,9 +10,9 @@ UTF-8 - 3.21.0.1 - 2.0.12.BETA - 0.2.4 + 3.25.2 + 2.0.13.BETA + 0.2.5 0.1.3 0.11.0 1.0 From 39f5136152759259695c5928da01edd9d01aa161 Mon Sep 17 00:00:00 2001 From: biezhi Date: Thu, 27 Dec 2018 01:07:50 +0800 Subject: [PATCH 7/8] :arrow_up: upgrade dependency --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6db7e98a..6dfb6e54 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ UTF-8 3.25.2 - 2.0.13.BETA + 2.0.14.RELEASE 0.2.5 0.1.3 0.11.0 From 2458b829ace7faeccf741d076b7800282466dfcc Mon Sep 17 00:00:00 2001 From: biezhi Date: Thu, 27 Dec 2018 20:05:10 +0800 Subject: [PATCH 8/8] :bookmark: release 2.0.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6dfb6e54..b6bfd51b 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ UTF-8 - 3.25.2 + 3.21.0.1 2.0.14.RELEASE 0.2.5 0.1.3