diff --git a/generator/build.gradle b/generator/build.gradle index fcfd72d5..53129e46 100644 --- a/generator/build.gradle +++ b/generator/build.gradle @@ -35,7 +35,6 @@ dependencies { implementation project(":deserialize") implementation project(":memshell") - implementation project(":memshell-java8") implementation 'net.bytebuddy:byte-buddy' implementation 'org.ow2.asm:asm-commons' diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/Server.java b/generator/src/main/java/com/reajason/javaweb/memshell/Server.java index b452b471..17d37545 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/Server.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/Server.java @@ -7,27 +7,6 @@ import com.reajason.javaweb.memshell.shelltool.command.*; import com.reajason.javaweb.memshell.shelltool.godzilla.*; import com.reajason.javaweb.memshell.shelltool.neoreg.*; import com.reajason.javaweb.memshell.shelltool.suo5.*; -import com.reajason.javaweb.memshell.springwebflux.command.CommandHandlerFunction; -import com.reajason.javaweb.memshell.springwebflux.command.CommandHandlerMethod; -import com.reajason.javaweb.memshell.springwebflux.command.CommandNettyHandler; -import com.reajason.javaweb.memshell.springwebflux.command.CommandWebFilter; -import com.reajason.javaweb.memshell.springwebflux.godzilla.GodzillaHandlerFunction; -import com.reajason.javaweb.memshell.springwebflux.godzilla.GodzillaHandlerMethod; -import com.reajason.javaweb.memshell.springwebflux.godzilla.GodzillaNettyHandler; -import com.reajason.javaweb.memshell.springwebflux.godzilla.GodzillaWebFilter; -import com.reajason.javaweb.memshell.springwebflux.suo5.Suo5WebFilter; -import com.reajason.javaweb.memshell.springwebmvc.antsword.AntSwordControllerHandler; -import com.reajason.javaweb.memshell.springwebmvc.antsword.AntSwordInterceptor; -import com.reajason.javaweb.memshell.springwebmvc.behinder.BehinderControllerHandler; -import com.reajason.javaweb.memshell.springwebmvc.behinder.BehinderInterceptor; -import com.reajason.javaweb.memshell.springwebmvc.command.CommandControllerHandler; -import com.reajason.javaweb.memshell.springwebmvc.command.CommandInterceptor; -import com.reajason.javaweb.memshell.springwebmvc.godzilla.GodzillaControllerHandler; -import com.reajason.javaweb.memshell.springwebmvc.godzilla.GodzillaInterceptor; -import com.reajason.javaweb.memshell.springwebmvc.neoreg.NeoreGeorgControllerHandler; -import com.reajason.javaweb.memshell.springwebmvc.neoreg.NeoreGeorgInterceptor; -import com.reajason.javaweb.memshell.springwebmvc.suo5.Suo5ControllerHandler; -import com.reajason.javaweb.memshell.springwebmvc.suo5.Suo5Interceptor; import lombok.Getter; import static com.reajason.javaweb.memshell.ShellType.*; diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/server/SpringWebFluxShell.java b/generator/src/main/java/com/reajason/javaweb/memshell/server/SpringWebFluxShell.java index bfb87f95..46845429 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/server/SpringWebFluxShell.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/server/SpringWebFluxShell.java @@ -1,9 +1,9 @@ package com.reajason.javaweb.memshell.server; -import com.reajason.javaweb.memshell.springwebflux.injector.SpringWebFluxHandlerFunctionInjector; -import com.reajason.javaweb.memshell.springwebflux.injector.SpringWebFluxHandlerMethodInjector; -import com.reajason.javaweb.memshell.springwebflux.injector.SpringWebFluxNettyHandlerInjector; -import com.reajason.javaweb.memshell.springwebflux.injector.SpringWebFluxWebFilterInjector; +import com.reajason.javaweb.memshell.injector.springwebflux.SpringWebFluxHandlerFunctionInjector; +import com.reajason.javaweb.memshell.injector.springwebflux.SpringWebFluxHandlerMethodInjector; +import com.reajason.javaweb.memshell.injector.springwebflux.SpringWebFluxNettyHandlerInjector; +import com.reajason.javaweb.memshell.injector.springwebflux.SpringWebFluxWebFilterInjector; import static com.reajason.javaweb.memshell.ShellType.*; diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/server/SpringWebMvcShell.java b/generator/src/main/java/com/reajason/javaweb/memshell/server/SpringWebMvcShell.java index 4cd5d64a..293c3afc 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/server/SpringWebMvcShell.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/server/SpringWebMvcShell.java @@ -1,8 +1,8 @@ package com.reajason.javaweb.memshell.server; -import com.reajason.javaweb.memshell.springwebmvc.injector.SpringWebMvcControllerHandlerInjector; -import com.reajason.javaweb.memshell.springwebmvc.injector.SpringWebMvcFrameworkServletAgentInjector; -import com.reajason.javaweb.memshell.springwebmvc.injector.SpringWebMvcInterceptorInjector; +import com.reajason.javaweb.memshell.injector.springwebmvc.SpringWebMvcControllerHandlerInjector; +import com.reajason.javaweb.memshell.injector.springwebmvc.SpringWebMvcFrameworkServletAgentInjector; +import com.reajason.javaweb.memshell.injector.springwebmvc.SpringWebMvcInterceptorInjector; import static com.reajason.javaweb.memshell.ShellType.*; diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/server/XxlJobShell.java b/generator/src/main/java/com/reajason/javaweb/memshell/server/XxlJobShell.java index 8483aa87..ca4dcbd6 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/server/XxlJobShell.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/server/XxlJobShell.java @@ -1,6 +1,6 @@ package com.reajason.javaweb.memshell.server; -import com.reajason.javaweb.memshell.xxljob.injector.XxlJobNettyHandlerInjector; +import com.reajason.javaweb.memshell.injector.xxljob.XxlJobNettyHandlerInjector; import static com.reajason.javaweb.memshell.ShellType.NETTY_HANDLER; diff --git a/memshell-java8/build.gradle b/memshell-java8/build.gradle deleted file mode 100644 index f29a56fc..00000000 --- a/memshell-java8/build.gradle +++ /dev/null @@ -1,30 +0,0 @@ -group = 'io.github.reajason' -description = "Normal Java MemShell for Java8" -version = rootProject.version - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(8) - } - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - -dependencies { - implementation project(":memshell") - implementation 'net.bytebuddy:byte-buddy' - implementation 'org.ow2.asm:asm-commons' - - implementation 'org.springframework:spring-webmvc' - implementation 'org.springframework:spring-webflux' - implementation 'io.projectreactor.netty:reactor-netty-core' - - implementation 'javax.servlet:javax.servlet-api' - implementation 'javax.websocket:javax.websocket-api' - testImplementation platform('org.junit:junit-bom') - testImplementation 'org.junit.jupiter:junit-jupiter' -} - -test { - useJUnitPlatform() -} \ No newline at end of file diff --git a/memshell/build.gradle b/memshell/build.gradle index b533fa7f..2d2416ab 100644 --- a/memshell/build.gradle +++ b/memshell/build.gradle @@ -7,8 +7,8 @@ java { toolchain { languageVersion = JavaLanguageVersion.of(8) } - sourceCompatibility = JavaVersion.VERSION_1_6 - targetCompatibility = JavaVersion.VERSION_1_6 + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } dependencies { @@ -16,4 +16,7 @@ dependencies { implementation 'org.ow2.asm:asm-commons' implementation 'javax.servlet:javax.servlet-api' implementation 'javax.websocket:javax.websocket-api' + implementation 'org.springframework:spring-webmvc' + implementation 'org.springframework:spring-webflux' + implementation 'io.projectreactor.netty:reactor-netty-core' } \ No newline at end of file diff --git a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/injector/SpringWebFluxHandlerFunctionInjector.java b/memshell/src/main/java/com/reajason/javaweb/memshell/injector/springwebflux/SpringWebFluxHandlerFunctionInjector.java similarity index 99% rename from memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/injector/SpringWebFluxHandlerFunctionInjector.java rename to memshell/src/main/java/com/reajason/javaweb/memshell/injector/springwebflux/SpringWebFluxHandlerFunctionInjector.java index 4a14d930..b8486961 100644 --- a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/injector/SpringWebFluxHandlerFunctionInjector.java +++ b/memshell/src/main/java/com/reajason/javaweb/memshell/injector/springwebflux/SpringWebFluxHandlerFunctionInjector.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.memshell.springwebflux.injector; +package com.reajason.javaweb.memshell.injector.springwebflux; import org.springframework.util.Base64Utils; import org.springframework.web.reactive.function.server.*; diff --git a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/injector/SpringWebFluxHandlerMethodInjector.java b/memshell/src/main/java/com/reajason/javaweb/memshell/injector/springwebflux/SpringWebFluxHandlerMethodInjector.java similarity index 99% rename from memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/injector/SpringWebFluxHandlerMethodInjector.java rename to memshell/src/main/java/com/reajason/javaweb/memshell/injector/springwebflux/SpringWebFluxHandlerMethodInjector.java index 00f0f276..898a9c0e 100644 --- a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/injector/SpringWebFluxHandlerMethodInjector.java +++ b/memshell/src/main/java/com/reajason/javaweb/memshell/injector/springwebflux/SpringWebFluxHandlerMethodInjector.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.memshell.springwebflux.injector; +package com.reajason.javaweb.memshell.injector.springwebflux; import org.springframework.util.Base64Utils; import org.springframework.web.method.HandlerMethod; diff --git a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/injector/SpringWebFluxNettyHandlerInjector.java b/memshell/src/main/java/com/reajason/javaweb/memshell/injector/springwebflux/SpringWebFluxNettyHandlerInjector.java similarity index 98% rename from memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/injector/SpringWebFluxNettyHandlerInjector.java rename to memshell/src/main/java/com/reajason/javaweb/memshell/injector/springwebflux/SpringWebFluxNettyHandlerInjector.java index 9ffd0fcb..85b12b8d 100644 --- a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/injector/SpringWebFluxNettyHandlerInjector.java +++ b/memshell/src/main/java/com/reajason/javaweb/memshell/injector/springwebflux/SpringWebFluxNettyHandlerInjector.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.memshell.springwebflux.injector; +package com.reajason.javaweb.memshell.injector.springwebflux; import io.netty.channel.Channel; import io.netty.channel.ChannelHandler; diff --git a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/injector/SpringWebFluxWebFilterInjector.java b/memshell/src/main/java/com/reajason/javaweb/memshell/injector/springwebflux/SpringWebFluxWebFilterInjector.java similarity index 98% rename from memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/injector/SpringWebFluxWebFilterInjector.java rename to memshell/src/main/java/com/reajason/javaweb/memshell/injector/springwebflux/SpringWebFluxWebFilterInjector.java index 4feb3832..3a417231 100644 --- a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/injector/SpringWebFluxWebFilterInjector.java +++ b/memshell/src/main/java/com/reajason/javaweb/memshell/injector/springwebflux/SpringWebFluxWebFilterInjector.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.memshell.springwebflux.injector; +package com.reajason.javaweb.memshell.injector.springwebflux; import org.springframework.util.Base64Utils; import org.springframework.web.server.WebFilter; diff --git a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/injector/SpringWebMvcControllerHandlerInjector.java b/memshell/src/main/java/com/reajason/javaweb/memshell/injector/springwebmvc/SpringWebMvcControllerHandlerInjector.java similarity index 99% rename from memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/injector/SpringWebMvcControllerHandlerInjector.java rename to memshell/src/main/java/com/reajason/javaweb/memshell/injector/springwebmvc/SpringWebMvcControllerHandlerInjector.java index 01358474..ee90840c 100644 --- a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/injector/SpringWebMvcControllerHandlerInjector.java +++ b/memshell/src/main/java/com/reajason/javaweb/memshell/injector/springwebmvc/SpringWebMvcControllerHandlerInjector.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.memshell.springwebmvc.injector; +package com.reajason.javaweb.memshell.injector.springwebmvc; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/injector/SpringWebMvcFrameworkServletAgentInjector.java b/memshell/src/main/java/com/reajason/javaweb/memshell/injector/springwebmvc/SpringWebMvcFrameworkServletAgentInjector.java similarity index 99% rename from memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/injector/SpringWebMvcFrameworkServletAgentInjector.java rename to memshell/src/main/java/com/reajason/javaweb/memshell/injector/springwebmvc/SpringWebMvcFrameworkServletAgentInjector.java index 308d60d9..f11e4608 100644 --- a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/injector/SpringWebMvcFrameworkServletAgentInjector.java +++ b/memshell/src/main/java/com/reajason/javaweb/memshell/injector/springwebmvc/SpringWebMvcFrameworkServletAgentInjector.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.memshell.springwebmvc.injector; +package com.reajason.javaweb.memshell.injector.springwebmvc; import org.objectweb.asm.*; diff --git a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/injector/SpringWebMvcInterceptorInjector.java b/memshell/src/main/java/com/reajason/javaweb/memshell/injector/springwebmvc/SpringWebMvcInterceptorInjector.java similarity index 99% rename from memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/injector/SpringWebMvcInterceptorInjector.java rename to memshell/src/main/java/com/reajason/javaweb/memshell/injector/springwebmvc/SpringWebMvcInterceptorInjector.java index 05ca2339..6956996b 100644 --- a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/injector/SpringWebMvcInterceptorInjector.java +++ b/memshell/src/main/java/com/reajason/javaweb/memshell/injector/springwebmvc/SpringWebMvcInterceptorInjector.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.memshell.springwebmvc.injector; +package com.reajason.javaweb.memshell.injector.springwebmvc; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/xxljob/injector/XxlJobNettyHandlerInjector.java b/memshell/src/main/java/com/reajason/javaweb/memshell/injector/xxljob/XxlJobNettyHandlerInjector.java similarity index 99% rename from memshell-java8/src/main/java/com/reajason/javaweb/memshell/xxljob/injector/XxlJobNettyHandlerInjector.java rename to memshell/src/main/java/com/reajason/javaweb/memshell/injector/xxljob/XxlJobNettyHandlerInjector.java index d72b697c..4e866406 100644 --- a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/xxljob/injector/XxlJobNettyHandlerInjector.java +++ b/memshell/src/main/java/com/reajason/javaweb/memshell/injector/xxljob/XxlJobNettyHandlerInjector.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.memshell.xxljob.injector; +package com.reajason.javaweb.memshell.injector.xxljob; import com.xxl.job.core.biz.impl.ExecutorBizImpl; import com.xxl.job.core.server.EmbedServer; diff --git a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/antsword/AntSwordControllerHandler.java b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/antsword/AntSwordControllerHandler.java similarity index 97% rename from memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/antsword/AntSwordControllerHandler.java rename to memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/antsword/AntSwordControllerHandler.java index 1750b8a8..b9461c3a 100644 --- a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/antsword/AntSwordControllerHandler.java +++ b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/antsword/AntSwordControllerHandler.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.memshell.springwebmvc.antsword; +package com.reajason.javaweb.memshell.shelltool.antsword; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.Controller; diff --git a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/antsword/AntSwordInterceptor.java b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/antsword/AntSwordInterceptor.java similarity index 97% rename from memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/antsword/AntSwordInterceptor.java rename to memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/antsword/AntSwordInterceptor.java index 558dbd17..e5f420f6 100644 --- a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/antsword/AntSwordInterceptor.java +++ b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/antsword/AntSwordInterceptor.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.memshell.springwebmvc.antsword; +package com.reajason.javaweb.memshell.shelltool.antsword; import org.springframework.web.servlet.AsyncHandlerInterceptor; import org.springframework.web.servlet.ModelAndView; diff --git a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/behinder/BehinderControllerHandler.java b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/behinder/BehinderControllerHandler.java similarity index 98% rename from memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/behinder/BehinderControllerHandler.java rename to memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/behinder/BehinderControllerHandler.java index 9d68d1c0..4dd42691 100644 --- a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/behinder/BehinderControllerHandler.java +++ b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/behinder/BehinderControllerHandler.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.memshell.springwebmvc.behinder; +package com.reajason.javaweb.memshell.shelltool.behinder; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.Controller; diff --git a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/behinder/BehinderInterceptor.java b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/behinder/BehinderInterceptor.java similarity index 98% rename from memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/behinder/BehinderInterceptor.java rename to memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/behinder/BehinderInterceptor.java index 04286efd..ac2076a2 100644 --- a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/behinder/BehinderInterceptor.java +++ b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/behinder/BehinderInterceptor.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.memshell.springwebmvc.behinder; +package com.reajason.javaweb.memshell.shelltool.behinder; import org.springframework.web.servlet.AsyncHandlerInterceptor; import org.springframework.web.servlet.ModelAndView; diff --git a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/command/CommandControllerHandler.java b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandControllerHandler.java similarity index 95% rename from memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/command/CommandControllerHandler.java rename to memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandControllerHandler.java index badca6af..8e560f37 100644 --- a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/command/CommandControllerHandler.java +++ b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandControllerHandler.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.memshell.springwebmvc.command; +package com.reajason.javaweb.memshell.shelltool.command; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.Controller; diff --git a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/command/CommandHandlerFunction.java b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandHandlerFunction.java similarity index 96% rename from memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/command/CommandHandlerFunction.java rename to memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandHandlerFunction.java index bb38c46d..aced08ee 100644 --- a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/command/CommandHandlerFunction.java +++ b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandHandlerFunction.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.memshell.springwebflux.command; +package com.reajason.javaweb.memshell.shelltool.command; import org.springframework.web.reactive.function.server.HandlerFunction; import org.springframework.web.reactive.function.server.ServerRequest; diff --git a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/command/CommandHandlerMethod.java b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandHandlerMethod.java similarity index 95% rename from memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/command/CommandHandlerMethod.java rename to memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandHandlerMethod.java index 09421cd5..cf9cf2f8 100644 --- a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/command/CommandHandlerMethod.java +++ b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandHandlerMethod.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.memshell.springwebflux.command; +package com.reajason.javaweb.memshell.shelltool.command; import org.springframework.http.ResponseEntity; import org.springframework.web.server.ServerWebExchange; diff --git a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/command/CommandInterceptor.java b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandInterceptor.java similarity index 96% rename from memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/command/CommandInterceptor.java rename to memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandInterceptor.java index 97e8f6f2..e7ae7c87 100644 --- a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/command/CommandInterceptor.java +++ b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandInterceptor.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.memshell.springwebmvc.command; +package com.reajason.javaweb.memshell.shelltool.command; import org.springframework.web.servlet.AsyncHandlerInterceptor; import org.springframework.web.servlet.ModelAndView; diff --git a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/command/CommandNettyHandler.java b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandNettyHandler.java similarity index 97% rename from memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/command/CommandNettyHandler.java rename to memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandNettyHandler.java index ffbcf0b5..1ffa3ded 100644 --- a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/command/CommandNettyHandler.java +++ b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandNettyHandler.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.memshell.springwebflux.command; +package com.reajason.javaweb.memshell.shelltool.command; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelDuplexHandler; diff --git a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/command/CommandWebFilter.java b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandWebFilter.java similarity index 96% rename from memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/command/CommandWebFilter.java rename to memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandWebFilter.java index f8802464..6811faea 100644 --- a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/command/CommandWebFilter.java +++ b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandWebFilter.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.memshell.springwebflux.command; +package com.reajason.javaweb.memshell.shelltool.command; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.core.io.buffer.DefaultDataBufferFactory; diff --git a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/godzilla/GodzillaControllerHandler.java b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaControllerHandler.java similarity index 98% rename from memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/godzilla/GodzillaControllerHandler.java rename to memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaControllerHandler.java index 7ad7dddb..9dc2328d 100644 --- a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/godzilla/GodzillaControllerHandler.java +++ b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaControllerHandler.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.memshell.springwebmvc.godzilla; +package com.reajason.javaweb.memshell.shelltool.godzilla; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.Controller; diff --git a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/godzilla/GodzillaHandlerFunction.java b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaHandlerFunction.java similarity index 98% rename from memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/godzilla/GodzillaHandlerFunction.java rename to memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaHandlerFunction.java index c1473539..3632ffd9 100644 --- a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/godzilla/GodzillaHandlerFunction.java +++ b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaHandlerFunction.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.memshell.springwebflux.godzilla; +package com.reajason.javaweb.memshell.shelltool.godzilla; import org.springframework.web.reactive.function.server.HandlerFunction; import org.springframework.web.reactive.function.server.ServerRequest; diff --git a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/godzilla/GodzillaHandlerMethod.java b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaHandlerMethod.java similarity index 98% rename from memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/godzilla/GodzillaHandlerMethod.java rename to memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaHandlerMethod.java index 3c3d11d0..c98c3711 100644 --- a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/godzilla/GodzillaHandlerMethod.java +++ b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaHandlerMethod.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.memshell.springwebflux.godzilla; +package com.reajason.javaweb.memshell.shelltool.godzilla; import org.springframework.http.ResponseEntity; import org.springframework.web.server.ServerWebExchange; diff --git a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/godzilla/GodzillaInterceptor.java b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaInterceptor.java similarity index 98% rename from memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/godzilla/GodzillaInterceptor.java rename to memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaInterceptor.java index 1cc9a15b..29603eef 100644 --- a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/godzilla/GodzillaInterceptor.java +++ b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaInterceptor.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.memshell.springwebmvc.godzilla; +package com.reajason.javaweb.memshell.shelltool.godzilla; import org.springframework.web.servlet.AsyncHandlerInterceptor; import org.springframework.web.servlet.ModelAndView; diff --git a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/godzilla/GodzillaNettyHandler.java b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaNettyHandler.java similarity index 99% rename from memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/godzilla/GodzillaNettyHandler.java rename to memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaNettyHandler.java index cd658167..884e67f1 100644 --- a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/godzilla/GodzillaNettyHandler.java +++ b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaNettyHandler.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.memshell.springwebflux.godzilla; +package com.reajason.javaweb.memshell.shelltool.godzilla; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelDuplexHandler; diff --git a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/godzilla/GodzillaWebFilter.java b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaWebFilter.java similarity index 98% rename from memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/godzilla/GodzillaWebFilter.java rename to memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaWebFilter.java index 583613fb..5419cd5d 100644 --- a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/godzilla/GodzillaWebFilter.java +++ b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaWebFilter.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.memshell.springwebflux.godzilla; +package com.reajason.javaweb.memshell.shelltool.godzilla; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.core.io.buffer.DefaultDataBufferFactory; diff --git a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/neoreg/NeoreGeorgControllerHandler.java b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/neoreg/NeoreGeorgControllerHandler.java similarity index 99% rename from memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/neoreg/NeoreGeorgControllerHandler.java rename to memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/neoreg/NeoreGeorgControllerHandler.java index b0e953ae..7aea2afe 100644 --- a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/neoreg/NeoreGeorgControllerHandler.java +++ b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/neoreg/NeoreGeorgControllerHandler.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.memshell.springwebmvc.neoreg; +package com.reajason.javaweb.memshell.shelltool.neoreg; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.Controller; diff --git a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/neoreg/NeoreGeorgInterceptor.java b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/neoreg/NeoreGeorgInterceptor.java similarity index 99% rename from memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/neoreg/NeoreGeorgInterceptor.java rename to memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/neoreg/NeoreGeorgInterceptor.java index 9828fbe2..6e0912e4 100644 --- a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/neoreg/NeoreGeorgInterceptor.java +++ b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/neoreg/NeoreGeorgInterceptor.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.memshell.springwebmvc.neoreg; +package com.reajason.javaweb.memshell.shelltool.neoreg; import org.springframework.web.servlet.AsyncHandlerInterceptor; import org.springframework.web.servlet.ModelAndView; diff --git a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/suo5/Suo5ControllerHandler.java b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/suo5/Suo5ControllerHandler.java similarity index 99% rename from memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/suo5/Suo5ControllerHandler.java rename to memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/suo5/Suo5ControllerHandler.java index 040d8b4d..791a6f8b 100644 --- a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/suo5/Suo5ControllerHandler.java +++ b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/suo5/Suo5ControllerHandler.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.memshell.springwebmvc.suo5; +package com.reajason.javaweb.memshell.shelltool.suo5; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.Controller; diff --git a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/suo5/Suo5Interceptor.java b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/suo5/Suo5Interceptor.java similarity index 99% rename from memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/suo5/Suo5Interceptor.java rename to memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/suo5/Suo5Interceptor.java index 70f93081..b827565e 100644 --- a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebmvc/suo5/Suo5Interceptor.java +++ b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/suo5/Suo5Interceptor.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.memshell.springwebmvc.suo5; +package com.reajason.javaweb.memshell.shelltool.suo5; import org.springframework.web.servlet.AsyncHandlerInterceptor; import org.springframework.web.servlet.ModelAndView; diff --git a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/suo5/Suo5WebFilter.java b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/suo5/Suo5WebFilter.java similarity index 99% rename from memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/suo5/Suo5WebFilter.java rename to memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/suo5/Suo5WebFilter.java index 5461c205..6a11ee7f 100644 --- a/memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/suo5/Suo5WebFilter.java +++ b/memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/suo5/Suo5WebFilter.java @@ -1,4 +1,4 @@ -package com.reajason.javaweb.memshell.springwebflux.suo5; +package com.reajason.javaweb.memshell.shelltool.suo5; import io.netty.channel.ChannelOption; import org.springframework.core.io.buffer.DataBuffer; diff --git a/memshell-java8/src/main/java/com/xxl/job/core/biz/ExecutorBiz.java b/memshell/src/main/java/com/xxl/job/core/biz/ExecutorBiz.java similarity index 100% rename from memshell-java8/src/main/java/com/xxl/job/core/biz/ExecutorBiz.java rename to memshell/src/main/java/com/xxl/job/core/biz/ExecutorBiz.java diff --git a/memshell-java8/src/main/java/com/xxl/job/core/biz/impl/ExecutorBizImpl.java b/memshell/src/main/java/com/xxl/job/core/biz/impl/ExecutorBizImpl.java similarity index 100% rename from memshell-java8/src/main/java/com/xxl/job/core/biz/impl/ExecutorBizImpl.java rename to memshell/src/main/java/com/xxl/job/core/biz/impl/ExecutorBizImpl.java diff --git a/memshell-java8/src/main/java/com/xxl/job/core/server/EmbedServer.java b/memshell/src/main/java/com/xxl/job/core/server/EmbedServer.java similarity index 100% rename from memshell-java8/src/main/java/com/xxl/job/core/server/EmbedServer.java rename to memshell/src/main/java/com/xxl/job/core/server/EmbedServer.java diff --git a/settings.gradle b/settings.gradle index a454deae..e2773cf3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -14,7 +14,6 @@ include 'tools:suo5' include 'tools:ant-sword' include 'memshell' -include 'memshell-java8' include 'deserialize' include 'boot'