diff --git a/mars-start/mars-start-base/pom.xml b/mars-start/mars-start-base/pom.xml deleted file mode 100644 index 9ea15f8..0000000 --- a/mars-start/mars-start-base/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - mars-start - com.github.yuyenews - 2.1.5 - - 4.0.0 - - mars-start-base - - - - com.github.yuyenews - mars-jdbc-base - ${project.parent.version} - - - com.github.yuyenews - mars-mvc - ${project.parent.version} - - - com.github.yuyenews - mars-junit - ${project.parent.version} - - - com.github.yuyenews - mars-timer - ${project.parent.version} - - - - \ No newline at end of file diff --git a/mars-start/mars-start-base/src/main/java/com/mars/start/base/BaseStartMars.java b/mars-start/mars-start-base/src/main/java/com/mars/start/base/BaseStartMars.java deleted file mode 100644 index 5d117b0..0000000 --- a/mars-start/mars-start-base/src/main/java/com/mars/start/base/BaseStartMars.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.mars.start.base; - -import com.alibaba.fastjson.JSONObject; -import com.mars.core.after.StartAfter; -import com.mars.core.constant.MarsConstant; -import com.mars.core.constant.MarsSpace; -import com.mars.core.load.LoadClass; -import com.mars.core.logger.MarsLogger; -import com.mars.core.util.ConfigUtil; -import com.mars.junit.StartList; -import com.mars.mvc.load.LoadInters; -import com.mars.netty.server.MarsServer; -import com.mars.ioc.load.LoadEasyBean; -import com.mars.jdbc.base.BaseInitJdbc; -import com.mars.mvc.load.LoadController; -import com.mars.mvc.servlet.MarsCoreServlet; -import com.mars.timer.execute.ExecuteMarsTimer; -import com.mars.timer.load.LoadMarsTimer; - -import java.util.List; - -/** - * 启动Mars框架 - * @author yuye - * - */ -public class BaseStartMars { - - private static MarsLogger log = MarsLogger.getLogger(BaseStartMars.class); - - /** - * 获取全局存储空间 - */ - private static MarsSpace constants = MarsSpace.getEasySpace(); - - /** - * 启动Mars框架 - * @param clazz - */ - public static void start(Class clazz, BaseInitJdbc baseInitJdbc, String suffix, List startList) { - try { - - log.info("程序启动中......"); - - /* 加载框架数据 */ - load(clazz,baseInitJdbc,suffix); - - /* 扩展要加载的东西 */ - if(startList != null){ - for(StartList item : startList){ - item.load(); - } - } - - /* 启动after方法 */ - StartAfter.after(); - - /* 执行定时任务 */ - ExecuteMarsTimer.execute(); - - /* 启动netty */ - MarsServer.start(getPort()); - - } catch (Exception e) { - log.error("",e); - System.exit(0); - } - } - - /** - * 加载所需的资源 - */ - private static void load(Class clazz, BaseInitJdbc baseInitJdbc,String suffix) throws Exception{ - - /* 配置核心servlet */ - constants.setAttr("core", MarsCoreServlet.class.getName()); - - /* 加载配置文件 */ - ConfigUtil.loadConfig(suffix); - - /*获取要扫描的包*/ - String className = getClassName(clazz); - - /* 将要扫描的包名存到全局存储空间，给别的需要的地方使用 */ - constants.setAttr("rootPath", className); - - /* 获取此包下面的所有类（包括jar中的） */ - LoadClass.loadBeans(className); - - /* 加载JDBC模块 */ - if(baseInitJdbc != null){ - baseInitJdbc.init(); - } - - /* 创建bean对象 */ - LoadEasyBean.loadBean(); - - /* 创建controller对象 */ - LoadController.loadContrl(); - - /* 创建interceptor对象 */ - LoadInters.loadIntersList(); - - /* 标识createBean方法已经调用完毕 */ - constants.setAttr(MarsConstant.HAS_START,"yes"); - - /* 加载timer对象 */ - LoadMarsTimer.loadMarsTimers(); - } - - /** - * 截取main方法所在包名 - * @param clazz - * @return - * @throws Exception - */ - private static String getClassName(Class clazz) throws Exception { - String className = clazz.getName(); - if(className.indexOf(".") < 0){ - throw new Exception("启动服务的main方法所在的类,必须放在两层包名中,比如[com.mars,com.test]等,不允许放在[com,cn]等包中,更不允许放在包外面"); - } - return className.substring(0,className.lastIndexOf(".")); - } - - /** - * 获取端口号，默认8080 - * @return - */ - private static int getPort() { - - JSONObject jsonObject = ConfigUtil.getConfig(); - Object por = jsonObject.get("port"); - if(por!=null) { - return Integer.parseInt(por.toString()); - } - - return 8080; - } -} diff --git a/mars-start/mars-start-base/src/main/resources/demo/mars.yml b/mars-start/mars-start-base/src/main/resources/demo/mars.yml deleted file mode 100644 index 3469f36..0000000 --- a/mars-start/mars-start-base/src/main/resources/demo/mars.yml +++ /dev/null @@ -1,85 +0,0 @@ -#此配置文件只是个demo，对开发没什么卵用 - -#配置端口号（默认8080） -port: 8088 -#配置jwt有效期（默认1），单位:秒 -jwtTime: 20 -#请求超时时间（默认10,2000000000），单位:秒 -timeOut: - readTimeOut: 10 - writeTimeOut: 2000000000 -#请求数据的最大值（默认10485760） -maxContentLength: 10 -#配置跨域请求 -cross_domain: - origin: "*" - methods: "GET,POST" - maxAge: 9 - headers: "x-requested-with,Cache-Control,Pragma,Content-Type,Token" - credentials: "true" - -#配置持久层 -jdbc: - #配置数据源，必须是数组，必须是阿里巴巴的 druid数据源 - dataSource: - - #左边这条斜杠千万不能省略，缩进也必须有; 下面的属性请参照druid数据源 - name: dataSource - url: jdbc:mysql://10.211.55.5:3306/test?serverTimezone=GMT%2B8 - username: root - password: rootroot - driverClassName: com.mysql.cj.jdbc.Driver - - #配置mybatis方言 - dialect: mysql - #配置要扫描的mapper.xml 文件存放路径 - mappers: mappers - - #mybatis配置文件路径，必须在classpath目录下 - #这个属性不建议配置，除非你有自己需要对mybatis配置的东西，否则不要配这个属性 - config-location: mybatis.xml - -#log4j2 配置文件的路径 -#相对路径必须以classPath- 开头，区分大小写，并且文件必须直接或者间接在classpath目录下 -#不可以有多余的空格 -#绝对路径直接写即可，不需要classPath开头 -logFile: classPath-log4j2.xml - - -#以下配置 必须在导入Mars-extends 中的相应的jar包后 才生效 - -#redis配置 -redis: - maxTotal: 1000 - maxIdle: 100 - numTestsPerEvictionRun: 10 - timeBetweenEvictionRunsMillis: 10 - minEvictableIdleTimeMillis: 10 - softMinEvictableIdleTimeMillis: 10 - maxWaitMillis: 10 - testOnBorrow: false - testWhileIdle: false - testOnReturn: false - jmxEnabled: false - jmxNamePrefix: pool - blockWhenExhausted: false - # redis连接，必须是数组 因为可能需要连多个redis - jedisShardInfos: - - - name: master - host: 10.211.55.5 - port: 6379 - password: 123456 - # 这两个可以不配置 - connectionTimeout: 1000 - soTimeout: 1000 - -#邮件配置 只支持smtp -mail: - host: smtp.sina.com - port: 465 - smtpSslEnable: true - debug: false - # 发件箱 - sendMail: 发件箱 - sendMailPwd: 发件箱密码 - auth: true \ No newline at end of file diff --git a/mars-start/mars-start-base/src/main/resources/mars-config-demo/mars.yml b/mars-start/mars-start-base/src/main/resources/mars-config-demo/mars.yml deleted file mode 100644 index 8aa3a5e..0000000 --- a/mars-start/mars-start-base/src/main/resources/mars-config-demo/mars.yml +++ /dev/null @@ -1,12 +0,0 @@ -#此配置文件只是个demo，对开发没什么卵用 - -#配置端口号（默认8080） -port: 8088 - -#Mars-config 远程配置中心 -config: - # 需要读取的配置文件名称，在整个分布式集群中必须唯一 - name: user1 - # Mars-config 服务的URL - # 必须是 本示例中的各式 - url: http://127.0.0.1:8090 \ No newline at end of file diff --git a/mars-start/mars-start-mj/pom.xml b/mars-start/mars-start-mj/pom.xml deleted file mode 100644 index 8d33781..0000000 --- a/mars-start/mars-start-mj/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - mars-start - com.github.yuyenews - 2.1.5 - - 4.0.0 - - mars-start-mj - - - - com.github.yuyenews - mars-start-base - ${project.parent.version} - - - com.github.yuyenews - mars-mj - ${project.parent.version} - - - \ No newline at end of file diff --git a/mars-start/mars-start-mj/src/main/java/com/mars/junit/MarsJunit.java b/mars-start/mars-start-mj/src/main/java/com/mars/junit/MarsJunit.java deleted file mode 100644 index bb6ecf9..0000000 --- a/mars-start/mars-start-mj/src/main/java/com/mars/junit/MarsJunit.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.mars.junit; - -import com.mars.mj.init.InitJdbc; - -/** - * junit - */ -public abstract class MarsJunit { - - /** - * 加载项目启动的必要数据 - * @param packName - */ - public void init(String packName,String suffix){ - MarsJunitStart.start(new InitJdbc(),packName,this,null,suffix); - } - - /** - * 加载项目启动的必要数据 - * @param packName - */ - public void init(String packName){ - init(packName,null); - } - - /** - * 单测开始前 - */ - public abstract void before(); -} diff --git a/mars-start/mars-start-mj/src/main/java/com/mars/start/StartMars.java b/mars-start/mars-start-mj/src/main/java/com/mars/start/StartMars.java deleted file mode 100644 index 719b3a5..0000000 --- a/mars-start/mars-start-mj/src/main/java/com/mars/start/StartMars.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.mars.start; - -import com.mars.mj.init.InitJdbc; -import com.mars.start.base.BaseStartMars; - -/** - * 启动Mars框架 - * @author yuye - * - */ -public class StartMars { - /** - * 启动Mars框架 - * @param clazz - */ - public static void start(Class clazz,String[] args){ - if(args != null && args[0] != null){ - BaseStartMars.start(clazz,new InitJdbc(),args[0],null); - } else { - BaseStartMars.start(clazz,new InitJdbc(),null,null); - } - } - - /** - * 启动Mars框架 - * @param clazz - */ - public static void start(Class clazz){ - start(clazz,null); - } -} diff --git a/mars-start/mars-start-mybatis/pom.xml b/mars-start/mars-start-mybatis/pom.xml deleted file mode 100644 index 1edaa03..0000000 --- a/mars-start/mars-start-mybatis/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - mars-start - com.github.yuyenews - 2.1.5 - - 4.0.0 - - mars-start-mybatis - - - - com.github.yuyenews - mars-start-base - ${project.parent.version} - - - com.github.yuyenews - mars-mybatis - ${project.parent.version} - - - - \ No newline at end of file diff --git a/mars-start/mars-start-mybatis/src/main/java/com/mars/junit/MarsJunit.java b/mars-start/mars-start-mybatis/src/main/java/com/mars/junit/MarsJunit.java deleted file mode 100644 index f5bbf81..0000000 --- a/mars-start/mars-start-mybatis/src/main/java/com/mars/junit/MarsJunit.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.mars.junit; - -import com.mars.mybatis.init.InitJdbc; -import org.junit.Before; - -/** - * junit - */ -public abstract class MarsJunit { - - /** - * 加载项目启动的必要数据 - * @param packName - */ - public void init(String packName,String suffix){ - MarsJunitStart.start(new InitJdbc(),packName,this,null,suffix); - } - - /** - * 加载项目启动的必要数据 - * @param packName - */ - public void init(String packName){ - init(packName,null); - } - - /** - * 单测开始前 - */ - @Before - public abstract void before(); -} diff --git a/mars-start/mars-start-mybatis/src/main/java/com/mars/start/StartMars.java b/mars-start/mars-start-mybatis/src/main/java/com/mars/start/StartMars.java deleted file mode 100644 index f23a3f5..0000000 --- a/mars-start/mars-start-mybatis/src/main/java/com/mars/start/StartMars.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.mars.start; - -import com.mars.mybatis.init.InitJdbc; -import com.mars.start.base.BaseStartMars; - -/** - * 启动Mars框架 - * @author yuye - * - */ -public class StartMars { - /** - * 启动Mars框架 - * @param clazz - */ - public static void start(Class clazz,String[] args) { - if(args != null && args[0] != null){ - BaseStartMars.start(clazz,new InitJdbc(),args[0],null); - } else { - BaseStartMars.start(clazz,new InitJdbc(),null,null); - } - } - - /** - * 启动Mars框架 - * @param clazz - */ - public static void start(Class clazz) { - start(clazz,null); - } -} diff --git a/mars-start/mars-start-simple/pom.xml b/mars-start/mars-start-simple/pom.xml deleted file mode 100644 index 3312a2e..0000000 --- a/mars-start/mars-start-simple/pom.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - mars-start - com.github.yuyenews - 2.1.5 - - 4.0.0 - - mars-start-simple - - - - com.github.yuyenews - mars-start-base - ${project.parent.version} - - - \ No newline at end of file diff --git a/mars-start/mars-start-simple/src/main/java/com/mars/junit/MarsJunit.java b/mars-start/mars-start-simple/src/main/java/com/mars/junit/MarsJunit.java deleted file mode 100644 index 11a051b..0000000 --- a/mars-start/mars-start-simple/src/main/java/com/mars/junit/MarsJunit.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.mars.junit; - -/** - * junit - */ -public abstract class MarsJunit { - - /** - * 加载项目启动的必要数据 - * @param packName - */ - public void init(String packName,String suffix){ - MarsJunitStart.start(null,packName,this,null,suffix); - } - - /** - * 加载项目启动的必要数据 - * @param packName - */ - public void init(String packName){ - init(packName,null); - } - - /** - * 单测开始前 - */ - public abstract void before(); -} diff --git a/mars-start/mars-start-simple/src/main/java/com/mars/start/StartMars.java b/mars-start/mars-start-simple/src/main/java/com/mars/start/StartMars.java deleted file mode 100644 index b4ffc07..0000000 --- a/mars-start/mars-start-simple/src/main/java/com/mars/start/StartMars.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.mars.start; - -import com.mars.start.base.BaseStartMars; - -/** - * 启动Mars框架 - * @author yuye - * - */ -public class StartMars { - /** - * 启动Mars框架 - * @param clazz - */ - public static void start(Class clazz,String[] args) { - if(args != null && args[0] != null){ - BaseStartMars.start(clazz,null,args[0],null); - } else { - BaseStartMars.start(clazz,null,null,null); - } - } - - /** - * 启动Mars框架 - * @param clazz - */ - public static void start(Class clazz) { - start(clazz,null); - } -} diff --git a/mars-start/mars-start.iml b/mars-start/mars-start.iml deleted file mode 100644 index f409c0e..0000000 --- a/mars-start/mars-start.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/mars-start/pom.xml b/mars-start/pom.xml deleted file mode 100644 index b08d0b1..0000000 --- a/mars-start/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - Mars-java - com.github.yuyenews - 2.1.5 - - 4.0.0 - pom - - mars-start-mybatis - mars-start-simple - mars-start-mj - mars-start-base - - mars-start - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 898bc1c..430df47 100644 --- a/pom.xml +++ b/pom.xml @@ -1,190 +1,189 @@ - - 4.0.0 - com.github.yuyenews - Mars-java - 2.1.5 - pom - - mars-aop - mars-ioc - mars-core - mars-mvc - mars-netty - mars-server - mars-start - mars-jdbc - mars-junit - mars-timer - - - - ${java.home}/../bin/javadoc - - - - - - com.github.yuyenews - mars-aop - ${project.parent.version} - - - com.github.yuyenews - mars-ioc - ${project.parent.version} - - - com.github.yuyenews - mars-mvc - ${project.parent.version} - - - com.github.yuyenews - mars-core - ${project.parent.version} - - - com.github.yuyenews - mars-netty - ${project.parent.version} - - - - com.github.yuyenews - mars-server - ${project.parent.version} - - - com.github.yuyenews - mars-junit - ${project.parent.version} - - - com.github.yuyenews - mars-timer - ${project.parent.version} - - - - io.netty - netty-all - 4.1.38.Final - - - - com.alibaba - fastjson - 1.2.47 - - - - org.slf4j - slf4j-api - 1.7.25 - - - org.slf4j - slf4j-jdk14 - 1.7.25 - - - - org.apache.logging.log4j - log4j-api - 2.11.2 - - - org.apache.logging.log4j - log4j-core - 2.11.2 - - - - org.ow2.asm - asm - 5.2 - - - cglib - cglib - 3.2.5 - - - - mysql - mysql-connector-java - 8.0.11 - - - - org.mybatis - mybatis - 3.4.6 - - - - com.alibaba - druid - 1.1.10 - - - - com.github.pagehelper - pagehelper - 4.1.3 - - - - com.auth0 - java-jwt - 3.4.1 - - - - org.yaml - snakeyaml - 1.24 - - - - com.squareup.okhttp3 - okhttp - 3.14.0 - - - - junit - junit - 4.12 - - - - - - org.sonatype.oss - oss-parent - 7 - - - - The GPL Software License, Version 3.0 - http://www.gnu.org/licenses/gpl-3.0.html - repo - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - + + 4.0.0 + com.github.yuyenews + Mars-java + 2.1.5 + pom + + mars-aop + mars-ioc + mars-core + mars-mvc + mars-netty + mars-server + mars-jdbc + mars-junit + mars-timer + + + + ${java.home}/../bin/javadoc + + + + + + com.github.yuyenews + mars-aop + ${project.parent.version} + + + com.github.yuyenews + mars-ioc + ${project.parent.version} + + + com.github.yuyenews + mars-mvc + ${project.parent.version} + + + com.github.yuyenews + mars-core + ${project.parent.version} + + + com.github.yuyenews + mars-netty + ${project.parent.version} + + + + com.github.yuyenews + mars-server + ${project.parent.version} + + + com.github.yuyenews + mars-junit + ${project.parent.version} + + + com.github.yuyenews + mars-timer + ${project.parent.version} + + + + io.netty + netty-all + 4.1.38.Final + + + + com.alibaba + fastjson + 1.2.47 + + + + org.slf4j + slf4j-api + 1.7.25 + + + org.slf4j + slf4j-jdk14 + 1.7.25 + + + + org.apache.logging.log4j + log4j-api + 2.11.2 + + + org.apache.logging.log4j + log4j-core + 2.11.2 + + + + org.ow2.asm + asm + 5.2 + + + cglib + cglib + 3.2.5 + + + + mysql + mysql-connector-java + 8.0.11 + + + + org.mybatis + mybatis + 3.4.6 + + + + com.alibaba + druid + 1.1.10 + + + + com.github.pagehelper + pagehelper + 4.1.3 + + + + com.auth0 + java-jwt + 3.4.1 + + + + org.yaml + snakeyaml + 1.24 + + + + com.squareup.okhttp3 + okhttp + 3.14.0 + + + + junit + junit + 4.12 + + + + + + org.sonatype.oss + oss-parent + 7 + + + + The GPL Software License, Version 3.0 + http://www.gnu.org/licenses/gpl-3.0.html + repo + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + \ No newline at end of file