8000 Develop by hellokaton · Pull Request #513 · otale/tale · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
This repository was archived by the owner on May 18, 2024. It is now read-only.

Develop #513

Merged
merged 10 commits into from
Dec 27, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
8000
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
16 changes: 0 additions & 16 deletions src/main/java/com/tale/exception/TipException.java

This file was deleted.

6 changes: 3 additions & 3 deletions src/main/java/com/tale/validators/CommonValidator.java
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 3 additions & 1 deletion src/main/resources/templates/admin/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
3 changes: 2 additions & 1 deletion src/main/resources/templates/admin/setting.html
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -250,4 +251,4 @@ <h3 class="panel-title">高级选项设置</h3>

</script>
</body>
</html>
</html>
0