From 0e7622ab54f2dbc5ae596a39a1a459cdef6cfea8 Mon Sep 17 00:00:00 2001
From: yuye <631941527@qq.com>
Date: Sun, 17 Nov 2019 14:39:28 +0800
Subject: [PATCH] update version

---
 .../java/com/mars/aop/proxy/MarsBeanProxy.java   |  7 ++-----
 .../java/com/mars/aop/proxy/exec/ExecAop.java    |  2 +-
 .../com/mars/aop/proxy/exec/ExecTraction.java    | 16 +++++++---------
 .../java/com/mars/jdbc/traction/TractionAop.java |  9 ++++-----
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/mars-core/src/main/java/com/mars/aop/proxy/MarsBeanProxy.java b/mars-core/src/main/java/com/mars/aop/proxy/MarsBeanProxy.java
index 239bc0f..9b87152 100644
--- a/mars-core/src/main/java/com/mars/aop/proxy/MarsBeanProxy.java
+++ b/mars-core/src/main/java/com/mars/aop/proxy/MarsBeanProxy.java
@@ -22,8 +22,6 @@ public class MarsBeanProxy implements MethodInterceptor {
 
 	private Enhancer enhancer;
 
-	private Class<?> cls;
-
 	/**
 	 * 获取代理对象
 	 *
@@ -31,7 +29,6 @@ public class MarsBeanProxy implements MethodInterceptor {
 	 * @return 对象
 	 */
 	public Object getProxy(Class<?> clazz) {
-		this.cls = clazz;
 		enhancer = new Enhancer();
 		// 设置需要创建子类的类
 		enhancer.setSuperclass(clazz);
@@ -67,7 +64,7 @@ public class MarsBeanProxy implements MethodInterceptor {
 			}
 
 			/* 开启事务 */
-			ExecTraction.beginTraction(args, tractionModel);
+			ExecTraction.beginTraction(tractionModel);
 
 			/* 执行aop的开始方法 */
 			ExecAop.startMethod(args, aopModel);
@@ -79,7 +76,7 @@ public class MarsBeanProxy implements MethodInterceptor {
 			ExecAop.endMethod(args,o1,aopModel);
 
 			/* 提交事务 */
-			ExecTraction.commit(args, tractionModel);
+			ExecTraction.commit(tractionModel);
 			return o1;
 		} catch (Throwable e) {
 			/* 回滚事务 */
diff --git a/mars-core/src/main/java/com/mars/aop/proxy/exec/ExecAop.java b/mars-core/src/main/java/com/mars/aop/proxy/exec/ExecAop.java
index c6d0e56..04ab1b0 100644
--- a/mars-core/src/main/java/com/mars/aop/proxy/exec/ExecAop.java
+++ b/mars-core/src/main/java/com/mars/aop/proxy/exec/ExecAop.java
@@ -59,7 +59,7 @@ public class ExecAop {
      * @param marsAop aop注解
      * @return aop实体
      */
-    public static  AopModel getAopModel(MarsAop marsAop) throws Exception {
+    public static AopModel getAopModel(MarsAop marsAop) throws Exception {
         if(marsAop == null) {
             return null;
         }
diff --git a/mars-core/src/main/java/com/mars/aop/proxy/exec/ExecTraction.java b/mars-core/src/main/java/com/mars/aop/proxy/exec/ExecTraction.java
index 3b2445b..a70f65a 100644
--- a/mars-core/src/main/java/com/mars/aop/proxy/exec/ExecTraction.java
+++ b/mars-core/src/main/java/com/mars/aop/proxy/exec/ExecTraction.java
@@ -11,30 +11,28 @@ public class ExecTraction {
 
     /**
      * 开启事务
-     * @param args 参数
      * @param aopModel Aop实体
      * @throws Exception 异常
      */
-    public static void beginTraction(Object[] args, AopModel aopModel) throws Exception {
+    public static void beginTraction(AopModel aopModel) throws Exception {
         if (aopModel == null) {
             return;
         }
-        Method m2 = aopModel.getCls().getDeclaredMethod(AopConstant.START_METHOD, new Class[]{Object[].class, AopModel.class});
-        m2.invoke(aopModel.getObj(), new Object[]{args, aopModel});
+        Method m2 = aopModel.getCls().getDeclaredMethod(AopConstant.START_METHOD, new Class[]{AopModel.class});
+        m2.invoke(aopModel.getObj(), new Object[]{aopModel});
     }
 
     /**
      * 提交事务
      * @param aopModel 对象
-     * @param args 参数
      * @throws Exception 异常
      */
-    public static void commit(Object[] args, AopModel aopModel) throws Exception {
+    public static void commit(AopModel aopModel) throws Exception {
         if (aopModel == null) {
             return;
         }
-        Method m2 = aopModel.getCls().getDeclaredMethod(AopConstant.END_METHOD, new Class[]{Object[].class});
-        m2.invoke(aopModel.getObj(), new Object[]{args});
+        Method m2 = aopModel.getCls().getDeclaredMethod(AopConstant.END_METHOD);
+        m2.invoke(aopModel.getObj());
     }
 
     /**
@@ -56,7 +54,7 @@ public class ExecTraction {
      * @param traction 事务监听注解
      * @return aop实体
      */
-    public static  AopModel getAopModel(Traction traction) throws Exception {
+    public static AopModel getAopModel(Traction traction) throws Exception {
         if(traction == null){
            return null;
         }
diff --git a/mars-jdbc/src/main/java/com/mars/jdbc/traction/TractionAop.java b/mars-jdbc/src/main/java/com/mars/jdbc/traction/TractionAop.java
index 995179d..3dfb3ef 100644
--- a/mars-jdbc/src/main/java/com/mars/jdbc/traction/TractionAop.java
+++ b/mars-jdbc/src/main/java/com/mars/jdbc/traction/TractionAop.java
@@ -28,9 +28,9 @@ public class TractionAop {
 	 * 
 	 * 将获取到的连接 放到缓存中
 	 * 
-	 * @param args canshu
+	 * @param aopModel aop对象
 	 */
-	public void startMethod(Object[] args, AopModel aopModel) {
+	public void startMethod(AopModel aopModel) {
 		try {
 
 			Map<String, DruidDataSource> maps = (Map<String,DruidDataSource>) marsSpace.getAttr(MarsConstant.DATA_SOURCE_MAP);
@@ -52,10 +52,9 @@ public class TractionAop {
 
 	/**
 	 * 从缓存中获取当前线程的数据库连接，并提交事务
-	 * 
-	 * @param args canshu
+	 *
 	 */
-	public void endMethod(Object[] args) {
+	public void endMethod() {
 		try {
 			Map<String,Connection> connections = (Map<String,Connection>) ThreadUtil.getThreadLocal().get();