From e974effee27ee8293faf0a8c100f1eb5466ea3f1 Mon Sep 17 00:00:00 2001
From: yuye <631941527@qq.com>
Date: Tue, 21 May 2019 20:49:07 +0800
Subject: [PATCH] :art: code review
---
mars-aop/pom.xml | 2 +-
mars-core/pom.xml | 2 +-
mars-ioc/pom.xml | 2 +-
.../com/mars/ioc/factory/BeanFactory.java | 4 +--
mars-jdbc/mars-jdbc-base/pom.xml | 2 +-
mars-jdbc/mars-mj/pom.xml | 2 +-
mars-jdbc/mars-mybatis/pom.xml | 2 +-
mars-jdbc/pom.xml | 2 +-
mars-junit/pom.xml | 2 +-
.../java/com/mars/junit/MarsJunitStart.java | 2 +-
mars-mvc/pom.xml | 2 +-
.../com/mars/mvc/servlet/EasyCoreServlet.java | 33 +++++++++++++++++--
mars-netty/pom.xml | 2 +-
.../com/mars/netty/thread/RequestThread.java | 3 +-
mars-server/pom.xml | 2 +-
mars-start/mars-start-base/pom.xml | 2 +-
mars-start/mars-start-mj/pom.xml | 2 +-
mars-start/mars-start-mybatis/pom.xml | 2 +-
mars-start/mars-start-simple/pom.xml | 2 +-
mars-start/pom.xml | 2 +-
pom.xml | 2 +-
21 files changed, 52 insertions(+), 24 deletions(-)
diff --git a/mars-aop/pom.xml b/mars-aop/pom.xml
index a82e630..654145a 100644
--- a/mars-aop/pom.xml
+++ b/mars-aop/pom.xml
@@ -5,7 +5,7 @@
com.github.yuyenews
Mars-java
- 2.1.2
+ 2.1.3
mars-aop
diff --git a/mars-core/pom.xml b/mars-core/pom.xml
index 3bd6006..8f7bb82 100644
--- a/mars-core/pom.xml
+++ b/mars-core/pom.xml
@@ -5,7 +5,7 @@
com.github.yuyenews
Mars-java
- 2.1.2
+ 2.1.3
mars-core
diff --git a/mars-ioc/pom.xml b/mars-ioc/pom.xml
index a1b4f4b..5d6d7f3 100644
--- a/mars-ioc/pom.xml
+++ b/mars-ioc/pom.xml
@@ -5,7 +5,7 @@
com.github.yuyenews
Mars-java
- 2.1.2
+ 2.1.3
mars-ioc
diff --git a/mars-ioc/src/main/java/com/mars/ioc/factory/BeanFactory.java b/mars-ioc/src/main/java/com/mars/ioc/factory/BeanFactory.java
index 17e8b80..97788ee 100644
--- a/mars-ioc/src/main/java/com/mars/ioc/factory/BeanFactory.java
+++ b/mars-ioc/src/main/java/com/mars/ioc/factory/BeanFactory.java
@@ -107,7 +107,7 @@ public class BeanFactory {
* @param name mingc
* @return duix
*/
- public static Object getBean(String name) throws Exception {
+ public static T getBean(String name,Class cls) throws Exception {
try {
Object marsBeans = constants.getAttr(MarsConstant.MARS_BEAN_OBJECTS);
@@ -116,7 +116,7 @@ public class BeanFactory {
marsBeanObjects = (Map)marsBeans;
}
- return marsBeanObjects.get(name).getObj();
+ return (T)marsBeanObjects.get(name).getObj();
} catch (Exception e) {
throw new Exception("找不到name为["+name+"]的bean",e);
}
diff --git a/mars-jdbc/mars-jdbc-base/pom.xml b/mars-jdbc/mars-jdbc-base/pom.xml
index 9090402..1571d04 100644
--- a/mars-jdbc/mars-jdbc-base/pom.xml
+++ b/mars-jdbc/mars-jdbc-base/pom.xml
@@ -5,7 +5,7 @@
mars-jdbc
com.github.yuyenews
- 2.1.2
+ 2.1.3
4.0.0
diff --git a/mars-jdbc/mars-mj/pom.xml b/mars-jdbc/mars-mj/pom.xml
index e6bbfc2..f20c9ce 100644
--- a/mars-jdbc/mars-mj/pom.xml
+++ b/mars-jdbc/mars-mj/pom.xml
@@ -5,7 +5,7 @@
mars-jdbc
com.github.yuyenews
- 2.1.2
+ 2.1.3
4.0.0
diff --git a/mars-jdbc/mars-mybatis/pom.xml b/mars-jdbc/mars-mybatis/pom.xml
index 1dea7e2..30c5706 100644
--- a/mars-jdbc/mars-mybatis/pom.xml
+++ b/mars-jdbc/mars-mybatis/pom.xml
@@ -5,7 +5,7 @@
com.github.yuyenews
mars-jdbc
- 2.1.2
+ 2.1.3
mars-mybatis
diff --git a/mars-jdbc/pom.xml b/mars-jdbc/pom.xml
index f0bee5b..782c242 100644
--- a/mars-jdbc/pom.xml
+++ b/mars-jdbc/pom.xml
@@ -5,7 +5,7 @@
Mars-java
com.github.yuyenews
- 2.1.2
+ 2.1.3
4.0.0
pom
diff --git a/mars-junit/pom.xml b/mars-junit/pom.xml
index 638038e..cfd6dcc 100644
--- a/mars-junit/pom.xml
+++ b/mars-junit/pom.xml
@@ -5,7 +5,7 @@
Mars-java
com.github.yuyenews
- 2.1.2
+ 2.1.3
4.0.0
diff --git a/mars-junit/src/main/java/com/mars/junit/MarsJunitStart.java b/mars-junit/src/main/java/com/mars/junit/MarsJunitStart.java
index 56758b0..006743d 100644
--- a/mars-junit/src/main/java/com/mars/junit/MarsJunitStart.java
+++ b/mars-junit/src/main/java/com/mars/junit/MarsJunitStart.java
@@ -96,7 +96,7 @@ public class MarsJunitStart {
Resource resource = f.getAnnotation(Resource.class);
if(resource!=null){
f.setAccessible(true);
- f.set(obj, BeanFactory.getBean(resource.value()));
+ f.set(obj, BeanFactory.getBean(resource.value(),f.getType()));
}
}
} catch (Exception e){
diff --git a/mars-mvc/pom.xml b/mars-mvc/pom.xml
index 18be5b1..131c8db 100644
--- a/mars-mvc/pom.xml
+++ b/mars-mvc/pom.xml
@@ -5,7 +5,7 @@
com.github.yuyenews
Mars-java
- 2.1.2
+ 2.1.3
mars-mvc
diff --git a/mars-mvc/src/main/java/com/mars/mvc/servlet/EasyCoreServlet.java b/mars-mvc/src/main/java/com/mars/mvc/servlet/EasyCoreServlet.java
index 4e9bc29..272db42 100644
--- a/mars-mvc/src/main/java/com/mars/mvc/servlet/EasyCoreServlet.java
+++ b/mars-mvc/src/main/java/com/mars/mvc/servlet/EasyCoreServlet.java
@@ -1,5 +1,7 @@
package com.mars.mvc.servlet;
+import com.alibaba.fastjson.JSON;
+import com.mars.core.enums.DataType;
import com.mars.mvc.resolve.ResolveRequest;
import com.mars.core.logger.MarsLogger;
import com.mars.server.server.request.HttpRequest;
@@ -24,11 +26,38 @@ public class EasyCoreServlet implements EasyServlet{
Object result = resolveRequest.resolve(request,response);
/*将控制层 返回的结果 返回给netty，让其响应给客户端*/
- return result;
-
+ if(isNotObject(result)) {
+ return result;
+ } else {
+ return JSON.toJSONString(result);
+ }
} catch (Exception e) {
log.error("解释请求的时候报错",e);
throw e;
}
}
+
+ /**
+ * 判断是否是对象
+ * @param result
+ * @return
+ */
+ public boolean isNotObject(Object result){
+ String fieldTypeName = result.getClass().getSimpleName().toUpperCase();
+ switch (fieldTypeName){
+ case DataType.INT:
+ case DataType.INTEGER:
+ case DataType.BYTE:
+ case DataType.STRING:
+ case DataType.CHAR:
+ case DataType.CHARACTER:
+ case DataType.DOUBLE:
+ case DataType.FLOAT:
+ case DataType.LONG:
+ case DataType.SHORT:
+ case DataType.BOOLEAN:
+ return true;
+ }
+ return false;
+ }
}
diff --git a/mars-netty/pom.xml b/mars-netty/pom.xml
index f9ce3d0..126566d 100644
--- a/mars-netty/pom.xml
+++ b/mars-netty/pom.xml
@@ -5,7 +5,7 @@
com.github.yuyenews
Mars-java
- 2.1.2
+ 2.1.3
mars-netty
diff --git a/mars-netty/src/main/java/com/mars/netty/thread/RequestThread.java b/mars-netty/src/main/java/com/mars/netty/thread/RequestThread.java
index 03f05f3..0e493f3 100644
--- a/mars-netty/src/main/java/com/mars/netty/thread/RequestThread.java
+++ b/mars-netty/src/main/java/com/mars/netty/thread/RequestThread.java
@@ -66,8 +66,7 @@ public class RequestThread implements Runnable {
return;
}
/* 将控制层返回的数据，转成json字符串返回 */
- response.send(JSON.toJSONString(result));
-
+ response.send(result.toString());
} catch (InvocationTargetException e){
log.error("处理请求的时候出错",e);
response.send(MesUtil.getMes(500,"处理请求发生错误:"+e.getTargetException().getMessage()).toJSONString(), HttpResponseStatus.INTERNAL_SERVER_ERROR);
diff --git a/mars-server/pom.xml b/mars-server/pom.xml
index d09a165..5c0b305 100644
--- a/mars-server/pom.xml
+++ b/mars-server/pom.xml
@@ -5,7 +5,7 @@
com.github.yuyenews
Mars-java
- 2.1.2
+ 2.1.3
mars-server
diff --git a/mars-start/mars-start-base/pom.xml b/mars-start/mars-start-base/pom.xml
index 3dc57f6..c331e43 100644
--- a/mars-start/mars-start-base/pom.xml
+++ b/mars-start/mars-start-base/pom.xml
@@ -5,7 +5,7 @@
mars-start
com.github.yuyenews
- 2.1.2
+ 2.1.3
4.0.0
diff --git a/mars-start/mars-start-mj/pom.xml b/mars-start/mars-start-mj/pom.xml
index 494aee6..fe9b38f 100644
--- a/mars-start/mars-start-mj/pom.xml
+++ b/mars-start/mars-start-mj/pom.xml
@@ -5,7 +5,7 @@
mars-start
com.github.yuyenews
- 2.1.2
+ 2.1.3
4.0.0
diff --git a/mars-start/mars-start-mybatis/pom.xml b/mars-start/mars-start-mybatis/pom.xml
index 1304927..b28449e 100644
--- a/mars-start/mars-start-mybatis/pom.xml
+++ b/mars-start/mars-start-mybatis/pom.xml
@@ -5,7 +5,7 @@
mars-start
com.github.yuyenews
- 2.1.2
+ 2.1.3
4.0.0
diff --git a/mars-start/mars-start-simple/pom.xml b/mars-start/mars-start-simple/pom.xml
index abb7375..b56edbf 100644
--- a/mars-start/mars-start-simple/pom.xml
+++ b/mars-start/mars-start-simple/pom.xml
@@ -5,7 +5,7 @@
mars-start
com.github.yuyenews
- 2.1.2
+ 2.1.3
4.0.0
diff --git a/mars-start/pom.xml b/mars-start/pom.xml
index f213370..cdcc44d 100644
--- a/mars-start/pom.xml
+++ b/mars-start/pom.xml
@@ -5,7 +5,7 @@
Mars-java
com.github.yuyenews
- 2.1.2
+ 2.1.3
4.0.0
pom
diff --git a/pom.xml b/pom.xml
index 1867328..b50cddb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
com.github.yuyenews
Mars-java
- 2.1.2
+ 2.1.3
pom
mars-aop