update: 升级 nutzboot & nutz & beetl 版本

Wizzercn · Sep 11, 2020 · 1db4b72 · 1db4b72
1 parent 5dceff6
commit 1db4b72
Show file tree

Hide file tree

Showing 20 changed files with 23 additions and 23 deletions.
diff --git a/wk-app/pom.xml b/wk-app/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wk-parent</artifactId>
         <groupId>cn.wizzer</groupId>
-        <version>5.2.7-SNAPSHOT</version>
+        <version>5.2.7-zookeeper</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

diff --git a/wk-app/wk-common/pom.xml b/wk-app/wk-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wk-app</artifactId>
         <groupId>cn.wizzer.app</groupId>
-        <version>5.2.7-SNAPSHOT</version>
+        <version>5.2.7-zookeeper</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/wk-app/wk-model/pom.xml b/wk-app/wk-model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wk-app</artifactId>
         <groupId>cn.wizzer.app</groupId>
-        <version>5.2.7-SNAPSHOT</version>
+        <version>5.2.7-zookeeper</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>cn.wizzer.app</groupId>
             <artifactId>wk-code-generator-nb</artifactId>
-            <version>5.2.7-SNAPSHOT</version>
+            <version>5.2.7-zookeeper</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>

diff --git a/wk-app/wk-nb-service-cms/pom.xml b/wk-app/wk-nb-service-cms/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wk-app</artifactId>
         <groupId>cn.wizzer.app</groupId>
-        <version>5.2.7-SNAPSHOT</version>
+        <version>5.2.7-zookeeper</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/wk-app/wk-nb-service-sys/pom.xml b/wk-app/wk-nb-service-sys/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wk-app</artifactId>
         <groupId>cn.wizzer.app</groupId>
-        <version>5.2.7-SNAPSHOT</version>
+        <version>5.2.7-zookeeper</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/wk-app/wk-nb-service-wx/pom.xml b/wk-app/wk-nb-service-wx/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wk-app</artifactId>
         <groupId>cn.wizzer.app</groupId>
-        <version>5.2.7-SNAPSHOT</version>
+        <version>5.2.7-zookeeper</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/wk-app/wk-nb-task/pom.xml b/wk-app/wk-nb-task/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wk-app</artifactId>
         <groupId>cn.wizzer.app</groupId>
-        <version>5.2.7-SNAPSHOT</version>
+        <version>5.2.7-zookeeper</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/wk-app/wk-nb-web-api/pom.xml b/wk-app/wk-nb-web-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wk-app</artifactId>
         <groupId>cn.wizzer.app</groupId>
-        <version>5.2.7-SNAPSHOT</version>
+        <version>5.2.7-zookeeper</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/wk-app/wk-nb-web-platform/pom.xml b/wk-app/wk-nb-web-platform/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wk-app</artifactId>
         <groupId>cn.wizzer.app</groupId>
-        <version>5.2.7-SNAPSHOT</version>
+        <version>5.2.7-zookeeper</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/wk-app/wk-nb-web-vue/pom.xml b/wk-app/wk-nb-web-vue/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wk-app</artifactId>
         <groupId>cn.wizzer.app</groupId>
-        <version>5.2.7-SNAPSHOT</version>
+        <version>5.2.7-zookeeper</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/...wk-nb-web-vue/src/main/java/cn/wizzer/app/web/commons/ext/handler/WkErrorPageHandler.java b/...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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -4,15 +4,15 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <groupId>cn.wizzer.app</groupId>
     <artifactId>wk-code-generator-nb</artifactId>
-    <version>5.2.7-SNAPSHOT</version>
+    <version>5.2.7-zookeeper</version>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
     <name>wk-code-generator-nb</name>
     <properties>
         <evo-inflector-version>1.0.1</evo-inflector-version>
         <velocity-version>1.7</velocity-version>
         <commons-cli-version>1.2</commons-cli-version>
-        <nutz-version>1.r.68-SNAPSHOT</nutz-version>
+        <nutz-version>1.r.68.v20200309</nutz-version>
         <slf4j.version>1.7.25</slf4j.version>
         <logback.version>1.2.3</logback.version>
     </properties>

diff --git a/wk-framework/pom.xml b/wk-framework/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wk-parent</artifactId>
         <groupId>cn.wizzer</groupId>
-        <version>5.2.7-SNAPSHOT</version>
+        <version>5.2.7-zookeeper</version>
     </parent>
     <packaging>jar</packaging>
     <modelVersion>4.0.0</modelVersion>

diff --git a/wk-starter/pom.xml b/wk-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wk-parent</artifactId>
         <groupId>cn.wizzer</groupId>
-        <version>5.2.7-SNAPSHOT</version>
+        <version>5.2.7-zookeeper</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/wk-wiki/pom.xml b/wk-wiki/pom.xml
@@ -6,10 +6,10 @@
     <parent>
         <artifactId>wk-parent</artifactId>
         <groupId>cn.wizzer</groupId>
-        <version>5.2.7-SNAPSHOT</version>
+        <version>5.2.7-zookeeper</version>
     </parent>
     <artifactId>wk-wiki</artifactId>
-    <version>5.2.7-SNAPSHOT</version>
+    <version>5.2.7-zookeeper</version>
     <packaging>pom</packaging>
     <name>wk-wiki</name>
     <url>https://www.wizzer.cn</url>