From 65dc646ab39d3a21fc5f20462ec119379e088d72 Mon Sep 17 00:00:00 2001 From: wizzer Date: Fri, 11 Sep 2020 15:30:51 +0800 Subject: [PATCH] =?UTF-8?q?update:=20=E5=8D=87=E7=BA=A7=20nutzboot=20&=20n?= =?UTF-8?q?utz=20&=20beetl=20=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 ++++-- pom.xml | 6 +++--- .../app/web/commons/ext/handler/WkErrorPageHandler.java | 2 +- .../cn/wizzer/app/web/modules/tags/CmsArticleListTag.java | 2 +- .../java/cn/wizzer/app/web/modules/tags/CmsArticleTag.java | 2 +- .../cn/wizzer/app/web/modules/tags/CmsChannelListTag.java | 2 +- .../java/cn/wizzer/app/web/modules/tags/CmsChannelTag.java | 2 +- .../java/cn/wizzer/app/web/modules/tags/CmsLinkListTag.java | 2 +- 8 files changed, 13 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index d06d1a328..67efdad67 100644 --- 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 index df6953a60..21338f4cd 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ jar cn.wizzer wk-mini - 5.2.6 + 5.2.7-mini NutzWk-Mini 5.2.6 - 2.3.7.v20190731 - 1.r.68.v20190731 + 2.4.0.v20200427 + 1.r.68.v20200309 5.1.48 2.3.1 1.7.25 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 index 0914ebeec..06a836cce 100644 --- 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 index 832cdc50c..36ef71e0d 100644 --- 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 index 7993a6408..d651ad4f4 100644 --- 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 index 950430d02..90ebf33cd 100644 --- 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 index e12ff4cdc..7033bdd57 100644 --- 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 index ee0ac92cc..b09e82adf 100644 --- 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;