From 1db4b723c3d989b5933219f61d4da74235f3833f Mon Sep 17 00:00:00 2001 From: wizzer Date: Fri, 11 Sep 2020 15:20:18 +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 --- wk-app/pom.xml | 2 +- wk-app/wk-common/pom.xml | 2 +- wk-app/wk-model/pom.xml | 4 ++-- wk-app/wk-nb-service-cms/pom.xml | 2 +- wk-app/wk-nb-service-sys/pom.xml | 2 +- wk-app/wk-nb-service-wx/pom.xml | 2 +- wk-app/wk-nb-task/pom.xml | 2 +- wk-app/wk-nb-web-api/pom.xml | 2 +- wk-app/wk-nb-web-platform/pom.xml | 2 +- wk-app/wk-nb-web-vue/pom.xml | 2 +- .../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 +- wk-code/wk-code-generator-nb/pom.xml | 4 ++-- wk-framework/pom.xml | 2 +- wk-starter/pom.xml | 2 +- wk-wiki/pom.xml | 4 ++-- 20 files changed, 23 insertions(+), 23 deletions(-) diff --git a/wk-app/pom.xml b/wk-app/pom.xml index 141aeb932..c94d0090c 100644 --- a/wk-app/pom.xml +++ b/wk-app/pom.xml @@ -5,7 +5,7 @@ wk-parent cn.wizzer - 5.2.7-SNAPSHOT + 5.2.7-zookeeper 4.0.0 pom diff --git a/wk-app/wk-common/pom.xml b/wk-app/wk-common/pom.xml index 851f8d940..60b69e928 100644 --- a/wk-app/wk-common/pom.xml +++ b/wk-app/wk-common/pom.xml @@ -5,7 +5,7 @@ wk-app cn.wizzer.app - 5.2.7-SNAPSHOT + 5.2.7-zookeeper 4.0.0 jar diff --git a/wk-app/wk-model/pom.xml b/wk-app/wk-model/pom.xml index 91ac2f26d..8bc7d8b74 100644 --- a/wk-app/wk-model/pom.xml +++ b/wk-app/wk-model/pom.xml @@ -5,7 +5,7 @@ wk-app cn.wizzer.app - 5.2.7-SNAPSHOT + 5.2.7-zookeeper 4.0.0 jar @@ -20,7 +20,7 @@ cn.wizzer.app wk-code-generator-nb - 5.2.7-SNAPSHOT + 5.2.7-zookeeper runtime diff --git a/wk-app/wk-nb-service-cms/pom.xml b/wk-app/wk-nb-service-cms/pom.xml index 658323187..8e234cf0b 100644 --- a/wk-app/wk-nb-service-cms/pom.xml +++ b/wk-app/wk-nb-service-cms/pom.xml @@ -5,7 +5,7 @@ wk-app cn.wizzer.app - 5.2.7-SNAPSHOT + 5.2.7-zookeeper 4.0.0 diff --git a/wk-app/wk-nb-service-sys/pom.xml b/wk-app/wk-nb-service-sys/pom.xml index 98f2966de..c52b90a18 100644 --- a/wk-app/wk-nb-service-sys/pom.xml +++ b/wk-app/wk-nb-service-sys/pom.xml @@ -5,7 +5,7 @@ wk-app cn.wizzer.app - 5.2.7-SNAPSHOT + 5.2.7-zookeeper 4.0.0 jar diff --git a/wk-app/wk-nb-service-wx/pom.xml b/wk-app/wk-nb-service-wx/pom.xml index df505095c..3a6766dbd 100644 --- a/wk-app/wk-nb-service-wx/pom.xml +++ b/wk-app/wk-nb-service-wx/pom.xml @@ -5,7 +5,7 @@ wk-app cn.wizzer.app - 5.2.7-SNAPSHOT + 5.2.7-zookeeper 4.0.0 diff --git a/wk-app/wk-nb-task/pom.xml b/wk-app/wk-nb-task/pom.xml index 546c30576..bb8cdb957 100644 --- a/wk-app/wk-nb-task/pom.xml +++ b/wk-app/wk-nb-task/pom.xml @@ -5,7 +5,7 @@ wk-app cn.wizzer.app - 5.2.7-SNAPSHOT + 5.2.7-zookeeper 4.0.0 jar diff --git a/wk-app/wk-nb-web-api/pom.xml b/wk-app/wk-nb-web-api/pom.xml index 06aef96de..73d8323a6 100644 --- a/wk-app/wk-nb-web-api/pom.xml +++ b/wk-app/wk-nb-web-api/pom.xml @@ -5,7 +5,7 @@ wk-app cn.wizzer.app - 5.2.7-SNAPSHOT + 5.2.7-zookeeper 4.0.0 jar diff --git a/wk-app/wk-nb-web-platform/pom.xml b/wk-app/wk-nb-web-platform/pom.xml index 12bf8fc10..6c8dd2af1 100644 --- a/wk-app/wk-nb-web-platform/pom.xml +++ b/wk-app/wk-nb-web-platform/pom.xml @@ -5,7 +5,7 @@ wk-app cn.wizzer.app - 5.2.7-SNAPSHOT + 5.2.7-zookeeper 4.0.0 jar diff --git a/wk-app/wk-nb-web-vue/pom.xml b/wk-app/wk-nb-web-vue/pom.xml index 14c5b69e6..383417283 100644 --- a/wk-app/wk-nb-web-vue/pom.xml +++ b/wk-app/wk-nb-web-vue/pom.xml @@ -5,7 +5,7 @@ wk-app cn.wizzer.app - 5.2.7-SNAPSHOT + 5.2.7-zookeeper 4.0.0 jar diff --git a/wk-app/wk-nb-web-vue/src/main/java/cn/wizzer/app/web/commons/ext/handler/WkErrorPageHandler.java b/wk-app/wk-nb-web-vue/src/main/java/cn/wizzer/app/web/commons/ext/handler/WkErrorPageHandler.java index 0914ebeec..ad597b594 100644 --- a/wk-app/wk-nb-web-vue/src/main/java/cn/wizzer/app/web/commons/ext/handler/WkErrorPageHandler.java +++ b/wk-app/wk-nb-web-vue/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/wk-app/wk-nb-web-vue/src/main/java/cn/wizzer/app/web/modules/tags/CmsArticleListTag.java b/wk-app/wk-nb-web-vue/src/main/java/cn/wizzer/app/web/modules/tags/CmsArticleListTag.java index 68030d7c6..1a770b124 100644 --- a/wk-app/wk-nb-web-vue/src/main/java/cn/wizzer/app/web/modules/tags/CmsArticleListTag.java +++ b/wk-app/wk-nb-web-vue/src/main/java/cn/wizzer/app/web/modules/tags/CmsArticleListTag.java @@ -6,7 +6,7 @@ import cn.wizzer.framework.page.Pagination; import com.alibaba.dubbo.config.annotation.Reference; 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/wk-app/wk-nb-web-vue/src/main/java/cn/wizzer/app/web/modules/tags/CmsArticleTag.java b/wk-app/wk-nb-web-vue/src/main/java/cn/wizzer/app/web/modules/tags/CmsArticleTag.java index 4ee8074b6..8c1fe8d2e 100644 --- a/wk-app/wk-nb-web-vue/src/main/java/cn/wizzer/app/web/modules/tags/CmsArticleTag.java +++ b/wk-app/wk-nb-web-vue/src/main/java/cn/wizzer/app/web/modules/tags/CmsArticleTag.java @@ -2,7 +2,7 @@ import cn.wizzer.app.cms.modules.services.CmsArticleService; import com.alibaba.dubbo.config.annotation.Reference; -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/wk-app/wk-nb-web-vue/src/main/java/cn/wizzer/app/web/modules/tags/CmsChannelListTag.java b/wk-app/wk-nb-web-vue/src/main/java/cn/wizzer/app/web/modules/tags/CmsChannelListTag.java index b29e80a1f..53f5a31da 100644 --- a/wk-app/wk-nb-web-vue/src/main/java/cn/wizzer/app/web/modules/tags/CmsChannelListTag.java +++ b/wk-app/wk-nb-web-vue/src/main/java/cn/wizzer/app/web/modules/tags/CmsChannelListTag.java @@ -3,7 +3,7 @@ import cn.wizzer.app.cms.modules.models.Cms_channel; import cn.wizzer.app.cms.modules.services.CmsChannelService; import com.alibaba.dubbo.config.annotation.Reference; -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/wk-app/wk-nb-web-vue/src/main/java/cn/wizzer/app/web/modules/tags/CmsChannelTag.java b/wk-app/wk-nb-web-vue/src/main/java/cn/wizzer/app/web/modules/tags/CmsChannelTag.java index bee8f9ff0..0581a77e1 100644 --- a/wk-app/wk-nb-web-vue/src/main/java/cn/wizzer/app/web/modules/tags/CmsChannelTag.java +++ b/wk-app/wk-nb-web-vue/src/main/java/cn/wizzer/app/web/modules/tags/CmsChannelTag.java @@ -3,7 +3,7 @@ import cn.wizzer.app.cms.modules.models.Cms_channel; import cn.wizzer.app.cms.modules.services.CmsChannelService; import com.alibaba.dubbo.config.annotation.Reference; -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/wk-app/wk-nb-web-vue/src/main/java/cn/wizzer/app/web/modules/tags/CmsLinkListTag.java b/wk-app/wk-nb-web-vue/src/main/java/cn/wizzer/app/web/modules/tags/CmsLinkListTag.java index bda58631e..fe09357f0 100644 --- a/wk-app/wk-nb-web-vue/src/main/java/cn/wizzer/app/web/modules/tags/CmsLinkListTag.java +++ b/wk-app/wk-nb-web-vue/src/main/java/cn/wizzer/app/web/modules/tags/CmsLinkListTag.java @@ -4,7 +4,7 @@ import cn.wizzer.app.cms.modules.services.CmsLinkService; import com.alibaba.dubbo.config.annotation.Reference; 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; diff --git a/wk-code/wk-code-generator-nb/pom.xml b/wk-code/wk-code-generator-nb/pom.xml index 2f9f9c5e5..43a4c9e5a 100644 --- a/wk-code/wk-code-generator-nb/pom.xml +++ b/wk-code/wk-code-generator-nb/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> cn.wizzer.app wk-code-generator-nb - 5.2.7-SNAPSHOT + 5.2.7-zookeeper 4.0.0 jar wk-code-generator-nb @@ -12,7 +12,7 @@ 1.0.1 1.7 1.2 - 1.r.68-SNAPSHOT + 1.r.68.v20200309 1.7.25 1.2.3 diff --git a/wk-framework/pom.xml b/wk-framework/pom.xml index 9992505b0..6a3577d97 100644 --- a/wk-framework/pom.xml +++ b/wk-framework/pom.xml @@ -5,7 +5,7 @@ wk-parent cn.wizzer - 5.2.7-SNAPSHOT + 5.2.7-zookeeper jar 4.0.0 diff --git a/wk-starter/pom.xml b/wk-starter/pom.xml index 353d9f2fc..37ce7f37e 100644 --- a/wk-starter/pom.xml +++ b/wk-starter/pom.xml @@ -5,7 +5,7 @@ wk-parent cn.wizzer - 5.2.7-SNAPSHOT + 5.2.7-zookeeper 4.0.0 diff --git a/wk-wiki/pom.xml b/wk-wiki/pom.xml index 6ff2cbff0..77bcdf5c0 100644 --- a/wk-wiki/pom.xml +++ b/wk-wiki/pom.xml @@ -6,10 +6,10 @@ wk-parent cn.wizzer - 5.2.7-SNAPSHOT + 5.2.7-zookeeper wk-wiki - 5.2.7-SNAPSHOT + 5.2.7-zookeeper pom wk-wiki https://www.wizzer.cn