Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

secfix #294

Merged
merged 1 commit into from
Dec 2, 2022
Merged

secfix #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .../java/com/baidu/cloud/starlight/springcloud/client/ribbon/RibbonServerLocalStoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,14 +151,14 @@ private List<Server> getServerList(int size) {

Map<String, String> labels = new HashMap<>();
labels.put("EM_PHY_IDC", "yq01");
labels.put("EM_HOST_NAME", "yq01-ecom-fengchao-emsin7.yq01.baidu.com");
labels.put("EM_INSTANCE_ID", "2.opera-online-starlightProvider-000-yq.FENGCHAO.yq01");
labels.put("EM_HOST_NAME", "localhost");
labels.put("EM_INSTANCE_ID", "instance.test");
labels.put("EM_PLATFORM", "online");
labels.put("env", "online");
labels.put("GRAVITY_CLIENT_VERSION", "2020.0.2-SNAPSHOT");
labels.put("EM_LOGIC_IDC", "yq");
labels.put("EM_PRODUCT_LINE", "cpdinf");
labels.put("MATRIX_HOST_IP", "10.102.118.45");
labels.put("MATRIX_HOST_IP", "127.0.0.1");
labels.put("EPOCH", "1619676145691");
labels.put("EM_ENV_TYPE", "ONLINE");
labels.put("protocols", "brpc,stargate,springrest");
Expand Down
2 changes: 1 addition & 1 deletion ...du-starlight/src/test/java/com/baidu/cloud/starlight/springcloud/common/XdsUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class XdsUtilsTest {
@Test
public void convertedInstanceId() {

String instanceId = "1.opera-online-starlightProvider-000-yq.FENGCHAO.yq011";
String instanceId = "1.test-test-test-test-yq.test.test";
String expectId = "1-online-yq";

assertEquals(expectId, RouteUtils.convertedInstanceId(instanceId));
Expand Down
3 changes: 1 addition & 2 deletions ...ight-api/src/main/java/com/baidu/cloud/starlight/api/exception/StarlightRpcException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@ public static StarlightRpcException timeoutException(Request request, String rem
"Client call service {" + request.getServiceName() + "} " + "method {" + request.getMethodName()
+ "} time out, remote addr " + remoteUri + ". " + "Maybe caused by: "
+ "1. Biz method execution timeout(4801). " + "2. Abnormal server instance status(4802). "
+ "3. Rpc message delay(4803). " + "4. Unknow reason(4810). "
+ "See http://wiki.baidu.com/pages/viewpage.action?pageId=1348583072 to get solutions.");
+ "3. Rpc message delay(4803). " + "4. Unknow reason(4810). ");
}

}
4 changes: 1 addition & 3 deletions ...-api/src/main/java/com/baidu/cloud/starlight/api/serialization/serializer/Serializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@ public interface Serializer {

String DESERIALIZE_ERROR_MSG =
"The problem is usually caused by" + "\n 1: difference of api.jar between server and client."
+ "\n 2: API contains a type that Starlight(stargate) does not support. eg:HashMap.keySet()"
+ "\n see http://wiki.baidu.com/pages/viewpage.action?pageId=1348583072 "
+ "to get more information about incompatible APIs";
+ "\n 2: API contains a type that Starlight(stargate) does not support. eg:HashMap.keySet()";

byte[] serialize(Object obj, Type type) throws CodecException;

Expand Down