update: 升级 nutzboot & nutz & beetl 版本

Wizzercn · Sep 11, 2020 · 65dc646 · 65dc646
1 parent 0b9d1a4
commit 65dc646
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -6,9 +6,11 @@ NutzWk 开源企业级Java Web开发框架
 [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
 [![PowerByNutz](https://img.shields.io/badge/PowerBy-Nutz-green.svg)](https://github.com/nutzam/nutz)
 
-https://nutzwk.wizzer.cn                 演示地址
+https://nutzwk.wizzer.cn                 V5演示地址
 
-https://wizzer.cn/donation                捐赠者列表
+https://demo.budwk.com                 V6演示地址
+
+https://budwk.com/donation                捐赠者列表
 
 # 前言
 

diff --git a/pom.xml b/pom.xml
@@ -6,13 +6,13 @@
     <packaging>jar</packaging>
     <groupId>cn.wizzer</groupId>
     <artifactId>wk-mini</artifactId>
-    <version>5.2.6</version>
+    <version>5.2.7-mini</version>
     <name>NutzWk-Mini</name>
 
     <properties>
         <nutzwk.version>5.2.6</nutzwk.version>
-        <nutzboot.version>2.3.7.v20190731</nutzboot.version>
-        <nutz.version>1.r.68.v20190731</nutz.version>
+        <nutzboot.version>2.4.0.v20200427</nutzboot.version>
+        <nutz.version>1.r.68.v20200309</nutz.version>
         <mysql-connector-java.version>5.1.48</mysql-connector-java.version>
         <jaxb-api.version>2.3.1</jaxb-api.version>
         <slf4j.version>1.7.25</slf4j.version>

diff --git a/src/main/java/cn/wizzer/app/web/commons/ext/handler/WkErrorPageHandler.java b/src/main/java/cn/wizzer/app/web/commons/ext/handler/WkErrorPageHandler.java
@@ -23,7 +23,7 @@ public class WkErrorPageHandler extends ErrorPageErrorHandler {
     private static final Log log = Logs.get();
 
     @Override
-    public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException {
+    public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
         if (response.getStatus() == 403 || response.getStatus() == 404 || response.getStatus() == 500) {
             try {
                 if (isAjax(request)) {

diff --git a/src/main/java/cn/wizzer/app/web/modules/tags/CmsArticleListTag.java b/src/main/java/cn/wizzer/app/web/modules/tags/CmsArticleListTag.java
@@ -5,7 +5,7 @@
 import cn.wizzer.app.cms.modules.services.CmsChannelService;
 import cn.wizzer.framework.page.Pagination;
 import org.apache.commons.lang3.math.NumberUtils;
-import org.beetl.core.GeneralVarTagBinding;
+import org.beetl.core.tag.GeneralVarTagBinding;
 import org.nutz.dao.Cnd;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;

diff --git a/src/main/java/cn/wizzer/app/web/modules/tags/CmsArticleTag.java b/src/main/java/cn/wizzer/app/web/modules/tags/CmsArticleTag.java
@@ -1,7 +1,7 @@
 package cn.wizzer.app.web.modules.tags;
 
 import cn.wizzer.app.cms.modules.services.CmsArticleService;
-import org.beetl.core.GeneralVarTagBinding;
+import org.beetl.core.tag.GeneralVarTagBinding;
 import org.nutz.dao.Cnd;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;

diff --git a/src/main/java/cn/wizzer/app/web/modules/tags/CmsChannelListTag.java b/src/main/java/cn/wizzer/app/web/modules/tags/CmsChannelListTag.java
@@ -2,7 +2,7 @@
 
 import cn.wizzer.app.cms.modules.models.Cms_channel;
 import cn.wizzer.app.cms.modules.services.CmsChannelService;
-import org.beetl.core.GeneralVarTagBinding;
+import org.beetl.core.tag.GeneralVarTagBinding;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.lang.Strings;

diff --git a/src/main/java/cn/wizzer/app/web/modules/tags/CmsChannelTag.java b/src/main/java/cn/wizzer/app/web/modules/tags/CmsChannelTag.java
@@ -2,7 +2,7 @@
 
 import cn.wizzer.app.cms.modules.models.Cms_channel;
 import cn.wizzer.app.cms.modules.services.CmsChannelService;
-import org.beetl.core.GeneralVarTagBinding;
+import org.beetl.core.tag.GeneralVarTagBinding;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.lang.Strings;

diff --git a/src/main/java/cn/wizzer/app/web/modules/tags/CmsLinkListTag.java b/src/main/java/cn/wizzer/app/web/modules/tags/CmsLinkListTag.java
@@ -3,7 +3,7 @@
 import cn.wizzer.app.cms.modules.models.Cms_link;
 import cn.wizzer.app.cms.modules.services.CmsLinkService;
 import org.apache.commons.lang3.math.NumberUtils;
-import org.beetl.core.GeneralVarTagBinding;
+import org.beetl.core.tag.GeneralVarTagBinding;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.lang.Strings;