Merge pull request otale#513 from otale/develop

Develop
hbfrank · Dec 27, 2018 · 70b32fa · 70b32fa
2 parents 620770f + 2458b82
commit 70b32fa
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 23 deletions.
diff --git a/pom.xml b/pom.xml
@@ -11,8 +11,8 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <sqlite.version>3.21.0.1</sqlite.version>
-        <blade-mvc.version>2.0.10.RELEASE</blade-mvc.version>
-        <anima.version>0.2.4</anima.version>
+        <blade-mvc.version>2.0.14.RELEASE</blade-mvc.version>
+        <anima.version>0.2.5</anima.version>
         <blade-tpl.verion>0.1.3</blade-tpl.verion>
         <commonmark.version>0.11.0</commonmark.version>
         <rome.version>1.0</rome.version>

diff --git a/src/main/java/com/tale/exception/TipException.java b/src/main/java/com/tale/exception/TipException.java
diff --git 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
@@ -3,6 +3,8 @@
 </footer>
 </div>
 </div>
+</div>
+</div>
 <script src="${cdnURL()}/plugins/jquery/3.2.1/jquery.min.js"></script>
 <script src="${cdnURL()}/plugins/bootstrap/3.3.7/js/bootstrap.min.js"></script>
 <script src="${cdnURL()}/plugins/md5/md5.min.js"></script>
@@ -16,4 +18,4 @@
 <script src="${cdnURL()}/plugins/moment/moment.min.js"></script>
 <script src="${cdnURL()}/plugins/vue-loading/vue-loading.min.js"></script>
 <script src="${cdnURL()}/plugins/dashborad/jquery.app.js?v=${version}"></script>
-<script src="${cdnURL()}/js/base.js?v=${version}"></script>
+<script src="${cdnURL()}/js/base.js?v=${version}"></script>
diff --git a/src/main/resources/templates/admin/setting.html b/src/main/resources/templates/admin/setting.html
@@ -214,6 +214,7 @@ <h3 class="panel-title">高级选项设置</h3>
                 });
             },
             saveAdvanced: function () {
+                var $vm = this;
                 var param = $('#advanced-form').serialize();
                 tale.post({
                     url: '/admin/api/advanced/save',
@@ -250,4 +251,4 @@ <h3 class="panel-title">高级选项设置</h3>
 
 </script>
 </body>
-</html>
+</html>