diff --git a/joker-core/pom.xml b/mars-core/pom.xml similarity index 91% rename from joker-core/pom.xml rename to mars-core/pom.xml index 6cca13b..4f1baee 100644 --- a/joker-core/pom.xml +++ b/mars-core/pom.xml @@ -4,10 +4,10 @@ 4.0.0 com.github.yuyenews - Joker + Mars 3.0.8 - joker-core + mars-core diff --git a/joker-core/src/main/java/com/mars/aop/base/BaseAop.java b/mars-core/src/main/java/com/mars/aop/base/BaseAop.java similarity index 100% rename from joker-core/src/main/java/com/mars/aop/base/BaseAop.java rename to mars-core/src/main/java/com/mars/aop/base/BaseAop.java diff --git a/joker-core/src/main/java/com/mars/aop/constant/AopConstant.java b/mars-core/src/main/java/com/mars/aop/constant/AopConstant.java similarity index 100% rename from joker-core/src/main/java/com/mars/aop/constant/AopConstant.java rename to mars-core/src/main/java/com/mars/aop/constant/AopConstant.java diff --git a/joker-core/src/main/java/com/mars/aop/model/AopModel.java b/mars-core/src/main/java/com/mars/aop/model/AopModel.java similarity index 100% rename from joker-core/src/main/java/com/mars/aop/model/AopModel.java rename to mars-core/src/main/java/com/mars/aop/model/AopModel.java diff --git a/joker-core/src/main/java/com/mars/aop/proxy/MarsBeanProxy.java b/mars-core/src/main/java/com/mars/aop/proxy/MarsBeanProxy.java similarity index 100% rename from joker-core/src/main/java/com/mars/aop/proxy/MarsBeanProxy.java rename to mars-core/src/main/java/com/mars/aop/proxy/MarsBeanProxy.java diff --git a/joker-core/src/main/java/com/mars/aop/proxy/exec/ExecAop.java b/mars-core/src/main/java/com/mars/aop/proxy/exec/ExecAop.java similarity index 100% rename from joker-core/src/main/java/com/mars/aop/proxy/exec/ExecAop.java rename to mars-core/src/main/java/com/mars/aop/proxy/exec/ExecAop.java diff --git a/joker-core/src/main/java/com/mars/aop/proxy/exec/ExecRedisLock.java b/mars-core/src/main/java/com/mars/aop/proxy/exec/ExecRedisLock.java similarity index 100% rename from joker-core/src/main/java/com/mars/aop/proxy/exec/ExecRedisLock.java rename to mars-core/src/main/java/com/mars/aop/proxy/exec/ExecRedisLock.java diff --git a/joker-core/src/main/java/com/mars/aop/proxy/exec/ExecTraction.java b/mars-core/src/main/java/com/mars/aop/proxy/exec/ExecTraction.java similarity index 100% rename from joker-core/src/main/java/com/mars/aop/proxy/exec/ExecTraction.java rename to mars-core/src/main/java/com/mars/aop/proxy/exec/ExecTraction.java diff --git a/joker-core/src/main/java/com/mars/core/after/StartAfter.java b/mars-core/src/main/java/com/mars/core/after/StartAfter.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/after/StartAfter.java rename to mars-core/src/main/java/com/mars/core/after/StartAfter.java diff --git a/joker-core/src/main/java/com/mars/core/annotation/MarsAfter.java b/mars-core/src/main/java/com/mars/core/annotation/MarsAfter.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/annotation/MarsAfter.java rename to mars-core/src/main/java/com/mars/core/annotation/MarsAfter.java diff --git a/joker-core/src/main/java/com/mars/core/annotation/MarsAop.java b/mars-core/src/main/java/com/mars/core/annotation/MarsAop.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/annotation/MarsAop.java rename to mars-core/src/main/java/com/mars/core/annotation/MarsAop.java diff --git a/joker-core/src/main/java/com/mars/core/annotation/MarsApi.java b/mars-core/src/main/java/com/mars/core/annotation/MarsApi.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/annotation/MarsApi.java rename to mars-core/src/main/java/com/mars/core/annotation/MarsApi.java diff --git a/joker-core/src/main/java/com/mars/core/annotation/MarsBean.java b/mars-core/src/main/java/com/mars/core/annotation/MarsBean.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/annotation/MarsBean.java rename to mars-core/src/main/java/com/mars/core/annotation/MarsBean.java diff --git a/joker-core/src/main/java/com/mars/core/annotation/MarsDao.java b/mars-core/src/main/java/com/mars/core/annotation/MarsDao.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/annotation/MarsDao.java rename to mars-core/src/main/java/com/mars/core/annotation/MarsDao.java diff --git a/joker-core/src/main/java/com/mars/core/annotation/MarsInterceptor.java b/mars-core/src/main/java/com/mars/core/annotation/MarsInterceptor.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/annotation/MarsInterceptor.java rename to mars-core/src/main/java/com/mars/core/annotation/MarsInterceptor.java diff --git a/joker-core/src/main/java/com/mars/core/annotation/MarsLog.java b/mars-core/src/main/java/com/mars/core/annotation/MarsLog.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/annotation/MarsLog.java rename to mars-core/src/main/java/com/mars/core/annotation/MarsLog.java diff --git a/joker-core/src/main/java/com/mars/core/annotation/MarsReference.java b/mars-core/src/main/java/com/mars/core/annotation/MarsReference.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/annotation/MarsReference.java rename to mars-core/src/main/java/com/mars/core/annotation/MarsReference.java diff --git a/joker-core/src/main/java/com/mars/core/annotation/MarsTest.java b/mars-core/src/main/java/com/mars/core/annotation/MarsTest.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/annotation/MarsTest.java rename to mars-core/src/main/java/com/mars/core/annotation/MarsTest.java diff --git a/joker-core/src/main/java/com/mars/core/annotation/MarsTimer.java b/mars-core/src/main/java/com/mars/core/annotation/MarsTimer.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/annotation/MarsTimer.java rename to mars-core/src/main/java/com/mars/core/annotation/MarsTimer.java diff --git a/joker-core/src/main/java/com/mars/core/annotation/MarsValue.java b/mars-core/src/main/java/com/mars/core/annotation/MarsValue.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/annotation/MarsValue.java rename to mars-core/src/main/java/com/mars/core/annotation/MarsValue.java diff --git a/joker-core/src/main/java/com/mars/core/annotation/MarsWrite.java b/mars-core/src/main/java/com/mars/core/annotation/MarsWrite.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/annotation/MarsWrite.java rename to mars-core/src/main/java/com/mars/core/annotation/MarsWrite.java diff --git a/joker-core/src/main/java/com/mars/core/annotation/RedisLock.java b/mars-core/src/main/java/com/mars/core/annotation/RedisLock.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/annotation/RedisLock.java rename to mars-core/src/main/java/com/mars/core/annotation/RedisLock.java diff --git a/joker-core/src/main/java/com/mars/core/annotation/RequestMethod.java b/mars-core/src/main/java/com/mars/core/annotation/RequestMethod.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/annotation/RequestMethod.java rename to mars-core/src/main/java/com/mars/core/annotation/RequestMethod.java diff --git a/joker-core/src/main/java/com/mars/core/annotation/Traction.java b/mars-core/src/main/java/com/mars/core/annotation/Traction.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/annotation/Traction.java rename to mars-core/src/main/java/com/mars/core/annotation/Traction.java diff --git a/joker-core/src/main/java/com/mars/core/annotation/enums/RefType.java b/mars-core/src/main/java/com/mars/core/annotation/enums/RefType.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/annotation/enums/RefType.java rename to mars-core/src/main/java/com/mars/core/annotation/enums/RefType.java diff --git a/joker-core/src/main/java/com/mars/core/annotation/enums/ReqMethod.java b/mars-core/src/main/java/com/mars/core/annotation/enums/ReqMethod.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/annotation/enums/ReqMethod.java rename to mars-core/src/main/java/com/mars/core/annotation/enums/ReqMethod.java diff --git a/joker-core/src/main/java/com/mars/core/base/BaseAfter.java b/mars-core/src/main/java/com/mars/core/base/BaseAfter.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/base/BaseAfter.java rename to mars-core/src/main/java/com/mars/core/base/BaseAfter.java diff --git a/joker-core/src/main/java/com/mars/core/base/InitBean.java b/mars-core/src/main/java/com/mars/core/base/InitBean.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/base/InitBean.java rename to mars-core/src/main/java/com/mars/core/base/InitBean.java diff --git a/joker-core/src/main/java/com/mars/core/constant/MarsCloudConstant.java b/mars-core/src/main/java/com/mars/core/constant/MarsCloudConstant.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/constant/MarsCloudConstant.java rename to mars-core/src/main/java/com/mars/core/constant/MarsCloudConstant.java diff --git a/joker-core/src/main/java/com/mars/core/constant/MarsConstant.java b/mars-core/src/main/java/com/mars/core/constant/MarsConstant.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/constant/MarsConstant.java rename to mars-core/src/main/java/com/mars/core/constant/MarsConstant.java diff --git a/joker-core/src/main/java/com/mars/core/constant/MarsSpace.java b/mars-core/src/main/java/com/mars/core/constant/MarsSpace.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/constant/MarsSpace.java rename to mars-core/src/main/java/com/mars/core/constant/MarsSpace.java diff --git a/joker-core/src/main/java/com/mars/core/enums/DataType.java b/mars-core/src/main/java/com/mars/core/enums/DataType.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/enums/DataType.java rename to mars-core/src/main/java/com/mars/core/enums/DataType.java diff --git a/joker-core/src/main/java/com/mars/core/enums/ExecutorType.java b/mars-core/src/main/java/com/mars/core/enums/ExecutorType.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/enums/ExecutorType.java rename to mars-core/src/main/java/com/mars/core/enums/ExecutorType.java diff --git a/joker-core/src/main/java/com/mars/core/enums/TractionLevel.java b/mars-core/src/main/java/com/mars/core/enums/TractionLevel.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/enums/TractionLevel.java rename to mars-core/src/main/java/com/mars/core/enums/TractionLevel.java diff --git a/joker-core/src/main/java/com/mars/core/load/LoadBeans.java b/mars-core/src/main/java/com/mars/core/load/LoadBeans.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/load/LoadBeans.java rename to mars-core/src/main/java/com/mars/core/load/LoadBeans.java diff --git a/joker-core/src/main/java/com/mars/core/load/LoadClass.java b/mars-core/src/main/java/com/mars/core/load/LoadClass.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/load/LoadClass.java rename to mars-core/src/main/java/com/mars/core/load/LoadClass.java diff --git a/joker-core/src/main/java/com/mars/core/load/LoadHelper.java b/mars-core/src/main/java/com/mars/core/load/LoadHelper.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/load/LoadHelper.java rename to mars-core/src/main/java/com/mars/core/load/LoadHelper.java diff --git a/joker-core/src/main/java/com/mars/core/load/WriteFields.java b/mars-core/src/main/java/com/mars/core/load/WriteFields.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/load/WriteFields.java rename to mars-core/src/main/java/com/mars/core/load/WriteFields.java diff --git a/joker-core/src/main/java/com/mars/core/model/MarsBeanClassModel.java b/mars-core/src/main/java/com/mars/core/model/MarsBeanClassModel.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/model/MarsBeanClassModel.java rename to mars-core/src/main/java/com/mars/core/model/MarsBeanClassModel.java diff --git a/joker-core/src/main/java/com/mars/core/model/MarsBeanModel.java b/mars-core/src/main/java/com/mars/core/model/MarsBeanModel.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/model/MarsBeanModel.java rename to mars-core/src/main/java/com/mars/core/model/MarsBeanModel.java diff --git a/joker-core/src/main/java/com/mars/core/model/MarsTimerModel.java b/mars-core/src/main/java/com/mars/core/model/MarsTimerModel.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/model/MarsTimerModel.java rename to mars-core/src/main/java/com/mars/core/model/MarsTimerModel.java diff --git a/joker-core/src/main/java/com/mars/core/ncfg/mvc/CoreServletClass.java b/mars-core/src/main/java/com/mars/core/ncfg/mvc/CoreServletClass.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/ncfg/mvc/CoreServletClass.java rename to mars-core/src/main/java/com/mars/core/ncfg/mvc/CoreServletClass.java diff --git a/joker-core/src/main/java/com/mars/core/ncfg/traction/TractionClass.java b/mars-core/src/main/java/com/mars/core/ncfg/traction/TractionClass.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/ncfg/traction/TractionClass.java rename to mars-core/src/main/java/com/mars/core/ncfg/traction/TractionClass.java diff --git a/joker-core/src/main/java/com/mars/core/util/ConfigUtil.java b/mars-core/src/main/java/com/mars/core/util/ConfigUtil.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/util/ConfigUtil.java rename to mars-core/src/main/java/com/mars/core/util/ConfigUtil.java diff --git a/joker-core/src/main/java/com/mars/core/util/FileUtil.java b/mars-core/src/main/java/com/mars/core/util/FileUtil.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/util/FileUtil.java rename to mars-core/src/main/java/com/mars/core/util/FileUtil.java diff --git a/joker-core/src/main/java/com/mars/core/util/HttpUtil.java b/mars-core/src/main/java/com/mars/core/util/HttpUtil.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/util/HttpUtil.java rename to mars-core/src/main/java/com/mars/core/util/HttpUtil.java diff --git a/joker-core/src/main/java/com/mars/core/util/MarsAddressUtil.java b/mars-core/src/main/java/com/mars/core/util/MarsAddressUtil.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/util/MarsAddressUtil.java rename to mars-core/src/main/java/com/mars/core/util/MarsAddressUtil.java diff --git a/joker-core/src/main/java/com/mars/core/util/MatchUtil.java b/mars-core/src/main/java/com/mars/core/util/MatchUtil.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/util/MatchUtil.java rename to mars-core/src/main/java/com/mars/core/util/MatchUtil.java diff --git a/joker-core/src/main/java/com/mars/core/util/MesUtil.java b/mars-core/src/main/java/com/mars/core/util/MesUtil.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/util/MesUtil.java rename to mars-core/src/main/java/com/mars/core/util/MesUtil.java diff --git a/joker-core/src/main/java/com/mars/core/util/PropertyUtil.java b/mars-core/src/main/java/com/mars/core/util/PropertyUtil.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/util/PropertyUtil.java rename to mars-core/src/main/java/com/mars/core/util/PropertyUtil.java diff --git a/joker-core/src/main/java/com/mars/core/util/ReadClass.java b/mars-core/src/main/java/com/mars/core/util/ReadClass.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/util/ReadClass.java rename to mars-core/src/main/java/com/mars/core/util/ReadClass.java diff --git a/joker-core/src/main/java/com/mars/core/util/RemoteConfigUtil.java b/mars-core/src/main/java/com/mars/core/util/RemoteConfigUtil.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/util/RemoteConfigUtil.java rename to mars-core/src/main/java/com/mars/core/util/RemoteConfigUtil.java diff --git a/joker-core/src/main/java/com/mars/core/util/SerializableUtil.java b/mars-core/src/main/java/com/mars/core/util/SerializableUtil.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/util/SerializableUtil.java rename to mars-core/src/main/java/com/mars/core/util/SerializableUtil.java diff --git a/joker-core/src/main/java/com/mars/core/util/StringUtil.java b/mars-core/src/main/java/com/mars/core/util/StringUtil.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/util/StringUtil.java rename to mars-core/src/main/java/com/mars/core/util/StringUtil.java diff --git a/joker-core/src/main/java/com/mars/core/util/ThreadUtil.java b/mars-core/src/main/java/com/mars/core/util/ThreadUtil.java similarity index 100% rename from joker-core/src/main/java/com/mars/core/util/ThreadUtil.java rename to mars-core/src/main/java/com/mars/core/util/ThreadUtil.java diff --git a/joker-core/src/main/java/com/mars/ioc/factory/BeanFactory.java b/mars-core/src/main/java/com/mars/ioc/factory/BeanFactory.java similarity index 100% rename from joker-core/src/main/java/com/mars/ioc/factory/BeanFactory.java rename to mars-core/src/main/java/com/mars/ioc/factory/BeanFactory.java diff --git a/joker-core/src/main/java/com/mars/ioc/load/LoadMarsBean.java b/mars-core/src/main/java/com/mars/ioc/load/LoadMarsBean.java similarity index 100% rename from joker-core/src/main/java/com/mars/ioc/load/LoadMarsBean.java rename to mars-core/src/main/java/com/mars/ioc/load/LoadMarsBean.java diff --git a/joker-core/src/main/java/com/mars/timer/execute/ExecuteMarsTimer.java b/mars-core/src/main/java/com/mars/timer/execute/ExecuteMarsTimer.java similarity index 100% rename from joker-core/src/main/java/com/mars/timer/execute/ExecuteMarsTimer.java rename to mars-core/src/main/java/com/mars/timer/execute/ExecuteMarsTimer.java diff --git a/joker-core/src/main/java/com/mars/timer/load/LoadMarsTimer.java b/mars-core/src/main/java/com/mars/timer/load/LoadMarsTimer.java similarity index 100% rename from joker-core/src/main/java/com/mars/timer/load/LoadMarsTimer.java rename to mars-core/src/main/java/com/mars/timer/load/LoadMarsTimer.java diff --git a/joker-jdbc/pom.xml b/mars-jdbc/pom.xml similarity index 87% rename from joker-jdbc/pom.xml rename to mars-jdbc/pom.xml index 5d6247e..d8b69d9 100644 --- a/joker-jdbc/pom.xml +++ b/mars-jdbc/pom.xml @@ -3,17 +3,17 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - Joker + Mars com.github.yuyenews 3.0.8 4.0.0 - joker-jdbc + mars-jdbc com.github.yuyenews - joker-core + mars-core ${project.parent.version} diff --git a/joker-jdbc/src/main/java/com/mars/jdbc/annotation/DataSource.java b/mars-jdbc/src/main/java/com/mars/jdbc/annotation/DataSource.java similarity index 100% rename from joker-jdbc/src/main/java/com/mars/jdbc/annotation/DataSource.java rename to mars-jdbc/src/main/java/com/mars/jdbc/annotation/DataSource.java diff --git a/joker-jdbc/src/main/java/com/mars/jdbc/annotation/MarsGet.java b/mars-jdbc/src/main/java/com/mars/jdbc/annotation/MarsGet.java similarity index 100% rename from joker-jdbc/src/main/java/com/mars/jdbc/annotation/MarsGet.java rename to mars-jdbc/src/main/java/com/mars/jdbc/annotation/MarsGet.java diff --git a/joker-jdbc/src/main/java/com/mars/jdbc/annotation/MarsSelect.java b/mars-jdbc/src/main/java/com/mars/jdbc/annotation/MarsSelect.java similarity index 100% rename from joker-jdbc/src/main/java/com/mars/jdbc/annotation/MarsSelect.java rename to mars-jdbc/src/main/java/com/mars/jdbc/annotation/MarsSelect.java diff --git a/joker-jdbc/src/main/java/com/mars/jdbc/annotation/MarsUpdate.java b/mars-jdbc/src/main/java/com/mars/jdbc/annotation/MarsUpdate.java similarity index 100% rename from joker-jdbc/src/main/java/com/mars/jdbc/annotation/MarsUpdate.java rename to mars-jdbc/src/main/java/com/mars/jdbc/annotation/MarsUpdate.java diff --git a/joker-jdbc/src/main/java/com/mars/jdbc/enums/OperType.java b/mars-jdbc/src/main/java/com/mars/jdbc/enums/OperType.java similarity index 100% rename from joker-jdbc/src/main/java/com/mars/jdbc/enums/OperType.java rename to mars-jdbc/src/main/java/com/mars/jdbc/enums/OperType.java diff --git a/joker-jdbc/src/main/java/com/mars/jdbc/helper/base/DBHelper.java b/mars-jdbc/src/main/java/com/mars/jdbc/helper/base/DBHelper.java similarity index 100% rename from joker-jdbc/src/main/java/com/mars/jdbc/helper/base/DBHelper.java rename to mars-jdbc/src/main/java/com/mars/jdbc/helper/base/DBHelper.java diff --git a/joker-jdbc/src/main/java/com/mars/jdbc/helper/manager/ConnectionManager.java b/mars-jdbc/src/main/java/com/mars/jdbc/helper/manager/ConnectionManager.java similarity index 100% rename from joker-jdbc/src/main/java/com/mars/jdbc/helper/manager/ConnectionManager.java rename to mars-jdbc/src/main/java/com/mars/jdbc/helper/manager/ConnectionManager.java diff --git a/joker-jdbc/src/main/java/com/mars/jdbc/helper/model/PageModel.java b/mars-jdbc/src/main/java/com/mars/jdbc/helper/model/PageModel.java similarity index 100% rename from joker-jdbc/src/main/java/com/mars/jdbc/helper/model/PageModel.java rename to mars-jdbc/src/main/java/com/mars/jdbc/helper/model/PageModel.java diff --git a/joker-jdbc/src/main/java/com/mars/jdbc/helper/model/PageParamModel.java b/mars-jdbc/src/main/java/com/mars/jdbc/helper/model/PageParamModel.java similarity index 100% rename from joker-jdbc/src/main/java/com/mars/jdbc/helper/model/PageParamModel.java rename to mars-jdbc/src/main/java/com/mars/jdbc/helper/model/PageParamModel.java diff --git a/joker-jdbc/src/main/java/com/mars/jdbc/helper/templete/JdbcPage.java b/mars-jdbc/src/main/java/com/mars/jdbc/helper/templete/JdbcPage.java similarity index 100% rename from joker-jdbc/src/main/java/com/mars/jdbc/helper/templete/JdbcPage.java rename to mars-jdbc/src/main/java/com/mars/jdbc/helper/templete/JdbcPage.java diff --git a/joker-jdbc/src/main/java/com/mars/jdbc/helper/templete/JdbcSelect.java b/mars-jdbc/src/main/java/com/mars/jdbc/helper/templete/JdbcSelect.java similarity index 100% rename from joker-jdbc/src/main/java/com/mars/jdbc/helper/templete/JdbcSelect.java rename to mars-jdbc/src/main/java/com/mars/jdbc/helper/templete/JdbcSelect.java diff --git a/joker-jdbc/src/main/java/com/mars/jdbc/helper/templete/JdbcTemplate.java b/mars-jdbc/src/main/java/com/mars/jdbc/helper/templete/JdbcTemplate.java similarity index 100% rename from joker-jdbc/src/main/java/com/mars/jdbc/helper/templete/JdbcTemplate.java rename to mars-jdbc/src/main/java/com/mars/jdbc/helper/templete/JdbcTemplate.java diff --git a/joker-jdbc/src/main/java/com/mars/jdbc/helper/templete/JdbcUpdate.java b/mars-jdbc/src/main/java/com/mars/jdbc/helper/templete/JdbcUpdate.java similarity index 100% rename from joker-jdbc/src/main/java/com/mars/jdbc/helper/templete/JdbcUpdate.java rename to mars-jdbc/src/main/java/com/mars/jdbc/helper/templete/JdbcUpdate.java diff --git a/joker-jdbc/src/main/java/com/mars/jdbc/helper/templete/base/BaseJdbcTemplate.java b/mars-jdbc/src/main/java/com/mars/jdbc/helper/templete/base/BaseJdbcTemplate.java similarity index 100% rename from joker-jdbc/src/main/java/com/mars/jdbc/helper/templete/base/BaseJdbcTemplate.java rename to mars-jdbc/src/main/java/com/mars/jdbc/helper/templete/base/BaseJdbcTemplate.java diff --git a/joker-jdbc/src/main/java/com/mars/jdbc/helper/templete/base/BaseSelect.java b/mars-jdbc/src/main/java/com/mars/jdbc/helper/templete/base/BaseSelect.java similarity index 100% rename from joker-jdbc/src/main/java/com/mars/jdbc/helper/templete/base/BaseSelect.java rename to mars-jdbc/src/main/java/com/mars/jdbc/helper/templete/base/BaseSelect.java diff --git a/joker-jdbc/src/main/java/com/mars/jdbc/helper/templete/model/SqlBuilderModel.java b/mars-jdbc/src/main/java/com/mars/jdbc/helper/templete/model/SqlBuilderModel.java similarity index 100% rename from joker-jdbc/src/main/java/com/mars/jdbc/helper/templete/model/SqlBuilderModel.java rename to mars-jdbc/src/main/java/com/mars/jdbc/helper/templete/model/SqlBuilderModel.java diff --git a/joker-jdbc/src/main/java/com/mars/jdbc/load/InitJdbc.java b/mars-jdbc/src/main/java/com/mars/jdbc/load/InitJdbc.java similarity index 100% rename from joker-jdbc/src/main/java/com/mars/jdbc/load/InitJdbc.java rename to mars-jdbc/src/main/java/com/mars/jdbc/load/InitJdbc.java diff --git a/joker-jdbc/src/main/java/com/mars/jdbc/load/LoadDaos.java b/mars-jdbc/src/main/java/com/mars/jdbc/load/LoadDaos.java similarity index 100% rename from joker-jdbc/src/main/java/com/mars/jdbc/load/LoadDaos.java rename to mars-jdbc/src/main/java/com/mars/jdbc/load/LoadDaos.java diff --git a/joker-jdbc/src/main/java/com/mars/jdbc/proxy/MjProxy.java b/mars-jdbc/src/main/java/com/mars/jdbc/proxy/MjProxy.java similarity index 100% rename from joker-jdbc/src/main/java/com/mars/jdbc/proxy/MjProxy.java rename to mars-jdbc/src/main/java/com/mars/jdbc/proxy/MjProxy.java diff --git a/joker-jdbc/src/main/java/com/mars/jdbc/proxy/oper/ProxyOpertion.java b/mars-jdbc/src/main/java/com/mars/jdbc/proxy/oper/ProxyOpertion.java similarity index 100% rename from joker-jdbc/src/main/java/com/mars/jdbc/proxy/oper/ProxyOpertion.java rename to mars-jdbc/src/main/java/com/mars/jdbc/proxy/oper/ProxyOpertion.java diff --git a/joker-jdbc/src/main/java/com/mars/jdbc/traction/TractionAop.java b/mars-jdbc/src/main/java/com/mars/jdbc/traction/TractionAop.java similarity index 100% rename from joker-jdbc/src/main/java/com/mars/jdbc/traction/TractionAop.java rename to mars-jdbc/src/main/java/com/mars/jdbc/traction/TractionAop.java diff --git a/joker-jdbc/src/main/java/com/mars/jdbc/util/JdbcConfigUtil.java b/mars-jdbc/src/main/java/com/mars/jdbc/util/JdbcConfigUtil.java similarity index 100% rename from joker-jdbc/src/main/java/com/mars/jdbc/util/JdbcConfigUtil.java rename to mars-jdbc/src/main/java/com/mars/jdbc/util/JdbcConfigUtil.java diff --git a/joker-mvc/pom.xml b/mars-mvc/pom.xml similarity index 78% rename from joker-mvc/pom.xml rename to mars-mvc/pom.xml index 2cb8f12..e1c91ed 100644 --- a/joker-mvc/pom.xml +++ b/mars-mvc/pom.xml @@ -4,15 +4,15 @@ 4.0.0 com.github.yuyenews - Joker + Mars 3.0.8 - joker-mvc + mars-mvc com.github.yuyenews - joker-netty + mars-netty \ No newline at end of file diff --git a/joker-mvc/src/main/java/com/mars/mvc/base/BaseInterceptor.java b/mars-mvc/src/main/java/com/mars/mvc/base/BaseInterceptor.java similarity index 100% rename from joker-mvc/src/main/java/com/mars/mvc/base/BaseInterceptor.java rename to mars-mvc/src/main/java/com/mars/mvc/base/BaseInterceptor.java diff --git a/joker-mvc/src/main/java/com/mars/mvc/constant/InterConstant.java b/mars-mvc/src/main/java/com/mars/mvc/constant/InterConstant.java similarity index 100% rename from joker-mvc/src/main/java/com/mars/mvc/constant/InterConstant.java rename to mars-mvc/src/main/java/com/mars/mvc/constant/InterConstant.java diff --git a/joker-mvc/src/main/java/com/mars/mvc/load/LoadInters.java b/mars-mvc/src/main/java/com/mars/mvc/load/LoadInters.java similarity index 100% rename from joker-mvc/src/main/java/com/mars/mvc/load/LoadInters.java rename to mars-mvc/src/main/java/com/mars/mvc/load/LoadInters.java diff --git a/joker-mvc/src/main/java/com/mars/mvc/load/LoadMarsApi.java b/mars-mvc/src/main/java/com/mars/mvc/load/LoadMarsApi.java similarity index 100% rename from joker-mvc/src/main/java/com/mars/mvc/load/LoadMarsApi.java rename to mars-mvc/src/main/java/com/mars/mvc/load/LoadMarsApi.java diff --git a/joker-mvc/src/main/java/com/mars/mvc/logs/LogAop.java b/mars-mvc/src/main/java/com/mars/mvc/logs/LogAop.java similarity index 100% rename from joker-mvc/src/main/java/com/mars/mvc/logs/LogAop.java rename to mars-mvc/src/main/java/com/mars/mvc/logs/LogAop.java diff --git a/joker-mvc/src/main/java/com/mars/mvc/model/MarsInterModel.java b/mars-mvc/src/main/java/com/mars/mvc/model/MarsInterModel.java similarity index 100% rename from joker-mvc/src/main/java/com/mars/mvc/model/MarsInterModel.java rename to mars-mvc/src/main/java/com/mars/mvc/model/MarsInterModel.java diff --git a/joker-mvc/src/main/java/com/mars/mvc/model/MarsMappingModel.java b/mars-mvc/src/main/java/com/mars/mvc/model/MarsMappingModel.java similarity index 100% rename from joker-mvc/src/main/java/com/mars/mvc/model/MarsMappingModel.java rename to mars-mvc/src/main/java/com/mars/mvc/model/MarsMappingModel.java diff --git a/joker-mvc/src/main/java/com/mars/mvc/proxy/ExecuteRef.java b/mars-mvc/src/main/java/com/mars/mvc/proxy/ExecuteRef.java similarity index 100% rename from joker-mvc/src/main/java/com/mars/mvc/proxy/ExecuteRef.java rename to mars-mvc/src/main/java/com/mars/mvc/proxy/ExecuteRef.java diff --git a/joker-mvc/src/main/java/com/mars/mvc/proxy/MvcCglibProxy.java b/mars-mvc/src/main/java/com/mars/mvc/proxy/MvcCglibProxy.java similarity index 100% rename from joker-mvc/src/main/java/com/mars/mvc/proxy/MvcCglibProxy.java rename to mars-mvc/src/main/java/com/mars/mvc/proxy/MvcCglibProxy.java diff --git a/joker-mvc/src/main/java/com/mars/mvc/proxy/ParamUtil.java b/mars-mvc/src/main/java/com/mars/mvc/proxy/ParamUtil.java similarity index 100% rename from joker-mvc/src/main/java/com/mars/mvc/proxy/ParamUtil.java rename to mars-mvc/src/main/java/com/mars/mvc/proxy/ParamUtil.java diff --git a/joker-mvc/src/main/java/com/mars/mvc/resolve/ExecuteInters.java b/mars-mvc/src/main/java/com/mars/mvc/resolve/ExecuteInters.java similarity index 100% rename from joker-mvc/src/main/java/com/mars/mvc/resolve/ExecuteInters.java rename to mars-mvc/src/main/java/com/mars/mvc/resolve/ExecuteInters.java diff --git a/joker-mvc/src/main/java/com/mars/mvc/resolve/ExecuteMars.java b/mars-mvc/src/main/java/com/mars/mvc/resolve/ExecuteMars.java similarity index 100% rename from joker-mvc/src/main/java/com/mars/mvc/resolve/ExecuteMars.java rename to mars-mvc/src/main/java/com/mars/mvc/resolve/ExecuteMars.java diff --git a/joker-mvc/src/main/java/com/mars/mvc/resolve/ResolveRequest.java b/mars-mvc/src/main/java/com/mars/mvc/resolve/ResolveRequest.java similarity index 100% rename from joker-mvc/src/main/java/com/mars/mvc/resolve/ResolveRequest.java rename to mars-mvc/src/main/java/com/mars/mvc/resolve/ResolveRequest.java diff --git a/joker-mvc/src/main/java/com/mars/mvc/resolve/access/PathAccess.java b/mars-mvc/src/main/java/com/mars/mvc/resolve/access/PathAccess.java similarity index 100% rename from joker-mvc/src/main/java/com/mars/mvc/resolve/access/PathAccess.java rename to mars-mvc/src/main/java/com/mars/mvc/resolve/access/PathAccess.java diff --git a/joker-mvc/src/main/java/com/mars/mvc/servlet/MarsCoreServlet.java b/mars-mvc/src/main/java/com/mars/mvc/servlet/MarsCoreServlet.java similarity index 100% rename from joker-mvc/src/main/java/com/mars/mvc/servlet/MarsCoreServlet.java rename to mars-mvc/src/main/java/com/mars/mvc/servlet/MarsCoreServlet.java diff --git a/joker-mvc/src/main/java/com/mars/mvc/util/BuildParams.java b/mars-mvc/src/main/java/com/mars/mvc/util/BuildParams.java similarity index 100% rename from joker-mvc/src/main/java/com/mars/mvc/util/BuildParams.java rename to mars-mvc/src/main/java/com/mars/mvc/util/BuildParams.java diff --git a/joker-netty/pom.xml b/mars-netty/pom.xml similarity index 77% rename from joker-netty/pom.xml rename to mars-netty/pom.xml index 7fac281..8b1ac3e 100644 --- a/joker-netty/pom.xml +++ b/mars-netty/pom.xml @@ -4,15 +4,15 @@ 4.0.0 com.github.yuyenews - Joker + Mars 3.0.8 - joker-netty + mars-netty com.github.yuyenews - joker-server + mars-server \ No newline at end of file diff --git a/joker-netty/src/main/java/com/mars/netty/execute/RequestExecute.java b/mars-netty/src/main/java/com/mars/netty/execute/RequestExecute.java similarity index 100% rename from joker-netty/src/main/java/com/mars/netty/execute/RequestExecute.java rename to mars-netty/src/main/java/com/mars/netty/execute/RequestExecute.java diff --git a/joker-netty/src/main/java/com/mars/netty/server/MarsServer.java b/mars-netty/src/main/java/com/mars/netty/server/MarsServer.java similarity index 100% rename from joker-netty/src/main/java/com/mars/netty/server/MarsServer.java rename to mars-netty/src/main/java/com/mars/netty/server/MarsServer.java diff --git a/joker-netty/src/main/java/com/mars/netty/server/MarsServerHandler.java b/mars-netty/src/main/java/com/mars/netty/server/MarsServerHandler.java similarity index 100% rename from joker-netty/src/main/java/com/mars/netty/server/MarsServerHandler.java rename to mars-netty/src/main/java/com/mars/netty/server/MarsServerHandler.java diff --git a/joker-netty/src/main/java/com/mars/netty/server/MarsServerInitializer.java b/mars-netty/src/main/java/com/mars/netty/server/MarsServerInitializer.java similarity index 100% rename from joker-netty/src/main/java/com/mars/netty/server/MarsServerInitializer.java rename to mars-netty/src/main/java/com/mars/netty/server/MarsServerInitializer.java diff --git a/joker-netty/src/main/java/com/mars/netty/util/ResponseUtil.java b/mars-netty/src/main/java/com/mars/netty/util/ResponseUtil.java similarity index 100% rename from joker-netty/src/main/java/com/mars/netty/util/ResponseUtil.java rename to mars-netty/src/main/java/com/mars/netty/util/ResponseUtil.java diff --git a/joker-redis/pom.xml b/mars-redis/pom.xml similarity index 84% rename from joker-redis/pom.xml rename to mars-redis/pom.xml index 44cef46..a8fb7a5 100644 --- a/joker-redis/pom.xml +++ b/mars-redis/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - Joker + Mars com.github.yuyenews 3.0.8 4.0.0 - joker-redis + mars-redis @@ -18,7 +18,7 @@ com.github.yuyenews - joker-core + mars-core true diff --git a/joker-redis/src/main/java/com/mars/redis/lock/MarsRedisLock.java b/mars-redis/src/main/java/com/mars/redis/lock/MarsRedisLock.java similarity index 100% rename from joker-redis/src/main/java/com/mars/redis/lock/MarsRedisLock.java rename to mars-redis/src/main/java/com/mars/redis/lock/MarsRedisLock.java diff --git a/joker-redis/src/main/java/com/mars/redis/template/JedisPoolFactory.java b/mars-redis/src/main/java/com/mars/redis/template/JedisPoolFactory.java similarity index 100% rename from joker-redis/src/main/java/com/mars/redis/template/JedisPoolFactory.java rename to mars-redis/src/main/java/com/mars/redis/template/JedisPoolFactory.java diff --git a/joker-redis/src/main/java/com/mars/redis/template/MarsRedisTemplate.java b/mars-redis/src/main/java/com/mars/redis/template/MarsRedisTemplate.java similarity index 100% rename from joker-redis/src/main/java/com/mars/redis/template/MarsRedisTemplate.java rename to mars-redis/src/main/java/com/mars/redis/template/MarsRedisTemplate.java diff --git a/joker-server/pom.xml b/mars-server/pom.xml similarity index 82% rename from joker-server/pom.xml rename to mars-server/pom.xml index 4d593e7..13f05a2 100644 --- a/joker-server/pom.xml +++ b/mars-server/pom.xml @@ -4,10 +4,10 @@ 4.0.0 com.github.yuyenews - Joker + Mars 3.0.8 - joker-server + mars-server @@ -21,7 +21,7 @@ com.github.yuyenews - joker-core + mars-core \ No newline at end of file diff --git a/joker-server/src/main/java/com/mars/server/server/jwt/JwtManager.java b/mars-server/src/main/java/com/mars/server/server/jwt/JwtManager.java similarity index 100% rename from joker-server/src/main/java/com/mars/server/server/jwt/JwtManager.java rename to mars-server/src/main/java/com/mars/server/server/jwt/JwtManager.java diff --git a/joker-server/src/main/java/com/mars/server/server/request/HttpMarsContext.java b/mars-server/src/main/java/com/mars/server/server/request/HttpMarsContext.java similarity index 100% rename from joker-server/src/main/java/com/mars/server/server/request/HttpMarsContext.java rename to mars-server/src/main/java/com/mars/server/server/request/HttpMarsContext.java diff --git a/joker-server/src/main/java/com/mars/server/server/request/HttpMarsRequest.java b/mars-server/src/main/java/com/mars/server/server/request/HttpMarsRequest.java similarity index 100% rename from joker-server/src/main/java/com/mars/server/server/request/HttpMarsRequest.java rename to mars-server/src/main/java/com/mars/server/server/request/HttpMarsRequest.java diff --git a/joker-server/src/main/java/com/mars/server/server/request/HttpMarsResponse.java b/mars-server/src/main/java/com/mars/server/server/request/HttpMarsResponse.java similarity index 100% rename from joker-server/src/main/java/com/mars/server/server/request/HttpMarsResponse.java rename to mars-server/src/main/java/com/mars/server/server/request/HttpMarsResponse.java diff --git a/joker-server/src/main/java/com/mars/server/server/request/RequestParser.java b/mars-server/src/main/java/com/mars/server/server/request/RequestParser.java similarity index 100% rename from joker-server/src/main/java/com/mars/server/server/request/RequestParser.java rename to mars-server/src/main/java/com/mars/server/server/request/RequestParser.java diff --git a/joker-server/src/main/java/com/mars/server/server/request/model/CrossDomain.java b/mars-server/src/main/java/com/mars/server/server/request/model/CrossDomain.java similarity index 100% rename from joker-server/src/main/java/com/mars/server/server/request/model/CrossDomain.java rename to mars-server/src/main/java/com/mars/server/server/request/model/CrossDomain.java diff --git a/joker-server/src/main/java/com/mars/server/server/request/model/MarsFileUpLoad.java b/mars-server/src/main/java/com/mars/server/server/request/model/MarsFileUpLoad.java similarity index 100% rename from joker-server/src/main/java/com/mars/server/server/request/model/MarsFileUpLoad.java rename to mars-server/src/main/java/com/mars/server/server/request/model/MarsFileUpLoad.java diff --git a/joker-server/src/main/java/com/mars/server/server/servlet/MarsServlet.java b/mars-server/src/main/java/com/mars/server/server/servlet/MarsServlet.java similarity index 100% rename from joker-server/src/main/java/com/mars/server/server/servlet/MarsServlet.java rename to mars-server/src/main/java/com/mars/server/server/servlet/MarsServlet.java diff --git a/joker-server/src/main/java/com/mars/server/util/RequestUtil.java b/mars-server/src/main/java/com/mars/server/util/RequestUtil.java similarity index 100% rename from joker-server/src/main/java/com/mars/server/util/RequestUtil.java rename to mars-server/src/main/java/com/mars/server/util/RequestUtil.java diff --git a/pom.xml b/pom.xml index 088d007..872c393 100644 --- a/pom.xml +++ b/pom.xml @@ -3,16 +3,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.github.yuyenews - Joker + Mars 3.0.8 pom - joker-core - joker-mvc - joker-netty - joker-server - joker-jdbc - joker-redis + mars-core + mars-mvc + mars-netty + mars-server + mars-jdbc + mars-redis @@ -23,33 +23,33 @@ com.github.yuyenews - joker-mvc + mars-mvc ${project.parent.version} com.github.yuyenews - joker-core + mars-core ${project.parent.version} com.github.yuyenews - joker-netty + mars-netty ${project.parent.version} com.github.yuyenews - joker-server + mars-server ${project.parent.version} com.github.yuyenews - joker-junit + mars-junit ${project.parent.version} com.github.yuyenews - joker-redis + mars-redis ${project.parent.version}