Skip to content

Commit 7ffdcc8

Browse files
ReaJasonReaJason
committed
refactor: merge memshell module
1 parent 4bbe9c9 commit 7ffdcc8

File tree

48 files changed

+498
-92
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+498
-92
lines changed

‎generator/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ dependencies {
3535
implementation project(":deserialize")
3636

3737
implementation project(":memshell")
38-
implementation project(":memshell-java8")
3938
implementation 'net.bytebuddy:byte-buddy'
4039
implementation 'org.ow2.asm:asm-commons'
4140

‎generator/src/main/java/com/reajason/javaweb/memshell/Server.java‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,6 @@
77
import com.reajason.javaweb.memshell.shelltool.godzilla.*;
88
import com.reajason.javaweb.memshell.shelltool.neoreg.*;
99
import com.reajason.javaweb.memshell.shelltool.suo5.*;
10-
import com.reajason.javaweb.memshell.springwebflux.command.CommandHandlerFunction;
11-
import com.reajason.javaweb.memshell.springwebflux.command.CommandHandlerMethod;
12-
import com.reajason.javaweb.memshell.springwebflux.command.CommandNettyHandler;
13-
import com.reajason.javaweb.memshell.springwebflux.command.CommandWebFilter;
14-
import com.reajason.javaweb.memshell.springwebflux.godzilla.GodzillaHandlerFunction;
15-
import com.reajason.javaweb.memshell.springwebflux.godzilla.GodzillaHandlerMethod;
16-
import com.reajason.javaweb.memshell.springwebflux.godzilla.GodzillaNettyHandler;
17-
import com.reajason.javaweb.memshell.springwebflux.godzilla.GodzillaWebFilter;
18-
import com.reajason.javaweb.memshell.springwebflux.suo5.Suo5WebFilter;
19-
import com.reajason.javaweb.memshell.springwebmvc.antsword.AntSwordControllerHandler;
20-
import com.reajason.javaweb.memshell.springwebmvc.antsword.AntSwordInterceptor;
21-
import com.reajason.javaweb.memshell.springwebmvc.behinder.BehinderControllerHandler;
22-
import com.reajason.javaweb.memshell.springwebmvc.behinder.BehinderInterceptor;
23-
import com.reajason.javaweb.memshell.springwebmvc.command.CommandControllerHandler;
24-
import com.reajason.javaweb.memshell.springwebmvc.command.CommandInterceptor;
25-
import com.reajason.javaweb.memshell.springwebmvc.godzilla.GodzillaControllerHandler;
26-
import com.reajason.javaweb.memshell.springwebmvc.godzilla.GodzillaInterceptor;
27-
import com.reajason.javaweb.memshell.springwebmvc.neoreg.NeoreGeorgControllerHandler;
28-
import com.reajason.javaweb.memshell.springwebmvc.neoreg.NeoreGeorgInterceptor;
29-
import com.reajason.javaweb.memshell.springwebmvc.suo5.Suo5ControllerHandler;
30-
import com.reajason.javaweb.memshell.springwebmvc.suo5.Suo5Interceptor;
3110
import lombok.Getter;
3211

3312
import static com.reajason.javaweb.memshell.ShellType.*;

‎generator/src/main/java/com/reajason/javaweb/memshell/server/SpringWebFluxShell.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.reajason.javaweb.memshell.server;
22

3-
import com.reajason.javaweb.memshell.springwebflux.injector.SpringWebFluxHandlerFunctionInjector;
4-
import com.reajason.javaweb.memshell.springwebflux.injector.SpringWebFluxHandlerMethodInjector;
5-
import com.reajason.javaweb.memshell.springwebflux.injector.SpringWebFluxNettyHandlerInjector;
6-
import com.reajason.javaweb.memshell.springwebflux.injector.SpringWebFluxWebFilterInjector;
3+
import com.reajason.javaweb.memshell.injector.springwebflux.SpringWebFluxHandlerFunctionInjector;
4+
import com.reajason.javaweb.memshell.injector.springwebflux.SpringWebFluxHandlerMethodInjector;
5+
import com.reajason.javaweb.memshell.injector.springwebflux.SpringWebFluxNettyHandlerInjector;
6+
import com.reajason.javaweb.memshell.injector.springwebflux.SpringWebFluxWebFilterInjector;
77

88
import static com.reajason.javaweb.memshell.ShellType.*;
99

‎generator/src/main/java/com/reajason/javaweb/memshell/server/SpringWebMvcShell.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.reajason.javaweb.memshell.server;
22

3-
import com.reajason.javaweb.memshell.springwebmvc.injector.SpringWebMvcControllerHandlerInjector;
4-
import com.reajason.javaweb.memshell.springwebmvc.injector.SpringWebMvcFrameworkServletAgentInjector;
5-
import com.reajason.javaweb.memshell.springwebmvc.injector.SpringWebMvcInterceptorInjector;
3+
import com.reajason.javaweb.memshell.injector.springwebmvc.SpringWebMvcControllerHandlerInjector;
4+
import com.reajason.javaweb.memshell.injector.springwebmvc.SpringWebMvcFrameworkServletAgentInjector;
5+
import com.reajason.javaweb.memshell.injector.springwebmvc.SpringWebMvcInterceptorInjector;
66

77
import static com.reajason.javaweb.memshell.ShellType.*;
88

‎generator/src/main/java/com/reajason/javaweb/memshell/server/XxlJobShell.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.reajason.javaweb.memshell.server;
22

3-
import com.reajason.javaweb.memshell.xxljob.injector.XxlJobNettyHandlerInjector;
3+
import com.reajason.javaweb.memshell.injector.xxljob.XxlJobNettyHandlerInjector;
44

55
import static com.reajason.javaweb.memshell.ShellType.NETTY_HANDLER;
66

‎memshell-java8/build.gradle‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎memshell/build.gradle‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,16 @@ java {
77
toolchain {
88
languageVersion = JavaLanguageVersion.of(8)
99
}
10-
sourceCompatibility = JavaVersion.VERSION_1_6
11-
targetCompatibility = JavaVersion.VERSION_1_6
10+
sourceCompatibility = JavaVersion.VERSION_1_8
11+
targetCompatibility = JavaVersion.VERSION_1_8
1212
}
1313

1414
dependencies {
1515
implementation 'net.bytebuddy:byte-buddy'
1616
implementation 'org.ow2.asm:asm-commons'
1717
implementation 'javax.servlet:javax.servlet-api'
1818
implementation 'javax.websocket:javax.websocket-api'
19+
implementation 'org.springframework:spring-webmvc'
20+
implementation 'org.springframework:spring-webflux'
21+
implementation 'io.projectreactor.netty:reactor-netty-core'
1922
}

memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/injector/SpringWebFluxHandlerFunctionInjector.java renamed to memshell/src/main/java/com/reajason/javaweb/memshell/injector/springwebflux/SpringWebFluxHandlerFunctionInjector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.reajason.javaweb.memshell.springwebflux.injector;
1+
package com.reajason.javaweb.memshell.injector.springwebflux;
22

33
import org.springframework.util.Base64Utils;
44
import org.springframework.web.reactive.function.server.*;

memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/injector/SpringWebFluxHandlerMethodInjector.java renamed to memshell/src/main/java/com/reajason/javaweb/memshell/injector/springwebflux/SpringWebFluxHandlerMethodInjector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.reajason.javaweb.memshell.springwebflux.injector;
1+
package com.reajason.javaweb.memshell.injector.springwebflux;
22

33
import org.springframework.util.Base64Utils;
44
import org.springframework.web.method.HandlerMethod;

memshell-java8/src/main/java/com/reajason/javaweb/memshell/springwebflux/injector/SpringWebFluxNettyHandlerInjector.java renamed to memshell/src/main/java/com/reajason/javaweb/memshell/injector/springwebflux/SpringWebFluxNettyHandlerInjector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.reajason.javaweb.memshell.springwebflux.injector;
1+
package com.reajason.javaweb.memshell.injector.springwebflux;
22

33
import io.netty.channel.Channel;
44
import io.netty.channel.ChannelHandler;

0 commit comments

Comments
 (0)