Merge remote-tracking branch 'origin/master'

jero-boot/jero-boot-module-demo/pom.xml

@@ -14,9 +14,15 @@
     <dependencies>
         <dependency>
             <groupId>com.jero.boot</groupId>
-            <artifactId>jero-boot-base-core</artifactId>
+            <artifactId>jero-system-local-api</artifactId>
         </dependency>
-        <!-- 如果需要微服务版本，则引入微服务启动依赖 starte
+        <!-- 如果需要微服务版本，则以上API注释，释放该API
+        <dependency>
+            <groupId>com.jero.boot</groupId>
+            <artifactId>jero-system-cloud-api</artifactId>
+        </dependency>
+        -->
+        <!-- 如果需要微服务版本，则引入微服务启动依赖 starter
         <dependency>
           <groupId>com.jero.boot</groupId>
           <artifactId>jero-cloud-feign-config</artifactId>

jero-boot/jero-boot-module-system/src/main/java/com/jero/JeroSystemApplication.java

@@ -1,40 +0,0 @@
-//package com.jero;
-//
-//import lombok.extern.slf4j.Slf4j;
-//import com.jero.common.util.oConvertUtils;
-//import org.springframework.boot.SpringApplication;
-//import org.springframework.boot.autoconfigure.SpringBootApplication;
-//import org.springframework.boot.builder.SpringApplicationBuilder;
-//import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-//import org.springframework.context.ConfigurableApplicationContext;
-//import org.springframework.core.env.Environment;
-//
-//import java.net.InetAddress;
-//import java.net.UnknownHostException;
-//
-///**
-//* 单体启动类（采用此类启动为单体模式）
-//*/
-//@Slf4j
-//@SpringBootApplication
-//public class JeroSystemApplication extends SpringBootServletInitializer {
-//
-//    @Override
-//    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-//        return application.sources(JeroSystemApplication.class);
-//    }
-//
-//    public static void main(String[] args) throws UnknownHostException {
-//        ConfigurableApplicationContext application = SpringApplication.run(JeroSystemApplication.class, args);
-//        Environment env = application.getEnvironment();
-//        String ip = InetAddress.getLocalHost().getHostAddress();
-//        String port = env.getProperty("server.port");
-//        String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
-//        log.info("\n----------------------------------------------------------\n\t" +
-//                "Application jero-boot is running! Access URLs:\n\t" +
-//                "Local: \t\thttp://localhost:" + port + path + "/\n\t" +
-//                "External: \thttp://" + ip + ":" + port + path + "/\n\t" +
-//                "Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
-//                "----------------------------------------------------------");
-//    }
-//}

jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml

@@ -131,7 +131,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://10.0.3.44:3306/jero-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://localhost:3306/jero-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
           password: 123456
           driver-class-name: com.mysql.cj.jdbc.Driver

jero-boot/pom.xml

@@ -54,6 +54,7 @@
 		<module>jero-boot-starter</module>
 		<!-- 单体应用启动类 -->
 		<module>jero-boot-single-startup</module>
+		<module>untitled</module>
 		<!--   需要微服务，请打开注释吗，并刷新maven
 		<module>jero-cloud-module</module>
 		-->