refactor: merge memshell module

This commit is contained in:
ReaJason
2025-06-07 13:23:51 +08:00
parent 4bbe9c975b
commit e24ed07d4d
40 changed files with 42 additions and 92 deletions
-1
View File
@@ -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'
@@ -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.*;
@@ -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.*;
@@ -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.*;
@@ -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;
-30
View File
@@ -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()
}
+5 -2
View File
@@ -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'
}
@@ -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.*;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -1,4 +1,4 @@
package com.reajason.javaweb.memshell.springwebmvc.injector;
package com.reajason.javaweb.memshell.injector.springwebmvc;
import org.objectweb.asm.*;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
-1
View File
@@ -14,7 +14,6 @@ include 'tools:suo5'
include 'tools:ant-sword'
include 'memshell'
include 'memshell-java8'
include 'deserialize'
include 'boot'