From 9f667b145fa15e1bd5a2bc67ccc338c47e85e3b6 Mon Sep 17 00:00:00 2001 From: yuye <631941527@qq.com> Date: Sat, 30 Nov 2019 16:21:19 +0800 Subject: [PATCH] update version --- .../mars/core/constant/MarsCloudConstant.java | 16 ----------- .../java/com/mars/mvc/util/BuildParams.java | 28 +------------------ 2 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 mars-core/src/main/java/com/mars/core/constant/MarsCloudConstant.java diff --git a/mars-core/src/main/java/com/mars/core/constant/MarsCloudConstant.java b/mars-core/src/main/java/com/mars/core/constant/MarsCloudConstant.java deleted file mode 100644 index 93b8843..0000000 --- a/mars-core/src/main/java/com/mars/core/constant/MarsCloudConstant.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.mars.core.constant; - -public class MarsCloudConstant { - - - /** - * rest请求,用它做key,从request里取数据 - */ - public static final String PARAM = "param"; - - - /** - * 请求类型 - */ - public static final String REQUEST_TYPE = "marsCloudWeiYiRequestKey"; -} diff --git a/mars-mvc/src/main/java/com/mars/mvc/util/BuildParams.java b/mars-mvc/src/main/java/com/mars/mvc/util/BuildParams.java index 35012c7..4a97783 100644 --- a/mars-mvc/src/main/java/com/mars/mvc/util/BuildParams.java +++ b/mars-mvc/src/main/java/com/mars/mvc/util/BuildParams.java @@ -1,8 +1,6 @@ package com.mars.mvc.util; -import com.mars.core.constant.MarsCloudConstant; import com.mars.core.enums.DataType; -import com.mars.core.util.SerializableUtil; import com.mars.server.server.request.HttpMarsRequest; import com.mars.server.server.request.HttpMarsResponse; import com.mars.server.server.request.model.MarsFileUpLoad; @@ -45,14 +43,7 @@ public class BuildParams { } else if(mapClass.equals(cls)) { params[i] = request.getParemeters(); } else { - /* 先判断此次请求是不是cloud发起的,如果是的话就将对象反序列化出来 */ - Object obj = builderCloudObject(cls,request); - if(obj == null){ - /* 如果此次请求不是cloud发起的,那么就走正常取参 */ - params[i] = getObject(cls,request); - } else { - params[i] = obj; - } + params[i] = getObject(cls,request); } } return params; @@ -122,21 +113,4 @@ public class BuildParams { } return obj; } - - /** - * 获取cloud通过序列化传来的参数对象 - * @param cls - * @param request - * @return - * @throws Exception - */ - private static Object builderCloudObject(Class cls, HttpMarsRequest request) throws Exception { - Object requestType = request.getParameter(MarsCloudConstant.REQUEST_TYPE); - if(requestType != null && requestType.toString().equals(MarsCloudConstant.REQUEST_TYPE)){ - MarsFileUpLoad marsFileUpLoad = request.getFile(MarsCloudConstant.PARAM); - byte[] bytes = marsFileUpLoad.getBytes(); - return SerializableUtil.deSerialization(bytes, cls); - } - return null; - } }