diff --git a/pom.xml b/pom.xml index 03c5b3975ffe1db9b8ec4395784d60bb31c30dd4..20df468bf25e9f55a92fcf731a22c30897c18c73 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ duckula-ops Tapestry 5 Application 1.8 - 5.6.1 + 5.7.1 1.0.4 1.0.1 2.11.2 @@ -260,7 +260,6 @@ net.wicp.tams tams-component - 1.2.6 diff --git a/src/main/java/net/wicp/tams/duckula/ops/WebTools.java b/src/main/java/net/wicp/tams/duckula/ops/WebTools.java index 8614bb2f194493483494818937a99f2fd0f6cc8c..9717961e2ba3ed919d821287e7cfdc5f70125040 100644 --- a/src/main/java/net/wicp/tams/duckula/ops/WebTools.java +++ b/src/main/java/net/wicp/tams/duckula/ops/WebTools.java @@ -1,6 +1,6 @@ package net.wicp.tams.duckula.ops; -import org.apache.tapestry5.services.Request; +import org.apache.tapestry5.http.services.Request; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/src/main/java/net/wicp/tams/duckula/ops/pages/Index.java b/src/main/java/net/wicp/tams/duckula/ops/pages/Index.java index 4c2e8e11dd7bb7cc0d4196a7568aee2873888c03..06b85536fff39d5c9c776d62d29b5a8078cd6d89 100644 --- a/src/main/java/net/wicp/tams/duckula/ops/pages/Index.java +++ b/src/main/java/net/wicp/tams/duckula/ops/pages/Index.java @@ -10,9 +10,9 @@ import org.apache.tapestry5.annotations.InjectPage; import org.apache.tapestry5.annotations.OnEvent; import org.apache.tapestry5.annotations.Path; import org.apache.tapestry5.annotations.SessionState; +import org.apache.tapestry5.commons.util.CollectionFactory; +import org.apache.tapestry5.http.services.Request; import org.apache.tapestry5.ioc.annotations.Inject; -import org.apache.tapestry5.ioc.internal.util.CollectionFactory; -import org.apache.tapestry5.services.Request; import org.apache.tapestry5.util.TextStreamResponse; import com.alibaba.fastjson.JSON; @@ -22,7 +22,6 @@ import com.alibaba.fastjson.JSONObject; import net.wicp.tams.app.duckula.controller.bean.models.SysGlobal; import net.wicp.tams.app.duckula.controller.config.constant.ConfigGlobleName; import net.wicp.tams.app.duckula.controller.dao.SysGlobalMapper; -import net.wicp.tams.common.Conf; import net.wicp.tams.common.Result; import net.wicp.tams.common.apiext.StringUtil; import net.wicp.tams.common.constant.dic.YesOrNo; diff --git a/src/main/java/net/wicp/tams/duckula/ops/pages/Login.java b/src/main/java/net/wicp/tams/duckula/ops/pages/Login.java index 1e7bda45bd3e7e8a33ea641f81430a5f390e94de..6a86f742ff94df4eeb56c6cf51656b74b159628b 100644 --- a/src/main/java/net/wicp/tams/duckula/ops/pages/Login.java +++ b/src/main/java/net/wicp/tams/duckula/ops/pages/Login.java @@ -4,8 +4,8 @@ import java.util.List; import org.apache.tapestry5.annotations.Import; import org.apache.tapestry5.annotations.SessionState; +import org.apache.tapestry5.http.services.Request; import org.apache.tapestry5.ioc.annotations.Inject; -import org.apache.tapestry5.services.Request; import org.slf4j.Logger; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/net/wicp/tams/duckula/ops/pages/Main.java b/src/main/java/net/wicp/tams/duckula/ops/pages/Main.java index 3b315d9017db984e39081ff3e8f48d8ab38d3f48..5ebbab93b5006971f29a2f50f64fa57145c686eb 100644 --- a/src/main/java/net/wicp/tams/duckula/ops/pages/Main.java +++ b/src/main/java/net/wicp/tams/duckula/ops/pages/Main.java @@ -1,13 +1,5 @@ package net.wicp.tams.duckula.ops.pages; -import java.util.List; - -import org.apache.tapestry5.annotations.OnEvent; -import org.apache.tapestry5.ioc.internal.util.CollectionFactory; - -import net.wicp.tams.component.assistbean.Menu; -import net.wicp.tams.component.constant.ResType; - public class Main { diff --git a/src/main/java/net/wicp/tams/duckula/ops/pages/runing/ConsumerManager.java b/src/main/java/net/wicp/tams/duckula/ops/pages/runing/ConsumerManager.java index 2dc23aa287ffd158338544aa83bd6ba9e80a7d54..c351a90c3eacf76b7034e6ecec9cd431f042bd3f 100644 --- a/src/main/java/net/wicp/tams/duckula/ops/pages/runing/ConsumerManager.java +++ b/src/main/java/net/wicp/tams/duckula/ops/pages/runing/ConsumerManager.java @@ -2,9 +2,9 @@ package net.wicp.tams.duckula.ops.pages.runing; import java.util.Map; +import org.apache.tapestry5.http.services.Request; +import org.apache.tapestry5.http.services.RequestGlobals; import org.apache.tapestry5.ioc.annotations.Inject; -import org.apache.tapestry5.services.Request; -import org.apache.tapestry5.services.RequestGlobals; import org.apache.tapestry5.util.TextStreamResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/net/wicp/tams/duckula/ops/pages/runing/DumpManager.java b/src/main/java/net/wicp/tams/duckula/ops/pages/runing/DumpManager.java index 96f873b139207b56328a0e6095a25259ee7bc582..8118fd2e61f06f2e51e016422b9fd112d7d4752b 100644 --- a/src/main/java/net/wicp/tams/duckula/ops/pages/runing/DumpManager.java +++ b/src/main/java/net/wicp/tams/duckula/ops/pages/runing/DumpManager.java @@ -2,9 +2,9 @@ package net.wicp.tams.duckula.ops.pages.runing; import java.util.Map; +import org.apache.tapestry5.http.services.Request; +import org.apache.tapestry5.http.services.RequestGlobals; import org.apache.tapestry5.ioc.annotations.Inject; -import org.apache.tapestry5.services.Request; -import org.apache.tapestry5.services.RequestGlobals; import org.apache.tapestry5.util.TextStreamResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/net/wicp/tams/duckula/ops/pages/runing/TaskManager.java b/src/main/java/net/wicp/tams/duckula/ops/pages/runing/TaskManager.java index 6dbb8a8b2d807fcaf0ee86950d1f9a3cc6ea9409..99c9014c795162595b420e9304bd327b33be5f49 100644 --- a/src/main/java/net/wicp/tams/duckula/ops/pages/runing/TaskManager.java +++ b/src/main/java/net/wicp/tams/duckula/ops/pages/runing/TaskManager.java @@ -5,9 +5,9 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.tapestry5.http.services.Request; +import org.apache.tapestry5.http.services.RequestGlobals; import org.apache.tapestry5.ioc.annotations.Inject; -import org.apache.tapestry5.services.Request; -import org.apache.tapestry5.services.RequestGlobals; import org.apache.tapestry5.util.TextStreamResponse; import com.alibaba.fastjson.JSON; @@ -30,7 +30,6 @@ import net.wicp.tams.app.duckula.controller.dao.CommonTaskMapper; import net.wicp.tams.app.duckula.controller.dao.CommonVersionMapper; import net.wicp.tams.app.duckula.controller.service.DeployService; import net.wicp.tams.app.duckula.controller.service.PosService; -import net.wicp.tams.app.duckula.controller.service.deploy.DeployK8s; import net.wicp.tams.common.Result; import net.wicp.tams.common.apiext.CollectionUtil; import net.wicp.tams.common.apiext.StringUtil; diff --git a/src/main/java/net/wicp/tams/duckula/ops/pages/setting/CheckpointManager.java b/src/main/java/net/wicp/tams/duckula/ops/pages/setting/CheckpointManager.java index 8ae6dbef1711af121f9ebdaecd39936e31fd48f7..ec03b561d58f57c16dd7c1f1a51210d2288c862b 100644 --- a/src/main/java/net/wicp/tams/duckula/ops/pages/setting/CheckpointManager.java +++ b/src/main/java/net/wicp/tams/duckula/ops/pages/setting/CheckpointManager.java @@ -2,9 +2,9 @@ package net.wicp.tams.duckula.ops.pages.setting; import java.util.List; +import org.apache.tapestry5.http.services.Request; +import org.apache.tapestry5.http.services.RequestGlobals; import org.apache.tapestry5.ioc.annotations.Inject; -import org.apache.tapestry5.services.Request; -import org.apache.tapestry5.services.RequestGlobals; import org.apache.tapestry5.util.TextStreamResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/net/wicp/tams/duckula/ops/pages/setting/DeployManager.java b/src/main/java/net/wicp/tams/duckula/ops/pages/setting/DeployManager.java index 8944fa04141f71a88581c49f03587d1398e826b7..427c7fa82b7c7ffea89514ccd55fcfc219104216 100644 --- a/src/main/java/net/wicp/tams/duckula/ops/pages/setting/DeployManager.java +++ b/src/main/java/net/wicp/tams/duckula/ops/pages/setting/DeployManager.java @@ -6,10 +6,10 @@ import java.util.Map; import org.apache.commons.collections.CollectionUtils; import org.apache.tapestry5.SymbolConstants; import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.http.services.Request; +import org.apache.tapestry5.http.services.RequestGlobals; import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.ioc.annotations.Symbol; -import org.apache.tapestry5.services.Request; -import org.apache.tapestry5.services.RequestGlobals; import org.apache.tapestry5.util.TextStreamResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/net/wicp/tams/duckula/ops/pages/setting/InstanceManager.java b/src/main/java/net/wicp/tams/duckula/ops/pages/setting/InstanceManager.java index cb2247722995770a6fac94e98d31366fac676b17..7196e1900c1211855b0ea20c404da2f77db818cd 100644 --- a/src/main/java/net/wicp/tams/duckula/ops/pages/setting/InstanceManager.java +++ b/src/main/java/net/wicp/tams/duckula/ops/pages/setting/InstanceManager.java @@ -2,9 +2,9 @@ package net.wicp.tams.duckula.ops.pages.setting; import java.util.List; +import org.apache.tapestry5.http.services.Request; +import org.apache.tapestry5.http.services.RequestGlobals; import org.apache.tapestry5.ioc.annotations.Inject; -import org.apache.tapestry5.services.Request; -import org.apache.tapestry5.services.RequestGlobals; import org.apache.tapestry5.util.TextStreamResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/net/wicp/tams/duckula/ops/pages/setting/MiddlewareManager.java b/src/main/java/net/wicp/tams/duckula/ops/pages/setting/MiddlewareManager.java index ba9c6da32d40b4afc5cff6727c4be3acdaaa5572..ec627b8d4dcda96e179237eec8f6e7a6ae2e43ee 100644 --- a/src/main/java/net/wicp/tams/duckula/ops/pages/setting/MiddlewareManager.java +++ b/src/main/java/net/wicp/tams/duckula/ops/pages/setting/MiddlewareManager.java @@ -3,9 +3,9 @@ package net.wicp.tams.duckula.ops.pages.setting; import java.util.Arrays; import java.util.List; +import org.apache.tapestry5.http.services.Request; +import org.apache.tapestry5.http.services.RequestGlobals; import org.apache.tapestry5.ioc.annotations.Inject; -import org.apache.tapestry5.services.Request; -import org.apache.tapestry5.services.RequestGlobals; import org.apache.tapestry5.util.TextStreamResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/net/wicp/tams/duckula/ops/pages/setting/VersionManager.java b/src/main/java/net/wicp/tams/duckula/ops/pages/setting/VersionManager.java index d0fe478f68ff286ea3c1526ca2bd6adb75abf455..4fba958f8e98860be5050f0792d53b581857f677 100644 --- a/src/main/java/net/wicp/tams/duckula/ops/pages/setting/VersionManager.java +++ b/src/main/java/net/wicp/tams/duckula/ops/pages/setting/VersionManager.java @@ -2,9 +2,9 @@ package net.wicp.tams.duckula.ops.pages.setting; import java.util.List; +import org.apache.tapestry5.http.services.Request; +import org.apache.tapestry5.http.services.RequestGlobals; import org.apache.tapestry5.ioc.annotations.Inject; -import org.apache.tapestry5.services.Request; -import org.apache.tapestry5.services.RequestGlobals; import org.apache.tapestry5.util.TextStreamResponse; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/net/wicp/tams/duckula/ops/pages/tools/DownLoadHelm3Charts.java b/src/main/java/net/wicp/tams/duckula/ops/pages/tools/DownLoadHelm3Charts.java index 1e73561aea50d0b4eb9dbcb5c26dd490d33d1bd5..2a7464811c9161e510de276c232932f5d9458392 100644 --- a/src/main/java/net/wicp/tams/duckula/ops/pages/tools/DownLoadHelm3Charts.java +++ b/src/main/java/net/wicp/tams/duckula/ops/pages/tools/DownLoadHelm3Charts.java @@ -8,9 +8,9 @@ import java.util.Map; import org.apache.commons.io.FileUtils; import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.http.services.Request; +import org.apache.tapestry5.http.services.RequestGlobals; import org.apache.tapestry5.ioc.annotations.Inject; -import org.apache.tapestry5.services.Request; -import org.apache.tapestry5.services.RequestGlobals; import lombok.extern.slf4j.Slf4j; import net.wicp.tams.app.duckula.controller.BusiTools; diff --git a/src/main/java/net/wicp/tams/duckula/ops/pages/tools/ViewPodLog.java b/src/main/java/net/wicp/tams/duckula/ops/pages/tools/ViewPodLog.java index d1f971756de0d79c8c6bdc6515bb918473aaff1c..aa06d3375bbb2144045877b3d675398acd1127c0 100644 --- a/src/main/java/net/wicp/tams/duckula/ops/pages/tools/ViewPodLog.java +++ b/src/main/java/net/wicp/tams/duckula/ops/pages/tools/ViewPodLog.java @@ -9,9 +9,9 @@ import java.util.Map; import org.apache.commons.io.FileUtils; import org.apache.tapestry5.annotations.BeforeRenderTemplate; import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.http.services.Request; +import org.apache.tapestry5.http.services.RequestGlobals; import org.apache.tapestry5.ioc.annotations.Inject; -import org.apache.tapestry5.services.Request; -import org.apache.tapestry5.services.RequestGlobals; import org.apache.tapestry5.util.TextStreamResponse; import com.alibaba.fastjson.JSONObject; @@ -19,7 +19,6 @@ import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import net.wicp.tams.app.duckula.controller.config.constant.CommandType; import net.wicp.tams.app.duckula.controller.service.DeployService; -import net.wicp.tams.app.duckula.controller.service.K8sService; import net.wicp.tams.common.Conf; import net.wicp.tams.common.apiext.FreemarkUtil; import net.wicp.tams.common.apiext.IOUtil; diff --git a/src/main/java/net/wicp/tams/duckula/ops/services/AppModule.java b/src/main/java/net/wicp/tams/duckula/ops/services/AppModule.java index e7c2964259e7295853de2f0ecd3654b6163ae699..1dd9e2af5579380fff58cb2f0b54ee0611bba098 100644 --- a/src/main/java/net/wicp/tams/duckula/ops/services/AppModule.java +++ b/src/main/java/net/wicp/tams/duckula/ops/services/AppModule.java @@ -4,17 +4,18 @@ import java.io.IOException; import java.util.UUID; import org.apache.tapestry5.SymbolConstants; -import org.apache.tapestry5.ioc.MappedConfiguration; -import org.apache.tapestry5.ioc.OrderedConfiguration; +import org.apache.tapestry5.commons.Configuration; +import org.apache.tapestry5.commons.MappedConfiguration; +import org.apache.tapestry5.commons.OrderedConfiguration; +import org.apache.tapestry5.http.services.Request; +import org.apache.tapestry5.http.services.RequestFilter; +import org.apache.tapestry5.http.services.RequestHandler; +import org.apache.tapestry5.http.services.Response; import org.apache.tapestry5.ioc.ServiceBinder; import org.apache.tapestry5.ioc.annotations.Contribute; import org.apache.tapestry5.ioc.annotations.Local; import org.apache.tapestry5.ioc.services.ApplicationDefaults; import org.apache.tapestry5.ioc.services.SymbolProvider; -import org.apache.tapestry5.services.Request; -import org.apache.tapestry5.services.RequestFilter; -import org.apache.tapestry5.services.RequestHandler; -import org.apache.tapestry5.services.Response; import org.slf4j.Logger; import net.wicp.tams.duckula.ops.ajax.AjaxImpl; @@ -138,7 +139,7 @@ public class AppModule { configuration.add("Timing", filter); } - public static void contributeIgnoredPathsFilter(org.apache.tapestry5.ioc.Configuration configuration) { + public static void contributeIgnoredPathsFilter(Configuration configuration) { configuration.add("/connector"); configuration.add("/websocket"); } diff --git a/src/main/java/net/wicp/tams/duckula/ops/services/DevelopmentModule.java b/src/main/java/net/wicp/tams/duckula/ops/services/DevelopmentModule.java index d1b700d81cae6896ed1c2f0cf33c205d80842cc3..e3d3add88c3f50f912b2952c7a993ed96ce0bd3a 100644 --- a/src/main/java/net/wicp/tams/duckula/ops/services/DevelopmentModule.java +++ b/src/main/java/net/wicp/tams/duckula/ops/services/DevelopmentModule.java @@ -1,7 +1,7 @@ package net.wicp.tams.duckula.ops.services; import org.apache.tapestry5.SymbolConstants; -import org.apache.tapestry5.ioc.MappedConfiguration; +import org.apache.tapestry5.commons.MappedConfiguration; /** * This module is automatically included as part of the Tapestry IoC Registry if tapestry.execution-mode diff --git a/src/main/java/net/wicp/tams/duckula/ops/services/QaModule.java b/src/main/java/net/wicp/tams/duckula/ops/services/QaModule.java index 57243b4fa3988202763311c1a385e4b949b51ca4..9ac373669bd34821d0ea6437b40a48937e1a31f1 100644 --- a/src/main/java/net/wicp/tams/duckula/ops/services/QaModule.java +++ b/src/main/java/net/wicp/tams/duckula/ops/services/QaModule.java @@ -1,8 +1,8 @@ package net.wicp.tams.duckula.ops.services; import org.apache.tapestry5.SymbolConstants; -import org.apache.tapestry5.ioc.Configuration; -import org.apache.tapestry5.ioc.MappedConfiguration; +import org.apache.tapestry5.commons.Configuration; +import org.apache.tapestry5.commons.MappedConfiguration; import org.apache.tapestry5.ioc.ServiceBinder; import org.apache.tapestry5.services.LibraryMapping;