From 5b1d22afd58eea3af1a88ca347c01a17afa16d4d Mon Sep 17 00:00:00 2001 From: yuye <631941527@qq.com> Date: Wed, 12 Feb 2020 15:43:08 +0800 Subject: [PATCH] update version --- .../src/main/java/com/mars/aop/proxy/exec/ExecTraction.java | 1 + .../src/main/java/com/mars/core/base/config/MarsConfig.java | 2 +- .../src/main/java/com/mars/core/util/MarsConfiguration.java | 1 - .../src/main/java/com/mars/ioc/factory/BeanFactory.java | 6 ++---- 4 files changed, 4 insertions(+), 6 deletions(-) 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 a70f65a..63906c9 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 @@ -53,6 +53,7 @@ public class ExecTraction { * 获取aop实体 * @param traction 事务监听注解 * @return aop实体 + * @throws Exception 异常 */ public static AopModel getAopModel(Traction traction) throws Exception { if(traction == null){ diff --git a/mars-core/src/main/java/com/mars/core/base/config/MarsConfig.java b/mars-core/src/main/java/com/mars/core/base/config/MarsConfig.java index f8b42a9..ef61e24 100644 --- a/mars-core/src/main/java/com/mars/core/base/config/MarsConfig.java +++ b/mars-core/src/main/java/com/mars/core/base/config/MarsConfig.java @@ -61,7 +61,7 @@ public abstract class MarsConfig { /** * 其他配置项 - * @return + * @return 配置 */ public Map marsValues(){ return null; diff --git a/mars-core/src/main/java/com/mars/core/util/MarsConfiguration.java b/mars-core/src/main/java/com/mars/core/util/MarsConfiguration.java index a93dd9e..422d469 100644 --- a/mars-core/src/main/java/com/mars/core/util/MarsConfiguration.java +++ b/mars-core/src/main/java/com/mars/core/util/MarsConfiguration.java @@ -17,7 +17,6 @@ public class MarsConfiguration { /** * 加载配置文件 * @param marsConfig 后缀 - * @throws Exception 异常 */ public static void loadConfig(MarsConfig marsConfig) { constants.setAttr(MarsConstant.CONFIG_CACHE_KEY,marsConfig); diff --git a/mars-core/src/main/java/com/mars/ioc/factory/BeanFactory.java b/mars-core/src/main/java/com/mars/ioc/factory/BeanFactory.java index 7ed190b..46163bf 100644 --- a/mars-core/src/main/java/com/mars/ioc/factory/BeanFactory.java +++ b/mars-core/src/main/java/com/mars/ioc/factory/BeanFactory.java @@ -54,14 +54,12 @@ public class BeanFactory { throw new Exception("创建["+className.getName()+"]类型的bean对象出现错误",e); } } - - + /** - * 获取bean * @param name bean名称 * @param cls bean类型 + * @param 类型 * @return bean对象 - * * @throws Exception 异常 */ public static T getBean(String name,Class cls) throws Exception {