RetException优化
This commit is contained in:
@@ -22,6 +22,7 @@ import org.redkale.convert.*;
|
||||
import org.redkale.convert.json.*;
|
||||
import org.redkale.net.*;
|
||||
import org.redkale.net.Filter;
|
||||
import org.redkale.service.RetException;
|
||||
import org.redkale.service.RetResult;
|
||||
import org.redkale.util.*;
|
||||
import org.redkale.util.AnyValue.Entry;
|
||||
@@ -374,7 +375,11 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
|
||||
|
||||
@Override
|
||||
protected void defaultError(Throwable t) {
|
||||
finish(500, null);
|
||||
if (t instanceof RetException) {
|
||||
finish(jsonRootConvert, RetResult.TYPE_RET_STRING, ((RetException) t).retResult());
|
||||
} else {
|
||||
finish(500, null);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1164,10 +1169,10 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
|
||||
} else {
|
||||
domain = "Domain=" + domain + "; ";
|
||||
}
|
||||
String path = defaultCookie == null ? null : defaultCookie.getPath();
|
||||
if (path == null || path.isEmpty()) {
|
||||
path = "/";
|
||||
}
|
||||
// String path = defaultCookie == null ? null : defaultCookie.getPath();
|
||||
// if (path == null || path.isEmpty()) {
|
||||
// path = "/";
|
||||
// }
|
||||
if (request.newSessionid.isEmpty()) {
|
||||
headerArray.put(("Set-Cookie: " + HttpRequest.SESSIONID_NAME + "=; " + domain
|
||||
+ "Path=/; Max-Age=0; HttpOnly\r\n")
|
||||
|
||||
@@ -40,4 +40,8 @@ public class RetException extends RedkaleException {
|
||||
public int getCode() {
|
||||
return code;
|
||||
}
|
||||
|
||||
public RetResult retResult() {
|
||||
return new RetResult(code, getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
/*
|
||||
|
||||
*/
|
||||
|
||||
package org.redkale.test.mq;
|
||||
|
||||
import org.redkale.mq.MessageConsumer;
|
||||
import org.redkale.mq.MessageEvent;
|
||||
import org.redkale.mq.ResourceConsumer;
|
||||
import org.redkale.util.AnyValue;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author zhangjx
|
||||
*/
|
||||
@ResourceConsumer(mq = "mymq", regexTopic = "test_.*")
|
||||
public class TestMessageRegexConsumer implements MessageConsumer<TestBean> {
|
||||
|
||||
@Override
|
||||
public void init(AnyValue config) {
|
||||
System.out.println("执行 TestMessageRegexConsumer.init");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onMessage(MessageEvent<TestBean>[] events) {
|
||||
for (MessageEvent<TestBean> event : events) {
|
||||
System.out.println("TestMessageRegexConsumer消费消息, message: " + event.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void destroy(AnyValue config) {
|
||||
System.out.println("执行 TestMessageRegexConsumer.destroy");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user