lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决WebSocket注入多Service问题

Browse Source
This commit is contained in:
redkale
2024-10-25 17:04:55 +08:00
parent da88762f99
commit 020d9c853d
4 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/org/redkale/net/http/Rest.java
View File

@@ -487,8 +487,8 @@ public final class Rest {
sb1.append(Type.getDescriptor(field.getType())); sb1.append(Type.getDescriptor(field.getType()));
sb2.append(Utility.getTypeDescriptor(field.getGenericType())); sb2.append(Utility.getTypeDescriptor(field.getGenericType()));
} }
final String resourceDesc = sb1.toString(); final String serviceParamsDesc = sb1.toString();
final String resourceGenericDesc = sb1.length() == sb2.length() ? null : sb2.toString(); final String serviceParamsGenericDesc = sb1.equals(sb2) ? null : sb2.toString();
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
ClassWriter cw = new ClassWriter(COMPUTE_FRAMES); ClassWriter cw = new ClassWriter(COMPUTE_FRAMES);
@@ -628,7 +628,7 @@ public final class Rest {
"_redkale_resource_" + i, "_redkale_resource_" + i,
Type.getDescriptor(resourcesFields.get(i).getType())); Type.getDescriptor(resourcesFields.get(i).getType()));
} }
mv.visitMethodInsn(INVOKESPECIAL, newDynWebSokcetFullName, "<init>", "(" + resourceDesc + ")V", false); mv.visitMethodInsn(INVOKESPECIAL, newDynWebSokcetFullName, "<init>", "(" + serviceParamsDesc + ")V", false);
mv.visitInsn(ARETURN); mv.visitInsn(ARETURN);
mv.visitMaxs(2 + resourcesFields.size(), 1); mv.visitMaxs(2 + resourcesFields.size(), 1);
mv.visitEnd(); mv.visitEnd();
@@ -793,8 +793,7 @@ public final class Rest {
mv.visitInsn(ARETURN); mv.visitInsn(ARETURN);
Label label2 = new Label(); Label label2 = new Label();
mv.visitLabel(label2); mv.visitLabel(label2);
mv.visitLocalVariable( mv.visitLocalVariable("this", "L" + newDynSuperMessageFullName + ";", null, label0, label2, 0);
"this", "L" + newDynSuperMessageFullName + ";", null, label0, label2, 0);
mv.visitLocalVariable("name", "Ljava/lang/String;", null, label0, label2, 1); mv.visitLocalVariable("name", "Ljava/lang/String;", null, label0, label2, 1);
mv.visitMaxs(2, 2); mv.visitMaxs(2, 2);
mv.visitEnd(); mv.visitEnd();
@@ -981,9 +980,9 @@ public final class Rest {
cw2.visitInnerClass( cw2.visitInnerClass(
newDynWebSokcetFullName, newDynName, newDynWebSokcetSimpleName, ACC_PUBLIC + ACC_STATIC); newDynWebSokcetFullName, newDynName, newDynWebSokcetSimpleName, ACC_PUBLIC + ACC_STATIC);
{ {
String resSignature = resourceGenericDesc == null ? null : ("(" + resourceGenericDesc + ")V"); String resSignature = serviceParamsGenericDesc == null ? null : ("(" + serviceParamsGenericDesc + ")V");
mv = new MethodDebugVisitor( mv = new MethodDebugVisitor(
cw2.visitMethod(ACC_PUBLIC, "<init>", "(" + resourceDesc + ")V", resSignature, null)); cw2.visitMethod(ACC_PUBLIC, "<init>", "(" + serviceParamsDesc + ")V", resSignature, null));
Label sublabel0 = new Label(); Label sublabel0 = new Label();
mv.visitLabel(sublabel0); mv.visitLabel(sublabel0);
mv.visitVarInsn(ALOAD, 0); mv.visitVarInsn(ALOAD, 0);
@@ -999,8 +998,14 @@ public final class Rest {
Label sublabel2 = new Label(); Label sublabel2 = new Label();
mv.visitLabel(sublabel2); mv.visitLabel(sublabel2);
mv.visitLocalVariable("this", "L" + newDynWebSokcetFullName + ";", null, sublabel0, sublabel2, 0); mv.visitLocalVariable("this", "L" + newDynWebSokcetFullName + ";", null, sublabel0, sublabel2, 0);
if (!resourceDesc.isEmpty()) { for (int i = 0; i < resourcesFields.size(); i++) {
mv.visitLocalVariable("service", resourceDesc, resSignature, sublabel0, sublabel2, 1); Field field = resourcesFields.get(i);
String fieldDesc = Type.getDescriptor(field.getType());
String fieldSignature = Utility.getTypeDescriptor(field.getGenericType());
if (fieldDesc.equals(fieldSignature)) {
fieldSignature = null;
}
mv.visitLocalVariable(field.getName(), fieldDesc, fieldSignature, sublabel0, sublabel2, 1 + i);
} }
mv.visitMaxs(2, 1 + resourcesFields.size()); mv.visitMaxs(2, 1 + resourcesFields.size());
mv.visitEnd(); mv.visitEnd();

3
src/main/java/org/redkale/source/CacheMemorySource.java
View File

@@ -116,8 +116,7 @@ public final class CacheMemorySource extends AbstractCacheSource {
@Override @Override
public String toString() { public String toString() {
return getClass().getSimpleName() + "{type=memory, name='" + resourceName() + "', hash=" return getClass().getSimpleName() + "_" + Objects.hash(this) + "{type=memory, name='" + resourceName() + "'}";
+ Objects.hashCode(this) + "}";
} }
@Override @Override

2
src/main/java/org/redkale/source/DataMemorySource.java
View File

@@ -71,7 +71,7 @@ public class DataMemorySource extends AbstractDataSource {
@Override @Override
public String toString() { public String toString() {
return getClass().getSimpleName() + "{type=memory, name='" + resourceName() + "'}"; return getClass().getSimpleName() + "_" + Objects.hash(this) + "{type=memory, name='" + resourceName() + "'}";
} }
@Override @Override

9
src/test/java/org/redkale/test/wsdync/_DyncChatWebSocketServlet.java
View File

@@ -13,6 +13,7 @@ import org.redkale.annotation.Resource;
import org.redkale.convert.ConvertDisabled; import org.redkale.convert.ConvertDisabled;
import org.redkale.convert.json.JsonConvert; import org.redkale.convert.json.JsonConvert;
import org.redkale.net.http.*; import org.redkale.net.http.*;
import org.redkale.test.rest.UserService;
import org.redkale.test.ws.ChatMessage; import org.redkale.test.ws.ChatMessage;
import org.redkale.test.ws.ChatService; import org.redkale.test.ws.ChatService;
import org.redkale.test.ws.ChatWebSocket; import org.redkale.test.ws.ChatWebSocket;
@@ -24,6 +25,9 @@ public final class _DyncChatWebSocketServlet extends WebSocketServlet {
@Resource @Resource
private ChatService _redkale_resource_0; private ChatService _redkale_resource_0;
@Resource
private UserService _redkale_resource_1;
public static Map<String, Annotation[]> _redkale_annotations; public static Map<String, Annotation[]> _redkale_annotations;
public _DyncChatWebSocketServlet() { public _DyncChatWebSocketServlet() {
@@ -33,7 +37,7 @@ public final class _DyncChatWebSocketServlet extends WebSocketServlet {
@Override @Override
protected <G extends Serializable, T> WebSocket<G, T> createWebSocket() { protected <G extends Serializable, T> WebSocket<G, T> createWebSocket() {
return (WebSocket) new _DyncChatWebSocket(_redkale_resource_0); return (WebSocket) new _DyncChatWebSocket(_redkale_resource_0, _redkale_resource_1);
} }
@Override @Override
@@ -43,9 +47,10 @@ public final class _DyncChatWebSocketServlet extends WebSocketServlet {
public static class _DyncChatWebSocket extends ChatWebSocket { public static class _DyncChatWebSocket extends ChatWebSocket {
public _DyncChatWebSocket(ChatService service) { public _DyncChatWebSocket(ChatService service, UserService userService) {
super(); super();
this.service = service; this.service = service;
this.userService = userService;
} }
} }